From 57cd1ff07fa606cf2b7e77c4d3f745e54844512f Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Thu, 3 Feb 2022 08:35:16 +0100 Subject: [PATCH 1/2] Upgrade Ubuntu version in CI images Closes gh-29628 --- 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 34de38ae58f..14be5d4ba46 100644 --- a/ci/images/ci-image-jdk11/Dockerfile +++ b/ci/images/ci-image-jdk11/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:focal-20220105 +FROM ubuntu:focal-20220113 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 7a537daf072..c74047349b1 100644 --- a/ci/images/ci-image-jdk17/Dockerfile +++ b/ci/images/ci-image-jdk17/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:focal-20220105 +FROM ubuntu:focal-20220113 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 393a6cb9b6a..0cd3fe9430a 100644 --- a/ci/images/ci-image/Dockerfile +++ b/ci/images/ci-image/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:focal-20220105 +FROM ubuntu:focal-20220113 ADD setup.sh /setup.sh ADD get-jdk-url.sh /get-jdk-url.sh From 080de85e2e85cbe2d6788c5c2f8c331226cdce70 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Thu, 3 Feb 2022 08:36:03 +0100 Subject: [PATCH 2/2] Upgrade Java 17 version in CI image Closes gh-29626 --- ci/images/get-jdk-url.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/images/get-jdk-url.sh b/ci/images/get-jdk-url.sh index d404512631c..94cf5dc12c2 100755 --- a/ci/images/get-jdk-url.sh +++ b/ci/images/get-jdk-url.sh @@ -9,7 +9,7 @@ case "$1" in echo "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.14%2B9/OpenJDK11U-jdk_x64_linux_hotspot_11.0.14_9.tar.gz" ;; java17) - echo "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.1%2B12/OpenJDK17U-jdk_x64_linux_hotspot_17.0.1_12.tar.gz" + echo "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.2%2B8/OpenJDK17U-jdk_x64_linux_hotspot_17.0.2_8.tar.gz" ;; *) echo $"Unknown java version"