Added build script from util to the pipeline

docker · Aug 4, 2016 · becf89b7d849426c13dee1761e7a2bf117d56799 · becf89b
1 parent d8986cb
commit becf89b7d849426c13dee1761e7a2bf117d56799
Unified Split

Showing with 8 additions and 4 deletions.

+2 −4 Jenkinsfile

+6 −0 build.sh
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -7,17 +7,15 @@ node {
 
     try{
       // Build Base Image
-      dir('bin') {
-        sh './build.sh &> debug'
-      }
+      sh './build.sh &> debug'
       // Build Base Image
       // sh './build_image.sh &> debug'
       // Run Base Container
       // sh 'bin/run.sh'
     } catch(error) {
       def error_details = readFile('./bin/debug');
       def message = "BUILD ERROR: There was a problem building the Base Image. \n\n ${error_details}"
-      sh "rm -f ./bin/debug"
+      sh "rm -f ./debug"
       handleError(message)
     }
 

diff --git a/build.sh b/build.sh
@@ -0,0 +1,6 @@
+#!/bin/bash
+
+source common.bash .
+
+echo "Building new Docker image($maintainer/$imagename)"
+docker build --rm -t $maintainer/$imagename --build-arg maintainer=$maintainer --build-arg imagename=$imagename --build-arg version=$version .