From a7faf830653c06d06e54459f74b93d18fed9ea5f Mon Sep 17 00:00:00 2001 From: Dave Wallace Date: Fri, 16 Apr 2021 13:56:29 -0400 Subject: Fix docker image update script - Handle case where the original image has been deleted from dockerhub. Signed-off-by: Dave Wallace Change-Id: Ifcb34f39b36f2974d45a48754b72d33e9cfc4b06 --- docker/scripts/update_dockerhub_prod_tags.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/docker/scripts/update_dockerhub_prod_tags.sh b/docker/scripts/update_dockerhub_prod_tags.sh index 187b640d..890beb3e 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() { -- cgit 1.2.3-korg