From: Peter Amstutz <peter.amstutz@curii.com>
Date: Thu, 9 Sep 2021 14:16:49 +0000 (-0400)
Subject: Tweak docker image tagging
X-Git-Tag: 2.3.1~35
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/6c8a0923515a0c9e085fa852de3a48f849a742fe?hp=fb39000148809df935ada41cd3be373fde268c57

Tweak docker image tagging

no issue #

Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <peter.amstutz@curii.com>
---

diff --git a/build/run-build-docker-images.sh b/build/run-build-docker-images.sh
index 8cff14b71e..00ef2de417 100755
--- a/build/run-build-docker-images.sh
+++ b/build/run-build-docker-images.sh
@@ -85,11 +85,14 @@ docker_push () {
     # docker always creates a local 'latest' tag, and we don't want to push that
     # tag in every case. Remove it.
     docker rmi $1:latest
+
+    GITHEAD=$(cd $WORKSPACE && git log --format=%H -n1 HEAD)
+
     if [[ ! -z "$tags" ]]
     then
         for tag in $( echo $tags|tr "," " " )
         do
-             $DOCKER tag $1 $1:$tag
+             $DOCKER tag $1:$GITHEAD $1:$tag
         done
     fi