Merge branch '2.1.x' into 2.2.x

Closes gh-20587
This commit is contained in:
Andy Wilkinson 2020-03-20 10:54:43 +00:00
commit 242e6b9974

View File

@ -3,7 +3,7 @@
ISSUE_TITLE="Upgrade Ubuntu version in CI images"
ubuntu="bionic"
latest=$( curl -s "https://partner-images.canonical.com/core/$ubuntu/current/unpacked/build-info.txt" | awk '{split($0, parts, "="); print parts[2]}' )
latest=$( curl -s "https://hub.docker.com/v2/repositories/library/ubuntu/tags/?page_size=1&page=1&name=$ubuntu" | jq -c -r '.results[0].name' | awk '{split($0, parts, "-"); print parts[2]}' )
current=$( grep "ubuntu:$ubuntu" git-repo/ci/images/spring-boot-ci-image/Dockerfile | awk '{split($0, parts, "-"); print parts[2]}' )
if [[ $current = $latest ]]; then