From f8f7a24dde7f5d7b75108cbbaf0d220093fc0258 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Thu, 24 Mar 2022 08:43:42 +0100 Subject: [PATCH 1/4] Upgrade Ubuntu version in CI images Closes gh-30400 --- ci/images/ci-image-jdk11/Dockerfile | 2 +- ci/images/ci-image-jdk17/Dockerfile | 2 +- ci/images/ci-image-jdk18/Dockerfile | 2 +- ci/images/ci-image/Dockerfile | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ci/images/ci-image-jdk11/Dockerfile b/ci/images/ci-image-jdk11/Dockerfile index 7d6bd647b48..9eca829ae35 100644 --- a/ci/images/ci-image-jdk11/Dockerfile +++ b/ci/images/ci-image-jdk11/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:focal-20220302 +FROM ubuntu:focal-20220316 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 8e3b9f94ddd..52d1de8b3d6 100644 --- a/ci/images/ci-image-jdk17/Dockerfile +++ b/ci/images/ci-image-jdk17/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:focal-20220302 +FROM ubuntu:focal-20220316 ADD setup.sh /setup.sh ADD get-jdk-url.sh /get-jdk-url.sh diff --git a/ci/images/ci-image-jdk18/Dockerfile b/ci/images/ci-image-jdk18/Dockerfile index 86389feb021..96366af97e8 100644 --- a/ci/images/ci-image-jdk18/Dockerfile +++ b/ci/images/ci-image-jdk18/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:focal-20220302 +FROM ubuntu:focal-20220316 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 ad09a6b2453..a425bf3bf1f 100644 --- a/ci/images/ci-image/Dockerfile +++ b/ci/images/ci-image/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:focal-20220302 +FROM ubuntu:focal-20220316 ADD setup.sh /setup.sh ADD get-jdk-url.sh /get-jdk-url.sh From 5deb8d7edc3eb9134809323b6f54654a96d0d0d3 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Thu, 24 Mar 2022 08:44:19 +0100 Subject: [PATCH 2/4] Upgrade Java 18 version in CI image Closes gh-30401 --- 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 e46f958725c..c959027b4de 100755 --- a/ci/images/get-jdk-url.sh +++ b/ci/images/get-jdk-url.sh @@ -12,7 +12,7 @@ case "$1" in 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" ;; java18) - echo "https://github.com/adoptium/temurin18-binaries/releases/download/jdk18-2022-03-10-06-10-beta/OpenJDK18-jdk_x64_linux_hotspot_2022-03-10-06-10.tar.gz" + echo "https://github.com/adoptium/temurin18-binaries/releases/download/jdk18-2022-03-17-09-00-beta/OpenJDK18-jdk_x64_linux_hotspot_2022-03-17-09-00.tar.gz" ;; *) echo $"Unknown java version" From 02e16675f3ac560782bb420bc06b9413ceac57da Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Thu, 24 Mar 2022 08:45:22 +0100 Subject: [PATCH 3/4] Upgrade Ubuntu version in CI images Closes gh-30397 --- ci/images/ci-image-jdk11/Dockerfile | 2 +- ci/images/ci-image-jdk17/Dockerfile | 2 +- ci/images/ci-image-jdk18/Dockerfile | 2 +- ci/images/ci-image/Dockerfile | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ci/images/ci-image-jdk11/Dockerfile b/ci/images/ci-image-jdk11/Dockerfile index 7d6bd647b48..9eca829ae35 100644 --- a/ci/images/ci-image-jdk11/Dockerfile +++ b/ci/images/ci-image-jdk11/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:focal-20220302 +FROM ubuntu:focal-20220316 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 8e3b9f94ddd..52d1de8b3d6 100644 --- a/ci/images/ci-image-jdk17/Dockerfile +++ b/ci/images/ci-image-jdk17/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:focal-20220302 +FROM ubuntu:focal-20220316 ADD setup.sh /setup.sh ADD get-jdk-url.sh /get-jdk-url.sh diff --git a/ci/images/ci-image-jdk18/Dockerfile b/ci/images/ci-image-jdk18/Dockerfile index 86389feb021..96366af97e8 100644 --- a/ci/images/ci-image-jdk18/Dockerfile +++ b/ci/images/ci-image-jdk18/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:focal-20220302 +FROM ubuntu:focal-20220316 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 ad09a6b2453..a425bf3bf1f 100644 --- a/ci/images/ci-image/Dockerfile +++ b/ci/images/ci-image/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:focal-20220302 +FROM ubuntu:focal-20220316 ADD setup.sh /setup.sh ADD get-jdk-url.sh /get-jdk-url.sh From 2b7712a2f12a36fe3d88555cfcd5a7285ef65583 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Thu, 24 Mar 2022 08:46:52 +0100 Subject: [PATCH 4/4] Upgrade Java 18 version in CI image Closes gh-30398 --- 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 e46f958725c..c959027b4de 100755 --- a/ci/images/get-jdk-url.sh +++ b/ci/images/get-jdk-url.sh @@ -12,7 +12,7 @@ case "$1" in 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" ;; java18) - echo "https://github.com/adoptium/temurin18-binaries/releases/download/jdk18-2022-03-10-06-10-beta/OpenJDK18-jdk_x64_linux_hotspot_2022-03-10-06-10.tar.gz" + echo "https://github.com/adoptium/temurin18-binaries/releases/download/jdk18-2022-03-17-09-00-beta/OpenJDK18-jdk_x64_linux_hotspot_2022-03-17-09-00.tar.gz" ;; *) echo $"Unknown java version"