Skip to content

Jdk25 #111

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 8 commits into
base: master
Choose a base branch
from
+38 −30
Open

Jdk25 #111

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
3303187
feat(docker-bake): add support for JDK 25 and update Windows build co…
gounthar Sep 17, 2025
b8d6588
feat(Dockerfile): add support for JDK 25 in jlink configuration
gounthar Sep 17, 2025
bd27e79
feat(Dockerfile): add support for JDK 25 in jlink configuration
gounthar Sep 17, 2025
b149a89
refactor(Dockerfile): streamline jlink options for better maintainabi…
gounthar Sep 17, 2025
460ea13
refactor(Dockerfile): simplify jlink command structure for improved r…
gounthar Sep 17, 2025
307d158
refactor(Dockerfile): optimize jlink command structure for better cla…
gounthar Sep 17, 2025
81f3708
refactor(Dockerfile): reduce jlink modules for JDK 25 to streamline c…
gounthar Sep 17, 2025
394a272
refactor(Dockerfile): update jlink modules for JDK 25 to include esse…
gounthar Sep 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 11 additions & 12 deletions alpine/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,18 +44,17 @@ RUN apk add --no-cache \
ENV PATH="/opt/jdk-${JAVA_VERSION}/bin:${PATH}"

RUN case "$(jlink --version 2>&1)" in \
"17."*) set -- "--compress=2" ;; \
# the compression argument is different for JDK21
"21."*) set -- "--compress=zip-6" ;; \
*) echo "ERROR: unmanaged jlink version pattern" && exit 1 ;; \
esac; \
jlink \
--strip-java-debug-attributes \
"$1" \
--add-modules ALL-MODULE-PATH \
--no-man-pages \
--no-header-files \
--output /javaruntime
"17."*) set -- "--compress=2" --add-modules ALL-MODULE-PATH ;; \
"21."*) set -- "--compress=zip-6" --add-modules ALL-MODULE-PATH ;; \
"25"*) set -- "--compress=zip-6" --add-modules java.base,java.logging,java.xml,java.se ;; \
*) echo "ERROR: unmanaged jlink version pattern" && exit 1 ;; \
esac; \
jlink \
--strip-java-debug-attributes \
"$@" \
--no-man-pages \
--no-header-files \
--output /javaruntime

FROM alpine:"${ALPINE_TAG}" AS build

Expand Down
23 changes: 11 additions & 12 deletions debian/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,18 +46,17 @@ ENV PATH="/opt/jdk-${JAVA_VERSION}/bin:${PATH}"
# for now we include the full module path to maintain compatibility
# while still saving space (approx 200mb from the full distribution)
RUN case "$(jlink --version 2>&1)" in \
"17."*) set -- "--compress=2" ;; \
# the compression argument is different for JDK21
"21."*) set -- "--compress=zip-6" ;; \
*) echo "ERROR: unmanaged jlink version pattern" && exit 1 ;; \
esac; \
jlink \
--strip-java-debug-attributes \
"$1" \
--add-modules ALL-MODULE-PATH \
--no-man-pages \
--no-header-files \
--output /javaruntime
"17."*) set -- "--compress=2" --add-modules ALL-MODULE-PATH ;; \
"21."*) set -- "--compress=zip-6" --add-modules ALL-MODULE-PATH ;; \
"25"*) set -- "--compress=zip-6" --add-modules java.base,java.logging,java.xml,java.se ;; \
*) echo "ERROR: unmanaged jlink version pattern" && exit 1 ;; \
esac; \
jlink \
--strip-java-debug-attributes \
"$@" \
--no-man-pages \
--no-header-files \
--output /javaruntime

FROM debian:"${DEBIAN_RELEASE}"

Expand Down
22 changes: 16 additions & 6 deletions docker-bake.hcl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,10 @@ group "linux-ppc64le" {
}

variable "jdks_to_build" {
default = [17, 21, 25]
}

variable "jdks_to_build_windows" {
default = [17, 21]
}

Expand Down Expand Up @@ -71,6 +75,10 @@ variable "JAVA21_VERSION" {
default = "21.0.8_9"
}

variable "JAVA25_VERSION" {
default = "25+9-ea-beta"
}

variable "DEBIAN_RELEASE" {
default = "trixie-20250908"
}
Expand All @@ -92,16 +100,18 @@ function "javaversion" {
params = [jdk]
result = (equal(17, jdk)
? "${JAVA17_VERSION}"
: "${JAVA21_VERSION}")
: equal(21, jdk)
? "${JAVA21_VERSION}"
: "${JAVA25_VERSION}")
}

## Specific functions
# Return an array of Alpine platforms to use depending on the jdk passed as parameter
function "alpine_platforms" {
params = [jdk]
result = (equal(21, jdk)
? ["linux/amd64", "linux/arm64"]
: ["linux/amd64"])
result = (equal(17, jdk)
? ["linux/amd64"]
: ["linux/amd64", "linux/arm64"])
}

# Return an array of Debian platforms to use depending on the jdk passed as parameter
Expand Down Expand Up @@ -191,7 +201,7 @@ target "debian" {

target "nanoserver" {
matrix = {
jdk = jdks_to_build
jdk = jdks_to_build_windows
windows_version = windowsversions("nanoserver")
}
name = "nanoserver-${windows_version}_jdk${jdk}"
Expand All @@ -216,7 +226,7 @@ target "nanoserver" {

target "windowsservercore" {
matrix = {
jdk = jdks_to_build
jdk = jdks_to_build_windows
windows_version = windowsversions("windowsservercore")
}
name = "windowsservercore-${windows_version}_jdk${jdk}"
Expand Down