Initial dev deployment [infra]

ci/prod/compose/bff.yml

@@ -24,7 +24,7 @@ services:
     container_name: sendico-bff
     platform: linux/amd64
     restart: unless-stopped
-    image: ${REGISTRY_URL}/bff/service:${APP_V}
+    image: ${REGISTRY_URL}/bff/service:${IMAGE_TAG:-${APP_V}}
     pull_policy: always
     environment:
       AMPLI_ENVIRONMENT: ${AMPLI_ENVIRONMENT}

ci/prod/compose/billing_documents.yml

@@ -16,7 +16,7 @@ services:
     container_name: sendico-billing-documents
     platform: linux/amd64
     restart: unless-stopped
-    image: ${REGISTRY_URL}/billing/documents:${APP_V}
+    image: ${REGISTRY_URL}/billing/documents:${IMAGE_TAG:-${APP_V}}
     pull_policy: always
     environment:
       DOCUMENTS_MONGO_HOST: ${DOCUMENTS_MONGO_HOST}

ci/prod/compose/billing_fees.yml

@@ -16,7 +16,7 @@ services:
     container_name: sendico-billing-fees
     platform: linux/amd64
     restart: unless-stopped
-    image: ${REGISTRY_URL}/billing/fees:${APP_V}
+    image: ${REGISTRY_URL}/billing/fees:${IMAGE_TAG:-${APP_V}}
     pull_policy: always
     environment:
       FEES_MONGO_HOST: ${FEES_MONGO_HOST}

ci/prod/compose/callbacks.yml

@@ -24,7 +24,7 @@ services:
     container_name: sendico-callbacks
     platform: linux/amd64
     restart: unless-stopped
-    image: ${REGISTRY_URL}/edge/callbacks:${APP_V}
+    image: ${REGISTRY_URL}/edge/callbacks:${IMAGE_TAG:-${APP_V}}
     pull_policy: always
     environment:
       CALLBACKS_MONGO_HOST: ${CALLBACKS_MONGO_HOST}

ci/prod/compose/chain_gateway.yml

@@ -24,7 +24,7 @@ services:
     container_name: sendico-chain-gateway
     platform: linux/amd64
     restart: unless-stopped
-    image: ${REGISTRY_URL}/gateway/chain:${APP_V}
+    image: ${REGISTRY_URL}/gateway/chain:${IMAGE_TAG:-${APP_V}}
     pull_policy: always
     environment:
       CHAIN_GATEWAY_MONGO_HOST: ${CHAIN_GATEWAY_MONGO_HOST}

ci/prod/compose/discovery.yml

@@ -16,7 +16,7 @@ services:
     container_name: sendico-discovery
     platform: linux/amd64
     restart: unless-stopped
-    image: ${REGISTRY_URL}/discovery/service:${APP_V}
+    image: ${REGISTRY_URL}/discovery/service:${IMAGE_TAG:-${APP_V}}
     pull_policy: always
     environment:
       NATS_URL: ${NATS_URL}

ci/prod/compose/frontend.yml

@@ -19,7 +19,7 @@ services:
     <<: *common-env
     container_name: sendico-frontend
     restart: unless-stopped
-    image: ${REGISTRY_URL}/frontend/service:${APP_V}
+    image: ${REGISTRY_URL}/frontend/service:${IMAGE_TAG:-${APP_V}}
     pull_policy: always
     environment:
       WS_PROTOCOL: ${WS_PROTOCOL}

ci/prod/compose/fx_ingestor.yml

@@ -16,7 +16,7 @@ services:
     container_name: sendico-fx-ingestor
     platform: linux/amd64
     restart: unless-stopped
-    image: ${REGISTRY_URL}/fx/ingestor:${APP_V}
+    image: ${REGISTRY_URL}/fx/ingestor:${IMAGE_TAG:-${APP_V}}
     pull_policy: always
     environment:
       FX_MONGO_HOST: ${FX_MONGO_HOST}

ci/prod/compose/fx_oracle.yml

@@ -16,7 +16,7 @@ services:
     container_name: sendico-fx-oracle
     platform: linux/amd64
     restart: unless-stopped
-    image: ${REGISTRY_URL}/fx/oracle:${APP_V}
+    image: ${REGISTRY_URL}/fx/oracle:${IMAGE_TAG:-${APP_V}}
     pull_policy: always
     environment:
       FX_MONGO_HOST: ${FX_MONGO_HOST}

ci/prod/compose/ledger.yml

@@ -16,7 +16,7 @@ services:
     container_name: sendico-ledger
     platform: linux/amd64
     restart: unless-stopped
-    image: ${REGISTRY_URL}/ledger/service:${APP_V}
+    image: ${REGISTRY_URL}/ledger/service:${IMAGE_TAG:-${APP_V}}
     pull_policy: always
     environment:
       LEDGER_MONGO_HOST: ${LEDGER_MONGO_HOST}

ci/prod/compose/mntx_gateway.yml

@@ -16,7 +16,7 @@ services:
     container_name: sendico-mntx-gateway
     platform: linux/amd64
     restart: unless-stopped
-    image: ${REGISTRY_URL}/gateway/mntx:${APP_V}
+    image: ${REGISTRY_URL}/gateway/mntx:${IMAGE_TAG:-${APP_V}}
     pull_policy: always
     environment:
       MNTX_GATEWAY_MONGO_HOST: ${MNTX_GATEWAY_MONGO_HOST}

ci/prod/compose/notification.yml

@@ -16,7 +16,7 @@ services:
     container_name: sendico-notification
     platform: linux/amd64
     restart: unless-stopped
-    image: ${REGISTRY_URL}/notification/service:${APP_V}
+    image: ${REGISTRY_URL}/notification/service:${IMAGE_TAG:-${APP_V}}
     pull_policy: always
     environment:
       AMPLI_ENVIRONMENT: ${AMPLI_ENVIRONMENT}

ci/prod/compose/payments_methods.yml

@@ -16,7 +16,7 @@ services:
     container_name: sendico-payments-methods
     platform: linux/amd64
     restart: unless-stopped
-    image: ${REGISTRY_URL}/payments/methods:${APP_V}
+    image: ${REGISTRY_URL}/payments/methods:${IMAGE_TAG:-${APP_V}}
     pull_policy: always
     environment:
       PAYMENTS_MONGO_HOST: ${PAYMENTS_MONGO_HOST}

ci/prod/compose/payments_orchestrator.yml

@@ -16,7 +16,7 @@ services:
     container_name: sendico-payments-orchestrator
     platform: linux/amd64
     restart: unless-stopped
-    image: ${REGISTRY_URL}/payments/orchestrator:${APP_V}
+    image: ${REGISTRY_URL}/payments/orchestrator:${IMAGE_TAG:-${APP_V}}
     pull_policy: always
     environment:
       PAYMENTS_MONGO_HOST: ${PAYMENTS_MONGO_HOST}

ci/prod/compose/payments_quotation.yml

@@ -16,7 +16,7 @@ services:
     container_name: sendico-payments-quotation
     platform: linux/amd64
     restart: unless-stopped
-    image: ${REGISTRY_URL}/payments/quotation:${APP_V}
+    image: ${REGISTRY_URL}/payments/quotation:${IMAGE_TAG:-${APP_V}}
     pull_policy: always
     environment:
       PAYMENTS_MONGO_HOST: ${PAYMENTS_MONGO_HOST}

ci/prod/compose/tgsettle_gateway.yml

@@ -16,7 +16,7 @@ services:
     container_name: sendico-tgsettle-gateway
     platform: linux/amd64
     restart: unless-stopped
-    image: ${REGISTRY_URL}/gateway/tgsettle:${APP_V}
+    image: ${REGISTRY_URL}/gateway/tgsettle:${IMAGE_TAG:-${APP_V}}
     pull_policy: always
     environment:
       TGSETTLE_GATEWAY_MONGO_HOST: ${TGSETTLE_GATEWAY_MONGO_HOST}

ci/prod/compose/tron_gateway.yml

@@ -24,7 +24,7 @@ services:
     container_name: sendico-tron-gateway
     platform: linux/amd64
     restart: unless-stopped
-    image: ${REGISTRY_URL}/gateway/tron:${APP_V}
+    image: ${REGISTRY_URL}/gateway/tron:${IMAGE_TAG:-${APP_V}}
     pull_policy: always
     environment:
       TRON_GATEWAY_MONGO_HOST: ${TRON_GATEWAY_MONGO_HOST}

ci/prod/scripts/deploy/bff.sh

@@ -12,6 +12,7 @@ trap 'echo "[deploy-bff] error at line $LINENO" >&2' ERR
 
 REMOTE_DIR="${REMOTE_BASE%/}/${BFF_DIR}"
 REMOTE_TARGET="${SSH_USER}@${SSH_HOST}"
+RUNTIME_ENV_FILE="${RUNTIME_ENV_FILE:-ci/prod/.env.runtime}"
 COMPOSE_FILE="bff.yml"
 SERVICE_NAMES="${BFF_SERVICE_NAME}"
 
@@ -68,7 +69,7 @@ RSYNC_FLAGS=(-az --delete)
 ssh "${SSH_OPTS[@]}" "$REMOTE_TARGET" "mkdir -p ${REMOTE_DIR}/{compose,env}"
 
 rsync "${RSYNC_FLAGS[@]}" -e "ssh ${SSH_OPTS[*]}" ci/prod/compose/ "$REMOTE_TARGET:${REMOTE_DIR}/compose/"
-rsync "${RSYNC_FLAGS[@]}" -e "ssh ${SSH_OPTS[*]}" ci/prod/.env.runtime "$REMOTE_TARGET:${REMOTE_DIR}/env/.env.runtime"
+rsync "${RSYNC_FLAGS[@]}" -e "ssh ${SSH_OPTS[*]}" "${RUNTIME_ENV_FILE}" "$REMOTE_TARGET:${REMOTE_DIR}/env/.env.runtime"
 rsync "${RSYNC_FLAGS[@]}" -e "ssh ${SSH_OPTS[*]}" .env.version         "$REMOTE_TARGET:${REMOTE_DIR}/env/.env.version"
 
 SERVICES_LINE="${SERVICE_NAMES}"
@@ -112,6 +113,9 @@ load_kv_file() {
 load_kv_file ../env/.env.version
 set +a
 
+IMAGE_TAG="${IMAGE_TAG:-${APP_V}-${GIT_REV}}"
+export IMAGE_TAG
+
 if base64 -d >/dev/null 2>&1 <<<'AA=='; then
   BASE64_DECODE_FLAG='-d'
 else

ci/prod/scripts/deploy/billing_documents.sh

@@ -12,6 +12,7 @@ trap 'echo "[deploy-billing-documents] error at line $LINENO" >&2' ERR
 
 REMOTE_DIR="${REMOTE_BASE%/}/${DOCUMENTS_DIR}"
 REMOTE_TARGET="${SSH_USER}@${SSH_HOST}"
+RUNTIME_ENV_FILE="${RUNTIME_ENV_FILE:-ci/prod/.env.runtime}"
 COMPOSE_FILE="billing_documents.yml"
 SERVICE_NAMES="${DOCUMENTS_SERVICE_NAME}"
 
@@ -72,7 +73,7 @@ RSYNC_FLAGS=(-az --delete)
 ssh "${SSH_OPTS[@]}" "$REMOTE_TARGET" "mkdir -p ${REMOTE_DIR}/{compose,env}"
 
 rsync "${RSYNC_FLAGS[@]}" -e "ssh ${SSH_OPTS[*]}" ci/prod/compose/ "$REMOTE_TARGET:${REMOTE_DIR}/compose/"
-rsync "${RSYNC_FLAGS[@]}" -e "ssh ${SSH_OPTS[*]}" ci/prod/.env.runtime "$REMOTE_TARGET:${REMOTE_DIR}/env/.env.runtime"
+rsync "${RSYNC_FLAGS[@]}" -e "ssh ${SSH_OPTS[*]}" "${RUNTIME_ENV_FILE}" "$REMOTE_TARGET:${REMOTE_DIR}/env/.env.runtime"
 rsync "${RSYNC_FLAGS[@]}" -e "ssh ${SSH_OPTS[*]}" .env.version         "$REMOTE_TARGET:${REMOTE_DIR}/env/.env.version"
 
 SERVICES_LINE="${SERVICE_NAMES}"
@@ -118,6 +119,9 @@ load_kv_file() {
 load_kv_file ../env/.env.version
 set +a
 
+IMAGE_TAG="${IMAGE_TAG:-${APP_V}-${GIT_REV}}"
+export IMAGE_TAG
+
 if base64 -d >/dev/null 2>&1 <<<'AA=='; then
   BASE64_DECODE_FLAG='-d'
 else

ci/prod/scripts/deploy/billing_fees.sh

@@ -12,6 +12,7 @@ trap 'echo "[deploy-billing-fees] error at line $LINENO" >&2' ERR
 
 REMOTE_DIR="${REMOTE_BASE%/}/${FEES_DIR}"
 REMOTE_TARGET="${SSH_USER}@${SSH_HOST}"
+RUNTIME_ENV_FILE="${RUNTIME_ENV_FILE:-ci/prod/.env.runtime}"
 COMPOSE_FILE="billing_fees.yml"
 SERVICE_NAMES="${FEES_SERVICE_NAME}"
 
@@ -62,7 +63,7 @@ RSYNC_FLAGS=(-az --delete)
 ssh "${SSH_OPTS[@]}" "$REMOTE_TARGET" "mkdir -p ${REMOTE_DIR}/{compose,env}"
 
 rsync "${RSYNC_FLAGS[@]}" -e "ssh ${SSH_OPTS[*]}" ci/prod/compose/ "$REMOTE_TARGET:${REMOTE_DIR}/compose/"
-rsync "${RSYNC_FLAGS[@]}" -e "ssh ${SSH_OPTS[*]}" ci/prod/.env.runtime "$REMOTE_TARGET:${REMOTE_DIR}/env/.env.runtime"
+rsync "${RSYNC_FLAGS[@]}" -e "ssh ${SSH_OPTS[*]}" "${RUNTIME_ENV_FILE}" "$REMOTE_TARGET:${REMOTE_DIR}/env/.env.runtime"
 rsync "${RSYNC_FLAGS[@]}" -e "ssh ${SSH_OPTS[*]}" .env.version         "$REMOTE_TARGET:${REMOTE_DIR}/env/.env.version"
 
 SERVICES_LINE="${SERVICE_NAMES}"
@@ -103,6 +104,9 @@ load_kv_file() {
 load_kv_file ../env/.env.version
 set +a
 
+IMAGE_TAG="${IMAGE_TAG:-${APP_V}-${GIT_REV}}"
+export IMAGE_TAG
+
 if base64 -d >/dev/null 2>&1 <<<'AA=='; then
   BASE64_DECODE_FLAG='-d'
 else

ci/prod/scripts/deploy/callbacks.sh

@@ -12,6 +12,7 @@ trap 'echo "[deploy-callbacks] error at line $LINENO" >&2' ERR
 
 REMOTE_DIR="${REMOTE_BASE%/}/${CALLBACKS_DIR}"
 REMOTE_TARGET="${SSH_USER}@${SSH_HOST}"
+RUNTIME_ENV_FILE="${RUNTIME_ENV_FILE:-ci/prod/.env.runtime}"
 COMPOSE_FILE="callbacks.yml"
 SERVICE_NAMES="${CALLBACKS_SERVICE_NAME}"
 
@@ -66,7 +67,7 @@ RSYNC_FLAGS=(-az --delete)
 ssh "${SSH_OPTS[@]}" "$REMOTE_TARGET" "mkdir -p ${REMOTE_DIR}/{compose,env}"
 
 rsync "${RSYNC_FLAGS[@]}" -e "ssh ${SSH_OPTS[*]}" ci/prod/compose/ "$REMOTE_TARGET:${REMOTE_DIR}/compose/"
-rsync "${RSYNC_FLAGS[@]}" -e "ssh ${SSH_OPTS[*]}" ci/prod/.env.runtime "$REMOTE_TARGET:${REMOTE_DIR}/env/.env.runtime"
+rsync "${RSYNC_FLAGS[@]}" -e "ssh ${SSH_OPTS[*]}" "${RUNTIME_ENV_FILE}" "$REMOTE_TARGET:${REMOTE_DIR}/env/.env.runtime"
 rsync "${RSYNC_FLAGS[@]}" -e "ssh ${SSH_OPTS[*]}" .env.version         "$REMOTE_TARGET:${REMOTE_DIR}/env/.env.version"
 
 SERVICES_LINE="${SERVICE_NAMES}"
@@ -109,6 +110,9 @@ load_kv_file() {
 load_kv_file ../env/.env.version
 set +a
 
+IMAGE_TAG="${IMAGE_TAG:-${APP_V}-${GIT_REV}}"
+export IMAGE_TAG
+
 if base64 -d >/dev/null 2>&1 <<<'AA=='; then
   BASE64_DECODE_FLAG='-d'
 else

ci/prod/scripts/deploy/chain_gateway.sh

@@ -12,6 +12,7 @@ trap 'echo "[deploy-chain-gateway] error at line $LINENO" >&2' ERR
 
 REMOTE_DIR="${REMOTE_BASE%/}/${CHAIN_GATEWAY_DIR}"
 REMOTE_TARGET="${SSH_USER}@${SSH_HOST}"
+RUNTIME_ENV_FILE="${RUNTIME_ENV_FILE:-ci/prod/.env.runtime}"
 COMPOSE_FILE="chain_gateway.yml"
 SERVICE_NAMES="${CHAIN_GATEWAY_SERVICE_NAME}"
 
@@ -72,7 +73,7 @@ RSYNC_FLAGS=(-az --delete)
 ssh "${SSH_OPTS[@]}" "$REMOTE_TARGET" "mkdir -p ${REMOTE_DIR}/compose/secrets ${REMOTE_DIR}/env"
 
 rsync "${RSYNC_FLAGS[@]}" -e "ssh ${SSH_OPTS[*]}" ci/prod/compose/ "$REMOTE_TARGET:${REMOTE_DIR}/compose/"
-rsync "${RSYNC_FLAGS[@]}" -e "ssh ${SSH_OPTS[*]}" ci/prod/.env.runtime "$REMOTE_TARGET:${REMOTE_DIR}/env/.env.runtime"
+rsync "${RSYNC_FLAGS[@]}" -e "ssh ${SSH_OPTS[*]}" "${RUNTIME_ENV_FILE}" "$REMOTE_TARGET:${REMOTE_DIR}/env/.env.runtime"
 rsync "${RSYNC_FLAGS[@]}" -e "ssh ${SSH_OPTS[*]}" .env.version         "$REMOTE_TARGET:${REMOTE_DIR}/env/.env.version"
 
 SERVICES_LINE="${SERVICE_NAMES}"
@@ -118,6 +119,9 @@ load_kv_file() {
 load_kv_file ../env/.env.version
 set +a
 
+IMAGE_TAG="${IMAGE_TAG:-${APP_V}-${GIT_REV}}"
+export IMAGE_TAG
+
 if base64 -d >/dev/null 2>&1 <<<'AA=='; then
   BASE64_DECODE_FLAG='-d'
 else

ci/prod/scripts/deploy/db.sh

@@ -15,6 +15,7 @@ trap 'echo "[deploy-db] error at line $LINENO" >&2' ERR
 
 REMOTE_DIR="${REMOTE_BASE%/}/${DB_DIR}"
 REMOTE_TARGET="${SSH_USER}@${SSH_HOST}"
+RUNTIME_ENV_FILE="${RUNTIME_ENV_FILE:-ci/prod/.env.runtime}"
 
 # SSH options: quiet by default; add -vv in debug mode
 SSH_OPTS=(
@@ -37,7 +38,7 @@ ssh "${SSH_OPTS[@]}" "$REMOTE_TARGET" "mkdir -p ${REMOTE_DIR}/{compose,env}"
 
 # Sync compose bundle and runtime env to the remote host
 rsync "${RSYNC_FLAGS[@]}" -e "ssh ${SSH_OPTS[*]}" ci/prod/compose/    "$REMOTE_TARGET:${REMOTE_DIR}/compose/"
-rsync "${RSYNC_FLAGS[@]}" -e "ssh ${SSH_OPTS[*]}" ci/prod/.env.runtime "$REMOTE_TARGET:${REMOTE_DIR}/env/.env.runtime"
+rsync "${RSYNC_FLAGS[@]}" -e "ssh ${SSH_OPTS[*]}" "${RUNTIME_ENV_FILE}" "$REMOTE_TARGET:${REMOTE_DIR}/env/.env.runtime"
 
 # Deploy on remote: pass AppRole creds ONLY to compose invocations.
 # The vault-agent container writes them into tmpfs and unsets them internally.

ci/prod/scripts/deploy/discovery.sh

@@ -12,6 +12,7 @@ trap 'echo "[deploy-discovery] error at line $LINENO" >&2' ERR
 
 REMOTE_DIR="${REMOTE_BASE%/}/${DISCOVERY_DIR}"
 REMOTE_TARGET="${SSH_USER}@${SSH_HOST}"
+RUNTIME_ENV_FILE="${RUNTIME_ENV_FILE:-ci/prod/.env.runtime}"
 COMPOSE_FILE="discovery.yml"
 SERVICE_NAMES="${DISCOVERY_SERVICE_NAME}"
 
@@ -58,7 +59,7 @@ RSYNC_FLAGS=(-az --delete)
 ssh "${SSH_OPTS[@]}" "$REMOTE_TARGET" "mkdir -p ${REMOTE_DIR}/{compose,env}"
 
 rsync "${RSYNC_FLAGS[@]}" -e "ssh ${SSH_OPTS[*]}" ci/prod/compose/ "$REMOTE_TARGET:${REMOTE_DIR}/compose/"
-rsync "${RSYNC_FLAGS[@]}" -e "ssh ${SSH_OPTS[*]}" ci/prod/.env.runtime "$REMOTE_TARGET:${REMOTE_DIR}/env/.env.runtime"
+rsync "${RSYNC_FLAGS[@]}" -e "ssh ${SSH_OPTS[*]}" "${RUNTIME_ENV_FILE}" "$REMOTE_TARGET:${REMOTE_DIR}/env/.env.runtime"
 rsync "${RSYNC_FLAGS[@]}" -e "ssh ${SSH_OPTS[*]}" .env.version         "$REMOTE_TARGET:${REMOTE_DIR}/env/.env.version"
 
 SERVICES_LINE="${SERVICE_NAMES}"
@@ -97,6 +98,9 @@ load_kv_file() {
 load_kv_file ../env/.env.version
 set +a
 
+IMAGE_TAG="${IMAGE_TAG:-${APP_V}-${GIT_REV}}"
+export IMAGE_TAG
+
 if base64 -d >/dev/null 2>&1 <<<'AA=='; then
   BASE64_DECODE_FLAG='-d'
 else

ci/prod/scripts/deploy/frontend.sh

@@ -12,6 +12,7 @@ trap 'echo "[deploy-frontend] error at line $LINENO" >&2' ERR
 
 REMOTE_DIR="${REMOTE_BASE%/}/${FRONTEND_DIR}"
 REMOTE_TARGET="${SSH_USER}@${SSH_HOST}"
+RUNTIME_ENV_FILE="${RUNTIME_ENV_FILE:-ci/prod/.env.runtime}"
 COMPOSE_FILE="frontend.yml"
 SERVICE_NAMES="${FRONTEND_SERVICE_NAME}"
 
@@ -37,7 +38,7 @@ RSYNC_FLAGS=(-az --delete)
 ssh "${SSH_OPTS[@]}" "$REMOTE_TARGET" "mkdir -p ${REMOTE_DIR}/{compose,env}"
 
 rsync "${RSYNC_FLAGS[@]}" -e "ssh ${SSH_OPTS[*]}" ci/prod/compose/ "$REMOTE_TARGET:${REMOTE_DIR}/compose/"
-rsync "${RSYNC_FLAGS[@]}" -e "ssh ${SSH_OPTS[*]}" ci/prod/.env.runtime "$REMOTE_TARGET:${REMOTE_DIR}/env/.env.runtime"
+rsync "${RSYNC_FLAGS[@]}" -e "ssh ${SSH_OPTS[*]}" "${RUNTIME_ENV_FILE}" "$REMOTE_TARGET:${REMOTE_DIR}/env/.env.runtime"
 rsync "${RSYNC_FLAGS[@]}" -e "ssh ${SSH_OPTS[*]}" .env.version         "$REMOTE_TARGET:${REMOTE_DIR}/env/.env.version"
 
 SERVICES_LINE="${SERVICE_NAMES}"
@@ -73,6 +74,9 @@ load_kv_file() {
 load_kv_file ../env/.env.version
 set +a
 
+IMAGE_TAG="${IMAGE_TAG:-${APP_V}-${GIT_REV}}"
+export IMAGE_TAG
+
 COMPOSE_PROJECT_NAME="$COMPOSE_PROJECT"
 export COMPOSE_PROJECT_NAME
 read -r -a SERVICES <<<"${SERVICES_LINE}"

ci/prod/scripts/deploy/fx.sh

@@ -15,6 +15,7 @@ SERVICE="$1"
 : "${SSH_HOST:?missing SSH_HOST}"
 
 REMOTE_TARGET="${SSH_USER}@${SSH_HOST}"
+RUNTIME_ENV_FILE="${RUNTIME_ENV_FILE:-ci/prod/.env.runtime}"
 
 case "$SERVICE" in
   ingestor)
@@ -88,7 +89,7 @@ RSYNC_FLAGS=(-az --delete)
 ssh "${SSH_OPTS[@]}" "$REMOTE_TARGET" "mkdir -p ${REMOTE_DIR}/{compose,env}"
 
 rsync "${RSYNC_FLAGS[@]}" -e "ssh ${SSH_OPTS[*]}" ci/prod/compose/ "$REMOTE_TARGET:${REMOTE_DIR}/compose/"
-rsync "${RSYNC_FLAGS[@]}" -e "ssh ${SSH_OPTS[*]}" ci/prod/.env.runtime "$REMOTE_TARGET:${REMOTE_DIR}/env/.env.runtime"
+rsync "${RSYNC_FLAGS[@]}" -e "ssh ${SSH_OPTS[*]}" "${RUNTIME_ENV_FILE}" "$REMOTE_TARGET:${REMOTE_DIR}/env/.env.runtime"
 rsync "${RSYNC_FLAGS[@]}" -e "ssh ${SSH_OPTS[*]}" .env.version         "$REMOTE_TARGET:${REMOTE_DIR}/env/.env.version"
 
 SERVICES_LINE="${SERVICE_NAMES}"
@@ -129,6 +130,9 @@ load_kv_file() {
 load_kv_file ../env/.env.version
 set +a
 
+IMAGE_TAG="${IMAGE_TAG:-${APP_V}-${GIT_REV}}"
+export IMAGE_TAG
+
 if base64 -d >/dev/null 2>&1 <<<'AA=='; then
   BASE64_DECODE_FLAG='-d'
 else

ci/prod/scripts/deploy/ledger.sh

@@ -12,6 +12,7 @@ trap 'echo "[deploy-ledger] error at line $LINENO" >&2' ERR
 
 REMOTE_DIR="${REMOTE_BASE%/}/${LEDGER_DIR}"
 REMOTE_TARGET="${SSH_USER}@${SSH_HOST}"
+RUNTIME_ENV_FILE="${RUNTIME_ENV_FILE:-ci/prod/.env.runtime}"
 COMPOSE_FILE="ledger.yml"
 SERVICE_NAMES="${LEDGER_SERVICE_NAME}"
 
@@ -62,7 +63,7 @@ RSYNC_FLAGS=(-az --delete)
 ssh "${SSH_OPTS[@]}" "$REMOTE_TARGET" "mkdir -p ${REMOTE_DIR}/{compose,env}"
 
 rsync "${RSYNC_FLAGS[@]}" -e "ssh ${SSH_OPTS[*]}" ci/prod/compose/ "$REMOTE_TARGET:${REMOTE_DIR}/compose/"
-rsync "${RSYNC_FLAGS[@]}" -e "ssh ${SSH_OPTS[*]}" ci/prod/.env.runtime "$REMOTE_TARGET:${REMOTE_DIR}/env/.env.runtime"
+rsync "${RSYNC_FLAGS[@]}" -e "ssh ${SSH_OPTS[*]}" "${RUNTIME_ENV_FILE}" "$REMOTE_TARGET:${REMOTE_DIR}/env/.env.runtime"
 rsync "${RSYNC_FLAGS[@]}" -e "ssh ${SSH_OPTS[*]}" .env.version         "$REMOTE_TARGET:${REMOTE_DIR}/env/.env.version"
 
 SERVICES_LINE="${SERVICE_NAMES}"
@@ -103,6 +104,9 @@ load_kv_file() {
 load_kv_file ../env/.env.version
 set +a
 
+IMAGE_TAG="${IMAGE_TAG:-${APP_V}-${GIT_REV}}"
+export IMAGE_TAG
+
 if base64 -d >/dev/null 2>&1 <<<'AA=='; then
   BASE64_DECODE_FLAG='-d'
 else

ci/prod/scripts/deploy/mntx_gateway.sh

@@ -12,6 +12,7 @@ trap 'echo "[deploy-mntx-gateway] error at line $LINENO" >&2' ERR
 
 REMOTE_DIR="${REMOTE_BASE%/}/${MNTX_GATEWAY_DIR}"
 REMOTE_TARGET="${SSH_USER}@${SSH_HOST}"
+RUNTIME_ENV_FILE="${RUNTIME_ENV_FILE:-ci/prod/.env.runtime}"
 COMPOSE_FILE="mntx_gateway.yml"
 SERVICE_NAMES="${MNTX_GATEWAY_SERVICE_NAME}"
 
@@ -66,7 +67,7 @@ RSYNC_FLAGS=(-az --delete)
 ssh "${SSH_OPTS[@]}" "$REMOTE_TARGET" "mkdir -p ${REMOTE_DIR}/compose ${REMOTE_DIR}/env"
 
 rsync "${RSYNC_FLAGS[@]}" -e "ssh ${SSH_OPTS[*]}" ci/prod/compose/ "$REMOTE_TARGET:${REMOTE_DIR}/compose/"
-rsync "${RSYNC_FLAGS[@]}" -e "ssh ${SSH_OPTS[*]}" ci/prod/.env.runtime "$REMOTE_TARGET:${REMOTE_DIR}/env/.env.runtime"
+rsync "${RSYNC_FLAGS[@]}" -e "ssh ${SSH_OPTS[*]}" "${RUNTIME_ENV_FILE}" "$REMOTE_TARGET:${REMOTE_DIR}/env/.env.runtime"
 rsync "${RSYNC_FLAGS[@]}" -e "ssh ${SSH_OPTS[*]}" .env.version         "$REMOTE_TARGET:${REMOTE_DIR}/env/.env.version"
 
 SERVICES_LINE="${SERVICE_NAMES}"
@@ -109,6 +110,9 @@ load_kv_file() {
 load_kv_file ../env/.env.version
 set +a
 
+IMAGE_TAG="${IMAGE_TAG:-${APP_V}-${GIT_REV}}"
+export IMAGE_TAG
+
 if base64 -d >/dev/null 2>&1 <<<'AA=='; then
   BASE64_DECODE_FLAG='-d'
 else

ci/prod/scripts/deploy/nats.sh

@@ -12,6 +12,7 @@ trap 'echo "[deploy-nats] error at line $LINENO" >&2' ERR
 
 REMOTE_DIR="${REMOTE_BASE%/}/${NATS_DIR}"
 REMOTE_TARGET="${SSH_USER}@${SSH_HOST}"
+RUNTIME_ENV_FILE="${RUNTIME_ENV_FILE:-ci/prod/.env.runtime}"
 
 SSH_OPTS=(
   -i /root/.ssh/id_rsa
@@ -31,7 +32,7 @@ ssh "${SSH_OPTS[@]}" "$REMOTE_TARGET" "mkdir -p ${REMOTE_DIR}/{compose,env}"
 
 rsync "${RSYNC_FLAGS[@]}" -e "ssh ${SSH_OPTS[*]}" ci/prod/compose/nats.yml "$REMOTE_TARGET:${REMOTE_DIR}/compose/nats.yml"
 rsync "${RSYNC_FLAGS[@]}" -e "ssh ${SSH_OPTS[*]}" ci/prod/compose/nats.dockerfile "$REMOTE_TARGET:${REMOTE_DIR}/compose/nats.dockerfile"
-rsync "${RSYNC_FLAGS[@]}" -e "ssh ${SSH_OPTS[*]}" ci/prod/.env.runtime "$REMOTE_TARGET:${REMOTE_DIR}/env/.env.runtime"
+rsync "${RSYNC_FLAGS[@]}" -e "ssh ${SSH_OPTS[*]}" "${RUNTIME_ENV_FILE}" "$REMOTE_TARGET:${REMOTE_DIR}/env/.env.runtime"
 
 ssh "${SSH_OPTS[@]}" "$REMOTE_TARGET" \
   REMOTE_DIR="$REMOTE_DIR" \

ci/prod/scripts/deploy/notification.sh

@@ -12,6 +12,7 @@ trap 'echo "[deploy-notification] error at line $LINENO" >&2' ERR
 
 REMOTE_DIR="${REMOTE_BASE%/}/${NOTIFICATION_DIR}"
 REMOTE_TARGET="${SSH_USER}@${SSH_HOST}"
+RUNTIME_ENV_FILE="${RUNTIME_ENV_FILE:-ci/prod/.env.runtime}"
 COMPOSE_FILE="notification.yml"
 SERVICE_NAMES="${NOTIFICATION_SERVICE_NAME}"
 
@@ -73,7 +74,7 @@ RSYNC_FLAGS=(-az --delete)
 ssh "${SSH_OPTS[@]}" "$REMOTE_TARGET" "mkdir -p ${REMOTE_DIR}/{compose,env}"
 
 rsync "${RSYNC_FLAGS[@]}" -e "ssh ${SSH_OPTS[*]}" ci/prod/compose/ "$REMOTE_TARGET:${REMOTE_DIR}/compose/"
-rsync "${RSYNC_FLAGS[@]}" -e "ssh ${SSH_OPTS[*]}" ci/prod/.env.runtime "$REMOTE_TARGET:${REMOTE_DIR}/env/.env.runtime"
+rsync "${RSYNC_FLAGS[@]}" -e "ssh ${SSH_OPTS[*]}" "${RUNTIME_ENV_FILE}" "$REMOTE_TARGET:${REMOTE_DIR}/env/.env.runtime"
 rsync "${RSYNC_FLAGS[@]}" -e "ssh ${SSH_OPTS[*]}" .env.version         "$REMOTE_TARGET:${REMOTE_DIR}/env/.env.version"
 
 SERVICES_LINE="${SERVICE_NAMES}"
@@ -120,6 +121,9 @@ load_kv_file() {
 load_kv_file ../env/.env.version
 set +a
 
+IMAGE_TAG="${IMAGE_TAG:-${APP_V}-${GIT_REV}}"
+export IMAGE_TAG
+
 if base64 -d >/dev/null 2>&1 <<<'AA=='; then
   BASE64_DECODE_FLAG='-d'
 else

ci/prod/scripts/deploy/payments_methods.sh

@@ -12,6 +12,7 @@ trap 'echo "[deploy-payments-methods] error at line $LINENO" >&2' ERR
 
 REMOTE_DIR="${REMOTE_BASE%/}/${PAYMENTS_METHODS_DIR}"
 REMOTE_TARGET="${SSH_USER}@${SSH_HOST}"
+RUNTIME_ENV_FILE="${RUNTIME_ENV_FILE:-ci/prod/.env.runtime}"
 COMPOSE_FILE="payments_methods.yml"
 SERVICE_NAMES="${PAYMENTS_METHODS_SERVICE_NAME}"
 
@@ -62,7 +63,7 @@ RSYNC_FLAGS=(-az --delete)
 ssh "${SSH_OPTS[@]}" "$REMOTE_TARGET" "mkdir -p ${REMOTE_DIR}/{compose,env}"
 
 rsync "${RSYNC_FLAGS[@]}" -e "ssh ${SSH_OPTS[*]}" ci/prod/compose/ "$REMOTE_TARGET:${REMOTE_DIR}/compose/"
-rsync "${RSYNC_FLAGS[@]}" -e "ssh ${SSH_OPTS[*]}" ci/prod/.env.runtime "$REMOTE_TARGET:${REMOTE_DIR}/env/.env.runtime"
+rsync "${RSYNC_FLAGS[@]}" -e "ssh ${SSH_OPTS[*]}" "${RUNTIME_ENV_FILE}" "$REMOTE_TARGET:${REMOTE_DIR}/env/.env.runtime"
 rsync "${RSYNC_FLAGS[@]}" -e "ssh ${SSH_OPTS[*]}" .env.version         "$REMOTE_TARGET:${REMOTE_DIR}/env/.env.version"
 
 SERVICES_LINE="${SERVICE_NAMES}"
@@ -103,6 +104,9 @@ load_kv_file() {
 load_kv_file ../env/.env.version
 set +a
 
+IMAGE_TAG="${IMAGE_TAG:-${APP_V}-${GIT_REV}}"
+export IMAGE_TAG
+
 if base64 -d >/dev/null 2>&1 <<<'AA=='; then
   BASE64_DECODE_FLAG='-d'
 else

ci/prod/scripts/deploy/payments_orchestrator.sh

@@ -12,6 +12,7 @@ trap 'echo "[deploy-payments-orchestrator] error at line $LINENO" >&2' ERR
 
 REMOTE_DIR="${REMOTE_BASE%/}/${PAYMENTS_DIR}"
 REMOTE_TARGET="${SSH_USER}@${SSH_HOST}"
+RUNTIME_ENV_FILE="${RUNTIME_ENV_FILE:-ci/prod/.env.runtime}"
 COMPOSE_FILE="payments_orchestrator.yml"
 SERVICE_NAMES="${PAYMENTS_SERVICE_NAME}"
 
@@ -62,7 +63,7 @@ RSYNC_FLAGS=(-az --delete)
 ssh "${SSH_OPTS[@]}" "$REMOTE_TARGET" "mkdir -p ${REMOTE_DIR}/{compose,env}"
 
 rsync "${RSYNC_FLAGS[@]}" -e "ssh ${SSH_OPTS[*]}" ci/prod/compose/ "$REMOTE_TARGET:${REMOTE_DIR}/compose/"
-rsync "${RSYNC_FLAGS[@]}" -e "ssh ${SSH_OPTS[*]}" ci/prod/.env.runtime "$REMOTE_TARGET:${REMOTE_DIR}/env/.env.runtime"
+rsync "${RSYNC_FLAGS[@]}" -e "ssh ${SSH_OPTS[*]}" "${RUNTIME_ENV_FILE}" "$REMOTE_TARGET:${REMOTE_DIR}/env/.env.runtime"
 rsync "${RSYNC_FLAGS[@]}" -e "ssh ${SSH_OPTS[*]}" .env.version         "$REMOTE_TARGET:${REMOTE_DIR}/env/.env.version"
 
 SERVICES_LINE="${SERVICE_NAMES}"
@@ -103,6 +104,9 @@ load_kv_file() {
 load_kv_file ../env/.env.version
 set +a
 
+IMAGE_TAG="${IMAGE_TAG:-${APP_V}-${GIT_REV}}"
+export IMAGE_TAG
+
 if base64 -d >/dev/null 2>&1 <<<'AA=='; then
   BASE64_DECODE_FLAG='-d'
 else

ci/prod/scripts/deploy/payments_quotation.sh

@@ -12,6 +12,7 @@ trap 'echo "[deploy-payments-quotation] error at line $LINENO" >&2' ERR
 
 REMOTE_DIR="${REMOTE_BASE%/}/${PAYMENTS_QUOTATION_DIR}"
 REMOTE_TARGET="${SSH_USER}@${SSH_HOST}"
+RUNTIME_ENV_FILE="${RUNTIME_ENV_FILE:-ci/prod/.env.runtime}"
 COMPOSE_FILE="payments_quotation.yml"
 SERVICE_NAMES="${PAYMENTS_QUOTATION_SERVICE_NAME}"
 
@@ -62,7 +63,7 @@ RSYNC_FLAGS=(-az --delete)
 ssh "${SSH_OPTS[@]}" "$REMOTE_TARGET" "mkdir -p ${REMOTE_DIR}/{compose,env}"
 
 rsync "${RSYNC_FLAGS[@]}" -e "ssh ${SSH_OPTS[*]}" ci/prod/compose/ "$REMOTE_TARGET:${REMOTE_DIR}/compose/"
-rsync "${RSYNC_FLAGS[@]}" -e "ssh ${SSH_OPTS[*]}" ci/prod/.env.runtime "$REMOTE_TARGET:${REMOTE_DIR}/env/.env.runtime"
+rsync "${RSYNC_FLAGS[@]}" -e "ssh ${SSH_OPTS[*]}" "${RUNTIME_ENV_FILE}" "$REMOTE_TARGET:${REMOTE_DIR}/env/.env.runtime"
 rsync "${RSYNC_FLAGS[@]}" -e "ssh ${SSH_OPTS[*]}" .env.version         "$REMOTE_TARGET:${REMOTE_DIR}/env/.env.version"
 
 SERVICES_LINE="${SERVICE_NAMES}"
@@ -103,6 +104,9 @@ load_kv_file() {
 load_kv_file ../env/.env.version
 set +a
 
+IMAGE_TAG="${IMAGE_TAG:-${APP_V}-${GIT_REV}}"
+export IMAGE_TAG
+
 if base64 -d >/dev/null 2>&1 <<<'AA=='; then
   BASE64_DECODE_FLAG='-d'
 else

ci/prod/scripts/deploy/tgsettle_gateway.sh

@@ -12,6 +12,7 @@ trap 'echo "[deploy-tgsettle-gateway] error at line $LINENO" >&2' ERR
 
 REMOTE_DIR="${REMOTE_BASE%/}/${TGSETTLE_GATEWAY_DIR}"
 REMOTE_TARGET="${SSH_USER}@${SSH_HOST}"
+RUNTIME_ENV_FILE="${RUNTIME_ENV_FILE:-ci/prod/.env.runtime}"
 COMPOSE_FILE="tgsettle_gateway.yml"
 SERVICE_NAMES="${TGSETTLE_GATEWAY_SERVICE_NAME}"
 
@@ -62,7 +63,7 @@ RSYNC_FLAGS=(-az --delete)
 ssh "${SSH_OPTS[@]}" "$REMOTE_TARGET" "mkdir -p ${REMOTE_DIR}/{compose,env}"
 
 rsync "${RSYNC_FLAGS[@]}" -e "ssh ${SSH_OPTS[*]}" ci/prod/compose/ "$REMOTE_TARGET:${REMOTE_DIR}/compose/"
-rsync "${RSYNC_FLAGS[@]}" -e "ssh ${SSH_OPTS[*]}" ci/prod/.env.runtime "$REMOTE_TARGET:${REMOTE_DIR}/env/.env.runtime"
+rsync "${RSYNC_FLAGS[@]}" -e "ssh ${SSH_OPTS[*]}" "${RUNTIME_ENV_FILE}" "$REMOTE_TARGET:${REMOTE_DIR}/env/.env.runtime"
 rsync "${RSYNC_FLAGS[@]}" -e "ssh ${SSH_OPTS[*]}" .env.version         "$REMOTE_TARGET:${REMOTE_DIR}/env/.env.version"
 
 SERVICES_LINE="${SERVICE_NAMES}"
@@ -103,6 +104,9 @@ load_kv_file() {
 load_kv_file ../env/.env.version
 set +a
 
+IMAGE_TAG="${IMAGE_TAG:-${APP_V}-${GIT_REV}}"
+export IMAGE_TAG
+
 if base64 -d >/dev/null 2>&1 <<<'AA=='; then
   BASE64_DECODE_FLAG='-d'
 else

ci/prod/scripts/deploy/tron_gateway.sh

@@ -12,6 +12,7 @@ trap 'echo "[deploy-tron-gateway] error at line $LINENO" >&2' ERR
 
 REMOTE_DIR="${REMOTE_BASE%/}/${TRON_GATEWAY_DIR}"
 REMOTE_TARGET="${SSH_USER}@${SSH_HOST}"
+RUNTIME_ENV_FILE="${RUNTIME_ENV_FILE:-ci/prod/.env.runtime}"
 COMPOSE_FILE="tron_gateway.yml"
 SERVICE_NAMES="${TRON_GATEWAY_SERVICE_NAME}"
 
@@ -74,7 +75,7 @@ RSYNC_FLAGS=(-az --delete)
 ssh "${SSH_OPTS[@]}" "$REMOTE_TARGET" "mkdir -p ${REMOTE_DIR}/compose/secrets ${REMOTE_DIR}/env"
 
 rsync "${RSYNC_FLAGS[@]}" -e "ssh ${SSH_OPTS[*]}" ci/prod/compose/ "$REMOTE_TARGET:${REMOTE_DIR}/compose/"
-rsync "${RSYNC_FLAGS[@]}" -e "ssh ${SSH_OPTS[*]}" ci/prod/.env.runtime "$REMOTE_TARGET:${REMOTE_DIR}/env/.env.runtime"
+rsync "${RSYNC_FLAGS[@]}" -e "ssh ${SSH_OPTS[*]}" "${RUNTIME_ENV_FILE}" "$REMOTE_TARGET:${REMOTE_DIR}/env/.env.runtime"
 rsync "${RSYNC_FLAGS[@]}" -e "ssh ${SSH_OPTS[*]}" .env.version         "$REMOTE_TARGET:${REMOTE_DIR}/env/.env.version"
 
 SERVICES_LINE="${SERVICE_NAMES}"
@@ -122,6 +123,9 @@ load_kv_file() {
 load_kv_file ../env/.env.version
 set +a
 
+IMAGE_TAG="${IMAGE_TAG:-${APP_V}-${GIT_REV}}"
+export IMAGE_TAG
+
 if base64 -d >/dev/null 2>&1 <<<'AA=='; then
   BASE64_DECODE_FLAG='-d'
 else