Add a docker tag for git commit (mozilla-releng#283). r=bhearsum

damidurodola · Mar 24, 2017 · 72f6e0c · 72f6e0c
1 parent 4b28b3a
commit 72f6e0c
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/agent/scripts/push-dockerimage.sh b/agent/scripts/push-dockerimage.sh
@@ -31,16 +31,20 @@ if [ "$branch" == "master" ]; then
     branch_tag="latest"
 fi
 date_tag="${branch}-${date}"
+commit_tag="${branch}-${commit}"
 
 echo "Building Docker image"
 docker build -t mozilla/balrogagent:${branch_tag} .
 echo "Tagging Docker image with date tag"
 docker tag mozilla/balrogagent:${branch_tag} "mozilla/balrogagent:${date_tag}"
+echo "Tagging Docker image with git commit tag"
+docker tag mozilla/balrogagent:${branch_tag} "mozilla/balrogagent:${commit_tag}"
 echo "Logging into Dockerhub"
 docker login -e $dockerhub_email -u $dockerhub_username -p $dockerhub_password
 echo "Pushing Docker image"
 docker push mozilla/balrogagent:${branch_tag}
 docker push mozilla/balrogagent:${date_tag}
+docker push mozilla/balrogagent:${commit_tag}
 
 sha256=$(docker images --no-trunc mozilla/balrogagent | grep "${date_tag}" | awk '/^mozilla/ {print $3}')
 echo "SHA256 is ${sha256}, creating artifact for it"

diff --git a/scripts/push-dockerimage.sh b/scripts/push-dockerimage.sh
@@ -35,16 +35,20 @@ if [ "$branch" == "master" ]; then
     branch_tag="latest"
 fi
 date_tag="${branch}-${date}"
+commit_tag="${branch}-${commit}"
 
 echo "Building Docker image"
 docker build -t mozilla/balrog:${branch_tag} .
 echo "Tagging Docker image with date tag"
 docker tag mozilla/balrog:${branch_tag} "mozilla/balrog:${date_tag}"
+echo "Tagging Docker image with git commit tag"
+docker tag mozilla/balrog:${branch_tag} "mozilla/balrog:${commit_tag}"
 echo "Logging into Dockerhub"
 docker login -e $dockerhub_email -u $dockerhub_username -p $dockerhub_password
 echo "Pushing Docker image"
 docker push mozilla/balrog:${branch_tag}
 docker push mozilla/balrog:${date_tag}
+docker push mozilla/balrog:${commit_tag}
 
 sha256=$(docker images --no-trunc mozilla/balrog | grep "${date_tag}" | awk '/^mozilla/ {print $3}')
 echo "SHA256 is ${sha256}, creating artifact for it"