diff --git a/docker-compose/.env b/docker-compose/.env index 00b12b0fcb55b351ebf9e56b37ae2c1f0fc6f4a9..49ae59b0047e49fe05702355f96c28facf657263 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 ba73b0bcaea5000e2eeee12dec9e1a87bba94c7a..f0f37dec5613b988ba3c471428aa426606cf9d5a 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 2cd015945c044fcd1e39a823f49a807fc519ac67..0000000000000000000000000000000000000000 --- 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 effee8b298b855e2007e50c379fa3df45010bd05..c4b8700935cb2644d6375537b91242d471ce0867 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