From ce98660502283ee8da275cb491307170abd7b55c Mon Sep 17 00:00:00 2001
From: Richard Morgan <r_morgan@sympatico.ca>
Date: Sun, 28 Oct 2018 22:53:46 -0400
Subject: [PATCH] update gitea Jenkins file add Jenkinsfile to sslproxy and add
 metrics.xai-corp.net.conf

---
 dockerfiles/services/gitea/Jenkinsfile        | 11 +++---
 dockerfiles/services/sslproxy/Jenkinsfile     | 35 +++++++++++++++++++
 .../services/sslproxy/docker-compose-prod.yml | 12 -------
 .../metrics.xai-corp.net.conf                 |  0
 4 files changed, 39 insertions(+), 19 deletions(-)
 create mode 100644 dockerfiles/services/sslproxy/Jenkinsfile
 rename dockerfiles/services/sslproxy/{hosts-disabled => hosts}/metrics.xai-corp.net.conf (100%)

diff --git a/dockerfiles/services/gitea/Jenkinsfile b/dockerfiles/services/gitea/Jenkinsfile
index 29c662c..5e4ea28 100644
--- a/dockerfiles/services/gitea/Jenkinsfile
+++ b/dockerfiles/services/gitea/Jenkinsfile
@@ -14,13 +14,10 @@ node('docker') {
 
     stage('deploy') {
         dir(workdir) {
-            sh '''export DOCKER_HOST=dkhost:2376
-
-            if docker stack ls | grep gitea; then
-              docker service update gitea_app
-            else
-              docker stack deploy -c docker-compose.yml gitea
-            fi'''
+            sh """
+                docker stack deploy --with-registry-auth --prune -c docker-compose.yml gitea
+                docker service update gitea_app
+            """
         }
     }
 
diff --git a/dockerfiles/services/sslproxy/Jenkinsfile b/dockerfiles/services/sslproxy/Jenkinsfile
new file mode 100644
index 0000000..8a10440
--- /dev/null
+++ b/dockerfiles/services/sslproxy/Jenkinsfile
@@ -0,0 +1,35 @@
+node('docker') {
+    def app_name = 'sslproxy'
+    def app_port = '80'
+    def workdir = 'dockerfiles/services/sslproxy'
+
+    stage('prepare') {
+        git credentialsId: 'f1f58215-c789-44a2-9b72-50e4425cb061', url: 'ssh://git@git.xai-corp.net:10022/xai-corp.net/provisioning.git'
+        sh 'ls'
+    }
+
+    stage('build') {
+        dir(workdir) {
+            sh """
+                docker-compose -f docker-compose.yml build
+            """
+            sh "DOCKER_HOST=dkhost:2376 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
+            """
+        }
+    }
+
+    stage('smoke tests') {
+        dir(workdir) {
+            sleep 10
+            sh "curl -If https://jenkins.xai-corp.net/metrics/ejkxeVI-iKLy968ji9AnfYmOHGIh1kYd3gA500JqrRxzTeenT06ynR5Dqo0CQplO/healthcheck"
+        }
+    }
+}
diff --git a/dockerfiles/services/sslproxy/docker-compose-prod.yml b/dockerfiles/services/sslproxy/docker-compose-prod.yml
index a3d0364..73bbe09 100644
--- a/dockerfiles/services/sslproxy/docker-compose-prod.yml
+++ b/dockerfiles/services/sslproxy/docker-compose-prod.yml
@@ -52,15 +52,3 @@ networks:
   prod_ui:
     external:
       name: prod_ui
-
-#    networks:
-#    - ingress
-#    - prod
-
-#networks:
-#  ingress:
-#    external:
-#      name: ingress
-#  prod:
-#    external:
-#      name: prod
diff --git a/dockerfiles/services/sslproxy/hosts-disabled/metrics.xai-corp.net.conf b/dockerfiles/services/sslproxy/hosts/metrics.xai-corp.net.conf
similarity index 100%
rename from dockerfiles/services/sslproxy/hosts-disabled/metrics.xai-corp.net.conf
rename to dockerfiles/services/sslproxy/hosts/metrics.xai-corp.net.conf