From 6695f6604549488c04752a54134fa7128d9f116e Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Thu, 13 Jan 2022 10:06:18 +0100 Subject: [PATCH 1/2] Upgrade Ubuntu version in CI images Closes gh-29363 --- ci/images/ci-image-jdk11/Dockerfile | 2 +- ci/images/ci-image-jdk17/Dockerfile | 2 +- ci/images/ci-image/Dockerfile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ci/images/ci-image-jdk11/Dockerfile b/ci/images/ci-image-jdk11/Dockerfile index 75c043fbfae4..34de38ae58fe 100644 --- a/ci/images/ci-image-jdk11/Dockerfile +++ b/ci/images/ci-image-jdk11/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:focal-20211006 +FROM ubuntu:focal-20220105 ADD setup.sh /setup.sh ADD get-jdk-url.sh /get-jdk-url.sh diff --git a/ci/images/ci-image-jdk17/Dockerfile b/ci/images/ci-image-jdk17/Dockerfile index a23e34aed08d..7a537daf0729 100644 --- a/ci/images/ci-image-jdk17/Dockerfile +++ b/ci/images/ci-image-jdk17/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:focal-20211006 +FROM ubuntu:focal-20220105 ADD setup.sh /setup.sh ADD get-jdk-url.sh /get-jdk-url.sh diff --git a/ci/images/ci-image/Dockerfile b/ci/images/ci-image/Dockerfile index 36c2ba862b4d..393a6cb9b6a7 100644 --- a/ci/images/ci-image/Dockerfile +++ b/ci/images/ci-image/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:focal-20211006 +FROM ubuntu:focal-20220105 ADD setup.sh /setup.sh ADD get-jdk-url.sh /get-jdk-url.sh From a96434467adfdc85d816c394ec9577b7a0a8d0fd Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Thu, 13 Jan 2022 10:06:59 +0100 Subject: [PATCH 2/2] Upgrade CI to Docker 20.10.12 Closes gh-29362 --- ci/images/get-docker-url.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/images/get-docker-url.sh b/ci/images/get-docker-url.sh index ae14e7ebf565..63a09f3dea23 100755 --- a/ci/images/get-docker-url.sh +++ b/ci/images/get-docker-url.sh @@ -1,5 +1,5 @@ #!/bin/bash set -e -version="20.10.11" +version="20.10.12" echo "https://download.docker.com/linux/static/stable/x86_64/docker-$version.tgz";