19070: Still trying to fix test_with_arvbox

[arvados.git] / build / run-build-docker-images.sh

diff --git a/build/run-build-docker-images.sh b/build/run-build-docker-images.sh
index 7cb8cf76ad5ce4b618b563858463a2877dfb1ca1..00ef2de417d77a230d5abad0975c4376317b5872 100755 (executable)
--- 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