From 5e284d9434d09c4d7d62ba25a70b13ede39cb986 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Thu, 29 Apr 2021 10:13:59 +0200 Subject: [PATCH 1/3] Upgrade Ubuntu version in CI images Closes gh-26287 --- ci/images/ci-image-jdk11/Dockerfile | 2 +- ci/images/ci-image-jdk15/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 45ea8e963f..34466ebf53 100644 --- a/ci/images/ci-image-jdk11/Dockerfile +++ b/ci/images/ci-image-jdk11/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:focal-20210401 +FROM ubuntu:focal-20210416 ADD setup.sh /setup.sh ADD get-jdk-url.sh /get-jdk-url.sh diff --git a/ci/images/ci-image-jdk15/Dockerfile b/ci/images/ci-image-jdk15/Dockerfile index 477ddb6c36..42559192ff 100644 --- a/ci/images/ci-image-jdk15/Dockerfile +++ b/ci/images/ci-image-jdk15/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:focal-20210401 +FROM ubuntu:focal-20210416 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 bcc00ba348..1ffa630a5b 100644 --- a/ci/images/ci-image/Dockerfile +++ b/ci/images/ci-image/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:focal-20210401 +FROM ubuntu:focal-20210416 ADD setup.sh /setup.sh ADD get-jdk-url.sh /get-jdk-url.sh From a3414fe80339e666d0e693dfeec61a377b4013cc Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Thu, 29 Apr 2021 10:15:03 +0200 Subject: [PATCH 2/3] Upgrade Ubuntu version in CI images Closes gh-26288 --- 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 45ea8e963f..34466ebf53 100644 --- a/ci/images/ci-image-jdk11/Dockerfile +++ b/ci/images/ci-image-jdk11/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:focal-20210401 +FROM ubuntu:focal-20210416 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 6aadb7776b..3795732860 100644 --- a/ci/images/ci-image-jdk16/Dockerfile +++ b/ci/images/ci-image-jdk16/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:focal-20210401 +FROM ubuntu:focal-20210416 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 bcc00ba348..1ffa630a5b 100644 --- a/ci/images/ci-image/Dockerfile +++ b/ci/images/ci-image/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:focal-20210401 +FROM ubuntu:focal-20210416 ADD setup.sh /setup.sh ADD get-jdk-url.sh /get-jdk-url.sh From 61758b04ae8dc8ba7243dac8a8d695ffbddfa94a Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Thu, 29 Apr 2021 10:15:40 +0200 Subject: [PATCH 3/3] Upgrade Java 16 version in CI image Closes gh-26291 --- 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 c539e19df3..91d2dc9912 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/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9/OpenJDK11U-jdk_x64_linux_hotspot_11.0.11_9.tar.gz" ;; java16) - echo "https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36/OpenJDK16-jdk_x64_linux_hotspot_16_36.tar.gz" + echo "https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9/OpenJDK16U-jdk_x64_linux_hotspot_16.0.1_9.tar.gz" ;; *) echo $"Unknown java version"