Do a docker pull before build to re-use layers

clarsonneur · clarsonneur · commit b43e6a4344c6 · 2019-02-12T16:16:31.000+01:00
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -44,9 +44,6 @@ pipeline {
                                     bin/build.sh $TAG_BASE:$(getLastVersion)_$JENKINS_VERSION $JENKINS_REPO_SOURCE
                                     '''
                                 }
-                                stage('Test image ${version}') {
-                                    sh 'bin/test_build.sh'
-                                }
                             }
                         }
                     }
diff --git a/bin/build.sh b/bin/build.sh
@@ -69,5 +69,5 @@ fi
 
 echo "-------------------------"
 set -x
-[ $PUSH = true ] && $DOCKER_CMD pull $TAG_NAME || echo "Building it from scratch"
+$DOCKER_CMD pull $TAG_NAME
 $DOCKER_CMD build $PROXY $TAG_ARG $OS $JENKINS_VERSION_ARG $DOCKER_VERSION_ARG $JENKINS_INSTALL_URL_FLAG .

Original file line number	Diff line number	Diff line change
`@@ -44,9 +44,6 @@ pipeline {`
`44`	`44`	`bin/build.sh $TAG_BASE:$(getLastVersion)_$JENKINS_VERSION $JENKINS_REPO_SOURCE`
`45`	`45`	`'''`
`46`	`46`	`}`
`47`		`- stage('Test image ${version}') {`
`48`		`- sh 'bin/test_build.sh'`
`49`		`- }`
`50`	`47`	`}`
`51`	`48`	`}`
`52`	`49`	`}`