From 9109a79d8d6559e162c2f7c1c38c593af2f14069 Mon Sep 17 00:00:00 2001 From: Sheogorath Date: Sat, 4 Nov 2017 21:57:32 +0100 Subject: [PATCH] Fix paging for tags --- tests/version.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tests/version.sh b/tests/version.sh index a47922b..3aadd6a 100755 --- a/tests/version.sh +++ b/tests/version.sh @@ -14,7 +14,7 @@ command_exits() { command -v $1 >/dev/null 2>&1 || { echo >&2 "I require $1 but # Docker latest version tag # See: https://www.shivering-isles.com/helpful-shell-snippets-for-docker-testing-and-bootstrapping/ -docker_image_latest_tag() { REPO=$1; [ $(echo $REPO | grep '/' | wc -l) -eq 0 ] && REPO=library/$1; wget -q -O- https://registry.hub.docker.com/v2/repositories/${REPO}/tags | jq .results[].name | sort -V | sed -e 's/"//g' | grep -P '^[[:digit:]]+((.[[:digit:]]+)?.[[:digit:]]+)' | tail -1; } +docker_image_latest_tag() { REPO=$1; [ $(echo $REPO | grep '/' | wc -l) -eq 0 ] && REPO=library/$1; wget -q -O- https://registry.hub.docker.com/v2/repositories/${REPO}/tags\?page\=1\&page_size\=250 | jq .results[].name | sed -e 's/"//g' | sort -V | grep -v "rc" | grep -P '^[[:digit:]]+((.[[:digit:]]+)?.[[:digit:]]+)$' | tail -1; } # Version comparison greater or equal # See: https://www.shivering-isles.com/helpful-shell-snippets-for-docker-testing-and-bootstrapping/ @@ -32,4 +32,6 @@ command_exits wget [ -e "$DOCKERFILE" ] || { echo >&2 "File '$DOCKERFILE' doesn't exist. Aborting."; exit 1; } +echo $(docker_image_latest_tag `docker_base_name "$DOCKERFILE"` | cut -d. -f1-2) + version_ge $(docker_base_version "$DOCKERFILE") $(docker_image_latest_tag `docker_base_name "$DOCKERFILE"` | cut -d. -f1-2) && echo "Base image is up to date! Test successful." || { echo >&2 "A newer base image is available! Please update."; exit 1; }