fix production storfront and homepage

production/fetch-image-through-vpn.sh

@@ -2,7 +2,38 @@
 
 set -euo pipefail
 
-IMAGE_TAG="${IMAGE_TAG:-${1:-13d0512048d86e9fe93e9395459d04663c2b7eb0}}"
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+ENV_FILE="${ENV_FILE:-${SCRIPT_DIR}/.env.docker.production}"
+
+read_env_value() {
+  local key="$1"
+  local value
+
+  if [[ ! -f "${ENV_FILE}" ]]; then
+    return 0
+  fi
+
+  value="$(
+    awk -F= -v key="$key" '
+      $1 == key {
+        value = substr($0, index($0, "=") + 1)
+      }
+      END {
+        if (value != "") {
+          print value
+        }
+      }
+    ' "${ENV_FILE}"
+  )"
+
+  value="${value%$'\r'}"
+  value="${value#\"}"
+  value="${value%\"}"
+  printf '%s' "${value}"
+}
+
+IMAGE_TAG="${IMAGE_TAG:-${1:-$(read_env_value IMAGE_TAG)}}"
+IMAGE_TAG="${IMAGE_TAG:-latest}"
 APP_IMAGE="${APP_IMAGE:-10.0.0.4/melabidi/carmanagement}"
 REGISTRY_USER="${REGISTRY_USER:-melabidi}"
 REGISTRY_TOKEN="${REGISTRY_TOKEN:-}"
@@ -16,7 +47,7 @@ Usage:
 
 Optional env vars:
   APP_IMAGE       Default: 10.0.0.4/melabidi/carmanagement
-  IMAGE_TAG       Default: 13d0512048d86e9fe93e9395459d04663c2b7eb0
+  IMAGE_TAG       Default: IMAGE_TAG from .env.docker.production, otherwise latest
   REGISTRY_USER  Default: melabidi
   REGISTRY_TOKEN  Prompted when unset
   TRANSFER_DIR   Default: /opt/docker-image-transfer
@@ -26,6 +57,13 @@ The script uses skopeo inside the VPN container network and writes:
 EOF
 }
 
+case "${1:-}" in
+  -h|--help)
+    usage
+    exit 0
+    ;;
+esac
+
 if [[ -z "${IMAGE_TAG}" ]]; then
   usage >&2
   exit 1