From 29b4fbaebe6c73d818b0c97f0811fd141ca87711 Mon Sep 17 00:00:00 2001
From: Jan David Mol <mol@astron.nl>
Date: Fri, 28 May 2021 13:43:27 +0200
Subject: [PATCH] L2SS-230: Use nproc for parallel make, pull fixed tag for
open62541 opc-ua lib
---
docker-compose/sdptr-sim/Dockerfile | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/docker-compose/sdptr-sim/Dockerfile b/docker-compose/sdptr-sim/Dockerfile
index bebf7b8eb..4ced94162 100644
--- a/docker-compose/sdptr-sim/Dockerfile
+++ b/docker-compose/sdptr-sim/Dockerfile
@@ -5,11 +5,11 @@ RUN apt-get update && \
apt-get clean
# Install OPC-UA lib
-RUN git clone --depth 1 https://github.com/open62541/open62541 && \
+RUN git clone --depth 1 --branch 1.2 https://github.com/open62541/open62541 && \
cd /open62541 && \
git submodule update --init --recursive && \
mkdir build && cd build && \
- cmake .. -DBUILD_SHARED_LIBS=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo -DUA_NAMESPACE_ZERO=FULL -DUA_MULTITHREADING=100 && make -j 4 install
+ bash -c "cmake .. -DBUILD_SHARED_LIBS=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo -DUA_NAMESPACE_ZERO=FULL -DUA_MULTITHREADING=100 && make -j `nproc` install"
# Update shared library cache
RUN ldconfig
@@ -20,7 +20,7 @@ RUN cd / && git clone --depth 1 --branch master https://git.astron.nl/lofar2.0/s
RUN cd /sdptr && \
autoreconf -v -f -i && \
./configure && \
- make -j 4 install
+ bash -c "make -j `nproc` install"
WORKDIR /sdptr/src
CMD ["sdptr", "--configfile=uniboard.conf", "--nodaemon"]
--
GitLab