fix(ci): fix frontend url in dockerfile

SocialGouv · Dec 19, 2024 · cab9c9b · cab9c9b
1 parent 0b7d363
commit cab9c9b
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 0 deletions.
diff --git a/.kontinuous/env/prod/values.yaml b/.kontinuous/env/prod/values.yaml
@@ -6,18 +6,21 @@ jobs:
           DOMIFA_BACKEND_URL: "https://domifa-api.{{ .Values.global.domain }}/"
           DOMIFA_PORTAIL_ADMINS_URL: "https://admin-{{ .Values.global.host }}/"
           DOMIFA_PORTAIL_USAGERS_URL: "https://mon-{{ .Values.global.host }}/"
+          DOMIFA_FRONTEND_URL: "https://{{ .Values.global.host }}/"
 
     build-frontend:
       with:
         buildArgs:
           DOMIFA_BACKEND_URL: "https://domifa-api.{{ .Values.global.domain }}/"
           DOMIFA_FRONTEND_META_ROBOTS: index,follow
+          DOMIFA_FRONTEND_URL: "https://{{ .Values.global.host }}/"
 
     build-portail-admins:
       with:
         buildArgs:
           DOMIFA_BACKEND_URL: "https://domifa-api.{{ .Values.global.domain }}/"
           PRODUCTION: "true"
+          DOMIFA_FRONTEND_URL: "https://{{ .Values.global.host }}/"
 
     build-portail-usagers:
       with:

diff --git a/.kontinuous/values.yaml b/.kontinuous/values.yaml
@@ -247,6 +247,7 @@ jobs:
           DOMIFA_BACKEND_URL: "https://api-{{ .Values.global.host }}/"
           DOMIFA_PORTAIL_ADMINS_URL: "https://admin-{{ .Values.global.host }}/"
           DOMIFA_PORTAIL_USAGERS_URL: "https://mon-{{ .Values.global.host }}/"
+          DOMIFA_FRONTEND_URL: "https://{{ .Values.global.host }}/"
           DOMIFA_FRONTEND_META_ROBOTS: noindex,nofollow
           DOMIFA_SENTRY_DSN_FRONTEND: "https://[email protected]/31"
 
@@ -258,6 +259,7 @@ jobs:
         buildArgs:
           DOMIFA_ENV_ID: "{{ .Values.global.env }}"
           DOMIFA_BACKEND_URL: "https://api-{{ .Values.global.host }}/"
+          DOMIFA_FRONTEND_URL: "https://{{ .Values.global.host }}/"
           DOMIFA_SENTRY_DSN_PORTAIL_ADMIN: "https://[email protected]/31"
 
     build-portail-usagers:

diff --git a/packages/frontend/Dockerfile b/packages/frontend/Dockerfile
@@ -23,13 +23,15 @@ ARG PRODUCTION
 ARG DOMIFA_BACKEND_URL
 ARG DOMIFA_PORTAIL_ADMINS_URL
 ARG DOMIFA_PORTAIL_USAGERS_URL
+ARG DOMIFA_FRONTEND_URL
 ARG DOMIFA_ENV_ID
 ARG DOMIFA_SENTRY_DSN_FRONTEND
 ARG DOMIFA_FRONTEND_META_ROBOTS
 
 ENV DOMIFA_BACKEND_URL=$DOMIFA_BACKEND_URL
 ENV DOMIFA_PORTAIL_ADMINS_URL=$DOMIFA_PORTAIL_ADMINS_URL
 ENV DOMIFA_PORTAIL_USAGERS_URL=$DOMIFA_PORTAIL_USAGERS_URL
+ENV DOMIFA_FRONTEND_URL=$DOMIFA_FRONTEND_URL
 ENV DOMIFA_ENV_ID=$DOMIFA_ENV_ID
 ENV DOMIFA_SENTRY_DSN_FRONTEND=$DOMIFA_SENTRY_DSN_FRONTEND
 ENV DOMIFA_FRONTEND_META_ROBOTS=$DOMIFA_FRONTEND_META_ROBOTS

diff --git a/packages/portail-admins/Dockerfile b/packages/portail-admins/Dockerfile
@@ -21,8 +21,10 @@ COPY ./packages/portail-admins ./packages/portail-admins
 ARG DOMIFA_BACKEND_URL
 ARG DOMIFA_ENV_ID
 ARG DOMIFA_SENTRY_DSN_PORTAIL_ADMIN
+ARG DOMIFA_FRONTEND_URL
 
 ENV DOMIFA_BACKEND_URL=$DOMIFA_BACKEND_URL
+ENV DOMIFA_FRONTEND_URL=$DOMIFA_FRONTEND_URL
 ENV DOMIFA_ENV_ID=$DOMIFA_ENV_ID
 ENV DOMIFA_SENTRY_DSN_PORTAIL_ADMIN=$DOMIFA_SENTRY_DSN_PORTAIL_ADMIN