From 7390b6fc314e3853b4024db4bd45a49ee53cbbe9 Mon Sep 17 00:00:00 2001
From: SennayT <wsennay@gmail.com>
Date: Sat, 6 Jun 2026 07:49:20 +0000
Subject: [PATCH] fix build time environment variables

---
 docker-compose.yaml                            | 4 ++--
 infrastructure/docker/Dockerfile.passenger-web | 2 +-
 scripts/deploy/sync-env-from-server.sh         | 4 ++++
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/docker-compose.yaml b/docker-compose.yaml
index 7b72bfe29..4e5eb4ab0 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -60,7 +60,7 @@ services:
       args:
         APP_PACKAGE: "@edr/passenger-portal"
         APP_PATH: apps/edr-passenger-web/portal
-        NEXT_PUBLIC_API_URL: ${PASSENGER_NEXT_PUBLIC_API_URL:-http://localhost:4000}
+        NEXT_PUBLIC_API_URL: ${NEXT_PUBLIC_API_URL:-http://localhost:4000}
       secrets:
         - npmrc
     ports:
@@ -75,7 +75,7 @@ services:
       args:
         APP_PACKAGE: "@edr/passenger-backoffice"
         APP_PATH: apps/edr-passenger-web/backoffice
-        NEXT_PUBLIC_API_URL: ${PASSENGER_NEXT_PUBLIC_API_URL:-http://localhost:4000}
+        NEXT_PUBLIC_API_URL: ${NEXT_PUBLIC_API_URL:-http://localhost:4000}
       secrets:
         - npmrc
     ports:
diff --git a/infrastructure/docker/Dockerfile.passenger-web b/infrastructure/docker/Dockerfile.passenger-web
index 4c6b6ad54..735a19e8e 100644
--- a/infrastructure/docker/Dockerfile.passenger-web
+++ b/infrastructure/docker/Dockerfile.passenger-web
@@ -14,7 +14,7 @@
 ARG APP_PACKAGE=@edr/passenger-portal
 ARG APP_PATH=apps/edr-passenger-web/portal
 ARG PORT=5174
-ARG NEXT_PUBLIC_API_URL=http://localhost:4000
+ARG NEXT_PUBLIC_API_URL
 
 FROM node:24.15.0-alpine AS base
 RUN apk add --no-cache libc6-compat
diff --git a/scripts/deploy/sync-env-from-server.sh b/scripts/deploy/sync-env-from-server.sh
index a0618982c..ca3ad1cc9 100644
--- a/scripts/deploy/sync-env-from-server.sh
+++ b/scripts/deploy/sync-env-from-server.sh
@@ -60,6 +60,10 @@ for service in "$@"; do
     service_var=$(echo "${service}" | tr '[:lower:]-' '[:upper:]_')
     echo "${service_var}_PORT=${port_value}" >> "${GITHUB_ENV}"
     echo "Exported ${service_var}_PORT from ${src}"
+
+    # Forward NEXT_PUBLIC_* vars so docker compose build can inject them as build args.
+    grep -E '^[[:space:]]*NEXT_PUBLIC_[A-Za-z0-9_]+=' "${src}" \
+      | sed -E 's/^[[:space:]]*//' >> "${GITHUB_ENV}" || true
   fi
 done