From 7bcc24a6904fcd0399db31223212525cabdd0a09 Mon Sep 17 00:00:00 2001 From: Stephan D Date: Fri, 7 Nov 2025 14:59:22 +0100 Subject: [PATCH] +project names --- ci/prod/.env.runtime | 2 ++ ci/prod/scripts/deploy/db.sh | 2 ++ ci/prod/scripts/deploy/nats.sh | 3 +++ 3 files changed, 7 insertions(+) diff --git a/ci/prod/.env.runtime b/ci/prod/.env.runtime index 4f236a9..5b1c60e 100644 --- a/ci/prod/.env.runtime +++ b/ci/prod/.env.runtime @@ -15,6 +15,7 @@ SSH_HOST=178.57.67.248 SSH_USER=cloud REMOTE_BASE=/srv/sendico DB_DIR=db +DB_COMPOSE_PROJECT=sendico-db # NATS deployment NATS_DIR=nats @@ -22,3 +23,4 @@ NATS_HOST=sendico-nats NATS_PORT=4222 NATS_MONITORING_PORT=8222 NATS_PROMETHEUS_PORT=7777 +NATS_COMPOSE_PROJECT=sendico-nats diff --git a/ci/prod/scripts/deploy/db.sh b/ci/prod/scripts/deploy/db.sh index c819f3b..471c2a4 100755 --- a/ci/prod/scripts/deploy/db.sh +++ b/ci/prod/scripts/deploy/db.sh @@ -49,6 +49,8 @@ ssh "${SSH_OPTS[@]}" "$REMOTE_TARGET" \ set -euo pipefail cd "${REMOTE_DIR}/compose" set -a; . ../env/.env.runtime; set +a +COMPOSE_PROJECT_NAME="${DB_COMPOSE_PROJECT:-sendico-db}" +export COMPOSE_PROJECT_NAME # Run with ephemeral AppRole env (scoped only to these commands) VAULT_ROLE_ID="${VAULT_ROLE_ID}" VAULT_SECRET_ID="${VAULT_SECRET_ID}" docker compose -f db.yml pull --quiet 2>/dev/null || \ VAULT_ROLE_ID="${VAULT_ROLE_ID}" VAULT_SECRET_ID="${VAULT_SECRET_ID}" docker compose -f db.yml pull diff --git a/ci/prod/scripts/deploy/nats.sh b/ci/prod/scripts/deploy/nats.sh index d0744ab..5dd7ade 100755 --- a/ci/prod/scripts/deploy/nats.sh +++ b/ci/prod/scripts/deploy/nats.sh @@ -40,8 +40,11 @@ ssh "${SSH_OPTS[@]}" "$REMOTE_TARGET" \ set -euo pipefail cd "${REMOTE_DIR}/compose" set -a; . ../env/.env.runtime; set +a +: "${NATS_COMPOSE_PROJECT:=sendico-nats}" : "${NATS_USER:?missing NATS_USER}" : "${NATS_PASSWORD:?missing NATS_PASSWORD}" +COMPOSE_PROJECT_NAME="$NATS_COMPOSE_PROJECT" +export COMPOSE_PROJECT_NAME export NATS_USER NATS_PASSWORD docker compose -f nats.yml pull --quiet 2>/dev/null || docker compose -f nats.yml pull