From 0d37ce2ab9df34abd5cbf05a5b0472a0bb246e7f Mon Sep 17 00:00:00 2001
From: Dan Elbert <dan.elbert@gmail.com>
Date: Sun, 22 Jul 2018 16:42:43 -0500
Subject: [PATCH] jenkins

---
 Jenkinsfile | 54 +++++++++++++++++++++++++++--------------------------
 1 file changed, 28 insertions(+), 26 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 90083de..2292172 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -2,42 +2,44 @@ library('jenkins_build')
 
 node {
 
-    main {
+    docker.withRegistry('https://registry.elbert.us', '6ad2f24c-6da4-4cdb-b526-4773922fb0d5') {
 
-        def jobnameparts = JOB_NAME.tokenize('/') as String[]
-        def jobconsolename = jobnameparts[0]
+        main {
 
-        def projectName = jobconsolename
-        def dockerImageName = "registry.elbert.us/${projectName}"
-        def sourceFigFile = "./docker-compose-rlyeh.yml"
-        def figFile = "/etc/fig/${projectName}.yml"
+            def jobnameparts = JOB_NAME.tokenize('/') as String[]
+            def jobconsolename = jobnameparts[0]
+
+            def projectName = jobconsolename
+            def dockerImageName = "registry.elbert.us/${projectName}"
+            def sourceFigFile = "./docker-compose-rlyeh.yml"
+            def figFile = "/etc/fig/${projectName}.yml"
 
 
-        def dockerImage
+            def dockerImage
 
-        stage("Checkout") {
-            checkout scm
-        }
+            stage("Checkout") {
+                checkout scm
+            }
 
-        stage("Build") {
-            dockerImage = docker.build("${dockerImageName}:latest")
-        }
+            stage("Build") {
+                dockerImage = docker.build("${dockerImageName}:latest")
+            }
+
+            stage("Deploy") {
 
-        stage("Deploy") {
-            docker.withRegistry('https://registry.elbert.us', '6ad2f24c-6da4-4cdb-b526-4773922fb0d5') {
                 dockerImage.push()
                 dockerImage.push("production")
+
+                sh "/usr/local/bin/docker-compose --project-name '${projectName}' --file '${sourceFigFile}' pull"
+
+                if (fileExists(figFile)) {
+                    sh "/usr/local/bin/docker-compose --project-name '${projectName}' --file '${figFile}' down"
+                }
+
+                sh "cp ${sourceFigFile} ${figFile}"
+
+                sh "/usr/local/bin/docker-compose --project-name '${projectName}' --file '${figFile}' up -d"
             }
-
-            sh "/usr/local/bin/docker-compose --project-name '${projectName}' --file '${sourceFigFile}' pull"
-
-            if (fileExists(figFile)) {
-                sh "/usr/local/bin/docker-compose --project-name '${projectName}' --file '${figFile}' down"
-            }
-
-            sh "cp ${sourceFigFile} ${figFile}"
-
-            sh "/usr/local/bin/docker-compose --project-name '${projectName}' --file '${figFile}' up -d"
         }
     }
 }