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

Fix formatting of Dockerfiles

Browse source 
Signed-off-by: Steffen Vogel <steffen.vogel@opal-rt.com>
This commit is contained in:
Steffen Vogel 2023-09-07 13:00:57 +02:00
parent b1ff19719a
commit 523adc48c4
4 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
packaging/docker/Dockerfile.debian
View file

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

14
packaging/docker/Dockerfile.debian-multiarch
View file

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

2
packaging/docker/Dockerfile.fedora
View file

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

2
packaging/docker/Dockerfile.ubuntu
View file

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