From 7252bc0137338448d1fd41db631353300a6bf08e Mon Sep 17 00:00:00 2001
From: Thomas Juerges <203795-tjuerges@users.noreply.gitlab.com>
Date: Thu, 12 Aug 2021 13:08:01 +0200
Subject: [PATCH] L2SS-329: Use repository version of open62541 lib
---
docker-compose/sdptr-sim/Dockerfile | 16 +++++-----------
1 file changed, 5 insertions(+), 11 deletions(-)
diff --git a/docker-compose/sdptr-sim/Dockerfile b/docker-compose/sdptr-sim/Dockerfile
index 4ced94162..ed6ac8d35 100644
--- a/docker-compose/sdptr-sim/Dockerfile
+++ b/docker-compose/sdptr-sim/Dockerfile
@@ -1,19 +1,13 @@
FROM ubuntu:20.04
+# Install build tools for sdptr and the C language OPC-UA lib
RUN apt-get update && \
- DEBIAN_FRONTEND=noninteractive apt-get install -y autoconf automake git make g++ build-essential pkg-config cmake python liburcu-dev libmbedtls-dev libsubunit-dev libboost-dev libboost-regex-dev libboost-system-dev libboost-program-options-dev && \
+ DEBIAN_FRONTEND=noninteractive apt-get install -y software-properties-common && \
+ DEBIAN_FRONTEND=noninteractive add-apt-repository ppa:open62541-team/ppa && \
+ apt-get update && \
+ DEBIAN_FRONTEND=noninteractive apt-get install -y autoconf automake git make g++ build-essential pkg-config libboost-dev libboost-regex-dev libboost-system-dev libboost-program-options-dev libopen62541-1-dev libopen62541-1-tools && \
apt-get clean
-# Install OPC-UA lib
-RUN git clone --depth 1 --branch 1.2 https://github.com/open62541/open62541 && \
- cd /open62541 && \
- git submodule update --init --recursive && \
- mkdir build && cd build && \
- 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
-
# Install SDPTR
RUN cd / && git clone --depth 1 --branch master https://git.astron.nl/lofar2.0/sdptr
--
GitLab