From ed45168a39443f88c5b7b59f608be600c3683c36 Mon Sep 17 00:00:00 2001 From: lukken <lukken@astron.nl> Date: Thu, 3 Jun 2021 13:04:59 +0000 Subject: [PATCH] L2SS-251: Pin rest of images referenced in .yml to specific version This patch ensures all images available from artefact.skatelescope.org are pinned to a specific version. This is necessary as :latest is not available on this registry. --- docker-compose/archiver.yml | 2 +- docker-compose/astor.yml | 2 +- docker-compose/jive.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 | 2 +- 8 files changed, 9 insertions(+), 9 deletions(-) diff --git a/docker-compose/archiver.yml b/docker-compose/archiver.yml index 98200f610..aa628e854 100644 --- a/docker-compose/archiver.yml +++ b/docker-compose/archiver.yml @@ -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 7911b66f9..7e3974bc5 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: diff --git a/docker-compose/jive.yml b/docker-compose/jive.yml index d3b8b06f9..82a16bec6 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/logviewer.yml b/docker-compose/logviewer.yml index ad1d975ec..0959d8b94 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 9e2d377c1..85bf0ef3d 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 dfbd154b2..4019b9fdd 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 cfbc9aea1..2e2494ff9 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 c2be72477..707b1cb7c 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: -- GitLab