Mirrors/VILLASnode
1
0
Fork 0
mirror of https://git.rwth-aachen.de/acs/public/villas/node/ synced 2025-03-09 00:00:00 +01:00
Code Issues Releases Wiki Activity

docker: add local lib folders to dl search path

Browse source
This commit is contained in:
Steffen Vogel 2020-09-30 11:17:25 +02:00
parent 795ef6e1a2
commit 048561417c
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
packaging/docker/Dockerfile.app
View file

@ -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

3
packaging/docker/Dockerfile.dev
View file

@ -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