diff --git a/packaging/docker/Dockerfile.debian b/packaging/docker/Dockerfile.debian index ad8398c90..b9fcb9801 100644 --- a/packaging/docker/Dockerfile.debian +++ b/packaging/docker/Dockerfile.debian @@ -55,7 +55,7 @@ RUN apt-get update && \ # Add local and 64-bit locations to linker paths ENV echo /usr/local/lib >> /etc/ld.so.conf && \ - echo /usr/local/lib64 >> /etc/ld.so.conf + echo /usr/local/lib64 >> /etc/ld.so.conf # or install unpackaged dependencies from source ADD packaging/deps.sh / diff --git a/packaging/docker/Dockerfile.debian-multiarch b/packaging/docker/Dockerfile.debian-multiarch index d776dbe3b..a7f858de6 100644 --- a/packaging/docker/Dockerfile.debian-multiarch +++ b/packaging/docker/Dockerfile.debian-multiarch @@ -63,18 +63,18 @@ RUN apt-get update && \ # Add local and 64-bit locations to linker paths ENV echo /usr/local/lib >> /etc/ld.so.conf && \ - echo /usr/local/lib64 >> /etc/ld.so.conf + echo /usr/local/lib64 >> /etc/ld.so.conf ADD cmake/toolchains/debian-${ARCH}.cmake / ENV PKG_CONFIG_PATH=/usr/lib/${TRIPLET}/pkgconfig:/usr/local/lib/${TRIPLET}/pkgconfig ENV CMAKE_EXTRA_OPTS="-DCMAKE_TOOLCHAIN_FILE=/debian-${ARCH}.cmake \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_PREFIX_PATH=${PREFIX} \ - -DCMAKE_INSTALL_PREFIX=${PREFIX} \ - -DCMAKE_INSTALL_LIBDIR=${PREFIX}/lib/${TRIPLET} \ - -DLWS_INSTALL_LIB_DIR=${PREFIX}/lib/${TRIPLET}" + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_PREFIX_PATH=${PREFIX} \ + -DCMAKE_INSTALL_PREFIX=${PREFIX} \ + -DCMAKE_INSTALL_LIBDIR=${PREFIX}/lib/${TRIPLET} \ + -DLWS_INSTALL_LIB_DIR=${PREFIX}/lib/${TRIPLET}" ENV CONFIGURE_OPTS="--libdir=${PREFIX}/lib/${TRIPLET}" @@ -111,7 +111,7 @@ COPY . /villas/ RUN rm -rf /villas/build && mkdir /villas/build WORKDIR /villas/build - + RUN cmake ${CMAKE_OPTS} ${CMAKE_EXTRA_OPTS} .. && \ make -j$(nproc) install diff --git a/packaging/docker/Dockerfile.fedora b/packaging/docker/Dockerfile.fedora index 88d86d39c..2d1ef0c0e 100644 --- a/packaging/docker/Dockerfile.fedora +++ b/packaging/docker/Dockerfile.fedora @@ -69,7 +69,7 @@ RUN dnf -y install \ # Add local and 64-bit locations to linker paths RUN echo /usr/local/lib >> /etc/ld.so.conf && \ - echo /usr/local/lib64 >> /etc/ld.so.conf + echo /usr/local/lib64 >> /etc/ld.so.conf # Install unpackaged dependencies from source ADD packaging/deps.sh / diff --git a/packaging/docker/Dockerfile.ubuntu b/packaging/docker/Dockerfile.ubuntu index 0bfb82217..78f85454d 100644 --- a/packaging/docker/Dockerfile.ubuntu +++ b/packaging/docker/Dockerfile.ubuntu @@ -57,7 +57,7 @@ RUN apt-get update && \ # Add local and 64-bit locations to linker paths ENV echo /usr/local/lib >> /etc/ld.so.conf && \ - echo /usr/local/lib64 >> /etc/ld.so.conf + echo /usr/local/lib64 >> /etc/ld.so.conf # or install unpackaged dependencies from source ADD packaging/deps.sh /