From 04a7df47fff60d93adf270d28a00363fb4631949 Mon Sep 17 00:00:00 2001
From: Etienne Loupias <eloupias@grandlyon.com>
Date: Wed, 18 Dec 2024 11:18:06 +0100
Subject: [PATCH] test envsubst
---
.gitlab-ci.yml | 2 ++
nginx/default.conf | 4 +++-
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 31c40b56e..f59e87c20 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -33,6 +33,7 @@ build:
script:
- docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
- docker login ${CI_DEPENDENCY_PROXY_SERVER} -u ${CI_DEPENDENCY_PROXY_USER} -p ${CI_DEPENDENCY_PROXY_PASSWORD}
+ - envsubst < nginx/default.conf > nginx/default.conf
- docker build --pull -t "$CI_REGISTRY_IMAGE:$IMAGE_TAG" --build-arg DEPENDENCY_PROXY="$DEPENDENCY_PROXY" .
- docker push "$CI_REGISTRY_IMAGE:$IMAGE_TAG"
@@ -48,6 +49,7 @@ build-tag:
script:
- docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
- docker login ${CI_DEPENDENCY_PROXY_SERVER} -u ${CI_DEPENDENCY_PROXY_USER} -p ${CI_DEPENDENCY_PROXY_PASSWORD}
+ - envsubst < nginx/default.conf > nginx/default.conf
- docker build --pull -t "$CI_REGISTRY_IMAGE:$IMAGE_TAG" --build-arg DEPENDENCY_PROXY="$DEPENDENCY_PROXY" .
- docker push "$CI_REGISTRY_IMAGE:$IMAGE_TAG"
diff --git a/nginx/default.conf b/nginx/default.conf
index 8127bc6a8..c744442cf 100644
--- a/nginx/default.conf
+++ b/nginx/default.conf
@@ -42,12 +42,14 @@ server {
# use regular expression for location to avoid nginx resolve error (https://stackoverflow.com/questions/57937222/502-bad-gateway-nginx-no-resolver-defined-to-resolve ) #
location ^~ /actualites/details/ {
+ resolver dns-default.openshift-dns.svc.cluster.local;
+
# proxy_set_header must be outside if clause (cf. https://stackoverflow.com/questions/16500594/why-i-cant-put-proxy-set-header-inside-an-if-clause )
proxy_set_header User-Agent "";
if ($prerender = 1) {
# For use of proxy_pass within a regular expression location, cf. https://stackoverflow.com/a/53354944
- proxy_pass http://res-client-service.ns-res-d01-syn.svc.cluster.local:8080/api/render/$uri;
+ proxy_pass http://res-client-service.ns-res-$NAMESPACE_ENV-syn.svc.cluster.local:8080/api/render/$uri;
}
# if no prerender, apply default angular route
--
GitLab