From 21f8bd8ddf13ba5a11bfe63e33f8564aab5697a4 Mon Sep 17 00:00:00 2001
From: stedif <stefano.difrischia@inaf.it>
Date: Tue, 13 Sep 2022 15:49:48 +0200
Subject: [PATCH] L2SS-822: add args to archiver yml file
---
docker-compose/archiver-timescale.yml | 4 ++++
docker-compose/tango-archiver-ts/Dockerfile | 6 ++----
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/docker-compose/archiver-timescale.yml b/docker-compose/archiver-timescale.yml
index cdbf1b037..e88a00eb4 100644
--- a/docker-compose/archiver-timescale.yml
+++ b/docker-compose/archiver-timescale.yml
@@ -35,6 +35,8 @@ services:
image: hdbppts-cm
build:
context: tango-archiver-ts
+ args:
+ SOURCE_IMAGE: ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}-tango-cpp:${TANGO_CPP_VERSION}
container_name: ${CONTAINER_NAME_PREFIX}hdbppts-cm
networks:
- control
@@ -63,6 +65,8 @@ services:
image: hdbppts-es
build:
context: tango-archiver-ts
+ args:
+ SOURCE_IMAGE: ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}-tango-cpp:${TANGO_CPP_VERSION}
container_name: ${CONTAINER_NAME_PREFIX}hdbppts-es
networks:
- control
diff --git a/docker-compose/tango-archiver-ts/Dockerfile b/docker-compose/tango-archiver-ts/Dockerfile
index b6f44b0ba..57f7bd708 100644
--- a/docker-compose/tango-archiver-ts/Dockerfile
+++ b/docker-compose/tango-archiver-ts/Dockerfile
@@ -1,7 +1,5 @@
-#ARG DOCKER_REGISTRY_USER
-#ARG DOCKER_REGISTRY_HOST
-#FROM ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/tango-cpp:latest
-FROM artefact.skao.int/ska-tango-images-tango-cpp:9.3.9
+ARG SOURCE_IMAGE
+FROM ${SOURCE_IMAGE}
USER root
--
GitLab