From bb7ccf8d67b56926e121bf541124250564b8046c Mon Sep 17 00:00:00 2001
From: Bret Comnes <bcomnes@gmail.com>
Date: Fri, 7 Dec 2018 16:31:41 -0800
Subject: [PATCH] Dump more env and fix tag reference env var

---
 Jenkinsfile | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 19c09608..8dd0d881 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -17,6 +17,7 @@ pipeline {
         not { buildingTag() }
       }
       steps {
+        sh "env"
         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 ."
       }
@@ -28,8 +29,8 @@ pipeline {
       }
       steps {
         sh "env"
-        sh "docker build --build-arg NF_IMAGE_VERSION=${env.GIT_COMMIT} -t netlify/build:${env.GIT_TAG_NAME} -t netlify/build:${env.GIT_COMMIT} ."
-        sh "docker build --build-arg NF_IMAGE_VERSION=${env.GIT_COMMIT} --squash -t netlify/build:${env.GIT_TAG_NAME}-squash -t netlify/build:${env.GIT_COMMIT}-squash ."
+        sh "docker build --build-arg NF_IMAGE_VERSION=${env.GIT_COMMIT} -t netlify/build:${env.GIT_BRANCH} -t netlify/build:${env.GIT_COMMIT} ."
+        sh "docker build --build-arg NF_IMAGE_VERSION=${env.GIT_COMMIT} --squash -t netlify/build:${env.GIT_BRANCH}-squash -t netlify/build:${env.GIT_COMMIT}-squash ."
       }
     }
 
@@ -40,9 +41,9 @@ pipeline {
       steps {
         script {
           docker.withRegistry('https://index.docker.io/v1/', 'docker-hub-ci') {
-            docker.image("netlify/build:${env.GIT_TAG_NAME}").push()
+            docker.image("netlify/build:${env.GIT_BRANCH}").push()
             docker.image("netlify/build:${env.GIT_COMMIT}").push()
-            docker.image("netlify/build:${env.GIT_TAG_NAME}-squash").push()
+            docker.image("netlify/build:${env.GIT_BRANCH}-squash").push()
             docker.image("netlify/build:${env.GIT_COMMIT}-squash").push()
           }
         }