Merge pull request #225 from netlify/refine-tagging

Add sha and tag docker tags
netlify · Dec 7, 2018 · 7ff03f9 · 7ff03f9
2 parents 12783d4 + 7419ce2
commit 7ff03f9
Showing 1 changed file with 42 additions and 8 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -4,32 +4,66 @@ pipeline {
   stages {
     stage("Build") {
       when {
-        not { branch 'master' }
+        not { anyOf { branch 'master' ; branch 'staging'} }
       }
       steps {
         sh "docker build --build-arg NF_IMAGE_VERSION=${env.GIT_COMMIT} ."
       }
     }
 
+    stage("Build Untagged") {
+      when {
+        anyOf { branch 'master' ; branch 'staging'}
+        not { buildingTag() }
+      }
+      steps {
+        sh "docker build --build-arg NF_IMAGE_VERSION=${env.GIT_COMMIT} -t netlify/build:${env.BRANCH_NAME} -t netlify/build:${env.GIT_COMMIT} ."
+        sh "docker build --build-arg NF_IMAGE_VERSION=${env.GIT_COMMIT} --squash -t netlify/build:${env.BRANCH_NAME}-squash -t netlify/build:${env.GIT_COMMIT}-squash ."
+      }
+    }
+
     stage("Build Tagged") {
       when {
-        branch 'master'
+        anyOf { branch 'master' ; branch 'staging'}
+        buildingTag()
+      }
+      steps {
+        sh "docker build --build-arg NF_IMAGE_VERSION=${env.GIT_COMMIT} -t netlify/build:${env.BRANCH_NAME} -t netlify/build:${env.GIT_COMMIT} -t netlify/build:${env.GIT_TAG} ."
+        sh "docker build --build-arg NF_IMAGE_VERSION=${env.GIT_COMMIT} --squash -t netlify/build:${env.BRANCH_NAME}-squash -t netlify/build:${env.GIT_COMMIT}-squash -t netlify/build:${env.GIT_TAG}-squash ."
+      }
+    }
+
+    stage("Push Tagged") {
+      when {
+        anyOf { branch 'master' ; branch 'staging'}
+        buildingTag()
       }
       steps {
-        sh "docker build --build-arg NF_IMAGE_VERSION=${env.GIT_COMMIT} -t netlify/build:latest ."
-        sh "docker build --build-arg NF_IMAGE_VERSION=${env.GIT_COMMIT} --squash -t netlify/build:squash ."
+        script {
+          docker.withRegistry('https://index.docker.io/v1/', 'docker-hub-ci') {
+            docker.image("netlify/build:${env.BRANCH_NAME}").push()
+            docker.image("netlify/build:${env.GIT_COMMIT}").push()
+            docker.image("netlify/build:${env.GIT_TAG}").push()
+            docker.image("netlify/build:${env.BRANCH_NAME}-squash").push()
+            docker.image("netlify/build:${env.GIT_COMMIT}-squash").push()
+            docker.image("netlify/build:${env.GIT_TAG}-squash").push()
+          }
+        }
       }
     }
 
-    stage("Push") {
+    stage("Push Untagged") {
       when {
-        branch 'master'
+        anyOf { branch 'master' ; branch 'staging'}
+        buildingTag()
       }
       steps {
         script {
           docker.withRegistry('https://index.docker.io/v1/', 'docker-hub-ci') {
-            docker.image('netlify/build:latest').push()
-            docker.image('netlify/build:squash').push()
+            docker.image("netlify/build:${env.BRANCH_NAME}").push()
+            docker.image("netlify/build:${env.GIT_COMMIT}").push()
+            docker.image("netlify/build:${env.BRANCH_NAME}-squash").push()
+            docker.image("netlify/build:${env.GIT_COMMIT}-squash").push()
           }
         }
       }