X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/95dbb33e42c6ad71151bd4b8c982569b7d90ae24..f42ee7c19b794e25db30051b1dfc4bee83929bcd:/build/run-build-docker-images.sh

diff --git a/build/run-build-docker-images.sh b/build/run-build-docker-images.sh
index 7cb8cf76ad..00ef2de417 100755
--- a/build/run-build-docker-images.sh
+++ b/build/run-build-docker-images.sh
@@ -82,11 +82,17 @@ title () {
 }
 
 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