From 3b1a1bd77faba539c362cb7226d8ed38fc276f10 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Thu, 7 Oct 2021 09:43:34 +0200 Subject: [PATCH 1/4] Upgrade Ubuntu version in CI images Closes gh-28219 --- ci/images/ci-image-jdk11/Dockerfile | 2 +- ci/images/ci-image-jdk16/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 b8c3e24803..6a70464837 100644 --- a/ci/images/ci-image-jdk11/Dockerfile +++ b/ci/images/ci-image-jdk11/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:focal-20210827 +FROM ubuntu:focal-20210921 ADD setup.sh /setup.sh ADD get-jdk-url.sh /get-jdk-url.sh diff --git a/ci/images/ci-image-jdk16/Dockerfile b/ci/images/ci-image-jdk16/Dockerfile index 1ec7f07843..a2c6b5da0b 100644 --- a/ci/images/ci-image-jdk16/Dockerfile +++ b/ci/images/ci-image-jdk16/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:focal-20210827 +FROM ubuntu:focal-20210921 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 9ac3a63400..3c224ba24a 100644 --- a/ci/images/ci-image/Dockerfile +++ b/ci/images/ci-image/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:focal-20210827 +FROM ubuntu:focal-20210921 ADD setup.sh /setup.sh ADD get-jdk-url.sh /get-jdk-url.sh From ab6c6b7f173bd99ab4af0fdb3ce1c3e43c258708 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Thu, 7 Oct 2021 09:44:18 +0200 Subject: [PATCH 2/4] Upgrade CI to Docker 20.10.9 Closes gh-28218 --- 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 60d02d1919..b868929740 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.8" +version="20.10.9" echo "https://download.docker.com/linux/static/stable/x86_64/docker-$version.tgz"; From 92aa791b1f16baa6fd9955b6927bd34a709f7f0e Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Thu, 7 Oct 2021 09:45:22 +0200 Subject: [PATCH 3/4] Upgrade Ubuntu version in CI images Closes gh-28215 --- 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 b8c3e24803..6a70464837 100644 --- a/ci/images/ci-image-jdk11/Dockerfile +++ b/ci/images/ci-image-jdk11/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:focal-20210827 +FROM ubuntu:focal-20210921 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 45bf983442..4cd74f75ea 100644 --- a/ci/images/ci-image-jdk17/Dockerfile +++ b/ci/images/ci-image-jdk17/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:focal-20210827 +FROM ubuntu:focal-20210921 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 9ac3a63400..3c224ba24a 100644 --- a/ci/images/ci-image/Dockerfile +++ b/ci/images/ci-image/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:focal-20210827 +FROM ubuntu:focal-20210921 ADD setup.sh /setup.sh ADD get-jdk-url.sh /get-jdk-url.sh From b222461c04e3583c0e35bea521dc36acdd39d5df Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Thu, 7 Oct 2021 09:45:47 +0200 Subject: [PATCH 4/4] Upgrade CI to Docker 20.10.9 Closes gh-28216 --- 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 60d02d1919..b868929740 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.8" +version="20.10.9" echo "https://download.docker.com/linux/static/stable/x86_64/docker-$version.tgz";