From 0ed780e113fa5eabc80a3885605277483c470c10 Mon Sep 17 00:00:00 2001
From: Jan David Mol <mol@astron.nl>
Date: Thu, 3 Jun 2021 14:21:51 +0200
Subject: [PATCH] L2SS-251: Refer to the DOCKER_REGISTRY environment variables
in .env for source images, instead of hard-coding them in the Dockerfiles
---
docker-compose/device-pcc.yml | 2 ++
docker-compose/device-sdp.yml | 2 ++
docker-compose/itango.yml | 2 +-
docker-compose/itango/Dockerfile | 6 ++----
docker-compose/jupyter.yml | 1 +
docker-compose/jupyter/Dockerfile | 4 ++--
docker-compose/lofar-device-base.yml | 2 ++
docker-compose/lofar-device-base/Dockerfile | 4 ++--
8 files changed, 14 insertions(+), 9 deletions(-)
diff --git a/docker-compose/device-pcc.yml b/docker-compose/device-pcc.yml
index 026ceff8d..47f2c9b22 100644
--- a/docker-compose/device-pcc.yml
+++ b/docker-compose/device-pcc.yml
@@ -19,6 +19,8 @@ services:
# being shared among services.
build:
context: lofar-device-base
+ args:
+ SOURCE_IMAGE: ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/tango-itango:9.3.3.7
container_name: ${CONTAINER_NAME_PREFIX}device-pcc
network_mode: ${NETWORK_MODE}
volumes:
diff --git a/docker-compose/device-sdp.yml b/docker-compose/device-sdp.yml
index 30e069a5e..132886304 100644
--- a/docker-compose/device-sdp.yml
+++ b/docker-compose/device-sdp.yml
@@ -19,6 +19,8 @@ services:
# being shared among services.
build:
context: lofar-device-base
+ args:
+ SOURCE_IMAGE: ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/tango-itango:9.3.3.7
container_name: ${CONTAINER_NAME_PREFIX}device-sdp
network_mode: ${NETWORK_MODE}
volumes:
diff --git a/docker-compose/itango.yml b/docker-compose/itango.yml
index 4c12fe3a0..1a8547baf 100644
--- a/docker-compose/itango.yml
+++ b/docker-compose/itango.yml
@@ -17,7 +17,7 @@ services:
build:
context: itango
args:
- SOURCE_IMAGE: ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/tango-itango:latest
+ SOURCE_IMAGE: ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/tango-itango:9.3.3.7
container_name: ${CONTAINER_NAME_PREFIX}itango
network_mode: ${NETWORK_MODE}
volumes:
diff --git a/docker-compose/itango/Dockerfile b/docker-compose/itango/Dockerfile
index 010d408ba..044ae985c 100644
--- a/docker-compose/itango/Dockerfile
+++ b/docker-compose/itango/Dockerfile
@@ -1,7 +1,5 @@
-ARG VERSION=9.3.3.7
-ARG DOCKER_REGISTRY_HOST=artefact.skatelescope.org
-ARG DOCKER_REGISTRY_USER=ska-tango-images
-FROM $DOCKER_REGISTRY_HOST/$DOCKER_REGISTRY_USER/tango-itango:${VERSION}
+ARG SOURCE_IMAGE
+FROM ${SOURCE_IMAGE}
RUN sudo apt-get -y update && \
sudo apt-get -y upgrade && \
diff --git a/docker-compose/jupyter.yml b/docker-compose/jupyter.yml
index 0ac641b22..9c4c8053c 100644
--- a/docker-compose/jupyter.yml
+++ b/docker-compose/jupyter.yml
@@ -15,6 +15,7 @@ services:
context: jupyter
args:
CONTAINER_EXECUTION_UID: ${CONTAINER_EXECUTION_UID}
+ SOURCE_IMAGE: ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/tango-itango:9.3.3.7
container_name: ${CONTAINER_NAME_PREFIX}jupyter
network_mode: ${NETWORK_MODE}
volumes:
diff --git a/docker-compose/jupyter/Dockerfile b/docker-compose/jupyter/Dockerfile
index aa1082426..7f043d449 100644
--- a/docker-compose/jupyter/Dockerfile
+++ b/docker-compose/jupyter/Dockerfile
@@ -1,5 +1,5 @@
-ARG VERSION=9.3.3.7
-FROM artefact.skatelescope.org/ska-tango-images/tango-itango:${VERSION}
+ARG SOURCE_IMAGE
+FROM ${SOURCE_IMAGE}
# UID if the user that this container will run under. This is needed to give directories
# that are needed for temporary storage the proper owner and access rights.
diff --git a/docker-compose/lofar-device-base.yml b/docker-compose/lofar-device-base.yml
index 3d40f0f63..18c8ef36b 100644
--- a/docker-compose/lofar-device-base.yml
+++ b/docker-compose/lofar-device-base.yml
@@ -17,5 +17,7 @@ services:
image: lofar-device-base
build:
context: lofar-device-base
+ args:
+ SOURCE_IMAGE: ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/tango-itango:9.3.3.7
container_name: ${CONTAINER_NAME_PREFIX}lofar-device-base
network_mode: ${NETWORK_MODE}
diff --git a/docker-compose/lofar-device-base/Dockerfile b/docker-compose/lofar-device-base/Dockerfile
index ddf83de36..34dde9337 100644
--- a/docker-compose/lofar-device-base/Dockerfile
+++ b/docker-compose/lofar-device-base/Dockerfile
@@ -1,5 +1,5 @@
-ARG VERSION=9.3.3.7
-FROM artefact.skatelescope.org/ska-tango-images/tango-itango:${VERSION}
+ARG SOURCE_IMAGE
+FROM ${SOURCE_IMAGE}
RUN sudo apt-get update && sudo apt-get install -y git && sudo apt-get clean
--
GitLab