Use JDK 21.0.1+12, not 21+35 (jenkinsci#1779)

* Use JDK 21.0.1_12 instead of 21_35 - latest JDK 21 release Only updates in the non-preview configurations. Preview configurations need a separate commit. * Use ubi9:3-1361, not ubi9:2-722 Most recent release of the UBI 9 container * Use JDK 21.0.1_12, not 21_35 in preview containers
MarkEWaite · Nov 9, 2023 · c7ae4b8 · c7ae4b8
1 parent 2d7c0c9
commit c7ae4b8
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 8 deletions.
diff --git a/21/alpine/hotspot/Dockerfile b/21/alpine/hotspot/Dockerfile
@@ -1,5 +1,5 @@
 ARG ALPINE_TAG=3.18.4
-ARG JAVA_VERSION=21_35
+ARG JAVA_VERSION=21.0.1_12
 FROM eclipse-temurin:"${JAVA_VERSION}"-jdk-alpine AS jre-build
 
 # Generate smaller java runtime without unneeded files

diff --git a/21/debian/bookworm-slim/hotspot/Dockerfile b/21/debian/bookworm-slim/hotspot/Dockerfile
@@ -1,5 +1,5 @@
 ARG BOOKWORM_TAG=20231030
-ARG JAVA_VERSION=21_35
+ARG JAVA_VERSION=21.0.1_12
 FROM eclipse-temurin:"${JAVA_VERSION}"-jdk-jammy as jre-build
 
 RUN if test "${TARGETPLATFORM}" != 'linux/arm/v7'; then \

diff --git a/21/debian/bookworm-slim/hotspot/preview/Dockerfile b/21/debian/bookworm-slim/hotspot/preview/Dockerfile
@@ -1,6 +1,6 @@
 ARG BOOKWORM_TAG=20231030
 FROM debian:bookworm-"${BOOKWORM_TAG}"-slim as jre-build
-ARG JAVA_VERSION=21+35
+ARG JAVA_VERSION=21.0.1_12
 ARG TARGETPLATFORM
 
 SHELL ["/bin/bash", "-o", "pipefail", "-c"]

diff --git a/21/debian/bookworm/hotspot/Dockerfile b/21/debian/bookworm/hotspot/Dockerfile
@@ -1,5 +1,5 @@
 ARG BOOKWORM_TAG=20231030
-ARG JAVA_VERSION=21_35
+ARG JAVA_VERSION=21.0.1_12
 FROM eclipse-temurin:"${JAVA_VERSION}"-jdk-jammy as jre-build
 
 RUN if test "${TARGETPLATFORM}" != 'linux/arm/v7'; then \

diff --git a/21/debian/bookworm/hotspot/preview/Dockerfile b/21/debian/bookworm/hotspot/preview/Dockerfile
@@ -1,6 +1,6 @@
 ARG BOOKWORM_TAG=20231030
 FROM debian:bookworm-"${BOOKWORM_TAG}"-slim as jre-build
-ARG JAVA_VERSION=21+35
+ARG JAVA_VERSION=21.0.1_12
 ARG TARGETPLATFORM
 
 SHELL ["/bin/bash", "-o", "pipefail", "-c"]

diff --git a/21/rhel/ubi9/hotspot/Dockerfile b/21/rhel/ubi9/hotspot/Dockerfile
@@ -1,5 +1,5 @@
-FROM registry.access.redhat.com/ubi9/ubi:9.2-722 as jre-build
-ARG JAVA_VERSION=21+35
+FROM registry.access.redhat.com/ubi9/ubi:9.3-1361 as jre-build
+ARG JAVA_VERSION=21.0.1_12
 ARG TARGETPLATFORM
 
 SHELL ["/bin/bash", "-o", "pipefail", "-c"]
@@ -28,7 +28,7 @@ RUN jlink \
   --compress=zip-6 \
   --output /javaruntime
 
-FROM registry.access.redhat.com/ubi9/ubi:9.2-722
+FROM registry.access.redhat.com/ubi9/ubi:9.3-1361
 
 ENV LANG C.UTF-8