Merge branch '2.6.x' into 2.7.x

Closes gh-32947
pull/33648/head
Andy Wilkinson 2 years ago
commit 471e6f9299

@ -2,7 +2,7 @@
ISSUE_TITLE="Upgrade Ubuntu version in CI images" ISSUE_TITLE="Upgrade Ubuntu version in CI images"
ubuntu="focal" ubuntu="jammy"
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]}' ) 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/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]}' )

Loading…
Cancel
Save