From e11bab1bc0ca56fe9cbca126fb9a0619726028a9 Mon Sep 17 00:00:00 2001
From: richard <r_morgan@sympatico.ca>
Date: Sat, 18 Apr 2020 21:39:57 -0400
Subject: [PATCH] fix registry credentials in sslproxy jenkinsfile

---
 dockerfiles/services/sslproxy/Jenkinsfile | 26 +++++++++++++++--------
 1 file changed, 17 insertions(+), 9 deletions(-)

diff --git a/dockerfiles/services/sslproxy/Jenkinsfile b/dockerfiles/services/sslproxy/Jenkinsfile
index c596ca9..22b5ea8 100644
--- a/dockerfiles/services/sslproxy/Jenkinsfile
+++ b/dockerfiles/services/sslproxy/Jenkinsfile
@@ -3,10 +3,11 @@ node('docker') {
     def app_name = 'sslproxy'
     def app_port = '80'
     def workdir = 'dockerfiles/services/sslproxy'
+    def DOCKER_HOST = 'dkhost:2376'
 
     stage('prepare') {
-        git credentialsId: 'f1f58215-c789-44a2-9b72-50e4425cb061', url: 'ssh://git@git.xai-corp.net:10022/xai-corp.net/provisioning.git'
-        //checkout scm
+//         git credentialsId: 'f1f58215-c789-44a2-9b72-50e4425cb061', url: 'ssh://git@git.xai-corp.net:10022/xai-corp.net/provisioning.git'
+        checkout scm
         sh 'ls'
     }
 
@@ -17,23 +18,30 @@ node('docker') {
                 customImage.push()
             }
 
-            sh "docker-compose -f docker-compose-prod.yml pull"
+            // sh "docker-compose -f docker-compose-prod.yml pull"
         }
     }
 
     stage('deploy') {
         dir(workdir) {
-            sh """
-                docker stack deploy --with-registry-auth --prune -c docker-compose-prod.yml sslproxy
-                docker service update sslproxy_app
-            """
+            try {
+                sh """
+                    export DOCKER_HOST=${DOCKER_HOST}
+                    docker stack deploy --with-registry-auth --prune -c docker-compose-prod.yml sslproxy
+                    docker service update -q sslproxy_app
+                """
+                sleep 10
+                sh "curl -If https://git.xai-corp.net/"
+            } catch (err) {
+                echo "Caught: ${err}"
+                currentBuild.result = 'FAILURE'
+                sh 'docker service update --rollback sslproxy_app'
+            }
         }
     }
 
     stage('smoke tests') {
         dir(workdir) {
-            sleep 10
-            sh "curl -If https://jenkins.xai-corp.net/metrics/ejkxeVI-iKLy968ji9AnfYmOHGIh1kYd3gA500JqrRxzTeenT06ynR5Dqo0CQplO/healthcheck"
         }
     }
 }