Include git tag in environment variable NF_IMAGE_TAG

netlify · Mar 11, 2019 · c8d455b · c8d455b
1 parent 90e934d
commit c8d455b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -405,3 +405,6 @@ ADD buildbot-git-config /root/.gitconfig
 USER buildbot
 ARG NF_IMAGE_VERSION
 ENV NF_IMAGE_VERSION ${NF_IMAGE_VERSION:-latest}
+
+ARG NF_IMAGE_TAG
+ENV NF_IMAGE_TAG ${NF_IMAGE_TAG:-latest}
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -16,7 +16,7 @@ pipeline {
         anyOf { branch 'master' ; branch 'xenial' ; branch 'trusty' ; 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} --build-arg NF_IMAGE_TAG=${env.BRANCH_NAME} -t netlify/build:${env.BRANCH_NAME} -t netlify/build:${env.GIT_COMMIT} ."
       }
     }
 
@@ -25,7 +25,7 @@ pipeline {
         anyOf { buildingTag() }
       }
       steps {
-        sh "docker build --build-arg NF_IMAGE_VERSION=${env.GIT_COMMIT} --squash -t netlify/build:${env.BRANCH_NAME}-squash ."
+        sh "docker build --build-arg NF_IMAGE_VERSION=${env.GIT_COMMIT} --build-arg NF_IMAGE_TAG=${env.BRANCH_NAME} --squash -t netlify/build:${env.BRANCH_NAME}-squash ."
       }
     }