From c7852125a8512777a29c4232283a85db87c557fe Mon Sep 17 00:00:00 2001
From: Jamie Curnow <jc@jc21.com>
Date: Thu, 3 May 2018 15:56:35 +1000
Subject: [PATCH] Fix CI pipeline

---
 Jenkinsfile | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index a26b6cdc..18d526cd 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -39,12 +39,9 @@ node-prune```
     }
     stage('Build') {
       steps {
-        TAG_VERSION = sh (
-            script: 'docker run --rm -v $(pwd)/manager:/data ${DOCKER_CI_TOOLS} bash -c "cat /data/package.json|jq -r \'.version\'"',
-            returnStdout: true
-        ).trim()
+        def TAG_VERSION = getPackageVersion()
 
-        sh '''docker build -t ${TEMP_IMAGE_NAME} .
+        sh '''docker build -t $TEMP_IMAGE_NAME .
 exit $?'''
       }
     }
@@ -80,3 +77,8 @@ exit $?'''
     }
   }
 }
+
+def getPackageVersion() {
+  ver = sh(script: 'docker run --rm -v $(pwd)/manager:/data $DOCKER_CI_TOOLS bash -c "cat /data/package.json|jq -r \'.version\'"', returnStdout: true)
+  return ver.trim()
+}