From ca45b8f8274c25be8c5180e51efdea4b52e7e847 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bryan=E2=84=A2?=
 <61433408+brycahta@users.noreply.github.com>
Date: Thu, 13 Aug 2020 13:08:14 -0500
Subject: [PATCH] fix manifest updating in push-docker-images (#231)

---
 scripts/push-docker-images | 61 ++++++++++++++++++++++++--------------
 1 file changed, 39 insertions(+), 22 deletions(-)

diff --git a/scripts/push-docker-images b/scripts/push-docker-images
index 8ae654c6..ee9b7576 100755
--- a/scripts/push-docker-images
+++ b/scripts/push-docker-images
@@ -8,14 +8,13 @@ MAKE_FILE_PATH=$REPO_ROOT_PATH/Makefile
 
 VERSION=$(make -s -f $MAKE_FILE_PATH version)
 PLATFORMS=("linux/amd64")
-MANIFEST_IMAGES=""
+MANIFEST_IMAGES=()
 MANIFEST=""
 DOCKER_CLI_CONFIG="$HOME/.docker/config.json"
 
 USAGE=$(cat << 'EOM'
   Usage: push-docker-images  [-p <platform pairs>]
   Pushes docker images for the platform pairs passed in w/ a dockerhub manifest
-
   Example: push-docker-images -p "linux/amd64,linux/arm"
           Optional:
             -p          Platform pair list (os/architecture) [DEFAULT: linux/amd64]
@@ -57,9 +56,22 @@ fi
 # if manifest exists already, fetch existing platforms so "updated" manifest includes images
 # that were there previously
 if [[ $MANIFEST == "true" ]]; then
+  if [[ ! -f $DOCKER_CLI_CONFIG ]]; then
+    echo '{"experimental":"enabled"}' > $DOCKER_CLI_CONFIG
+    echo "Created docker config file"
+  fi
+  cat <<< $(jq '.+{"experimental":"enabled"}' $DOCKER_CLI_CONFIG) > $DOCKER_CLI_CONFIG
+  echo "Enabled experimental CLI features to execute docker manifest commands"
   manifest_exists=$(docker manifest inspect $IMAGE_REPO:$VERSION > /dev/null ; echo $?)
-  if [[ $manifest_exists -eq 0 ]]; then
-    PLATFORMS+=($(docker manifest inspect $IMAGE_REPO:$VERSION | jq -r '.manifests[] | "\(.platform.os)/\(.platform.architecture)"'))
+  if [[ manifest_exists -eq 0 ]]; then
+    echo "manifest already exists"
+    EXISTING_IMAGES=($(docker manifest inspect $IMAGE_REPO:$VERSION | jq -r '.manifests[] | "\(.platform.os)-\(.platform.architecture)"'))
+    # treat separate from PLATFORMS because existing images don't need to be tagged and pushed
+    for os_arch in "${EXISTING_IMAGES[@]}"; do
+      img_tag="$IMAGE_REPO:$VERSION-$os_arch"
+      MANIFEST_IMAGES+=($img_tag)
+    done
+    echo "images already in manifest: $MANIFEST_IMAGES"
   fi
 fi
 
@@ -75,28 +87,33 @@ for os_arch in "${PLATFORMS[@]}"; do
         img_tag="$IMAGE_REPO:$VERSION"
         docker tag $img_tag_w_platform $img_tag
     fi
-
     docker push $img_tag
-    MANIFEST_IMAGES="$MANIFEST_IMAGES $img_tag"
+    MANIFEST_IMAGES+=($img_tag)
 done
 
 if [[ $MANIFEST == "true" ]]; then
-    if [[ ! -f $DOCKER_CLI_CONFIG ]]; then
-      echo '{"experimental":"enabled"}' > $DOCKER_CLI_CONFIG
-      echo "Created docker config file"
-    fi
-    cat <<< $(jq '.+{"experimental":"enabled"}' $DOCKER_CLI_CONFIG) > $DOCKER_CLI_CONFIG
-    echo "Enabled experimental CLI features to create the docker manifest"
-    docker manifest create $IMAGE_REPO:$VERSION $MANIFEST_IMAGES
-
-    for os_arch in "${PLATFORMS[@]}"; do
-        os=$(echo $os_arch | cut -d'/' -f1)
-        arch=$(echo $os_arch | cut -d'/' -f2)
-
-        img_tag="$IMAGE_REPO:$VERSION-$os-$arch"
-
-        docker manifest annotate $IMAGE_REPO:$VERSION $img_tag --arch $arch --os $os
+    current_os=$(uname)
+    # Windows will append '\r' to the end of $img which
+    # results in docker failing to create the manifest due to invalid reference format.
+    # However, MacOS does not recognize '\r' as carriage return
+    # and attempts to remove literal 'r' chars; therefore, made this so portable
+    for img in "${MANIFEST_IMAGES[@]}"; do
+      if [[ $current_os == "Darwin" ]]; then
+        updated_img=$img
+      else
+        updated_img=$(echo $img | sed -e 's/\r$//')
+      fi
+      echo "creating manifest for $updated_img"
+      docker manifest create $IMAGE_REPO:$VERSION $updated_img --amend
+
+      os_arch=$(echo ${updated_img//$IMAGE_REPO:$VERSION-/})
+      os=$(echo $os_arch | cut -d'-' -f1)
+      arch=$(echo $os_arch | cut -d'-' -f2)
+
+      echo "annotating manifest"
+      docker manifest annotate $IMAGE_REPO:$VERSION $updated_img --arch $arch --os $os
     done
 
+    echo "pushing manifest"
     docker manifest push --purge $IMAGE_REPO:$VERSION
-fi
\ No newline at end of file
+fi