From 2b5f14d1259b869a2fae27b2d70c4b572bdcaefc Mon Sep 17 00:00:00 2001
From: lukken <lukken@astron.nl>
Date: Tue, 16 Nov 2021 14:25:57 +0000
Subject: [PATCH] L2SS-205: Recv-sim container use image build outside this
repository
---
docker-compose/.env | 1 +
docker-compose/pypcc-sim-base/Dockerfile | 10 +++-------
docker-compose/pypcc-sim-base/requirements.txt | 3 ---
docker-compose/recv-sim.yml | 3 +++
4 files changed, 7 insertions(+), 10 deletions(-)
delete mode 100644 docker-compose/pypcc-sim-base/requirements.txt
diff --git a/docker-compose/.env b/docker-compose/.env
index 00b12b0fc..49ae59b00 100644
--- a/docker-compose/.env
+++ b/docker-compose/.env
@@ -1,6 +1,7 @@
DOCKER_REGISTRY_HOST=artefact.skao.int
DOCKER_REGISTRY_USER=ska-tango-images
LOCAL_DOCKER_REGISTRY_HOST=git.astron.nl:5000
+LOCAL_DOCKER_REGISTRY_LOFAR=lofar2.0
LOCAL_DOCKER_REGISTRY_USER=lofar2.0/tango
TANGO_ARCHIVER_VERSION=2021-05-28
diff --git a/docker-compose/pypcc-sim-base/Dockerfile b/docker-compose/pypcc-sim-base/Dockerfile
index ba73b0bca..f0f37dec5 100644
--- a/docker-compose/pypcc-sim-base/Dockerfile
+++ b/docker-compose/pypcc-sim-base/Dockerfile
@@ -1,10 +1,6 @@
-FROM ubuntu:20.04
+ARG LOCAL_DOCKER_REGISTRY_HOST
+ARG LOCAL_DOCKER_REGISTRY_LOFAR
-COPY requirements.txt /requirements.txt
+FROM ${LOCAL_DOCKER_REGISTRY_HOST}/${LOCAL_DOCKER_REGISTRY_LOFAR}/pypcc:latest
-RUN apt-get update && apt-get install -y python3 python3-pip python3-yaml git && \
- pip3 install -r requirements.txt && \
- git clone --depth 1 --branch master https://git.astron.nl/lofar2.0/pypcc
-
-WORKDIR /pypcc
CMD ["python3", "pypcc2.py", "--simulator", "--port","4843"]
diff --git a/docker-compose/pypcc-sim-base/requirements.txt b/docker-compose/pypcc-sim-base/requirements.txt
deleted file mode 100644
index 2cd015945..000000000
--- a/docker-compose/pypcc-sim-base/requirements.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-opcua
-numpy
-recordclass>=0.16,<0.16.1
\ No newline at end of file
diff --git a/docker-compose/recv-sim.yml b/docker-compose/recv-sim.yml
index effee8b29..c4b870093 100644
--- a/docker-compose/recv-sim.yml
+++ b/docker-compose/recv-sim.yml
@@ -10,6 +10,9 @@ services:
recv-sim:
build:
context: pypcc-sim-base
+ args:
+ - LOCAL_DOCKER_REGISTRY_HOST=${LOCAL_DOCKER_REGISTRY_HOST}
+ - LOCAL_DOCKER_REGISTRY_THIRD_PARTY=${LOCAL_DOCKER_REGISTRY_THIRD_PARTY}
container_name: ${CONTAINER_NAME_PREFIX}recv-sim
networks:
- control
--
GitLab