From 70fd53761e99dee108e6d1d2646ee7e88938f7f8 Mon Sep 17 00:00:00 2001
From: lukken <lukken@astron.nl>
Date: Tue, 16 Nov 2021 15:54:23 +0000
Subject: [PATCH] L2SS-205: sdptr based simulators use externally build docker
image
---
docker-compose/apsct-sim.yml | 3 +++
docker-compose/apspu-sim.yml | 3 +++
docker-compose/recv-sim.yml | 2 +-
docker-compose/sdptr-sim.yml | 3 +++
docker-compose/sdptr-sim/Dockerfile | 19 +++----------------
docker-compose/unb2-sim.yml | 3 +++
6 files changed, 16 insertions(+), 17 deletions(-)
diff --git a/docker-compose/apsct-sim.yml b/docker-compose/apsct-sim.yml
index d30f5a026..b9742fdb9 100644
--- a/docker-compose/apsct-sim.yml
+++ b/docker-compose/apsct-sim.yml
@@ -10,6 +10,9 @@ services:
apsct-sim:
build:
context: pypcc-sim-base
+ args:
+ - LOCAL_DOCKER_REGISTRY_HOST=${LOCAL_DOCKER_REGISTRY_HOST}
+ - LOCAL_DOCKER_REGISTRY_LOFAR=${LOCAL_DOCKER_REGISTRY_LOFAR}
container_name: ${CONTAINER_NAME_PREFIX}apsct-sim
networks:
- control
diff --git a/docker-compose/apspu-sim.yml b/docker-compose/apspu-sim.yml
index d3fc5fa04..f5677048f 100644
--- a/docker-compose/apspu-sim.yml
+++ b/docker-compose/apspu-sim.yml
@@ -10,6 +10,9 @@ services:
apspu-sim:
build:
context: pypcc-sim-base
+ args:
+ - LOCAL_DOCKER_REGISTRY_HOST=${LOCAL_DOCKER_REGISTRY_HOST}
+ - LOCAL_DOCKER_REGISTRY_LOFAR=${LOCAL_DOCKER_REGISTRY_LOFAR}
container_name: ${CONTAINER_NAME_PREFIX}apspu-sim
networks:
- control
diff --git a/docker-compose/recv-sim.yml b/docker-compose/recv-sim.yml
index c4b870093..8fd795be6 100644
--- a/docker-compose/recv-sim.yml
+++ b/docker-compose/recv-sim.yml
@@ -12,7 +12,7 @@ services:
context: pypcc-sim-base
args:
- LOCAL_DOCKER_REGISTRY_HOST=${LOCAL_DOCKER_REGISTRY_HOST}
- - LOCAL_DOCKER_REGISTRY_THIRD_PARTY=${LOCAL_DOCKER_REGISTRY_THIRD_PARTY}
+ - LOCAL_DOCKER_REGISTRY_LOFAR=${LOCAL_DOCKER_REGISTRY_LOFAR}
container_name: ${CONTAINER_NAME_PREFIX}recv-sim
networks:
- control
diff --git a/docker-compose/sdptr-sim.yml b/docker-compose/sdptr-sim.yml
index c81c3db9a..badf707e3 100644
--- a/docker-compose/sdptr-sim.yml
+++ b/docker-compose/sdptr-sim.yml
@@ -10,6 +10,9 @@ services:
sdptr-sim:
build:
context: sdptr-sim
+ args:
+ - LOCAL_DOCKER_REGISTRY_HOST=${LOCAL_DOCKER_REGISTRY_HOST}
+ - LOCAL_DOCKER_REGISTRY_LOFAR=${LOCAL_DOCKER_REGISTRY_LOFAR}
container_name: ${CONTAINER_NAME_PREFIX}sdptr-sim
networks:
- control
diff --git a/docker-compose/sdptr-sim/Dockerfile b/docker-compose/sdptr-sim/Dockerfile
index 57fe98141..4e64ca2a6 100644
--- a/docker-compose/sdptr-sim/Dockerfile
+++ b/docker-compose/sdptr-sim/Dockerfile
@@ -1,20 +1,7 @@
-FROM ubuntu:20.04
+ARG LOCAL_DOCKER_REGISTRY_HOST
+ARG LOCAL_DOCKER_REGISTRY_LOFAR
-# Install build tools for sdptr and the C language OPC-UA lib
-RUN apt-get update && \
- 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 SDPTR
-RUN cd / && git clone --depth 1 --branch master https://git.astron.nl/lofar2.0/sdptr
-
-RUN cd /sdptr && \
- autoreconf -v -f -i && \
- ./configure && \
- bash -c "make -j `nproc` install"
+FROM ${LOCAL_DOCKER_REGISTRY_HOST}/${LOCAL_DOCKER_REGISTRY_LOFAR}/sdptr:latest
COPY simulator.conf /sdptr/src/simulator.conf
diff --git a/docker-compose/unb2-sim.yml b/docker-compose/unb2-sim.yml
index d1ecaaa70..b01802cd0 100644
--- a/docker-compose/unb2-sim.yml
+++ b/docker-compose/unb2-sim.yml
@@ -10,6 +10,9 @@ services:
unb2-sim:
build:
context: pypcc-sim-base
+ args:
+ - LOCAL_DOCKER_REGISTRY_HOST=${LOCAL_DOCKER_REGISTRY_HOST}
+ - LOCAL_DOCKER_REGISTRY_LOFAR=${LOCAL_DOCKER_REGISTRY_LOFAR}
container_name: ${CONTAINER_NAME_PREFIX}unb2-sim
networks:
- control
--
GitLab