p

Author: alepefe

client/Dockerfile.prod

@@ -8,6 +8,7 @@ WORKDIR /app
 ARG NEXT_PUBLIC_ENVIRONMENT
 ARG NEXT_PUBLIC_URL
 ARG NEXT_PUBLIC_API_URL
+ARG NEXT_PUBLIC_BASE_PATH
 ARG NEXT_PUBLIC_MAPBOX_API_TOKEN
 ARG NEXT_PUBLIC_MAPBOX_USERNAME
 ARG NEXT_PUBLIC_MAPBOX_STYLE_ID
@@ -19,6 +20,7 @@ ARG NEXT_PUBLIC_PREVIEW_SECRET
 ENV NEXT_PUBLIC_ENVIRONMENT=$NEXT_PUBLIC_ENVIRONMENT \
     NEXT_PUBLIC_URL=$NEXT_PUBLIC_URL \
     NEXT_PUBLIC_API_URL=$NEXT_PUBLIC_API_URL \
+    NEXT_PUBLIC_BASE_PATH=$NEXT_PUBLIC_BASE_PATH \
     NEXT_PUBLIC_MAPBOX_API_TOKEN=$NEXT_PUBLIC_MAPBOX_API_TOKEN \
     NEXT_PUBLIC_MAPBOX_USERNAME=$NEXT_PUBLIC_MAPBOX_USERNAME \
     NEXT_PUBLIC_MAPBOX_STYLE_ID=$NEXT_PUBLIC_MAPBOX_STYLE_ID \
@@ -49,6 +51,7 @@ WORKDIR /app
 ARG NEXT_PUBLIC_ENVIRONMENT
 ARG NEXT_PUBLIC_URL
 ARG NEXT_PUBLIC_API_URL
+ARG NEXT_PUBLIC_BASE_PATH
 ARG NEXT_PUBLIC_MAPBOX_API_TOKEN
 ARG NEXT_PUBLIC_MAPBOX_USERNAME
 ARG NEXT_PUBLIC_MAPBOX_STYLE_ID
@@ -60,6 +63,7 @@ ARG NEXT_PUBLIC_PREVIEW_SECRET
 ENV NEXT_PUBLIC_ENVIRONMENT=$NEXT_PUBLIC_ENVIRONMENT \
     NEXT_PUBLIC_URL=$NEXT_PUBLIC_URL \
     NEXT_PUBLIC_API_URL=$NEXT_PUBLIC_API_URL \
+    NEXT_PUBLIC_BASE_PATH=$NEXT_PUBLIC_BASE_PATH \
     NEXT_PUBLIC_MAPBOX_API_TOKEN=$NEXT_PUBLIC_MAPBOX_API_TOKEN \
     NEXT_PUBLIC_MAPBOX_USERNAME=$NEXT_PUBLIC_MAPBOX_USERNAME \
     NEXT_PUBLIC_MAPBOX_STYLE_ID=$NEXT_PUBLIC_MAPBOX_STYLE_ID \

infrastructure/terraform/modules/env/client_env_vars.tf

@@ -9,8 +9,9 @@ locals {
     NEXT_PUBLIC_PREVIEW_SECRET = random_string.preview_secret.result
   }
   client_env_vars = {
-    NODE_ENV            = "production"
-    NEXT_PUBLIC_URL     = "https://${var.domain}${var.base_path}"
-    NEXT_PUBLIC_API_URL = "https://${var.domain}${var.base_path}/cms/api"
+    NODE_ENV              = "production"
+    NEXT_PUBLIC_URL       = "https://${var.domain}"
+    NEXT_PUBLIC_BASE_PATH = var.base_path
+    NEXT_PUBLIC_API_URL   = "https://${var.domain}${var.base_path}/cms/api"
   }
 }