summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVratko Polak <vrpolak@cisco.com>2021-04-22 14:28:45 +0000
committerGerrit Code Review <gerrit@fd.io>2021-04-22 14:28:45 +0000
commit07afa5e16b729b4a8e03b2e35cfee168c2c5dd76 (patch)
tree553d96c26f9f64b72d711e970953688de1ade532
parent6e2c967568b4059dd0fd5e72ad7bb01dc569ef39 (diff)
parenta7faf830653c06d06e54459f74b93d18fed9ea5f (diff)
Merge "Fix docker image update script"
-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() {