Fix docker image update script 16/32016/2
authorDave Wallace <dwallacelf@gmail.com>
Fri, 16 Apr 2021 17:56:29 +0000 (13:56 -0400)
committerDave Wallace <dwallacelf@gmail.com>
Wed, 21 Apr 2021 23:04:05 +0000 (19:04 -0400)
- Handle case where the original image has been
  deleted from dockerhub.

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

docker/scripts/update_dockerhub_prod_tags.sh

index 187b640..890beb3 100755 (executable)
@@ -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() {