diff --git a/.kontinuous/env/prod/values.yaml b/.kontinuous/env/prod/values.yaml index 73185d8b2b..3b8deb526b 100644 --- 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 index 676ad31e76..6db1d908db 100644 --- 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://5dab749719e9488798341efad0947291@sentry.fabrique.social.gouv.fr/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://5dab749719e9488798341efad0947291@sentry.fabrique.social.gouv.fr/31" build-portail-usagers: diff --git a/packages/frontend/Dockerfile b/packages/frontend/Dockerfile index 5948f7160e..60d78f00eb 100644 --- a/packages/frontend/Dockerfile +++ b/packages/frontend/Dockerfile @@ -23,6 +23,7 @@ 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 @@ -30,6 +31,7 @@ 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 index d1f1767781..7238acd64d 100644 --- 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