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

diff --git a/build/run-build-docker-images.sh b/build/run-build-docker-images.sh
index 7cb8cf76ad..d7ee41743f 100755
--- a/build/run-build-docker-images.sh
+++ b/build/run-build-docker-images.sh
@@ -82,27 +82,36 @@ 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 "," " " )
+        for tag in $(echo $tags|tr "," " " )
         do
-             $DOCKER tag $1 $1:$tag
+             $DOCKER tag $1:$GITHEAD $1:$tag
         done
     fi
 
-    # Sometimes docker push fails; retry it a few times if necessary.
-    for i in `seq 1 5`; do
-        $DOCKER push $*
-        ECODE=$?
-        if [[ "$ECODE" == "0" ]]; then
-            break
-        fi
+    for tag in $(echo $tags|tr "," " " )
+    do
+	# Sometimes docker push fails; retry it a few times if necessary.
+	for i in `seq 1 5`; do
+             $DOCKER push $1:$tag
+             ECODE=$?
+             if [[ "$ECODE" == "0" ]]; then
+		 break
+             fi
+	done
+
+	if [[ "$ECODE" != "0" ]]; then
+            title "!!!!!! docker push $1:$tag failed !!!!!!"
+            EXITCODE=$(($EXITCODE + $ECODE))
+	fi
     done
-
-    if [[ "$ECODE" != "0" ]]; then
-        title "!!!!!! docker push $* failed !!!!!!"
-        EXITCODE=$(($EXITCODE + $ECODE))
-    fi
 }
 
 timer_reset() {