From df4782f4fd668f49288a816a56c4135226bd003f Mon Sep 17 00:00:00 2001
From: lukken <lukken@astron.nl>
Date: Thu, 3 Jun 2021 14:20:54 +0000
Subject: [PATCH] Download missing images using our own registry
Any images missing from the artefact.skatelescope.org registry are now
configured to be downloaded from git.astron.nl:5000
---
docker-compose/.env | 2 ++
docker-compose/archiver.yml | 6 +++---
docker-compose/astor.yml | 2 +-
docker-compose/hdbpp_viewer.yml | 2 +-
4 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/docker-compose/.env b/docker-compose/.env
index c46981dca..db8a61aee 100644
--- a/docker-compose/.env
+++ b/docker-compose/.env
@@ -1,2 +1,4 @@
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 aa628e854..7aa1c1336 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:
diff --git a/docker-compose/astor.yml b/docker-compose/astor.yml
index 7e3974bc5..747a39c5f 100644
--- a/docker-compose/astor.yml
+++ b/docker-compose/astor.yml
@@ -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/hdbpp_viewer.yml b/docker-compose/hdbpp_viewer.yml
index 7add56d90..c3d10c3ff 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:
--
GitLab