Merge branch 'master' of github.internet2.edu:docker/shib-sp

docker · Sep 12, 2016 · 9f90b0d · 9f90b0d
2 parents a58d229 + d6b5db4
commit 9f90b0d
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -14,11 +14,19 @@ node('docker') {
       sh 'mv bin/* ../bin/.'
     }
   stage 'Environment'
-  
+
     def maintainer = maintainer()
     def imagename = imagename()
     def tag = env.BRANCH_NAME
-    if(!imagename){
+
+    // Tag images created on master branch with 'latest'
+   if(env.BRANCH_NAME == "master"){
+     tag = "latest"
+   }else{
+     tag = env.BRANCH_NAME
+   }
+
+   if(!imagename){
       echo "You must define an imagename in common.bash"
       currentBuild.result = 'FAILURE'
     }