From a6a0a003f594151a69c4b5e792838ba253aac4ce Mon Sep 17 00:00:00 2001
From: Thomas Juerges <203795-tjuerges@users.noreply.gitlab.com>
Date: Wed, 30 Jun 2021 15:59:15 +0200
Subject: [PATCH] L2SS-294: Update SKAO repo, image versions, refactor a bit
I moved the image versions to the .env file, updated the SKAO repo
and updated the SKAO image naming. They replaced the "/" between
the registry user and the image name with a "-".
---
docker-compose/.env | 11 +++++++++++
docker-compose/archiver.yml | 4 ++--
docker-compose/astor.yml | 4 ++--
docker-compose/device-pcc.yml | 2 +-
docker-compose/device-sdp.yml | 2 +-
docker-compose/device-sst.yml | 2 +-
docker-compose/hdbpp_viewer.yml | 2 +-
docker-compose/itango.yml | 2 +-
docker-compose/jive.yml | 2 +-
docker-compose/jupyter.yml | 2 +-
docker-compose/lofar-device-base.yml | 2 +-
docker-compose/logviewer.yml | 2 +-
docker-compose/pogo.yml | 2 +-
docker-compose/rest.yml | 2 +-
docker-compose/tango.yml | 4 ++--
docker-compose/tangotest.yml | 4 ++--
16 files changed, 30 insertions(+), 19 deletions(-)
diff --git a/docker-compose/.env b/docker-compose/.env
index fd258fde0..85ebd21e4 100644
--- a/docker-compose/.env
+++ b/docker-compose/.env
@@ -2,3 +2,14 @@ DOCKER_REGISTRY_HOST=artefact.skao.int
DOCKER_REGISTRY_USER=ska-tango-images
LOCAL_DOCKER_REGISTRY_HOST=git.astron.nl:5000
LOCAL_DOCKER_REGISTRY_USER=lofar2.0/tango
+
+TANGO_ARCHIVER_VERSION=2021-05-28
+TANGO_CPP_VERSION=9.3.5
+TANGO_DB_VERSION=10.4.11
+TANGO_DSCONFIG_VERSION=1.5.1
+TANGO_HDBPP_VIEWER_VERSION=2021-05-28
+TANGO_ITANGO_VERSION=9.3.5
+TANGO_JAVA_VERSION=9.3.4
+TANGO_POGO_VERSION=9.6.32
+TANGO_REST_VERSION=1.14.2
+TANGO_STARTER_VERSION=2021-05-28
diff --git a/docker-compose/archiver.yml b/docker-compose/archiver.yml
index 08d90a113..41d5df160 100644
--- a/docker-compose/archiver.yml
+++ b/docker-compose/archiver.yml
@@ -36,7 +36,7 @@ services:
hdbppes-srv 01"
hdbpp-cm:
- image: ${LOCAL_DOCKER_REGISTRY_HOST}/${LOCAL_DOCKER_REGISTRY_USER}/tango-archiver:2021-05-28
+ image: ${LOCAL_DOCKER_REGISTRY_HOST}/${LOCAL_DOCKER_REGISTRY_USER}/tango-archiver:${TANGO_ARCHIVER_VERSION}
networks:
- control
container_name: hdbpp-cm
@@ -54,7 +54,7 @@ services:
hdbppcm-srv 01"
dsconfig:
- image: ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/tango-dsconfig:1.5.0.6
+ image: ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}-tango-dsconfig:${TANGO_DSCONFIG_VERSION}
container_name: dsconfig
networks:
- control
diff --git a/docker-compose/astor.yml b/docker-compose/astor.yml
index 1d86575d4..7010a82af 100644
--- a/docker-compose/astor.yml
+++ b/docker-compose/astor.yml
@@ -13,7 +13,7 @@ version: '2'
services:
astor:
- image: ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/tango-java:9.3.3.2
+ image: ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}-tango-java:${TANGO_JAVA_VERSION}
container_name: ${CONTAINER_NAME_PREFIX}astor
networks:
- control
@@ -32,7 +32,7 @@ services:
- /usr/local/bin/astor
starter-example:
- image: ${LOCAL_DOCKER_REGISTRY_HOST}/${LOCAL_DOCKER_REGISTRY_USER}/tango-starter:2021-05-28
+ image: ${LOCAL_DOCKER_REGISTRY_HOST}/${LOCAL_DOCKER_REGISTRY_USER}/tango-starter:${TANGO_STARTER_VERSION}
container_name: ${CONTAINER_NAME_PREFIX}starter-example
networks:
- control
diff --git a/docker-compose/device-pcc.yml b/docker-compose/device-pcc.yml
index 2b7c14064..3dc69f20b 100644
--- a/docker-compose/device-pcc.yml
+++ b/docker-compose/device-pcc.yml
@@ -20,7 +20,7 @@ services:
build:
context: lofar-device-base
args:
- SOURCE_IMAGE: ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/tango-itango:9.3.3.7
+ SOURCE_IMAGE: ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}-tango-itango:${TANGO_ITANGO_VERSION}
container_name: ${CONTAINER_NAME_PREFIX}device-pcc
networks:
- control
diff --git a/docker-compose/device-sdp.yml b/docker-compose/device-sdp.yml
index ec51d4fa1..27d6a33cf 100644
--- a/docker-compose/device-sdp.yml
+++ b/docker-compose/device-sdp.yml
@@ -20,7 +20,7 @@ services:
build:
context: lofar-device-base
args:
- SOURCE_IMAGE: ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/tango-itango:9.3.3.7
+ SOURCE_IMAGE: ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}-tango-itango:${TANGO_ITANGO_VERSION}
container_name: ${CONTAINER_NAME_PREFIX}device-sdp
networks:
- control
diff --git a/docker-compose/device-sst.yml b/docker-compose/device-sst.yml
index 992980bca..7a669cf0a 100644
--- a/docker-compose/device-sst.yml
+++ b/docker-compose/device-sst.yml
@@ -20,7 +20,7 @@ services:
build:
context: lofar-device-base
args:
- SOURCE_IMAGE: ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/tango-itango:9.3.3.7
+ SOURCE_IMAGE: ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}-tango-itango:${TANGO_ITANGO_VERSION}
container_name: ${CONTAINER_NAME_PREFIX}device-sst
networks:
- control
diff --git a/docker-compose/hdbpp_viewer.yml b/docker-compose/hdbpp_viewer.yml
index c7a54f7e6..481879729 100644
--- a/docker-compose/hdbpp_viewer.yml
+++ b/docker-compose/hdbpp_viewer.yml
@@ -10,7 +10,7 @@ version: '2'
services:
hdbpp-viewer:
- image: ${LOCAL_DOCKER_REGISTRY_HOST}/${LOCAL_DOCKER_REGISTRY_USER}/hdbpp_viewer:2021-05-28
+ image: ${LOCAL_DOCKER_REGISTRY_HOST}/${LOCAL_DOCKER_REGISTRY_USER}/hdbpp_viewer:${TANGO_HDBPP_VIEWER_VERSION}
container_name: ${CONTAINER_NAME_PREFIX}hdbpp-viewer
networks:
- control
diff --git a/docker-compose/itango.yml b/docker-compose/itango.yml
index cd5283f23..25a551464 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:9.3.3.7
+ SOURCE_IMAGE: ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}-tango-itango:${TANGO_ITANGO_VERSION}
container_name: ${CONTAINER_NAME_PREFIX}itango
networks:
- control
diff --git a/docker-compose/jive.yml b/docker-compose/jive.yml
index 82a16bec6..b810073e6 100644
--- a/docker-compose/jive.yml
+++ b/docker-compose/jive.yml
@@ -18,7 +18,7 @@ version: '2'
services:
jive:
- image: ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/tango-java:9.3.3.2
+ image: ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}-tango-java:${TANGO_JAVA_VERSION}
container_name: ${CONTAINER_NAME_PREFIX}jive
network_mode: host
volumes:
diff --git a/docker-compose/jupyter.yml b/docker-compose/jupyter.yml
index cbd2ab9ce..36cc0acbc 100644
--- a/docker-compose/jupyter.yml
+++ b/docker-compose/jupyter.yml
@@ -15,7 +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
+ SOURCE_IMAGE: ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}-tango-itango:${TANGO_ITANGO_VERSION}
container_name: ${CONTAINER_NAME_PREFIX}jupyter
networks:
- control
diff --git a/docker-compose/lofar-device-base.yml b/docker-compose/lofar-device-base.yml
index 2a2cdc4dd..22ecabca3 100644
--- a/docker-compose/lofar-device-base.yml
+++ b/docker-compose/lofar-device-base.yml
@@ -18,7 +18,7 @@ services:
build:
context: lofar-device-base
args:
- SOURCE_IMAGE: ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/tango-itango:9.3.3.7
+ SOURCE_IMAGE: ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}-tango-itango:${TANGO_ITANGO_VERSION}
container_name: ${CONTAINER_NAME_PREFIX}lofar-device-base
networks:
- control
diff --git a/docker-compose/logviewer.yml b/docker-compose/logviewer.yml
index cea364027..bf0c9b2d5 100644
--- a/docker-compose/logviewer.yml
+++ b/docker-compose/logviewer.yml
@@ -12,7 +12,7 @@ version: '2'
services:
logviewer:
- image: ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/tango-java:9.3.3.2
+ image: ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}-tango-java:${TANGO_JAVA_VERSION}
container_name: ${CONTAINER_NAME_PREFIX}logviewer
networks:
- control
diff --git a/docker-compose/pogo.yml b/docker-compose/pogo.yml
index 6f87f640a..2029874a5 100644
--- a/docker-compose/pogo.yml
+++ b/docker-compose/pogo.yml
@@ -20,7 +20,7 @@ volumes:
services:
pogo:
- image: ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/tango-pogo:9.6.31.2
+ image: ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}-tango-pogo:${TANGO_POGO_VERSION}
container_name: ${CONTAINER_NAME_PREFIX}pogo
networks:
- control
diff --git a/docker-compose/rest.yml b/docker-compose/rest.yml
index f5bfbd329..b76ed39c5 100644
--- a/docker-compose/rest.yml
+++ b/docker-compose/rest.yml
@@ -13,7 +13,7 @@ version: '2'
services:
rest:
- image: ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/tango-rest:1.14.1.2
+ image: ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}-tango-rest:${TANGO_REST_VERSION}
container_name: ${CONTAINER_NAME_PREFIX}tango-rest
networks:
- control
diff --git a/docker-compose/tango.yml b/docker-compose/tango.yml
index 0cde93b0c..b3a860d7b 100644
--- a/docker-compose/tango.yml
+++ b/docker-compose/tango.yml
@@ -15,7 +15,7 @@ volumes:
services:
tangodb:
- image: ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/tango-db:10.4.10
+ image: ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}-tango-db:${TANGO_DB_VERSION}
container_name: ${CONTAINER_NAME_PREFIX}tangodb
networks:
- control
@@ -31,7 +31,7 @@ services:
restart: on-failure
databaseds:
- image: ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/tango-cpp:9.3.4.2
+ image: ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}-tango-cpp:${TANGO_CPP_VERSION}
container_name: ${CONTAINER_NAME_PREFIX}databaseds
networks:
- control
diff --git a/docker-compose/tangotest.yml b/docker-compose/tangotest.yml
index 30e057502..3a44fc61b 100644
--- a/docker-compose/tangotest.yml
+++ b/docker-compose/tangotest.yml
@@ -4,14 +4,14 @@
# Defines:
# - tangotest: TANGO test device server
#
-# Requires:
+# Requires:
# - tango.yml
#
version: '2'
services:
tangotest:
- image: ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/tango-java:9.3.3.2
+ image: ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}-tango-java:${TANGO_JAVA_VERSION}
container_name: ${CONTAINER_NAME_PREFIX}tangotest
networks:
- control
--
GitLab