From 64e3953a77d22fc3769b584d5046994eaddd8821 Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Wed, 2 May 2018 10:13:32 -0400
Subject: [PATCH] Update Jenkinsfile

---
 Jenkinsfile | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 9715dedd..02056edd 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -21,12 +21,27 @@ pipeline {
                         echo "You must define an imagename in common.bash"
                         currentBuild.result = 'FAILURE'
                      }
-                } 
+                    sh 'mkdir -p tmp'
+                    dir('tmp'){
+                    git([ url: "https://github.internet2.edu/docker/util.git",
+                    credentialsId: "jenkins-github-access-token" ])
+                    sh 'ls'
+                    sh 'mv bin/* ../bin/.'
+                }  
              }
         }    
         stage('Build') {
             steps {
-                echo 'step 2'
+                script {
+                   try{
+                     sh 'bin/rebuild.sh >> debug'
+                   } catch(error) {
+                     def error_details = readFile('./debug');
+                     def message = "BUILD ERROR: There was a problem building the Base Image. \n\n ${error_details}"
+                     sh "rm -f ./debug"
+                     handleError(message)
+                   }
+                }
             }
         } 
         stage('Push') {