From be5f216342d91a8db86207d6f7441f80b390ae22 Mon Sep 17 00:00:00 2001
From: Roberto Bruggemann <roberto@weave.works>
Date: Thu, 14 Dec 2017 15:39:19 +0000
Subject: [PATCH] Tag images at build time

`push_images` used to tag and publish the latest built image, no matter what version or what branch or tag was checked out.
Since `bin/release build` and `bin/release publish` can be run at different times, it was possible for the latest built image to change. At which point `bin/release publish` would tag and publish an intended image.

Moving image tagging at build time will prevent this from happening again.
---
 bin/release | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/bin/release b/bin/release
index 3650c16fc..a4a95f9ef 100755
--- a/bin/release
+++ b/bin/release
@@ -104,6 +104,8 @@ build() {
     #    exit 1
     #fi
 
+    tag_images
+
     echo -e '\u2713 Build OK'
     echo '** Release artefacts in' "$RELEASE_DIR"
 }
@@ -232,17 +234,24 @@ publish() {
     fi
 }
 
-push_images() {
-    echo "== Tagging and pushing images on docker hub and quay.io as user $DOCKERHUB_USER"
+tag_images() {
+    echo "== Tagging images for docker hub and quay.io as user $DOCKERHUB_USER"
     for IMAGE in "scope" "cloud-agent"; do
         $SUDO docker tag "$DOCKERHUB_USER/$IMAGE" "$DOCKERHUB_USER/$IMAGE:$VERSION"
-        $SUDO docker push "$DOCKERHUB_USER/$IMAGE:$VERSION"
         $SUDO docker tag "$DOCKERHUB_USER/$IMAGE:$VERSION" "$DOCKERHUB_USER/$IMAGE:latest_release"
-        $SUDO docker push "$DOCKERHUB_USER/$IMAGE:latest_release"
         $SUDO docker tag "$DOCKERHUB_USER/$IMAGE:$VERSION" "quay.io/$DOCKERHUB_USER/$IMAGE:$VERSION"
+    done
+    echo "** Docker images tagged"
+}
+
+push_images() {
+    echo "== Pushing images on docker hub and quay.io as user $DOCKERHUB_USER"
+    for IMAGE in "scope" "cloud-agent"; do
+        $SUDO docker push "$DOCKERHUB_USER/$IMAGE:$VERSION"
+        $SUDO docker push "$DOCKERHUB_USER/$IMAGE:latest_release"
         $SUDO docker push "quay.io/$DOCKERHUB_USER/$IMAGE:$VERSION"
     done
-    echo "** Docker images tagged and pushed"
+    echo "** Docker images pushed"
 }
 
 usage() {