From 6695f6604549488c04752a54134fa7128d9f116e Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Thu, 13 Jan 2022 10:06:18 +0100 Subject: [PATCH 1/6] 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 75c043fbfae..34de38ae58f 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 a23e34aed08..7a537daf072 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 36c2ba862b4..393a6cb9b6a 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/6] 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 ae14e7ebf56..63a09f3dea2 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"; From c4c90a3e7de341cb60e5d04cfdfa9d7ee32f9787 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Thu, 13 Jan 2022 10:08:33 +0100 Subject: [PATCH 3/6] Upgrade Ubuntu version in CI images Closes gh-29359 --- 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 75c043fbfae..34de38ae58f 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 a23e34aed08..7a537daf072 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 36c2ba862b4..393a6cb9b6a 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 36aa085a4c6727162f463e54e664ad158c397cef Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Thu, 13 Jan 2022 10:09:13 +0100 Subject: [PATCH 4/6] Upgrade CI to Docker 20.10.12 Closes gh-29358 --- 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 ae14e7ebf56..63a09f3dea2 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"; From d93aeaefa2bc9042098ceb3d4188d147c43eb6e8 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Thu, 13 Jan 2022 10:10:50 +0100 Subject: [PATCH 5/6] Upgrade Ubuntu version in CI images Closes gh-29360 --- 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 75c043fbfae..34de38ae58f 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 a23e34aed08..7a537daf072 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 36c2ba862b4..393a6cb9b6a 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 2cc15dc671cbf88631238c667a9c672afe0cd7a0 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Thu, 13 Jan 2022 10:11:25 +0100 Subject: [PATCH 6/6] Upgrade CI to Docker 20.10.12 Closes gh-29361 --- 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 ae14e7ebf56..63a09f3dea2 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";