diff --git a/nginx/nginx.template b/nginx/nginx-start/nginx.template similarity index 100% rename from nginx/nginx.template rename to nginx/nginx-start/nginx.template diff --git a/nginx/template.sh b/nginx/nginx-start/template.sh similarity index 100% rename from nginx/template.sh rename to nginx/nginx-start/template.sh diff --git a/openshift/dev/Jenkinsfile b/openshift/dev/Jenkinsfile index b00c15c..7be9230 100644 --- a/openshift/dev/Jenkinsfile +++ b/openshift/dev/Jenkinsfile @@ -5,7 +5,7 @@ def i1project = "${I1_NAMESPACE}" def u1project = "${U1_NAMESPACE}" def t1project = "${T1_NAMESPACE}" def jenkinsslave = "nodejs15-agent" -def dist_path = "dist/apps/dafa-web/" +def dist_path = "dist/apps/dafa-web" pipeline { @@ -91,7 +91,7 @@ pipeline { stage("Build application") { environment { - DIST_PATH = "${dist_path}" + NGINX_PATH = "${dist_path}/." } steps { echo '### Building application... ###' @@ -99,7 +99,7 @@ pipeline { sh ''' npm run build:dafa - cp -r nginx/* ${DIST_PATH}/nginx-start + cp -r nginx/* ${NGINX_PATH} ''' // Used when testing Openshift, so that we dont need to wait for build. Also put a # before npm ci above