From 048561417c43e1d97056efaa41591ade04fc85d2 Mon Sep 17 00:00:00 2001 From: Steffen Vogel Date: Wed, 30 Sep 2020 11:17:25 +0200 Subject: [PATCH] docker: add local lib folders to dl search path --- packaging/docker/Dockerfile.app | 3 ++- packaging/docker/Dockerfile.dev | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/packaging/docker/Dockerfile.app b/packaging/docker/Dockerfile.app index c76fd9bc5..2efb7f13c 100644 --- a/packaging/docker/Dockerfile.app +++ b/packaging/docker/Dockerfile.app @@ -40,7 +40,8 @@ RUN rm -rf /villas/build && mkdir /villas/build WORKDIR /villas/build RUN cmake .. && \ make -j$(nproc) doc && \ - make -j$(nproc) install + make -j$(nproc) install && \ + ldconfig # For WebSocket / API access EXPOSE 80 diff --git a/packaging/docker/Dockerfile.dev b/packaging/docker/Dockerfile.dev index bd53d7b31..01dd49d52 100644 --- a/packaging/docker/Dockerfile.dev +++ b/packaging/docker/Dockerfile.dev @@ -88,7 +88,7 @@ RUN dnf -y install \ libusb-devel # Add local and 64-bit locations to linker paths -ENV echo /usr/local/lib >> /etc/ld.so.conf && \ +RUN echo /usr/local/lib >> /etc/ld.so.conf && \ echo /usr/local/lib64 >> /etc/ld.so.conf ENV VARIANT=fedora @@ -98,6 +98,7 @@ ENV TRIPLET=x86_64-linux-gnu # Install unpackaged dependencies from source ADD packaging/deps.sh / RUN bash deps.sh +RUN ldconfig # Workaround for libnl3's search path for netem distributions RUN ln -s /usr/lib64/tc /usr/lib/tc