From 7e8a676d53416a6752012f529cf6da42a17d41d3 Mon Sep 17 00:00:00 2001
From: Victor Fraile Garcia <victor@mesavault.local>
Date: Mon, 20 Jul 2026 12:59:52 +0200
Subject: [PATCH] fix(ucepsa): pin incident collector runtime context

---
 ...opfloor_context_incident_collector_v037.sh | 30 +++++++++++++++++++
 .../shopfloor_context_incident_collector.py   |  4 +--
 2 files changed, 32 insertions(+), 2 deletions(-)

diff --git a/ucepsa/edge-oee-demo/ops/manage_shopfloor_context_incident_collector_v037.sh b/ucepsa/edge-oee-demo/ops/manage_shopfloor_context_incident_collector_v037.sh
index c9a56ca..43c208e 100755
--- a/ucepsa/edge-oee-demo/ops/manage_shopfloor_context_incident_collector_v037.sh
+++ b/ucepsa/edge-oee-demo/ops/manage_shopfloor_context_incident_collector_v037.sh
@@ -7,6 +7,20 @@ CONTAINER="${SHOPFLOOR_INCIDENT_CONTAINER:-mv_ucepsa_shopfloor_context_incident_
 NETWORK="${SHOPFLOOR_DOCKER_NETWORK:-mv_ucepsa_net}"
 INTERVAL="${SHOPFLOOR_INCIDENT_INTERVAL_S:-15}"
 
+POSTGRES_CONTAINER="${SHOPFLOOR_POSTGRES_CONTAINER:-mv_ucepsa_postgres_hot}"
+TENANT_OVERRIDE="${SHOPFLOOR_TENANT_OVERRIDE:-ucepsa}"
+SITE_OVERRIDE="${SHOPFLOOR_SITE_OVERRIDE:-ucepsa_onpremise}"
+PGHOST_OVERRIDE="${SHOPFLOOR_PGHOST_OVERRIDE:-mv_ucepsa_postgres_hot}"
+
+PGDATABASE_OVERRIDE="${SHOPFLOOR_PGDATABASE_OVERRIDE:-$(
+    docker inspect "$POSTGRES_CONTAINER"       --format '{{range .Config.Env}}{{println .}}{{end}}'       | sed -n 's/^POSTGRES_DB=//p'       | head -n 1
+)}"
+
+if [[ -z "$PGDATABASE_OVERRIDE" ]]; then
+    echo "ERROR: no se pudo determinar POSTGRES_DB." >&2
+    exit 1
+fi
+
 cd "$ROOT"
 
 image() {
@@ -27,6 +41,10 @@ start_collector() {
         --restart unless-stopped \
         --network "$NETWORK" \
         --env-file .env \
+        -e TENANT_OVERRIDE="$TENANT_OVERRIDE" \
+        -e SITE_OVERRIDE="$SITE_OVERRIDE" \
+        -e PGHOST="$PGHOST_OVERRIDE" \
+        -e PGDATABASE="$PGDATABASE_OVERRIDE" \
         -v "$ROOT:/app:ro" \
         -w /app \
         --entrypoint python \
@@ -47,6 +65,10 @@ one_shot() {
     docker run --rm -i \
         --network "$NETWORK" \
         --env-file .env \
+        -e TENANT_OVERRIDE="$TENANT_OVERRIDE" \
+        -e SITE_OVERRIDE="$SITE_OVERRIDE" \
+        -e PGHOST="$PGHOST_OVERRIDE" \
+        -e PGDATABASE="$PGDATABASE_OVERRIDE" \
         -v "$ROOT:/app:ro" \
         -w /app \
         --entrypoint python \
@@ -62,6 +84,10 @@ dry_run() {
     docker run --rm -i \
         --network "$NETWORK" \
         --env-file .env \
+        -e TENANT_OVERRIDE="$TENANT_OVERRIDE" \
+        -e SITE_OVERRIDE="$SITE_OVERRIDE" \
+        -e PGHOST="$PGHOST_OVERRIDE" \
+        -e PGDATABASE="$PGDATABASE_OVERRIDE" \
         -v "$ROOT:/app:ro" \
         -w /app \
         --entrypoint python \
@@ -79,6 +105,10 @@ admin() {
     docker run --rm -i \
         --network "$NETWORK" \
         --env-file .env \
+        -e TENANT_OVERRIDE="$TENANT_OVERRIDE" \
+        -e SITE_OVERRIDE="$SITE_OVERRIDE" \
+        -e PGHOST="$PGHOST_OVERRIDE" \
+        -e PGDATABASE="$PGDATABASE_OVERRIDE" \
         -v "$ROOT:/app:ro" \
         -w /app \
         --entrypoint python \
diff --git a/ucepsa/edge-oee-demo/tools/shopfloor_context_incident_collector.py b/ucepsa/edge-oee-demo/tools/shopfloor_context_incident_collector.py
index 9717c80..0cb3d63 100755
--- a/ucepsa/edge-oee-demo/tools/shopfloor_context_incident_collector.py
+++ b/ucepsa/edge-oee-demo/tools/shopfloor_context_incident_collector.py
@@ -74,14 +74,14 @@ def load_config() -> Config:
 
     return Config(
         tenant=env_first(
-            "TENANT",
             "TENANT_OVERRIDE",
+            "TENANT",
             default="ucepsa",
         )
         or "ucepsa",
         site=env_first(
-            "SITE",
             "SITE_OVERRIDE",
+            "SITE",
             default="ucepsa_onpremise",
         )
         or "ucepsa_onpremise",