From cd8d7cbbe1af5c55ff7cd749036b34f00f6e1f3f Mon Sep 17 00:00:00 2001 From: Erik Tiekstra Date: Tue, 4 May 2021 09:00:10 +0200 Subject: [PATCH] Updated Jenkinsfile and nginx.template --- nginx/nginx.template | 4 ++-- openshift/dev/Jenkinsfile | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/nginx/nginx.template b/nginx/nginx.template index 3c40d31..4cbc100 100644 --- a/nginx/nginx.template +++ b/nginx/nginx.template @@ -64,10 +64,10 @@ http { add_header Cache-Control "no-cache, public, must-revalidate, proxy-revalidate"; } - underscores_in_headers on; + # underscores_in_headers on; # $RESOLVER - # JWT TOKEN + # # JWT TOKEN # location /token/jwt/rest/idp/v0/dafa { # proxy_pass $JWT_URL; # } diff --git a/openshift/dev/Jenkinsfile b/openshift/dev/Jenkinsfile index cbe5577..b00c15c 100644 --- a/openshift/dev/Jenkinsfile +++ b/openshift/dev/Jenkinsfile @@ -98,7 +98,8 @@ pipeline { sh ''' npm run build:dafa - cp -r nginx/* ${DIST_PATH}. + + cp -r nginx/* ${DIST_PATH}/nginx-start ''' // Used when testing Openshift, so that we dont need to wait for build. Also put a # before npm ci above