summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDave Wallace <dwallacelf@gmail.com>2021-04-16 13:56:29 -0400
committerDave Wallace <dwallacelf@gmail.com>2021-04-21 19:04:05 -0400
commita7faf830653c06d06e54459f74b93d18fed9ea5f (patch)
tree068af8bf35a9cfefbf3bf45a0ea3bf03ba54cc4c
parentf8747a9f7a238c033f80c54bd18239915b2c0648 (diff)
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
-rwxr-xr-xdocker/scripts/update_dockerhub_prod_tags.sh5
1 files changed, 4 insertions, 1 deletions
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() {