diff --git a/bin/start-jive.sh b/bin/start-jive.sh
index 06fa7e09a17c79951d36f5c44aa32104005ff55b..fcbb9f8b5e95a4bbbfb6b2895c30d4d2a1914340 100755
--- a/bin/start-jive.sh
+++ b/bin/start-jive.sh
@@ -28,7 +28,7 @@ else
fi
#docker run --rm -it --network host ${OPTIONS} nexus.engageska-portugal.pt/ska-docker/tango-java:latest ${command} ${@}
-container_name=nexus.engageska-portugal.pt/ska-docker/tango-java:latest
+container_name=artefact.skatelescope.org/ska-tango-images/tango-java:9.3.3.2
container=$(docker ps | egrep ${container_name} | cut -d' ' -f1)
if [ ! -z ${container} ]; then
docker exec -it ${container} ${command} ${@}
diff --git a/docker-compose/.env b/docker-compose/.env
index bf415f70a3466cd1dcdf87437e8d4e97758f6087..db8a61aee7475710d46b46701a2df1bbfa93d0e7 100644
--- a/docker-compose/.env
+++ b/docker-compose/.env
@@ -1,2 +1,4 @@
-DOCKER_REGISTRY_HOST=nexus.engageska-portugal.pt
-DOCKER_REGISTRY_USER=ska-docker
+DOCKER_REGISTRY_HOST=artefact.skatelescope.org
+DOCKER_REGISTRY_USER=ska-tango-images
+LOCAL_DOCKER_REGISTRY_HOST=git.astron.nl:5000
+LOCAL_DOCKER_REGISTRY_USER=lofar2.0/tango
diff --git a/docker-compose/archiver.yml b/docker-compose/archiver.yml
index 98200f610c887a6a40cdc27c8e87dfbdac8b22a7..7aa1c13362c15d5d2a44185e9a6f2e6289a2c056 100644
--- a/docker-compose/archiver.yml
+++ b/docker-compose/archiver.yml
@@ -2,7 +2,7 @@ version: '2'
services:
archiver-maria-db:
- image: ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/mariadb_hdbpp:latest
+ image: ${LOCAL_DOCKER_REGISTRY_HOST}/${LOCAL_DOCKER_REGISTRY_USER}/mariadb_hdbpp:2021-05-28
container_name: archiver-maria-db
network_mode: ${NETWORK_MODE}
depends_on:
@@ -17,7 +17,7 @@ services:
restart: on-failure
hdbpp-es:
- image: ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/tango-archiver:latest
+ image: ${LOCAL_DOCKER_REGISTRY_HOST}/${LOCAL_DOCKER_REGISTRY_USER}/tango-archiver:2021-05-28
network_mode: ${NETWORK_MODE}
container_name: hdbpp-es
depends_on:
@@ -34,7 +34,7 @@ services:
hdbppes-srv 01"
hdbpp-cm:
- image: ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/tango-archiver:latest
+ image: ${LOCAL_DOCKER_REGISTRY_HOST}/${LOCAL_DOCKER_REGISTRY_USER}/tango-archiver:2021-05-28
network_mode: ${NETWORK_MODE}
container_name: hdbpp-cm
depends_on:
@@ -51,7 +51,7 @@ services:
hdbppcm-srv 01"
dsconfig:
- image: ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/tango-dsconfig:latest
+ image: ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/tango-dsconfig:1.5.0.6
container_name: dsconfig
network_mode: ${NETWORK_MODE}
depends_on:
diff --git a/docker-compose/astor.yml b/docker-compose/astor.yml
index 7911b66f9cda51aa6585fb37b18408eef6349754..747a39c5fef9958cfe9d80fc2afafd25478c09f5 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:latest
+ image: ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/tango-java:9.3.3.2
container_name: ${CONTAINER_NAME_PREFIX}astor
network_mode: ${NETWORK_MODE}
volumes:
@@ -31,7 +31,7 @@ services:
- /usr/local/bin/astor
starter-example:
- image: ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/tango-starter:latest
+ image: ${LOCAL_DOCKER_REGISTRY_HOST}/${LOCAL_DOCKER_REGISTRY_USER}/tango-starter:2021-05-28
container_name: ${CONTAINER_NAME_PREFIX}starter-example
network_mode: ${NETWORK_MODE}
# set the hostname, otherwise duplicate device registrations result every
diff --git a/docker-compose/device-pcc.yml b/docker-compose/device-pcc.yml
index 026ceff8ded94fb2d6d8951e6f8b33b758dbb467..47f2c9b22089e1162e9ca10737ea11aa27a4b32c 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 30e069a5eb0d38c9ccb1e9dbe1ffaf678dd0627c..13288630491032d2cb7f550177dc421c210561b3 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/hdbpp_viewer.yml b/docker-compose/hdbpp_viewer.yml
index 7add56d90c4ced139c03df5d8a455b3db7132aab..c3d10c3ff48df27a3f15bf483743e6d601ce869e 100644
--- a/docker-compose/hdbpp_viewer.yml
+++ b/docker-compose/hdbpp_viewer.yml
@@ -10,7 +10,7 @@ version: '2'
services:
hdbpp-viewer:
- image: ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/hdbpp_viewer:latest
+ image: ${LOCAL_DOCKER_REGISTRY_HOST}/${LOCAL_DOCKER_REGISTRY_USER}/hdbpp_viewer:2021-05-28
container_name: ${CONTAINER_NAME_PREFIX}hdbpp-viewer
network_mode: ${NETWORK_MODE}
depends_on:
diff --git a/docker-compose/itango.yml b/docker-compose/itango.yml
index 4c12fe3a00fe8ee5fda3a26668bc24adcbf25a72..1a8547baf830bfd893177049017f9aece28afa88 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 d0305710bdd63b76002e928185a21bcedd4d7902..044ae985c4d1d45c26a6c00f6c3a455b93187cff 100644
--- a/docker-compose/itango/Dockerfile
+++ b/docker-compose/itango/Dockerfile
@@ -1,7 +1,5 @@
-ARG VERSION=latest
-ARG DOCKER_REGISTRY_HOST=nexus.engageska-portugal.pt
-ARG DOCKER_REGISTRY_USER=ska-docker
-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/jive.yml b/docker-compose/jive.yml
index d3b8b06f9778e3e5f53953a5f2eb26725d657e60..82a16bec6f904f54ef19414c111915cdbc54990b 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:latest
+ image: ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/tango-java:9.3.3.2
container_name: ${CONTAINER_NAME_PREFIX}jive
network_mode: host
volumes:
diff --git a/docker-compose/jupyter.yml b/docker-compose/jupyter.yml
index 0ac641b22f78a6a1d332e572dc3d9b6db470a5bf..9c4c8053c7d397733a0ba73402eb3ec54b98a9b2 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 62fb7395184b9bc9f4540c8ad68acabc5dc26713..7f043d4493e71fff9659dc5ee26cd0b716cef247 100644
--- a/docker-compose/jupyter/Dockerfile
+++ b/docker-compose/jupyter/Dockerfile
@@ -1,5 +1,5 @@
-ARG VERSION=latest
-FROM nexus.engageska-portugal.pt/ska-docker/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 3d40f0f63554222907e6094bc61f1342cc8fabfa..18c8ef36bb028be8bcb92c5fc7e17dd045d36857 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 e0b6efd3d2e44f7f6f92283ede8916c70d7b8aaf..34dde933732b08f6986149210fa9a497fb371737 100644
--- a/docker-compose/lofar-device-base/Dockerfile
+++ b/docker-compose/lofar-device-base/Dockerfile
@@ -1,4 +1,5 @@
-FROM nexus.engageska-portugal.pt/ska-docker/tango-itango:latest
+ARG SOURCE_IMAGE
+FROM ${SOURCE_IMAGE}
RUN sudo apt-get update && sudo apt-get install -y git && sudo apt-get clean
diff --git a/docker-compose/logviewer.yml b/docker-compose/logviewer.yml
index ad1d975ec4f611a393bbb12250e582b4ae33671a..0959d8b944c31d1b2ad9cf537037f51d31fe410e 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:latest
+ image: ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/tango-java:9.3.3.2
container_name: ${CONTAINER_NAME_PREFIX}logviewer
network_mode: ${NETWORK_MODE}
volumes:
diff --git a/docker-compose/pogo.yml b/docker-compose/pogo.yml
index 9e2d377c1c40f3276f979af621d986a04a04a6b7..85bf0ef3d9bcbf962f501d4bbca22227820e42aa 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:latest
+ image: ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/tango-pogo:9.6.31.2
container_name: ${CONTAINER_NAME_PREFIX}pogo
network_mode: ${NETWORK_MODE}
volumes:
diff --git a/docker-compose/rest.yml b/docker-compose/rest.yml
index dfbd154b270eb9b6f74ce6b769660e43ebd58b14..4019b9fddb4f8801db6922c9afa559d1e581e2ee 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:latest
+ image: ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/tango-rest:1.14.1.2
container_name: ${CONTAINER_NAME_PREFIX}tango-rest
network_mode: ${NETWORK_MODE}
# set the hostname, otherwise duplicate device registrations result every
diff --git a/docker-compose/tango.yml b/docker-compose/tango.yml
index cfbc9aea18b42bf0cad229bac80c2545b70857d9..2e2494ff9ff08e326ac0b68a449dd70ae2811a86 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:latest
+ image: ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/tango-db:10.4.10
container_name: ${CONTAINER_NAME_PREFIX}tangodb
network_mode: ${NETWORK_MODE}
environment:
@@ -30,7 +30,7 @@ services:
restart: on-failure
databaseds:
- image: ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/tango-cpp:latest
+ image: ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/tango-cpp:9.3.4.2
container_name: ${CONTAINER_NAME_PREFIX}databaseds
network_mode: ${NETWORK_MODE}
ports:
diff --git a/docker-compose/tangotest.yml b/docker-compose/tangotest.yml
index c2be7247749990377932159692631fb79fbd4335..707b1cb7ce182792974df28f1fdbff5fab4702a7 100644
--- a/docker-compose/tangotest.yml
+++ b/docker-compose/tangotest.yml
@@ -11,7 +11,7 @@ version: '2'
services:
tangotest:
- image: ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/tango-java:latest
+ image: ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/tango-java:9.3.3.2
container_name: ${CONTAINER_NAME_PREFIX}tangotest
network_mode: ${NETWORK_MODE}
environment: