From: Dave Wallace <dwallacelf@gmail.com>
Date: Fri, 16 Apr 2021 17:56:29 +0000 (-0400)
Subject: Fix docker image update script
X-Git-Url: https://gerrit.fd.io/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F16%2F32016%2F2;p=ci-management.git

Fix docker image update script

- Handle case where the original image has been
  deleted from dockerhub.

Signed-off-by: Dave Wallace <dwallacelf@gmail.com>
Change-Id: Ifcb34f39b36f2974d45a48754b72d33e9cfc4b06
---

diff --git a/docker/scripts/update_dockerhub_prod_tags.sh b/docker/scripts/update_dockerhub_prod_tags.sh
index 187b640d3..890beb3e3 100755
--- a/docker/scripts/update_dockerhub_prod_tags.sh
+++ b/docker/scripts/update_dockerhub_prod_tags.sh
@@ -109,7 +109,10 @@ format_image_tags() {
     #       bug in docker hub which returns old tags which were deleted via
     #       the webUI, but are still retrieved by 'docker pull -a'
     image_tags="$(docker images | grep $1 | grep $image_arch | grep -v prod-curr | sort -r | mawk '{print $1":"$2}' | tr '\n' ' ')"
-    image_realname="$(docker images | grep $1 | grep $image_arch | sort -r | grep -v prod | mawk '{print $1":"$2}')"
+    image_realname="$(docker images | grep $1 | grep $image_arch | sort -r | grep -v prod | mawk '{print $1":"$2}' || true)"
+    if [ -z "${image_realname:-}" ] ; then
+        image_realname="$image_tags"
+    fi
 }
 
 get_image_id_tags() {