Merge branch '2.1.x' into 2.2.x

Closes gh-23700
This commit is contained in:
Brian Clozel 2020-10-15 11:08:10 +02:00
commit f43970e6e0
1 changed files with 1 additions and 1 deletions

View File

@ -4,7 +4,7 @@ ISSUE_TITLE="Upgrade Ubuntu version in CI images"
ubuntu="focal"
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]}' )
current=$( grep "ubuntu:$ubuntu" git-repo/ci/images/ci-image/Dockerfile | awk '{split($0, parts, "-"); print parts[2]}' )
if [[ $current = $latest ]]; then
echo "Already up-to-date"