Fix CI pipeline

jc21 · jc21 · commit c7852125a851 · 2018-05-03T15:56:35.000+10:00
diff --git 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()
+}

Original file line number	Diff line number	Diff line change
@@ -39,12 +39,9 @@ node-prune```
`39`	`39`	`}`
`40`	`40`	`stage('Build') {`
`41`	`41`	`steps {`
`42`		`- TAG_VERSION = sh (`
`43`		`- script: 'docker run --rm -v $(pwd)/manager:/data ${DOCKER_CI_TOOLS} bash -c "cat /data/package.json\|jq -r \'.version\'"',`
`44`		`- returnStdout: true`
`45`		`- ).trim()`
	`42`	`+ def TAG_VERSION = getPackageVersion()`
`46`	`43`
`47`		`- sh '''docker build -t ${TEMP_IMAGE_NAME} .`
	`44`	`+ sh '''docker build -t $TEMP_IMAGE_NAME .`
`48`	`45`	`exit $?'''`
`49`	`46`	`}`
`50`	`47`	`}`
`@@ -80,3 +77,8 @@ exit $?'''`
`80`	`77`	`}`
`81`	`78`	`}`
`82`	`79`	`}`
	`80`	`+`
	`81`	`+def getPackageVersion() {`
	`82`	`+ ver = sh(script: 'docker run --rm -v $(pwd)/manager:/data $DOCKER_CI_TOOLS bash -c "cat /data/package.json\|jq -r \'.version\'"', returnStdout: true)`
	`83`	`+ return ver.trim()`
	`84`	`+}`