From ebdb617c06140eeb21af9eef0b769d66ec236ca0 Mon Sep 17 00:00:00 2001
From: stedif <stefano.difrischia@inaf.it>
Date: Wed, 21 Sep 2022 12:09:03 +0200
Subject: [PATCH] L2SS-822: parameterize timescaledb source image
---
docker-compose/.env | 1 +
docker-compose/archiver-timescale.yml | 2 ++
docker-compose/timescaledb/Dockerfile | 3 ++-
3 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/docker-compose/.env b/docker-compose/.env
index eb952e414..ac4d6ab6d 100644
--- a/docker-compose/.env
+++ b/docker-compose/.env
@@ -15,6 +15,7 @@ TANGO_POGO_VERSION=9.6.34
TANGO_REST_VERSION=1.14.6
TANGO_STARTER_VERSION=2021-05-28
+PG_TIMESCALEDB_VERSION=latest-pg12
PG_SUPERUSER_PASSWORD=password
PG_HDB_PASSWORD=hdbpp
MYSQL_ROOT_PASSWORD=secret
diff --git a/docker-compose/archiver-timescale.yml b/docker-compose/archiver-timescale.yml
index e88a00eb4..820142abf 100644
--- a/docker-compose/archiver-timescale.yml
+++ b/docker-compose/archiver-timescale.yml
@@ -8,6 +8,8 @@ services:
image: timescaledb
build:
context: timescaledb
+ args:
+ SOURCE_IMAGE: timescale/timescaledb:${PG_TIMESCALEDB_VERSION}
container_name: ${CONTAINER_NAME_PREFIX}archiver-timescale
networks:
- control
diff --git a/docker-compose/timescaledb/Dockerfile b/docker-compose/timescaledb/Dockerfile
index 656d2ef66..73932cadd 100644
--- a/docker-compose/timescaledb/Dockerfile
+++ b/docker-compose/timescaledb/Dockerfile
@@ -1,4 +1,5 @@
-FROM timescale/timescaledb:latest-pg12
+ARG SOURCE_IMAGE
+FROM ${SOURCE_IMAGE}
# Set admin role to perform DB creation
COPY resources/01_admin.sh docker-entrypoint-initdb.d/002_admin.sh
--
GitLab