diff --git a/dockerfiles/services/sslproxy/Jenkinsfile b/dockerfiles/services/sslproxy/Jenkinsfile index 832b31d..f4a2202 100644 --- a/dockerfiles/services/sslproxy/Jenkinsfile +++ b/dockerfiles/services/sslproxy/Jenkinsfile @@ -41,11 +41,13 @@ pipeline { stage('deploy') { steps { dir(WORKDIR) { - sh """ - export DOCKER_HOST=${DOCKER_HOST} - docker stack deploy --with-registry-auth --prune -c docker-compose-prod.yml sslproxy - (cd ../ && chmod +x ./scaleout.sh && ./scaleout.sh sslproxy_app 30) - """ + withDockerRegistry(credentialsId: 'b11d7f1a-81ac-4daf-8842-56afc0d2370e', url: 'http://dkregistry.xai-corp.net:5000') { + sh """ + export DOCKER_HOST=${DOCKER_HOST} + docker stack deploy --with-registry-auth --prune -c docker-compose-prod.yml sslproxy + (cd ../ && chmod +x ./scaleout.sh && ./scaleout.sh sslproxy_app 30) + """ + } } } } @@ -60,10 +62,12 @@ pipeline { post { failure { dir(WORKDIR) { - sh """ - export DOCKER_HOST=${DOCKER_HOST} - docker service rollback sslproxy_app - """ + withDockerRegistry(credentialsId: 'b11d7f1a-81ac-4daf-8842-56afc0d2370e', url: 'http://dkregistry.xai-corp.net:5000') { + sh """ + export DOCKER_HOST=${DOCKER_HOST} + docker service rollback sslproxy_app + """ + } } } } diff --git a/dockerfiles/services/sslproxy/hosts/abcapi.xai-corp.net.conf b/dockerfiles/services/sslproxy/hosts/abcapi.xai-corp.net.conf index 641d06e..f23dc58 100644 --- a/dockerfiles/services/sslproxy/hosts/abcapi.xai-corp.net.conf +++ b/dockerfiles/services/sslproxy/hosts/abcapi.xai-corp.net.conf @@ -10,7 +10,7 @@ server { # this is the internal Docker DNS, cache only for 30s resolver 127.0.0.11 valid=30s; - set $backend http://dkhost.xai-corp.net:8084; + set $backend http://tasks.abc-api_nginx:8084; listen 443 ssl ipv6only=off; server_name abcapi.xai-corp.net; @@ -26,7 +26,7 @@ server { proxy_set_header X-Real-IP $remote_addr; # pass on real client's IP proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; proxy_set_header X-Forwarded-Proto $scheme; - proxy_set_header Connection $http_connection; + proxy_set_header Connection $http_connection; } }