xai-corp.net/provisioning
1
0
Fork 0
Code Issues 9 Releases Activity

add missing docker credentials to sslproxy deploy

Browse Source
This commit is contained in:
richard
2020-05-16 08:33:04 -04:00
parent f4223a66a9
commit ed7de0dc8c
2 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
dockerfiles/services/sslproxy/Jenkinsfile vendored
View File

@@ -41,11 +41,13 @@ pipeline {
stage('deploy') { stage('deploy') {
steps { steps {
dir(WORKDIR) { dir(WORKDIR) {
sh """ withDockerRegistry(credentialsId: 'b11d7f1a-81ac-4daf-8842-56afc0d2370e', url: 'http://dkregistry.xai-corp.net:5000') {
export DOCKER_HOST=${DOCKER_HOST} sh """
docker stack deploy --with-registry-auth --prune -c docker-compose-prod.yml sslproxy export DOCKER_HOST=${DOCKER_HOST}
(cd ../ && chmod +x ./scaleout.sh && ./scaleout.sh sslproxy_app 30) 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 { post {
failure { failure {
dir(WORKDIR) { dir(WORKDIR) {
sh """ withDockerRegistry(credentialsId: 'b11d7f1a-81ac-4daf-8842-56afc0d2370e', url: 'http://dkregistry.xai-corp.net:5000') {
export DOCKER_HOST=${DOCKER_HOST} sh """
docker service rollback sslproxy_app export DOCKER_HOST=${DOCKER_HOST}
""" docker service rollback sslproxy_app
"""
}
} }
} }
} }

4
dockerfiles/services/sslproxy/hosts/abcapi.xai-corp.net.conf
View File

@@ -10,7 +10,7 @@ server {
# this is the internal Docker DNS, cache only for 30s # this is the internal Docker DNS, cache only for 30s
resolver 127.0.0.11 valid=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; listen 443 ssl ipv6only=off;
server_name abcapi.xai-corp.net; 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-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-For $proxy_add_x_forwarded_for;
proxy_set_header X-Forwarded-Proto $scheme; proxy_set_header X-Forwarded-Proto $scheme;
proxy_set_header Connection $http_connection; proxy_set_header Connection $http_connection;
} }
} }