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

4
dockerfiles/services/sslproxy/Jenkinsfile vendored
View File

@@ -41,6 +41,7 @@ pipeline {
stage('deploy') { stage('deploy') {
steps { steps {
dir(WORKDIR) { dir(WORKDIR) {
withDockerRegistry(credentialsId: 'b11d7f1a-81ac-4daf-8842-56afc0d2370e', url: 'http://dkregistry.xai-corp.net:5000') {
sh """ sh """
export DOCKER_HOST=${DOCKER_HOST} export DOCKER_HOST=${DOCKER_HOST}
docker stack deploy --with-registry-auth --prune -c docker-compose-prod.yml sslproxy docker stack deploy --with-registry-auth --prune -c docker-compose-prod.yml sslproxy
@@ -49,6 +50,7 @@ pipeline {
} }
} }
} }
}
stage('smoke tests') { stage('smoke tests') {
steps { steps {
@@ -60,6 +62,7 @@ pipeline {
post { post {
failure { failure {
dir(WORKDIR) { dir(WORKDIR) {
withDockerRegistry(credentialsId: 'b11d7f1a-81ac-4daf-8842-56afc0d2370e', url: 'http://dkregistry.xai-corp.net:5000') {
sh """ sh """
export DOCKER_HOST=${DOCKER_HOST} export DOCKER_HOST=${DOCKER_HOST}
docker service rollback sslproxy_app docker service rollback sslproxy_app
@@ -68,6 +71,7 @@ pipeline {
} }
} }
} }
}
} }
} }

2
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;