Initial dev deployment [infra]

ci/scripts/bff/build-image.sh

@@ -9,6 +9,7 @@ REPO_ROOT="$(cd "$(dirname "$0")/../../.." && pwd)"
 cd "${REPO_ROOT}"
 
 sh ci/scripts/common/ensure_env_version.sh
+. ci/scripts/common/runtime_env.sh
 
 normalize_env_file() {
   file="$1"
@@ -32,19 +33,10 @@ load_env_file() {
   done <"$file"
 }
 
-BFF_ENV_NAME="${BFF_ENV:-prod}"
-RUNTIME_ENV_FILE="./ci/${BFF_ENV_NAME}/.env.runtime"
+BFF_ENV_NAME="${BFF_ENV:-$(resolve_runtime_env_name)}"
+load_runtime_env_bundle "${BFF_ENV_NAME}"
 
-if [ ! -f "${RUNTIME_ENV_FILE}" ]; then
-  echo "[bff-build] runtime env file not found: ${RUNTIME_ENV_FILE}" >&2
-  exit 1
-fi
-
-normalize_env_file "${RUNTIME_ENV_FILE}"
-normalize_env_file ./.env.version
-
-load_env_file "${RUNTIME_ENV_FILE}"
-load_env_file ./.env.version
+IMAGE_TAG="$(compute_image_tag)"
 
 REGISTRY_URL="${REGISTRY_URL:?missing REGISTRY_URL}"
 APP_V="${APP_V:?missing APP_V}"
@@ -76,7 +68,7 @@ fi
 /kaniko/executor \
   --context "${BUILD_CONTEXT}" \
   --dockerfile "${BFF_DOCKERFILE}" \
-  --destination "${REGISTRY_URL}/${BFF_IMAGE_PATH}:${APP_V}" \
+  --destination "${REGISTRY_URL}/${BFF_IMAGE_PATH}:${IMAGE_TAG}" \
   --build-arg APP_VERSION="${APP_V}" \
   --build-arg GIT_REV="${GIT_REV}" \
   --build-arg BUILD_BRANCH="${BUILD_BRANCH}" \

ci/scripts/bff/deploy.sh

@@ -9,6 +9,7 @@ REPO_ROOT="$(cd "$(dirname "$0")/../../.." && pwd)"
 cd "${REPO_ROOT}"
 
 sh ci/scripts/common/ensure_env_version.sh
+. ci/scripts/common/runtime_env.sh
 
 normalize_env_file() {
   file="$1"
@@ -34,19 +35,8 @@ load_env_file() {
 
 . ci/scripts/common/nats_env.sh
 
-BFF_ENV_NAME="${BFF_ENV:-prod}"
-RUNTIME_ENV_FILE="./ci/${BFF_ENV_NAME}/.env.runtime"
-
-if [ ! -f "${RUNTIME_ENV_FILE}" ]; then
-  echo "[bff-deploy] runtime env file not found: ${RUNTIME_ENV_FILE}" >&2
-  exit 1
-fi
-
-normalize_env_file "${RUNTIME_ENV_FILE}"
-normalize_env_file ./.env.version
-
-load_env_file "${RUNTIME_ENV_FILE}"
-load_env_file ./.env.version
+BFF_ENV_NAME="${BFF_ENV:-$(resolve_runtime_env_name)}"
+load_runtime_env_bundle "${BFF_ENV_NAME}"
 
 BFF_MONGO_SECRET_PATH="${BFF_MONGO_SECRET_PATH:?missing BFF_MONGO_SECRET_PATH}"
 BFF_API_SECRET_PATH="${BFF_API_SECRET_PATH:?missing BFF_API_SECRET_PATH}"

ci/scripts/billing_documents/build-image.sh

@@ -9,6 +9,7 @@ REPO_ROOT="$(cd "$(dirname "$0")/../../.." && pwd)"
 cd "${REPO_ROOT}"
 
 sh ci/scripts/common/ensure_env_version.sh
+. ci/scripts/common/runtime_env.sh
 
 normalize_env_file() {
   file="$1"
@@ -32,19 +33,10 @@ load_env_file() {
   done <"$file"
 }
 
-DOCUMENTS_ENV_NAME="${DOCUMENTS_ENV:-prod}"
-RUNTIME_ENV_FILE="./ci/${DOCUMENTS_ENV_NAME}/.env.runtime"
+DOCUMENTS_ENV_NAME="${DOCUMENTS_ENV:-$(resolve_runtime_env_name)}"
+load_runtime_env_bundle "${DOCUMENTS_ENV_NAME}"
 
-if [ ! -f "${RUNTIME_ENV_FILE}" ]; then
-  echo "[billing-documents-build] runtime env file not found: ${RUNTIME_ENV_FILE}" >&2
-  exit 1
-fi
-
-normalize_env_file "${RUNTIME_ENV_FILE}"
-normalize_env_file ./.env.version
-
-load_env_file "${RUNTIME_ENV_FILE}"
-load_env_file ./.env.version
+IMAGE_TAG="$(compute_image_tag)"
 
 REGISTRY_URL="${REGISTRY_URL:?missing REGISTRY_URL}"
 APP_V="${APP_V:?missing APP_V}"
@@ -76,7 +68,7 @@ fi
 /kaniko/executor \
   --context "${BUILD_CONTEXT}" \
   --dockerfile "${DOCUMENTS_DOCKERFILE}" \
-  --destination "${REGISTRY_URL}/${DOCUMENTS_IMAGE_PATH}:${APP_V}" \
+  --destination "${REGISTRY_URL}/${DOCUMENTS_IMAGE_PATH}:${IMAGE_TAG}" \
   --build-arg APP_VERSION="${APP_V}" \
   --build-arg GIT_REV="${GIT_REV}" \
   --build-arg BUILD_BRANCH="${BUILD_BRANCH}" \

ci/scripts/billing_documents/deploy.sh

@@ -9,6 +9,7 @@ REPO_ROOT="$(cd "$(dirname "$0")/../../.." && pwd)"
 cd "${REPO_ROOT}"
 
 sh ci/scripts/common/ensure_env_version.sh
+. ci/scripts/common/runtime_env.sh
 
 normalize_env_file() {
   file="$1"
@@ -34,19 +35,8 @@ load_env_file() {
 
 . ci/scripts/common/nats_env.sh
 
-DOCUMENTS_ENV_NAME="${DOCUMENTS_ENV:-prod}"
-RUNTIME_ENV_FILE="./ci/${DOCUMENTS_ENV_NAME}/.env.runtime"
-
-if [ ! -f "${RUNTIME_ENV_FILE}" ]; then
-  echo "[billing-documents-deploy] runtime env file not found: ${RUNTIME_ENV_FILE}" >&2
-  exit 1
-fi
-
-normalize_env_file "${RUNTIME_ENV_FILE}"
-normalize_env_file ./.env.version
-
-load_env_file "${RUNTIME_ENV_FILE}"
-load_env_file ./.env.version
+DOCUMENTS_ENV_NAME="${DOCUMENTS_ENV:-$(resolve_runtime_env_name)}"
+load_runtime_env_bundle "${DOCUMENTS_ENV_NAME}"
 
 DOCUMENTS_MONGO_SECRET_PATH="${DOCUMENTS_MONGO_SECRET_PATH:?missing DOCUMENTS_MONGO_SECRET_PATH}"
 

ci/scripts/billing_fees/build-image.sh

@@ -9,6 +9,7 @@ REPO_ROOT="$(cd "$(dirname "$0")/../../.." && pwd)"
 cd "${REPO_ROOT}"
 
 sh ci/scripts/common/ensure_env_version.sh
+. ci/scripts/common/runtime_env.sh
 
 normalize_env_file() {
   file="$1"
@@ -32,19 +33,10 @@ load_env_file() {
   done <"$file"
 }
 
-FEES_ENV_NAME="${FEES_ENV:-prod}"
-RUNTIME_ENV_FILE="./ci/${FEES_ENV_NAME}/.env.runtime"
+FEES_ENV_NAME="${FEES_ENV:-$(resolve_runtime_env_name)}"
+load_runtime_env_bundle "${FEES_ENV_NAME}"
 
-if [ ! -f "${RUNTIME_ENV_FILE}" ]; then
-  echo "[billing-fees-build] runtime env file not found: ${RUNTIME_ENV_FILE}" >&2
-  exit 1
-fi
-
-normalize_env_file "${RUNTIME_ENV_FILE}"
-normalize_env_file ./.env.version
-
-load_env_file "${RUNTIME_ENV_FILE}"
-load_env_file ./.env.version
+IMAGE_TAG="$(compute_image_tag)"
 
 REGISTRY_URL="${REGISTRY_URL:?missing REGISTRY_URL}"
 APP_V="${APP_V:?missing APP_V}"
@@ -76,7 +68,7 @@ fi
 /kaniko/executor \
   --context "${BUILD_CONTEXT}" \
   --dockerfile "${FEES_DOCKERFILE}" \
-  --destination "${REGISTRY_URL}/${FEES_IMAGE_PATH}:${APP_V}" \
+  --destination "${REGISTRY_URL}/${FEES_IMAGE_PATH}:${IMAGE_TAG}" \
   --build-arg APP_VERSION="${APP_V}" \
   --build-arg GIT_REV="${GIT_REV}" \
   --build-arg BUILD_BRANCH="${BUILD_BRANCH}" \

ci/scripts/billing_fees/deploy.sh

@@ -9,6 +9,7 @@ REPO_ROOT="$(cd "$(dirname "$0")/../../.." && pwd)"
 cd "${REPO_ROOT}"
 
 sh ci/scripts/common/ensure_env_version.sh
+. ci/scripts/common/runtime_env.sh
 
 normalize_env_file() {
   file="$1"
@@ -34,19 +35,8 @@ load_env_file() {
 
 . ci/scripts/common/nats_env.sh
 
-FEES_ENV_NAME="${FEES_ENV:-prod}"
-RUNTIME_ENV_FILE="./ci/${FEES_ENV_NAME}/.env.runtime"
-
-if [ ! -f "${RUNTIME_ENV_FILE}" ]; then
-  echo "[billing-fees-deploy] runtime env file not found: ${RUNTIME_ENV_FILE}" >&2
-  exit 1
-fi
-
-normalize_env_file "${RUNTIME_ENV_FILE}"
-normalize_env_file ./.env.version
-
-load_env_file "${RUNTIME_ENV_FILE}"
-load_env_file ./.env.version
+FEES_ENV_NAME="${FEES_ENV:-$(resolve_runtime_env_name)}"
+load_runtime_env_bundle "${FEES_ENV_NAME}"
 
 FEES_MONGO_SECRET_PATH="${FEES_MONGO_SECRET_PATH:?missing FEES_MONGO_SECRET_PATH}"
 

ci/scripts/callbacks/build-image.sh

@@ -9,6 +9,7 @@ REPO_ROOT="$(cd "$(dirname "$0")/../../.." && pwd)"
 cd "${REPO_ROOT}"
 
 sh ci/scripts/common/ensure_env_version.sh
+. ci/scripts/common/runtime_env.sh
 
 normalize_env_file() {
   file="$1"
@@ -32,19 +33,10 @@ load_env_file() {
   done <"$file"
 }
 
-CALLBACKS_ENV_NAME="${CALLBACKS_ENV:-prod}"
-RUNTIME_ENV_FILE="./ci/${CALLBACKS_ENV_NAME}/.env.runtime"
+CALLBACKS_ENV_NAME="${CALLBACKS_ENV:-$(resolve_runtime_env_name)}"
+load_runtime_env_bundle "${CALLBACKS_ENV_NAME}"
 
-if [ ! -f "${RUNTIME_ENV_FILE}" ]; then
-  echo "[callbacks-build] runtime env file not found: ${RUNTIME_ENV_FILE}" >&2
-  exit 1
-fi
-
-normalize_env_file "${RUNTIME_ENV_FILE}"
-normalize_env_file ./.env.version
-
-load_env_file "${RUNTIME_ENV_FILE}"
-load_env_file ./.env.version
+IMAGE_TAG="$(compute_image_tag)"
 
 REGISTRY_URL="${REGISTRY_URL:?missing REGISTRY_URL}"
 APP_V="${APP_V:?missing APP_V}"
@@ -76,7 +68,7 @@ fi
 /kaniko/executor \
   --context "${BUILD_CONTEXT}" \
   --dockerfile "${CALLBACKS_DOCKERFILE}" \
-  --destination "${REGISTRY_URL}/${CALLBACKS_IMAGE_PATH}:${APP_V}" \
+  --destination "${REGISTRY_URL}/${CALLBACKS_IMAGE_PATH}:${IMAGE_TAG}" \
   --build-arg APP_VERSION="${APP_V}" \
   --build-arg GIT_REV="${GIT_REV}" \
   --build-arg BUILD_BRANCH="${BUILD_BRANCH}" \

ci/scripts/callbacks/deploy.sh

@@ -9,6 +9,7 @@ REPO_ROOT="$(cd "$(dirname "$0")/../../.." && pwd)"
 cd "${REPO_ROOT}"
 
 sh ci/scripts/common/ensure_env_version.sh
+. ci/scripts/common/runtime_env.sh
 
 normalize_env_file() {
   file="$1"
@@ -34,19 +35,8 @@ load_env_file() {
 
 . ci/scripts/common/nats_env.sh
 
-CALLBACKS_ENV_NAME="${CALLBACKS_ENV:-prod}"
-RUNTIME_ENV_FILE="./ci/${CALLBACKS_ENV_NAME}/.env.runtime"
-
-if [ ! -f "${RUNTIME_ENV_FILE}" ]; then
-  echo "[callbacks-deploy] runtime env file not found: ${RUNTIME_ENV_FILE}" >&2
-  exit 1
-fi
-
-normalize_env_file "${RUNTIME_ENV_FILE}"
-normalize_env_file ./.env.version
-
-load_env_file "${RUNTIME_ENV_FILE}"
-load_env_file ./.env.version
+CALLBACKS_ENV_NAME="${CALLBACKS_ENV:-$(resolve_runtime_env_name)}"
+load_runtime_env_bundle "${CALLBACKS_ENV_NAME}"
 
 CALLBACKS_MONGO_SECRET_PATH="${CALLBACKS_MONGO_SECRET_PATH:?missing CALLBACKS_MONGO_SECRET_PATH}"
 CALLBACKS_VAULT_SECRET_PATH="${CALLBACKS_VAULT_SECRET_PATH:?missing CALLBACKS_VAULT_SECRET_PATH}"

ci/scripts/chain_gateway/build-image.sh

@@ -9,6 +9,7 @@ REPO_ROOT="$(cd "$(dirname "$0")/../../.." && pwd)"
 cd "${REPO_ROOT}"
 
 sh ci/scripts/common/ensure_env_version.sh
+. ci/scripts/common/runtime_env.sh
 
 normalize_env_file() {
   file="$1"
@@ -32,19 +33,10 @@ load_env_file() {
   done <"$file"
 }
 
-CHAIN_GATEWAY_ENV_NAME="${CHAIN_GATEWAY_ENV:-prod}"
-RUNTIME_ENV_FILE="./ci/${CHAIN_GATEWAY_ENV_NAME}/.env.runtime"
+CHAIN_GATEWAY_ENV_NAME="${CHAIN_GATEWAY_ENV:-$(resolve_runtime_env_name)}"
+load_runtime_env_bundle "${CHAIN_GATEWAY_ENV_NAME}"
 
-if [ ! -f "${RUNTIME_ENV_FILE}" ]; then
-  echo "[chain-gateway-build] runtime env file not found: ${RUNTIME_ENV_FILE}" >&2
-  exit 1
-fi
-
-normalize_env_file "${RUNTIME_ENV_FILE}"
-normalize_env_file ./.env.version
-
-load_env_file "${RUNTIME_ENV_FILE}"
-load_env_file ./.env.version
+IMAGE_TAG="$(compute_image_tag)"
 
 REGISTRY_URL="${REGISTRY_URL:?missing REGISTRY_URL}"
 APP_V="${APP_V:?missing APP_V}"
@@ -93,7 +85,7 @@ fi
 /kaniko/executor \
   --context "${BUILD_CONTEXT}" \
   --dockerfile "${CHAIN_GATEWAY_DOCKERFILE}" \
-  --destination "${REGISTRY_URL}/${CHAIN_GATEWAY_IMAGE_PATH}:${APP_V}" \
+  --destination "${REGISTRY_URL}/${CHAIN_GATEWAY_IMAGE_PATH}:${IMAGE_TAG}" \
   --build-arg APP_VERSION="${APP_V}" \
   --build-arg GIT_REV="${GIT_REV}" \
   --build-arg BUILD_BRANCH="${BUILD_BRANCH}" \

ci/scripts/chain_gateway/deploy.sh

@@ -9,6 +9,7 @@ REPO_ROOT="$(cd "$(dirname "$0")/../../.." && pwd)"
 cd "${REPO_ROOT}"
 
 sh ci/scripts/common/ensure_env_version.sh
+. ci/scripts/common/runtime_env.sh
 
 normalize_env_file() {
   file="$1"
@@ -34,19 +35,8 @@ load_env_file() {
 
 . ci/scripts/common/nats_env.sh
 
-CHAIN_GATEWAY_ENV_NAME="${CHAIN_GATEWAY_ENV:-prod}"
-RUNTIME_ENV_FILE="./ci/${CHAIN_GATEWAY_ENV_NAME}/.env.runtime"
-
-if [ ! -f "${RUNTIME_ENV_FILE}" ]; then
-  echo "[chain-gateway-deploy] runtime env file not found: ${RUNTIME_ENV_FILE}" >&2
-  exit 1
-fi
-
-normalize_env_file "${RUNTIME_ENV_FILE}"
-normalize_env_file ./.env.version
-
-load_env_file "${RUNTIME_ENV_FILE}"
-load_env_file ./.env.version
+CHAIN_GATEWAY_ENV_NAME="${CHAIN_GATEWAY_ENV:-$(resolve_runtime_env_name)}"
+load_runtime_env_bundle "${CHAIN_GATEWAY_ENV_NAME}"
 
 CHAIN_GATEWAY_MONGO_SECRET_PATH="${CHAIN_GATEWAY_MONGO_SECRET_PATH:?missing CHAIN_GATEWAY_MONGO_SECRET_PATH}"
 CHAIN_GATEWAY_RPC_SECRET_PATH="${CHAIN_GATEWAY_RPC_SECRET_PATH:?missing CHAIN_GATEWAY_RPC_SECRET_PATH}"

ci/scripts/common/runtime_env.sh

@@ -0,0 +1,103 @@
+#!/bin/sh
+
+runtime_ci_event() {
+  if [ -n "${CI_PIPELINE_EVENT:-}" ]; then
+    printf '%s\n' "${CI_PIPELINE_EVENT}"
+    return
+  fi
+
+  if [ -n "${WOODPECKER_BUILD_EVENT:-}" ]; then
+    printf '%s\n' "${WOODPECKER_BUILD_EVENT}"
+    return
+  fi
+
+  printf 'local\n'
+}
+
+resolve_runtime_env_name() {
+  if [ -n "${CI_TARGET_ENV:-}" ]; then
+    printf '%s\n' "${CI_TARGET_ENV}"
+    return
+  fi
+
+  case "$(runtime_ci_event)" in
+    push)
+      printf 'devserver\n'
+      ;;
+    tag)
+      printf 'prod\n'
+      ;;
+    *)
+      printf 'prod\n'
+      ;;
+  esac
+}
+
+normalize_env_file() {
+  file="$1"
+  tmp="${file}.tmp.$$"
+  tr -d '\r' <"$file" >"$tmp"
+  mv "$tmp" "$file"
+}
+
+load_env_file() {
+  file="$1"
+  while IFS= read -r line || [ -n "$line" ]; do
+    case "$line" in
+      ''|\#*) continue ;;
+    esac
+    key="${line%%=*}"
+    value="${line#*=}"
+    key="$(printf '%s' "$key" | tr -d '[:space:]')"
+    value="${value#"${value%%[![:space:]]*}"}"
+    value="${value%"${value##*[![:space:]]}"}"
+    export "$key=$value"
+  done <"$file"
+}
+
+resolve_runtime_env_file() {
+  env_name="$1"
+  override_file="./ci/${env_name}/.env.runtime"
+
+  if [ ! -f "${override_file}" ]; then
+    echo "[runtime-env] runtime env file not found: ${override_file}" >&2
+    return 1
+  fi
+
+  if [ "${env_name}" = "prod" ]; then
+    printf '%s\n' "${override_file}"
+    return
+  fi
+
+  base_file="./ci/prod/.env.runtime"
+  if [ ! -f "${base_file}" ]; then
+    printf '%s\n' "${override_file}"
+    return
+  fi
+
+  merged_file="$(mktemp "${TMPDIR:-/tmp}/sendico-runtime.${env_name}.XXXXXX")"
+  cat "${base_file}" >"${merged_file}"
+  printf '\n' >>"${merged_file}"
+  cat "${override_file}" >>"${merged_file}"
+  printf '%s\n' "${merged_file}"
+}
+
+load_runtime_env_bundle() {
+  env_name="$1"
+  runtime_file="$(resolve_runtime_env_file "${env_name}")"
+
+  normalize_env_file "${runtime_file}"
+  normalize_env_file ./.env.version
+
+  load_env_file "${runtime_file}"
+  load_env_file ./.env.version
+
+  export CI_RUNTIME_ENV_NAME="${env_name}"
+  export RUNTIME_ENV_FILE="${runtime_file}"
+}
+
+compute_image_tag() {
+  : "${APP_V:?missing APP_V}"
+  : "${GIT_REV:?missing GIT_REV}"
+  printf '%s-%s\n' "${APP_V}" "${GIT_REV}"
+}

ci/scripts/discovery/build-image.sh

@@ -9,6 +9,7 @@ REPO_ROOT="$(cd "$(dirname "$0")/../../.." && pwd)"
 cd "${REPO_ROOT}"
 
 sh ci/scripts/common/ensure_env_version.sh
+. ci/scripts/common/runtime_env.sh
 
 normalize_env_file() {
   file="$1"
@@ -32,19 +33,10 @@ load_env_file() {
   done <"$file"
 }
 
-DISCOVERY_ENV_NAME="${DISCOVERY_ENV:-prod}"
-RUNTIME_ENV_FILE="./ci/${DISCOVERY_ENV_NAME}/.env.runtime"
+DISCOVERY_ENV_NAME="${DISCOVERY_ENV:-$(resolve_runtime_env_name)}"
+load_runtime_env_bundle "${DISCOVERY_ENV_NAME}"
 
-if [ ! -f "${RUNTIME_ENV_FILE}" ]; then
-  echo "[discovery-build] runtime env file not found: ${RUNTIME_ENV_FILE}" >&2
-  exit 1
-fi
-
-normalize_env_file "${RUNTIME_ENV_FILE}"
-normalize_env_file ./.env.version
-
-load_env_file "${RUNTIME_ENV_FILE}"
-load_env_file ./.env.version
+IMAGE_TAG="$(compute_image_tag)"
 
 REGISTRY_URL="${REGISTRY_URL:?missing REGISTRY_URL}"
 APP_V="${APP_V:?missing APP_V}"
@@ -76,7 +68,7 @@ fi
 /kaniko/executor \
   --context "${BUILD_CONTEXT}" \
   --dockerfile "${DISCOVERY_DOCKERFILE}" \
-  --destination "${REGISTRY_URL}/${DISCOVERY_IMAGE_PATH}:${APP_V}" \
+  --destination "${REGISTRY_URL}/${DISCOVERY_IMAGE_PATH}:${IMAGE_TAG}" \
   --build-arg APP_VERSION="${APP_V}" \
   --build-arg GIT_REV="${GIT_REV}" \
   --build-arg BUILD_BRANCH="${BUILD_BRANCH}" \

ci/scripts/discovery/deploy.sh

@@ -9,6 +9,7 @@ REPO_ROOT="$(cd "$(dirname "$0")/../../.." && pwd)"
 cd "${REPO_ROOT}"
 
 sh ci/scripts/common/ensure_env_version.sh
+. ci/scripts/common/runtime_env.sh
 
 normalize_env_file() {
   file="$1"
@@ -34,19 +35,8 @@ load_env_file() {
 
 . ci/scripts/common/nats_env.sh
 
-DISCOVERY_ENV_NAME="${DISCOVERY_ENV:-prod}"
-RUNTIME_ENV_FILE="./ci/${DISCOVERY_ENV_NAME}/.env.runtime"
-
-if [ ! -f "${RUNTIME_ENV_FILE}" ]; then
-  echo "[discovery-deploy] runtime env file not found: ${RUNTIME_ENV_FILE}" >&2
-  exit 1
-fi
-
-normalize_env_file "${RUNTIME_ENV_FILE}"
-normalize_env_file ./.env.version
-
-load_env_file "${RUNTIME_ENV_FILE}"
-load_env_file ./.env.version
+DISCOVERY_ENV_NAME="${DISCOVERY_ENV:-$(resolve_runtime_env_name)}"
+load_runtime_env_bundle "${DISCOVERY_ENV_NAME}"
 
 load_nats_env
 

ci/scripts/frontend/build-image.sh

@@ -9,6 +9,7 @@ REPO_ROOT="$(cd "$(dirname "$0")/../../.." && pwd)"
 cd "${REPO_ROOT}"
 
 sh ci/scripts/common/ensure_env_version.sh
+. ci/scripts/common/runtime_env.sh
 
 normalize_env_file() {
   file="$1"
@@ -32,19 +33,10 @@ load_env_file() {
   done <"$file"
 }
 
-FRONTEND_ENV_NAME="${FRONTEND_ENV:-prod}"
-RUNTIME_ENV_FILE="./ci/${FRONTEND_ENV_NAME}/.env.runtime"
+FRONTEND_ENV_NAME="${FRONTEND_ENV:-$(resolve_runtime_env_name)}"
+load_runtime_env_bundle "${FRONTEND_ENV_NAME}"
 
-if [ ! -f "${RUNTIME_ENV_FILE}" ]; then
-  echo "[frontend-build] runtime env file not found: ${RUNTIME_ENV_FILE}" >&2
-  exit 1
-fi
-
-normalize_env_file "${RUNTIME_ENV_FILE}"
-normalize_env_file ./.env.version
-
-load_env_file "${RUNTIME_ENV_FILE}"
-load_env_file ./.env.version
+IMAGE_TAG="$(compute_image_tag)"
 
 REGISTRY_URL="${REGISTRY_URL:?missing REGISTRY_URL}"
 APP_V="${APP_V:?missing APP_V}"
@@ -76,7 +68,7 @@ fi
 /kaniko/executor \
   --context "${BUILD_CONTEXT}" \
   --dockerfile "${FRONTEND_DOCKERFILE}" \
-  --destination "${REGISTRY_URL}/${FRONTEND_IMAGE_PATH}:${APP_V}" \
+  --destination "${REGISTRY_URL}/${FRONTEND_IMAGE_PATH}:${IMAGE_TAG}" \
   --build-arg APP_VERSION="${APP_V}" \
   --build-arg GIT_REV="${GIT_REV}" \
   --build-arg BUILD_BRANCH="${BUILD_BRANCH}" \

ci/scripts/frontend/deploy.sh

@@ -9,6 +9,7 @@ REPO_ROOT="$(cd "$(dirname "$0")/../../.." && pwd)"
 cd "${REPO_ROOT}"
 
 sh ci/scripts/common/ensure_env_version.sh
+. ci/scripts/common/runtime_env.sh
 
 normalize_env_file() {
   file="$1"
@@ -32,19 +33,8 @@ load_env_file() {
   done <"$file"
 }
 
-FRONTEND_ENV_NAME="${FRONTEND_ENV:-prod}"
-RUNTIME_ENV_FILE="./ci/${FRONTEND_ENV_NAME}/.env.runtime"
-
-if [ ! -f "${RUNTIME_ENV_FILE}" ]; then
-  echo "[frontend-deploy] runtime env file not found: ${RUNTIME_ENV_FILE}" >&2
-  exit 1
-fi
-
-normalize_env_file "${RUNTIME_ENV_FILE}"
-normalize_env_file ./.env.version
-
-load_env_file "${RUNTIME_ENV_FILE}"
-load_env_file ./.env.version
+FRONTEND_ENV_NAME="${FRONTEND_ENV:-$(resolve_runtime_env_name)}"
+load_runtime_env_bundle "${FRONTEND_ENV_NAME}"
 
 if [ ! -s .env.version ]; then
   echo ".env.version is missing; run version step first" >&2

ci/scripts/fx/build-image.sh

@@ -9,6 +9,7 @@ REPO_ROOT="$(cd "$(dirname "$0")/../../.." && pwd)"
 cd "${REPO_ROOT}"
 
 sh ci/scripts/common/ensure_env_version.sh
+. ci/scripts/common/runtime_env.sh
 
 normalize_env_file() {
   file="$1"
@@ -32,19 +33,10 @@ load_env_file() {
   done <"$file"
 }
 
-FX_ENV_NAME="${FX_ENV:-prod}"
-RUNTIME_ENV_FILE="./ci/${FX_ENV_NAME}/.env.runtime"
+FX_ENV_NAME="${FX_ENV:-$(resolve_runtime_env_name)}"
+load_runtime_env_bundle "${FX_ENV_NAME}"
 
-if [ ! -f "${RUNTIME_ENV_FILE}" ]; then
-  echo "[fx-build] runtime env file not found: ${RUNTIME_ENV_FILE}" >&2
-  exit 1
-fi
-
-normalize_env_file "${RUNTIME_ENV_FILE}"
-normalize_env_file ./.env.version
-
-load_env_file "${RUNTIME_ENV_FILE}"
-load_env_file ./.env.version
+IMAGE_TAG="$(compute_image_tag)"
 
 REGISTRY_URL="${REGISTRY_URL:?missing REGISTRY_URL}"
 APP_V="${APP_V:?missing APP_V}"
@@ -76,7 +68,7 @@ fi
 /kaniko/executor \
   --context "${BUILD_CONTEXT}" \
   --dockerfile "${FX_DOCKERFILE}" \
-  --destination "${REGISTRY_URL}/${FX_IMAGE_PATH}:${APP_V}" \
+  --destination "${REGISTRY_URL}/${FX_IMAGE_PATH}:${IMAGE_TAG}" \
   --build-arg APP_VERSION="${APP_V}" \
   --build-arg GIT_REV="${GIT_REV}" \
   --build-arg BUILD_BRANCH="${BUILD_BRANCH}" \

ci/scripts/fx/deploy.sh

@@ -9,6 +9,7 @@ REPO_ROOT="$(cd "$(dirname "$0")/../../.." && pwd)"
 cd "${REPO_ROOT}"
 
 sh ci/scripts/common/ensure_env_version.sh
+. ci/scripts/common/runtime_env.sh
 
 normalize_env_file() {
   file="$1"
@@ -34,19 +35,8 @@ load_env_file() {
 
 . ci/scripts/common/nats_env.sh
 
-FX_ENV_NAME="${FX_ENV:-prod}"
-RUNTIME_ENV_FILE="./ci/${FX_ENV_NAME}/.env.runtime"
-
-if [ ! -f "${RUNTIME_ENV_FILE}" ]; then
-  echo "[fx-deploy] runtime env file not found: ${RUNTIME_ENV_FILE}" >&2
-  exit 1
-fi
-
-normalize_env_file "${RUNTIME_ENV_FILE}"
-normalize_env_file ./.env.version
-
-load_env_file "${RUNTIME_ENV_FILE}"
-load_env_file ./.env.version
+FX_ENV_NAME="${FX_ENV:-$(resolve_runtime_env_name)}"
+load_runtime_env_bundle "${FX_ENV_NAME}"
 
 FX_MONGO_SECRET_PATH="${FX_MONGO_SECRET_PATH:?missing FX_MONGO_SECRET_PATH}"
 FX_DEPLOY_TARGET="${FX_DEPLOY_TARGET:?missing FX_DEPLOY_TARGET}"

ci/scripts/ledger/build-image.sh

@@ -9,6 +9,7 @@ REPO_ROOT="$(cd "$(dirname "$0")/../../.." && pwd)"
 cd "${REPO_ROOT}"
 
 sh ci/scripts/common/ensure_env_version.sh
+. ci/scripts/common/runtime_env.sh
 
 normalize_env_file() {
   file="$1"
@@ -32,19 +33,10 @@ load_env_file() {
   done <"$file"
 }
 
-LEDGER_ENV_NAME="${LEDGER_ENV:-prod}"
-RUNTIME_ENV_FILE="./ci/${LEDGER_ENV_NAME}/.env.runtime"
+LEDGER_ENV_NAME="${LEDGER_ENV:-$(resolve_runtime_env_name)}"
+load_runtime_env_bundle "${LEDGER_ENV_NAME}"
 
-if [ ! -f "${RUNTIME_ENV_FILE}" ]; then
-  echo "[ledger-build] runtime env file not found: ${RUNTIME_ENV_FILE}" >&2
-  exit 1
-fi
-
-normalize_env_file "${RUNTIME_ENV_FILE}"
-normalize_env_file ./.env.version
-
-load_env_file "${RUNTIME_ENV_FILE}"
-load_env_file ./.env.version
+IMAGE_TAG="$(compute_image_tag)"
 
 REGISTRY_URL="${REGISTRY_URL:?missing REGISTRY_URL}"
 APP_V="${APP_V:?missing APP_V}"
@@ -76,7 +68,7 @@ fi
 /kaniko/executor \
   --context "${BUILD_CONTEXT}" \
   --dockerfile "${LEDGER_DOCKERFILE}" \
-  --destination "${REGISTRY_URL}/${LEDGER_IMAGE_PATH}:${APP_V}" \
+  --destination "${REGISTRY_URL}/${LEDGER_IMAGE_PATH}:${IMAGE_TAG}" \
   --build-arg APP_VERSION="${APP_V}" \
   --build-arg GIT_REV="${GIT_REV}" \
   --build-arg BUILD_BRANCH="${BUILD_BRANCH}" \

ci/scripts/ledger/deploy.sh

@@ -9,6 +9,7 @@ REPO_ROOT="$(cd "$(dirname "$0")/../../.." && pwd)"
 cd "${REPO_ROOT}"
 
 sh ci/scripts/common/ensure_env_version.sh
+. ci/scripts/common/runtime_env.sh
 
 normalize_env_file() {
   file="$1"
@@ -34,19 +35,8 @@ load_env_file() {
 
 . ci/scripts/common/nats_env.sh
 
-LEDGER_ENV_NAME="${LEDGER_ENV:-prod}"
-RUNTIME_ENV_FILE="./ci/${LEDGER_ENV_NAME}/.env.runtime"
-
-if [ ! -f "${RUNTIME_ENV_FILE}" ]; then
-  echo "[ledger-deploy] runtime env file not found: ${RUNTIME_ENV_FILE}" >&2
-  exit 1
-fi
-
-normalize_env_file "${RUNTIME_ENV_FILE}"
-normalize_env_file ./.env.version
-
-load_env_file "${RUNTIME_ENV_FILE}"
-load_env_file ./.env.version
+LEDGER_ENV_NAME="${LEDGER_ENV:-$(resolve_runtime_env_name)}"
+load_runtime_env_bundle "${LEDGER_ENV_NAME}"
 
 LEDGER_MONGO_SECRET_PATH="${LEDGER_MONGO_SECRET_PATH:?missing LEDGER_MONGO_SECRET_PATH}"
 

ci/scripts/mntx/build-image.sh

@@ -9,6 +9,7 @@ REPO_ROOT="$(cd "$(dirname "$0")/../../.." && pwd)"
 cd "${REPO_ROOT}"
 
 sh ci/scripts/common/ensure_env_version.sh
+. ci/scripts/common/runtime_env.sh
 
 normalize_env_file() {
   file="$1"
@@ -32,19 +33,10 @@ load_env_file() {
   done <"$file"
 }
 
-MNTX_GATEWAY_ENV_NAME="${MNTX_GATEWAY_ENV:-prod}"
-RUNTIME_ENV_FILE="./ci/${MNTX_GATEWAY_ENV_NAME}/.env.runtime"
+MNTX_GATEWAY_ENV_NAME="${MNTX_GATEWAY_ENV:-$(resolve_runtime_env_name)}"
+load_runtime_env_bundle "${MNTX_GATEWAY_ENV_NAME}"
 
-if [ ! -f "${RUNTIME_ENV_FILE}" ]; then
-  echo "[mntx-gateway-build] runtime env file not found: ${RUNTIME_ENV_FILE}" >&2
-  exit 1
-fi
-
-normalize_env_file "${RUNTIME_ENV_FILE}"
-normalize_env_file ./.env.version
-
-load_env_file "${RUNTIME_ENV_FILE}"
-load_env_file ./.env.version
+IMAGE_TAG="$(compute_image_tag)"
 
 REGISTRY_URL="${REGISTRY_URL:?missing REGISTRY_URL}"
 APP_V="${APP_V:?missing APP_V}"
@@ -93,7 +85,7 @@ fi
 /kaniko/executor \
   --context "${BUILD_CONTEXT}" \
   --dockerfile "${MNTX_GATEWAY_DOCKERFILE}" \
-  --destination "${REGISTRY_URL}/${MNTX_GATEWAY_IMAGE_PATH}:${APP_V}" \
+  --destination "${REGISTRY_URL}/${MNTX_GATEWAY_IMAGE_PATH}:${IMAGE_TAG}" \
   --build-arg APP_VERSION="${APP_V}" \
   --build-arg GIT_REV="${GIT_REV}" \
   --build-arg BUILD_BRANCH="${BUILD_BRANCH}" \

ci/scripts/mntx/deploy.sh

@@ -32,24 +32,14 @@ load_env_file() {
 
 . ci/scripts/common/nats_env.sh
 
-MNTX_GATEWAY_ENV_NAME="${MNTX_GATEWAY_ENV:-prod}"
-RUNTIME_ENV_FILE="./ci/${MNTX_GATEWAY_ENV_NAME}/.env.runtime"
+MNTX_GATEWAY_ENV_NAME="${MNTX_GATEWAY_ENV:-$(resolve_runtime_env_name)}"
+load_runtime_env_bundle "${MNTX_GATEWAY_ENV_NAME}"
 
-if [ ! -f "${RUNTIME_ENV_FILE}" ]; then
-  echo "[mntx-gateway-deploy] runtime env file not found: ${RUNTIME_ENV_FILE}" >&2
-  exit 1
-fi
 if [ ! -f ./.env.version ]; then
   echo "[mntx-gateway-deploy] .env.version is missing; run version step first" >&2
   exit 1
 fi
 
-normalize_env_file "${RUNTIME_ENV_FILE}"
-normalize_env_file ./.env.version
-
-load_env_file "${RUNTIME_ENV_FILE}"
-load_env_file ./.env.version
-
 MNTX_GATEWAY_MONGO_SECRET_PATH="${MNTX_GATEWAY_MONGO_SECRET_PATH:?missing MNTX_GATEWAY_MONGO_SECRET_PATH}"
 MNTX_GATEWAY_MONETIX_SECRET_PATH="${MNTX_GATEWAY_MONETIX_SECRET_PATH:-sendico/gateway/monetix}"
 MNTX_GATEWAY_NATS_SECRET_PATH="${MNTX_GATEWAY_NATS_SECRET_PATH:-sendico/nats}"

ci/scripts/notification/build-image.sh

@@ -9,6 +9,7 @@ REPO_ROOT="$(cd "$(dirname "$0")/../../.." && pwd)"
 cd "${REPO_ROOT}"
 
 sh ci/scripts/common/ensure_env_version.sh
+. ci/scripts/common/runtime_env.sh
 
 normalize_env_file() {
   file="$1"
@@ -32,19 +33,10 @@ load_env_file() {
   done <"$file"
 }
 
-NOTIFICATION_ENV_NAME="${NOTIFICATION_ENV:-prod}"
-RUNTIME_ENV_FILE="./ci/${NOTIFICATION_ENV_NAME}/.env.runtime"
+NOTIFICATION_ENV_NAME="${NOTIFICATION_ENV:-$(resolve_runtime_env_name)}"
+load_runtime_env_bundle "${NOTIFICATION_ENV_NAME}"
 
-if [ ! -f "${RUNTIME_ENV_FILE}" ]; then
-  echo "[notification-build] runtime env file not found: ${RUNTIME_ENV_FILE}" >&2
-  exit 1
-fi
-
-normalize_env_file "${RUNTIME_ENV_FILE}"
-normalize_env_file ./.env.version
-
-load_env_file "${RUNTIME_ENV_FILE}"
-load_env_file ./.env.version
+IMAGE_TAG="$(compute_image_tag)"
 
 REGISTRY_URL="${REGISTRY_URL:?missing REGISTRY_URL}"
 APP_V="${APP_V:?missing APP_V}"
@@ -76,7 +68,7 @@ fi
 /kaniko/executor \
   --context "${BUILD_CONTEXT}" \
   --dockerfile "${NOTIFICATION_DOCKERFILE}" \
-  --destination "${REGISTRY_URL}/${NOTIFICATION_IMAGE_PATH}:${APP_V}" \
+  --destination "${REGISTRY_URL}/${NOTIFICATION_IMAGE_PATH}:${IMAGE_TAG}" \
   --build-arg APP_VERSION="${APP_V}" \
   --build-arg GIT_REV="${GIT_REV}" \
   --build-arg BUILD_BRANCH="${BUILD_BRANCH}" \

ci/scripts/notification/deploy.sh

@@ -9,6 +9,7 @@ REPO_ROOT="$(cd "$(dirname "$0")/../../.." && pwd)"
 cd "${REPO_ROOT}"
 
 sh ci/scripts/common/ensure_env_version.sh
+. ci/scripts/common/runtime_env.sh
 
 normalize_env_file() {
   file="$1"
@@ -34,19 +35,8 @@ load_env_file() {
 
 . ci/scripts/common/nats_env.sh
 
-NOTIFICATION_ENV_NAME="${NOTIFICATION_ENV:-prod}"
-RUNTIME_ENV_FILE="./ci/${NOTIFICATION_ENV_NAME}/.env.runtime"
-
-if [ ! -f "${RUNTIME_ENV_FILE}" ]; then
-  echo "[notification-deploy] runtime env file not found: ${RUNTIME_ENV_FILE}" >&2
-  exit 1
-fi
-
-normalize_env_file "${RUNTIME_ENV_FILE}"
-normalize_env_file ./.env.version
-
-load_env_file "${RUNTIME_ENV_FILE}"
-load_env_file ./.env.version
+NOTIFICATION_ENV_NAME="${NOTIFICATION_ENV:-$(resolve_runtime_env_name)}"
+load_runtime_env_bundle "${NOTIFICATION_ENV_NAME}"
 
 NOTIFICATION_MONGO_SECRET_PATH="${NOTIFICATION_MONGO_SECRET_PATH:?missing NOTIFICATION_MONGO_SECRET_PATH}"
 NOTIFICATION_MAIL_SECRET_PATH="${NOTIFICATION_MAIL_SECRET_PATH:?missing NOTIFICATION_MAIL_SECRET_PATH}"

ci/scripts/payments_methods/build-image.sh

@@ -9,6 +9,7 @@ REPO_ROOT="$(cd "$(dirname "$0")/../../.." && pwd)"
 cd "${REPO_ROOT}"
 
 sh ci/scripts/common/ensure_env_version.sh
+. ci/scripts/common/runtime_env.sh
 
 normalize_env_file() {
   file="$1"
@@ -32,19 +33,10 @@ load_env_file() {
   done <"$file"
 }
 
-PAYMENTS_METHODS_ENV_NAME="${PAYMENTS_METHODS_ENV:-prod}"
-RUNTIME_ENV_FILE="./ci/${PAYMENTS_METHODS_ENV_NAME}/.env.runtime"
+PAYMENTS_METHODS_ENV_NAME="${PAYMENTS_METHODS_ENV:-$(resolve_runtime_env_name)}"
+load_runtime_env_bundle "${PAYMENTS_METHODS_ENV_NAME}"
 
-if [ ! -f "${RUNTIME_ENV_FILE}" ]; then
-  echo "[payments-methods-build] runtime env file not found: ${RUNTIME_ENV_FILE}" >&2
-  exit 1
-fi
-
-normalize_env_file "${RUNTIME_ENV_FILE}"
-normalize_env_file ./.env.version
-
-load_env_file "${RUNTIME_ENV_FILE}"
-load_env_file ./.env.version
+IMAGE_TAG="$(compute_image_tag)"
 
 REGISTRY_URL="${REGISTRY_URL:?missing REGISTRY_URL}"
 APP_V="${APP_V:?missing APP_V}"
@@ -76,7 +68,7 @@ fi
 /kaniko/executor \
   --context "${BUILD_CONTEXT}" \
   --dockerfile "${PAYMENTS_METHODS_DOCKERFILE}" \
-  --destination "${REGISTRY_URL}/${PAYMENTS_METHODS_IMAGE_PATH}:${APP_V}" \
+  --destination "${REGISTRY_URL}/${PAYMENTS_METHODS_IMAGE_PATH}:${IMAGE_TAG}" \
   --build-arg APP_VERSION="${APP_V}" \
   --build-arg GIT_REV="${GIT_REV}" \
   --build-arg BUILD_BRANCH="${BUILD_BRANCH}" \

ci/scripts/payments_methods/deploy.sh

@@ -9,6 +9,7 @@ REPO_ROOT="$(cd "$(dirname "$0")/../../.." && pwd)"
 cd "${REPO_ROOT}"
 
 sh ci/scripts/common/ensure_env_version.sh
+. ci/scripts/common/runtime_env.sh
 
 normalize_env_file() {
   file="$1"
@@ -34,19 +35,8 @@ load_env_file() {
 
 . ci/scripts/common/nats_env.sh
 
-PAYMENTS_METHODS_ENV_NAME="${PAYMENTS_METHODS_ENV:-prod}"
-RUNTIME_ENV_FILE="./ci/${PAYMENTS_METHODS_ENV_NAME}/.env.runtime"
-
-if [ ! -f "${RUNTIME_ENV_FILE}" ]; then
-  echo "[payments-methods-deploy] runtime env file not found: ${RUNTIME_ENV_FILE}" >&2
-  exit 1
-fi
-
-normalize_env_file "${RUNTIME_ENV_FILE}"
-normalize_env_file ./.env.version
-
-load_env_file "${RUNTIME_ENV_FILE}"
-load_env_file ./.env.version
+PAYMENTS_METHODS_ENV_NAME="${PAYMENTS_METHODS_ENV:-$(resolve_runtime_env_name)}"
+load_runtime_env_bundle "${PAYMENTS_METHODS_ENV_NAME}"
 
 PAYMENTS_METHODS_MONGO_SECRET_PATH="${PAYMENTS_METHODS_MONGO_SECRET_PATH:?missing PAYMENTS_METHODS_MONGO_SECRET_PATH}"
 

ci/scripts/payments_orchestrator/build-image.sh

@@ -9,6 +9,7 @@ REPO_ROOT="$(cd "$(dirname "$0")/../../.." && pwd)"
 cd "${REPO_ROOT}"
 
 sh ci/scripts/common/ensure_env_version.sh
+. ci/scripts/common/runtime_env.sh
 
 normalize_env_file() {
   file="$1"
@@ -32,19 +33,10 @@ load_env_file() {
   done <"$file"
 }
 
-PAYMENTS_ENV_NAME="${PAYMENTS_ENV:-prod}"
-RUNTIME_ENV_FILE="./ci/${PAYMENTS_ENV_NAME}/.env.runtime"
+PAYMENTS_ENV_NAME="${PAYMENTS_ENV:-$(resolve_runtime_env_name)}"
+load_runtime_env_bundle "${PAYMENTS_ENV_NAME}"
 
-if [ ! -f "${RUNTIME_ENV_FILE}" ]; then
-  echo "[payments-orchestrator-build] runtime env file not found: ${RUNTIME_ENV_FILE}" >&2
-  exit 1
-fi
-
-normalize_env_file "${RUNTIME_ENV_FILE}"
-normalize_env_file ./.env.version
-
-load_env_file "${RUNTIME_ENV_FILE}"
-load_env_file ./.env.version
+IMAGE_TAG="$(compute_image_tag)"
 
 REGISTRY_URL="${REGISTRY_URL:?missing REGISTRY_URL}"
 APP_V="${APP_V:?missing APP_V}"
@@ -76,7 +68,7 @@ fi
 /kaniko/executor \
   --context "${BUILD_CONTEXT}" \
   --dockerfile "${PAYMENTS_DOCKERFILE}" \
-  --destination "${REGISTRY_URL}/${PAYMENTS_IMAGE_PATH}:${APP_V}" \
+  --destination "${REGISTRY_URL}/${PAYMENTS_IMAGE_PATH}:${IMAGE_TAG}" \
   --build-arg APP_VERSION="${APP_V}" \
   --build-arg GIT_REV="${GIT_REV}" \
   --build-arg BUILD_BRANCH="${BUILD_BRANCH}" \

ci/scripts/payments_orchestrator/deploy.sh

@@ -9,6 +9,7 @@ REPO_ROOT="$(cd "$(dirname "$0")/../../.." && pwd)"
 cd "${REPO_ROOT}"
 
 sh ci/scripts/common/ensure_env_version.sh
+. ci/scripts/common/runtime_env.sh
 
 normalize_env_file() {
   file="$1"
@@ -34,19 +35,8 @@ load_env_file() {
 
 . ci/scripts/common/nats_env.sh
 
-PAYMENTS_ENV_NAME="${PAYMENTS_ENV:-prod}"
-RUNTIME_ENV_FILE="./ci/${PAYMENTS_ENV_NAME}/.env.runtime"
-
-if [ ! -f "${RUNTIME_ENV_FILE}" ]; then
-  echo "[payments-orchestrator-deploy] runtime env file not found: ${RUNTIME_ENV_FILE}" >&2
-  exit 1
-fi
-
-normalize_env_file "${RUNTIME_ENV_FILE}"
-normalize_env_file ./.env.version
-
-load_env_file "${RUNTIME_ENV_FILE}"
-load_env_file ./.env.version
+PAYMENTS_ENV_NAME="${PAYMENTS_ENV:-$(resolve_runtime_env_name)}"
+load_runtime_env_bundle "${PAYMENTS_ENV_NAME}"
 
 PAYMENTS_MONGO_SECRET_PATH="${PAYMENTS_MONGO_SECRET_PATH:?missing PAYMENTS_MONGO_SECRET_PATH}"
 

ci/scripts/payments_quotation/build-image.sh

@@ -9,6 +9,7 @@ REPO_ROOT="$(cd "$(dirname "$0")/../../.." && pwd)"
 cd "${REPO_ROOT}"
 
 sh ci/scripts/common/ensure_env_version.sh
+. ci/scripts/common/runtime_env.sh
 
 normalize_env_file() {
   file="$1"
@@ -32,19 +33,10 @@ load_env_file() {
   done <"$file"
 }
 
-PAYMENTS_QUOTATION_ENV_NAME="${PAYMENTS_QUOTATION_ENV:-prod}"
-RUNTIME_ENV_FILE="./ci/${PAYMENTS_QUOTATION_ENV_NAME}/.env.runtime"
+PAYMENTS_QUOTATION_ENV_NAME="${PAYMENTS_QUOTATION_ENV:-$(resolve_runtime_env_name)}"
+load_runtime_env_bundle "${PAYMENTS_QUOTATION_ENV_NAME}"
 
-if [ ! -f "${RUNTIME_ENV_FILE}" ]; then
-  echo "[payments-quotation-build] runtime env file not found: ${RUNTIME_ENV_FILE}" >&2
-  exit 1
-fi
-
-normalize_env_file "${RUNTIME_ENV_FILE}"
-normalize_env_file ./.env.version
-
-load_env_file "${RUNTIME_ENV_FILE}"
-load_env_file ./.env.version
+IMAGE_TAG="$(compute_image_tag)"
 
 REGISTRY_URL="${REGISTRY_URL:?missing REGISTRY_URL}"
 APP_V="${APP_V:?missing APP_V}"
@@ -76,7 +68,7 @@ fi
 /kaniko/executor \
   --context "${BUILD_CONTEXT}" \
   --dockerfile "${PAYMENTS_QUOTATION_DOCKERFILE}" \
-  --destination "${REGISTRY_URL}/${PAYMENTS_QUOTATION_IMAGE_PATH}:${APP_V}" \
+  --destination "${REGISTRY_URL}/${PAYMENTS_QUOTATION_IMAGE_PATH}:${IMAGE_TAG}" \
   --build-arg APP_VERSION="${APP_V}" \
   --build-arg GIT_REV="${GIT_REV}" \
   --build-arg BUILD_BRANCH="${BUILD_BRANCH}" \

ci/scripts/payments_quotation/deploy.sh

@@ -9,6 +9,7 @@ REPO_ROOT="$(cd "$(dirname "$0")/../../.." && pwd)"
 cd "${REPO_ROOT}"
 
 sh ci/scripts/common/ensure_env_version.sh
+. ci/scripts/common/runtime_env.sh
 
 normalize_env_file() {
   file="$1"
@@ -34,19 +35,8 @@ load_env_file() {
 
 . ci/scripts/common/nats_env.sh
 
-PAYMENTS_QUOTATION_ENV_NAME="${PAYMENTS_QUOTATION_ENV:-prod}"
-RUNTIME_ENV_FILE="./ci/${PAYMENTS_QUOTATION_ENV_NAME}/.env.runtime"
-
-if [ ! -f "${RUNTIME_ENV_FILE}" ]; then
-  echo "[payments-quotation-deploy] runtime env file not found: ${RUNTIME_ENV_FILE}" >&2
-  exit 1
-fi
-
-normalize_env_file "${RUNTIME_ENV_FILE}"
-normalize_env_file ./.env.version
-
-load_env_file "${RUNTIME_ENV_FILE}"
-load_env_file ./.env.version
+PAYMENTS_QUOTATION_ENV_NAME="${PAYMENTS_QUOTATION_ENV:-$(resolve_runtime_env_name)}"
+load_runtime_env_bundle "${PAYMENTS_QUOTATION_ENV_NAME}"
 
 PAYMENTS_QUOTATION_MONGO_SECRET_PATH="${PAYMENTS_QUOTATION_MONGO_SECRET_PATH:?missing PAYMENTS_QUOTATION_MONGO_SECRET_PATH}"
 

ci/scripts/tgsettle/build-image.sh

@@ -9,6 +9,7 @@ REPO_ROOT="$(cd "$(dirname "$0")/../../.." && pwd)"
 cd "${REPO_ROOT}"
 
 sh ci/scripts/common/ensure_env_version.sh
+. ci/scripts/common/runtime_env.sh
 
 normalize_env_file() {
   file="$1"
@@ -32,19 +33,10 @@ load_env_file() {
   done <"$file"
 }
 
-TGSETTLE_GATEWAY_ENV_NAME="${TGSETTLE_GATEWAY_ENV:-prod}"
-RUNTIME_ENV_FILE="./ci/${TGSETTLE_GATEWAY_ENV_NAME}/.env.runtime"
+TGSETTLE_GATEWAY_ENV_NAME="${TGSETTLE_GATEWAY_ENV:-$(resolve_runtime_env_name)}"
+load_runtime_env_bundle "${TGSETTLE_GATEWAY_ENV_NAME}"
 
-if [ ! -f "${RUNTIME_ENV_FILE}" ]; then
-  echo "[tgsettle-gateway-build] runtime env file not found: ${RUNTIME_ENV_FILE}" >&2
-  exit 1
-fi
-
-normalize_env_file "${RUNTIME_ENV_FILE}"
-normalize_env_file ./.env.version
-
-load_env_file "${RUNTIME_ENV_FILE}"
-load_env_file ./.env.version
+IMAGE_TAG="$(compute_image_tag)"
 
 REGISTRY_URL="${REGISTRY_URL:?missing REGISTRY_URL}"
 APP_V="${APP_V:?missing APP_V}"
@@ -93,7 +85,7 @@ fi
 /kaniko/executor \
   --context "${BUILD_CONTEXT}" \
   --dockerfile "${TGSETTLE_GATEWAY_DOCKERFILE}" \
-  --destination "${REGISTRY_URL}/${TGSETTLE_GATEWAY_IMAGE_PATH}:${APP_V}" \
+  --destination "${REGISTRY_URL}/${TGSETTLE_GATEWAY_IMAGE_PATH}:${IMAGE_TAG}" \
   --build-arg APP_VERSION="${APP_V}" \
   --build-arg GIT_REV="${GIT_REV}" \
   --build-arg BUILD_BRANCH="${BUILD_BRANCH}" \

ci/scripts/tgsettle/deploy.sh

@@ -9,6 +9,7 @@ REPO_ROOT="$(cd "$(dirname "$0")/../../.." && pwd)"
 cd "${REPO_ROOT}"
 
 sh ci/scripts/common/ensure_env_version.sh
+. ci/scripts/common/runtime_env.sh
 
 normalize_env_file() {
   file="$1"
@@ -34,19 +35,8 @@ load_env_file() {
 
 . ci/scripts/common/nats_env.sh
 
-TGSETTLE_GATEWAY_ENV_NAME="${TGSETTLE_GATEWAY_ENV:-prod}"
-RUNTIME_ENV_FILE="./ci/${TGSETTLE_GATEWAY_ENV_NAME}/.env.runtime"
-
-if [ ! -f "${RUNTIME_ENV_FILE}" ]; then
-  echo "[tgsettle-gateway-deploy] runtime env file not found: ${RUNTIME_ENV_FILE}" >&2
-  exit 1
-fi
-
-normalize_env_file "${RUNTIME_ENV_FILE}"
-normalize_env_file ./.env.version
-
-load_env_file "${RUNTIME_ENV_FILE}"
-load_env_file ./.env.version
+TGSETTLE_GATEWAY_ENV_NAME="${TGSETTLE_GATEWAY_ENV:-$(resolve_runtime_env_name)}"
+load_runtime_env_bundle "${TGSETTLE_GATEWAY_ENV_NAME}"
 
 TGSETTLE_GATEWAY_MONGO_SECRET_PATH="${TGSETTLE_GATEWAY_MONGO_SECRET_PATH:?missing TGSETTLE_GATEWAY_MONGO_SECRET_PATH}"
 

ci/scripts/tron_gateway/build-image.sh

@@ -9,6 +9,7 @@ REPO_ROOT="$(cd "$(dirname "$0")/../../.." && pwd)"
 cd "${REPO_ROOT}"
 
 sh ci/scripts/common/ensure_env_version.sh
+. ci/scripts/common/runtime_env.sh
 
 normalize_env_file() {
   file="$1"
@@ -32,19 +33,10 @@ load_env_file() {
   done <"$file"
 }
 
-TRON_GATEWAY_ENV_NAME="${TRON_GATEWAY_ENV:-prod}"
-RUNTIME_ENV_FILE="./ci/${TRON_GATEWAY_ENV_NAME}/.env.runtime"
+TRON_GATEWAY_ENV_NAME="${TRON_GATEWAY_ENV:-$(resolve_runtime_env_name)}"
+load_runtime_env_bundle "${TRON_GATEWAY_ENV_NAME}"
 
-if [ ! -f "${RUNTIME_ENV_FILE}" ]; then
-  echo "[tron-gateway-build] runtime env file not found: ${RUNTIME_ENV_FILE}" >&2
-  exit 1
-fi
-
-normalize_env_file "${RUNTIME_ENV_FILE}"
-normalize_env_file ./.env.version
-
-load_env_file "${RUNTIME_ENV_FILE}"
-load_env_file ./.env.version
+IMAGE_TAG="$(compute_image_tag)"
 
 REGISTRY_URL="${REGISTRY_URL:?missing REGISTRY_URL}"
 APP_V="${APP_V:?missing APP_V}"
@@ -93,7 +85,7 @@ fi
 /kaniko/executor \
   --context "${BUILD_CONTEXT}" \
   --dockerfile "${TRON_GATEWAY_DOCKERFILE}" \
-  --destination "${REGISTRY_URL}/${TRON_GATEWAY_IMAGE_PATH}:${APP_V}" \
+  --destination "${REGISTRY_URL}/${TRON_GATEWAY_IMAGE_PATH}:${IMAGE_TAG}" \
   --build-arg APP_VERSION="${APP_V}" \
   --build-arg GIT_REV="${GIT_REV}" \
   --build-arg BUILD_BRANCH="${BUILD_BRANCH}" \

ci/scripts/tron_gateway/deploy.sh

@@ -9,6 +9,7 @@ REPO_ROOT="$(cd "$(dirname "$0")/../../.." && pwd)"
 cd "${REPO_ROOT}"
 
 sh ci/scripts/common/ensure_env_version.sh
+. ci/scripts/common/runtime_env.sh
 
 normalize_env_file() {
   file="$1"
@@ -34,19 +35,8 @@ load_env_file() {
 
 . ci/scripts/common/nats_env.sh
 
-TRON_GATEWAY_ENV_NAME="${TRON_GATEWAY_ENV:-prod}"
-RUNTIME_ENV_FILE="./ci/${TRON_GATEWAY_ENV_NAME}/.env.runtime"
-
-if [ ! -f "${RUNTIME_ENV_FILE}" ]; then
-  echo "[tron-gateway-deploy] runtime env file not found: ${RUNTIME_ENV_FILE}" >&2
-  exit 1
-fi
-
-normalize_env_file "${RUNTIME_ENV_FILE}"
-normalize_env_file ./.env.version
-
-load_env_file "${RUNTIME_ENV_FILE}"
-load_env_file ./.env.version
+TRON_GATEWAY_ENV_NAME="${TRON_GATEWAY_ENV:-$(resolve_runtime_env_name)}"
+load_runtime_env_bundle "${TRON_GATEWAY_ENV_NAME}"
 
 TRON_GATEWAY_MONGO_SECRET_PATH="${TRON_GATEWAY_MONGO_SECRET_PATH:?missing TRON_GATEWAY_MONGO_SECRET_PATH}"
 TRON_GATEWAY_RPC_SECRET_PATH="${TRON_GATEWAY_RPC_SECRET_PATH:?missing TRON_GATEWAY_RPC_SECRET_PATH}"