added JDK 22 to OracleJava, replaced JDK 21 with JDK 22 in OracleOpen…

…JDK (#2774)

Signed-off-by: Aurelio Garcia-Ribeyro <[email protected]>

OracleJava/22/Dockerfile

@@ -0,0 +1,88 @@
+# Copyright (c) 2022, 2024 Oracle and/or its affiliates.
+#
+# Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
+#
+# ORACLE DOCKERFILES PROJECT
+# --------------------------
+# This is the Dockerfile for Oracle JDK 22 on Oracle Linux 8
+#
+# REQUIRED FILES TO BUILD THIS IMAGE
+# ----------------------------------
+# This dockerfile will download a copy of JDK 22 from
+#	https://download.oracle.com/java/22/latest/jdk-22_linux-<ARCH>_bin.tar.gz  
+# 
+# It will use either x64 or aarch64 depending on the target platform
+#
+# HOW TO BUILD THIS IMAGE
+# -----------------------
+# Run:
+#      $ docker build -t oracle/jdk:22 .
+#
+# This command is already scripted in build.sh so you can alternatively run
+#		$ bash build.sh
+#
+# The builder image will be used to uncompress the tar.gz file with the Java Runtime.
+
+FROM oraclelinux:8 as builder
+
+LABEL maintainer="Aurelio Garcia-Ribeyro <[email protected]>"
+
+# Since the files are compressed as tar.gz first dnf install tar. gzip is already in oraclelinux:8
+RUN set -eux; \
+	dnf install -y tar; 
+
+# Default to UTF-8 file.encoding
+ENV LANG en_US.UTF-8
+
+# Environment variables for the builder image.
+# Required to validate that you are using the correct file
+
+ENV JAVA_URL=https://download.oracle.com/java/22/latest \
+	JAVA_HOME=/usr/java/jdk-22
+
+##
+SHELL ["/bin/bash", "-o", "pipefail", "-c"]
+RUN set -eux; \
+	ARCH="$(uname -m)" && \
+	# Java uses just x64 in the name of the tarball
+    if [ "$ARCH" = "x86_64" ]; \
+        then ARCH="x64"; \
+    fi && \
+    JAVA_PKG="$JAVA_URL"/jdk-22_linux-"${ARCH}"_bin.tar.gz ; \
+	JAVA_SHA256=$(curl "$JAVA_PKG".sha256) ; \ 
+	curl --output /tmp/jdk.tgz "$JAVA_PKG" && \
+	echo "$JAVA_SHA256" */tmp/jdk.tgz | sha256sum -c; \
+	mkdir -p "$JAVA_HOME"; \
+	tar --extract --file /tmp/jdk.tgz --directory "$JAVA_HOME" --strip-components 1
+
+## Get a fresh version of OL8 for the final image	
+FROM oraclelinux:8
+
+# Default to UTF-8 file.encoding
+ENV LANG en_US.UTF-8
+ENV	JAVA_HOME=/usr/java/jdk-22
+ENV	PATH $JAVA_HOME/bin:$PATH	
+
+# If you need the Java Version you can read it from the release file with 
+# JAVA_VERSION=$(sed -n '/^JAVA_VERSION="/{s///;s/"//;p;}' "$JAVA_HOME"/release);
+
+# Copy the uncompressed Java Runtime from the builder image
+COPY --from=builder $JAVA_HOME $JAVA_HOME
+
+RUN set -eux; \
+# Ensure we get the latest OL 8 updates available at build time
+	dnf -y update; \
+# JDK assumes freetype is available	
+	dnf install -y \
+		freetype fontconfig \
+	; \
+	rm -rf /var/cache/dnf; \
+	ln -sfT "$JAVA_HOME" /usr/java/default; \
+	ln -sfT "$JAVA_HOME" /usr/java/latest; \
+	for bin in "$JAVA_HOME/bin/"*; do \
+		base="$(basename "$bin")"; \
+		[ ! -e "/usr/bin/$base" ]; \
+		alternatives --install "/usr/bin/$base" "$base" "$bin" 20000; \
+	done;
+
+CMD ["jshell"]

OracleJava/22/build.sh

@@ -0,0 +1,8 @@
+#!/bin/sh
+
+# Copyright (c) 2024 Oracle and/or its affiliates.
+#
+# Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
+
+echo "Building Oracle JDK 22 on Oracle Linux 8"
+docker build --file Dockerfile --tag oracle/jdk:22-ol8 .

OracleJava/README.md

@@ -1,24 +1,24 @@
 # Oracle Java in Containers
 
-This repository contains sample container configurations to facilitate installation and environment setup for DevOps users. This project provides container images based on Oracle Linux for JDK versions 21, 17, 11 and 8 as well as Server JRE 8.
+This repository contains sample container configurations to facilitate installation and environment setup for DevOps users. This project provides container images based on Oracle Linux for JDK versions 22, 21, 17, 11 and 8 as well as Server JRE 8.
 
 Oracle Java Server JRE provides the features from Oracle Java JDK commonly required for server-side applications (i.e. Running a Java EE application server). For more information about Server JRE, visit the [Understanding the Server JRE blog entry](https://blogs.oracle.com/java-platform-group/understanding-the-server-jre) from the Java Product Management team.
 
 ## Building the Oracle Java base image
 
-For JDK 21 and 17 the required JDK binaries will be downloaded from [Oracle](https://www.oracle.com/javadownload) as part of the build using curl.
+For JDK 22, 21, and 17 the required JDK binaries will be downloaded from [Oracle](https://www.oracle.com/javadownload) as part of the build using curl.
 
 For JDK 11 and JDK 8 you must first download the linux x64 or linux aarch64 compressed archive (tar.gz), for Server JRE 8 you must download the linux x64 compressed archive, from [https://oracle.com/javadownload](https://www.oracle.com/javadownload) and place it in the same directory as the corresponding Dockerfile.
 
 e.g. for JDK 11 download jdk-11[X]_linux-x64_bin.tar.gz into OracleJava/11, for Server JRE 8 download server-jre-8uXXX-linux-x64.tar.gz into OracleJava/8/serverjre
 
 To build the container image run `docker build`. Tag it with the correct version number.
 
-e.g. For JDK 21 run
+e.g. For JDK 22 run
 
 ```bash
-cd ../OracleJava/21
-docker build --tag oracle/jdk:21 .
+cd ../OracleJava/22
+docker build --tag oracle/jdk:22 .
 ```
 
 for Server JRE 8 run
@@ -36,7 +36,7 @@ bash build.sh
 
 ### Parent image OS version
 
-The Oracle Java images for JDK 17 and 21 use `oraclelinux:8` as the parent image.
+The Oracle Java images for JDK 22, 21, and 17 use `oraclelinux:8` as the parent image.
 The Oracle Java image for JDK 11, JDK 8, and Server JRE 8 use `oraclelinux:7-slim` as the parent image.
 
 JDK 11, JDK 8, and Server JRE 8 allow for optionally building on `oraclelinux:8` by using `Dockerfile.8` rather than `Dockerfile`.
@@ -60,12 +60,12 @@ The script `build.sh` will tag the images it creates with the JDK version, and w
 
 ## Licenses
 
-JDK 21 and 17 are downloaded, as part of the build process, from the [Oracle Website](https://www.oracle.com/javadownload) under the [Oracle No-Fee Terms and Conditions (NFTC)](https://java.com/freeuselicense).
+JDK 22, 21, and 17 are downloaded, as part of the build process, from the [Oracle Website](https://www.oracle.com/javadownload) under the [Oracle No-Fee Terms and Conditions (NFTC)](https://java.com/freeuselicense).
 
 For building JDK 11, JDK 8, and Server JRE 8 you must first download the corresponding Java Runtime from the [Oracle Website](https://www.oracle.com/javadownload) and accept the license indicated on that page.
 
 All scripts and files hosted in this project and GitHub [`docker/OracleJava`](./) repository, required to build the container images are, unless otherwise noted, released under the [UPL 1.0](https://oss.oracle.com/licenses/upl/) license.
 
 ## Customer Support
 
-Oracle offers support for JDK 21, JDK 17, JDK 11, and JDK 8 (JDK and Server JRE) when running on certified operating systems in a container. For additional details on the JDK Certified System Configurations, please refer to the [Oracle Java SE Certified System Configuration Pages](https://www.oracle.com/technetwork/java/javaseproducts/documentation/index.html#sysconfig).
+Oracle offers support for JDK 22, JDK 21, JDK 17, JDK 11, and JDK 8 (JDK and Server JRE) when running on certified operating systems in a container. For additional details on the JDK Certified System Configurations, please refer to the [Oracle Java SE Certified System Configuration Pages](https://www.oracle.com/technetwork/java/javaseproducts/documentation/index.html#sysconfig).

OracleOpenJDK/21/Dockerfile → OracleOpenJDK/22/Dockerfile

@@ -1,21 +1,21 @@
-# Copyright (c) 2022, 2023 Oracle and/or its affiliates.
+# Copyright (c) 2022, 2024 Oracle and/or its affiliates.
 #
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 #
 # ORACLE DOCKERFILES PROJECT
 # --------------------------
-# This is the Dockerfile for Oracle OpenJDK 21 on Oracle Linux 8
+# This is the Dockerfile for Oracle OpenJDK 22 on Oracle Linux 8
 #
 # REQUIRED FILES TO BUILD THIS IMAGE
 # ----------------------------------
 #
-# (1) openjdk-21.xx_linux-x64_bin.tar.gz
-#     Downloaded from https://jdk.java.net/21/
+# (1) openjdk-22.xx_linux-x64_bin.tar.gz
+#     Downloaded from https://jdk.java.net/22/
 #
 # HOW TO BUILD THIS IMAGE
 # -----------------------
 # Run:
-#      $ docker build -t oracle/openjdk:21 .
+#      $ docker build -t oracle/openjdk:22 .
 #
 # This command is already scripted in build.sh so you can alternatively run
 #		$ bash build.sh
@@ -25,8 +25,8 @@ FROM oraclelinux:8
 
 LABEL maintainer="Aurelio Garcia-Ribeyro <[email protected]>"
 
-ENV JAVA_URL=https://download.java.net/java/GA/jdk21.0.2/f2283984656d49d69e91c558476027ac/13/GPL \
-	JAVA_HOME=/usr/java/jdk-21 \
+ENV JAVA_URL=https://download.java.net/java/GA/jdk22/830ec9fcccef480bb3e73fb7ecafe059/36/GPL \
+	JAVA_HOME=/usr/java/jdk-22 \
 	LANG=en_US.UTF-8
 
 
@@ -50,7 +50,7 @@ RUN set -eux; \
     if [ "$ARCH" = "x86_64" ]; \
         then ARCH="x64"; \
     fi && \
-    JAVA_PKG="$JAVA_URL"/openjdk-21.0.2_linux-"${ARCH}"_bin.tar.gz ; \
+    JAVA_PKG="$JAVA_URL"/openjdk-22_linux-"${ARCH}"_bin.tar.gz ; \
 	JAVA_SHA256="$(curl "$JAVA_PKG".sha256)" ; \ 
 	curl --output /tmp/jdk.tgz "$JAVA_PKG" && \
 	echo "$JAVA_SHA256" */tmp/jdk.tgz | sha256sum -c -; \

OracleOpenJDK/21/build.sh → OracleOpenJDK/22/build.sh

@@ -4,5 +4,5 @@
 #
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
-echo "Building OpenJDK 21 on Oracle Linux 8"
-docker build --file Dockerfile --tag oracle/openjdk:21-ol8 .
+echo "Building OpenJDK 22 on Oracle Linux 8"
+docker build --file Dockerfile --tag oracle/openjdk:22-ol8 .

OracleOpenJDK/README.md

@@ -6,11 +6,11 @@ This repository contains sample container configurations to facilitate installat
 
 Navigate to the folder containing the `Dockerfile` and run `docker build`, tagging the image with the version number:
 
-e.g. for OpenJDK 21 run
+e.g. for OpenJDK 22 run
 
 ```bash
-cd ../OracleOpenJDK/21
-docker build -t oracle/openjdk:21 .
+cd ../OracleOpenJDK/22
+docker build -t oracle/openjdk:22 .
 ```
 
 This command is already scripted in `build.sh` so you can alternatively run:
@@ -21,7 +21,7 @@ bash build.sh
 
 ### Parent image OS version
 
-The Oracle Java images for OpenJDK 21 uses `oraclelinux:8` as the default parent image.
+The Oracle Java images for OpenJDK 22 uses `oraclelinux:8` as the default parent image.
 
 ## License