From 52dfc0512c6ce501a46e8cef8af72cd3b6a3c7dc Mon Sep 17 00:00:00 2001
From: sanderegg <35365065+sanderegg@users.noreply.github.com>
Date: Wed, 22 Nov 2023 10:01:37 +0100
Subject: [PATCH] make CLUSTERS_KEEPER_COMPUTATIONAL_BACKEND_DOCKER_IMAGE_TAG
 compulsory

---
 .env-devel                                                    | 1 +
 .../src/simcore_service_clusters_keeper/core/settings.py      | 4 ++--
 services/docker-compose.yml                                   | 1 +
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/.env-devel b/.env-devel
index d4b58c5796d2..4122729e1460 100644
--- a/.env-devel
+++ b/.env-devel
@@ -31,6 +31,7 @@ CATALOG_DEV_FEATURES_ENABLED=0
 CATALOG_SERVICES_DEFAULT_RESOURCES='{"CPU": {"limit": 0.1, "reservation": 0.1}, "RAM": {"limit": 2147483648, "reservation": 2147483648}}'
 CATALOG_SERVICES_DEFAULT_SPECIFICATIONS='{}'
 
+CLUSTERS_KEEPER_COMPUTATIONAL_BACKEND_DOCKER_IMAGE_TAG=master-github-latest
 CLUSTERS_KEEPER_EC2_ACCESS=null
 CLUSTERS_KEEPER_MAX_MISSED_HEARTBEATS_BEFORE_CLUSTER_TERMINATION=5
 CLUSTERS_KEEPER_PRIMARY_EC2_INSTANCES=null
diff --git a/services/clusters-keeper/src/simcore_service_clusters_keeper/core/settings.py b/services/clusters-keeper/src/simcore_service_clusters_keeper/core/settings.py
index 3702227670bb..4f74e6656969 100644
--- a/services/clusters-keeper/src/simcore_service_clusters_keeper/core/settings.py
+++ b/services/clusters-keeper/src/simcore_service_clusters_keeper/core/settings.py
@@ -225,8 +225,8 @@ class ApplicationSettings(BaseCustomSettings, MixinLoggingSettings):
     )
 
     CLUSTERS_KEEPER_COMPUTATIONAL_BACKEND_DOCKER_IMAGE_TAG: str = Field(
-        default="master-github-latest",
-        description="defines the image tag to use for the computational backend",
+        ...,
+        description="defines the image tag to use for the computational backend sidecar image (NOTE: it currently defaults to use itisfoundation organisation in Dockerhub)",
     )
 
     SWARM_STACK_NAME: str = Field(
diff --git a/services/docker-compose.yml b/services/docker-compose.yml
index 644a53215c10..77ff34e1753d 100644
--- a/services/docker-compose.yml
+++ b/services/docker-compose.yml
@@ -116,6 +116,7 @@ services:
     networks:
       - default
     environment:
+      - CLUSTERS_KEEPER_COMPUTATIONAL_BACKEND_DOCKER_IMAGE_TAG=${CLUSTERS_KEEPER_COMPUTATIONAL_BACKEND_DOCKER_IMAGE_TAG}
       - CLUSTERS_KEEPER_MAX_MISSED_HEARTBEATS_BEFORE_CLUSTER_TERMINATION=${CLUSTERS_KEEPER_MAX_MISSED_HEARTBEATS_BEFORE_CLUSTER_TERMINATION}
       - CLUSTERS_KEEPER_TASK_INTERVAL=${CLUSTERS_KEEPER_TASK_INTERVAL}
       - CLUSTERS_KEEPER_LOGLEVEL=${LOG_LEVEL:-WARNING}