feat(jdk): Add Java 25 preview target for all images #939

gounthar · 2025-02-12T14:34:20Z

Introduction

The upcoming release of JDK 25 in October 2025 marks a significant milestone for Java developers, bringing new features and enhancements. Early adoption and testing of JDK 25 are crucial for ensuring compatibility and leveraging its improvements. By starting with Jenkins agent images, we can iterate incrementally, eventually extending support to Jenkins controller images and the broader Jenkins infrastructure.

Why Start with Jenkins Agent Images?

Incremental Testing: Agent images are ideal for early experimentation without disrupting the core Jenkins controller.
Modular Approach: Agents allow isolated testing of pipelines and plugins with JDK 25.
Foundation for Expansion: Success with agents can pave the way for seamless integration into controllers and infrastructure.

These changes introduce support for JDK 25 across multiple build configurations. The Dockerfiles now feature a new conditional branch in the jlink command to apply "--compress=zip-6 --add-modules java.base,java.logging,java.xml,java.se" when detecting a JDK version starting with "25." The build configurations and targets have been updated in docker-bake.hcl, along with the necessary updatecli YAML configuration adjustments. Additionally, the Windows Server Core Dockerfile is modified to install and point to JDK 25, while the build script has been reformatted without functional changes.

JDK 25 requires the --module-path option when using ALL-MODULE-PATH. JDK 24 and 25 of Temurin enable JEP 493.

Currently, I've added a minimal set of modules (java.base,java.logging,java.xml,java.se) detected using jdeps -cp "agent.jar:slave.jar" -R --print-module-deps --ignore-missing-deps agent.jar, though this might not suffice in the long run. We will need to add more than just this limited set of modules, but not necessarily all 69 of them.

Keeping the JDK25 version updated

If this PR is merged, I will then supply an updatecli manifest to keep the version updated.

Testing done

make every-build

Submitter checklist

Make sure you are opening from a topic/feature/bugfix branch (right side) and not your main branch!
Ensure that the pull request title represents the desired changelog entry
Please describe what you did
Link to relevant issues in GitHub or Jira
Link to relevant pull requests, esp. upstream and downstream changes
Ensure you have provided tests - that demonstrates feature works or fixes the issue

Fixes #6 Add Java 25 target for all images in docker bake and other necessary places. * Modify `docker-bake.hcl` to include Java 25 in various targets and functions. * Update `alpine/Dockerfile`, `debian/Dockerfile`, and `rhel/ubi9/Dockerfile` to handle Java 25 in the `jlink` command. * Modify `build.ps1` to include Java 25 in the `jdks_to_build` variable and update the `Test-Image` function. * Update `updatecli/updatecli.d/jdk21.yaml` to `updatecli/updatecli.d/jdk25.yaml` and modify relevant fields for Java 25. --- For more details, open the [Copilot Workspace session](https://copilot-workspace.githubnext.com/gounthar/docker-agent/issues/6?shareId=XXXX-XXXX-XXXX-XXXX).

docker-bake.hcl

Co-authored-by: Tim Jacomb <[email protected]>

timja

Thanks! LGTM

lemeurherveCB

Thanks!

alpine/Dockerfile

rhel/ubi9/Dockerfile

debian/Dockerfile

Thanks, Hervé! 👍 Co-authored-by: lemeurherveCB <[email protected]>

lemeurherveCB · 2025-02-13T18:47:34Z

alpine/Dockerfile

+      "17."*) options="--compress=2 --add-modules ALL-MODULE-PATH" ;; \
+      "21."*) options="--compress=zip-6 --add-modules ALL-MODULE-PATH" ;; \
+      "25"*) options="--compress=zip-6 --add-modules java.base,java.logging,java.xml,java.se" ;; \


Having the $options variable defined instead of set -- returned with $1 is more clear for L52, 👍

lemeurherveCB · 2025-02-13T18:49:45Z

alpine/Dockerfile

+      "17."*) options="--compress=2 --add-modules ALL-MODULE-PATH" ;; \
+      "21."*) options="--compress=zip-6 --add-modules ALL-MODULE-PATH" ;; \
+      "25"*) options="--compress=zip-6 --add-modules java.base,java.logging,java.xml,java.se" ;; \
+      *) echo "Unsupported Java version ($(jlink --version 2>&1))" && exit 1 ;; \


Question: why this comment change?

I remember questioning myself about this comment and its meaning, and AFAIR that concerns a jlink version pattern, not the Java version. (Could be wrong though)

I'm not familiar with the history behind that previous comment. I made this change because the original comment didn't make sense to me, and I haven't encountered such a scenario.

Now that we have three different Java versions, I thought it would be better to use this comment about the Java version, even though I highly doubt we'll ever see it since the versions we pass as arguments are defined in docker-bake.hcl.

I'm fine with reverting to the old comment if needed.

I would apply the Chesterton's fence principle here, but fine either way too.

Thank you for bringing up Chesterton's fence—it's a great principle to ensure we don't remove something valuable without understanding its purpose.🙏
That being said, I believe it also highlights the importance of questioning the status quo when the original reasoning has been lost to time or is no longer relevant.

In this case, since no one seems to recall the exact context or reasoning behind the original comment, it feels like we're in a situation similar to the famous thought experiment with the monkeys, the bananas, and the ladder.
Sometimes practices or comments persist simply because 'that's how it's always been,' even when their original purpose no longer applies.

I made this change because the old comment didn't make sense to me in the current context, and I wanted to make it clearer for anyone reading or maintaining this code in the future.

Nevertheless, I'm open to reverting it if we think preserving the old comment is more valuable, but I do think it's worth revisiting these things from time to time. 😊

rhel/ubi9/Dockerfile

Co-authored-by: lemeurherveCB <[email protected]>

The `-preview` is replicated in the URL (https://api.adoptium.net/v3/binary/version/jdk-25%2B9-ea-beta-preview/alpine-linux/x64/jdk/hotspot/normal/eclipse?project=jdk.), leading to a 404. We have to find a workaround.

lemeurherveCB · 2025-02-13T19:29:02Z

docker-bake.hcl

@gounthar The -preview suffix for JDK25 can be added in the tags sections of the targets to avoid failure.

Proposing #944 to simplify tags management and to automatically take in account JDK in preview.

gounthar · 2025-02-17T13:41:40Z

nanoserver image build fails.

12:18:48  Successfully built 64c61680f4d2
12:18:48  Successfully tagged jenkins4eval/agent:jdk17-nanoserver-ltsc2022
12:18:48   Service agent_nanoserver-ltsc2022_jdk17  Built
12:18:48   ---> Removed intermediate container ee7e14cbff56
12:18:48   ---> 06d651e612ee
12:18:48  Successfully built 06d651e612ee
12:18:48  Successfully tagged jenkins4eval/agent:jdk25-nanoserver-ltsc2022-preview
12:18:48   Service agent_nanoserver-ltsc2022_jdk25  Built
12:19:47  unexpected EOF
12:19:47  = BUILD: Finished building all images.
script returned exit code 1

…view suffix logic

…DK tags

…re images

lemeurherveCB

I've compared the list of tags generated from this PR and from #944, except the "jdk25-preview" for Windows they are the same, LGTM!

Some suggestions about HCL formatting and rhel_ubi9 jdk to build.

lemeurherveCB · 2025-03-02T12:56:41Z

docker-bake.hcl

  ]
  platforms = debian_platforms(jdk)
 }

 target "rhel_ubi9" {
  matrix = {
    type = agent_types_to_build
-    jdk  = [17, 21]
+    jdk = [17, 21, 25]


Suggested change

jdk = [17, 21, 25]

jdk = jdks_to_build

todo: no need for a special treatment here anymore. (Should have been part of #890 ideally), and restore spacing part of HCL formatting.

Extracted from #944 in #945 FYI.

lemeurherveCB · 2025-03-02T12:58:18Z

docker-bake.hcl

@@ -324,19 +350,21 @@ target "nanoserver" {
  target = type
  tags = [


Suggestion: keep "jdk25-preview" like in the Linux distribution instead of adding only "preview" at the end of the tag, help with consistency (as all Windows tags end with the Windows flavor), and allow regrouping tags definition together without a special case for this (cf #944)

Alternative: wait for #944 to be merged to simplify this PR.

lemeurherveCB · 2025-03-02T13:00:59Z

docker-bake.hcl

+      : "",
+      equal(ON_TAG, "true") ?
+      "${REGISTRY}/${orgrepo(type)}:${REMOTING_VERSION}-${BUILD_NUMBER}-alpine${ALPINE_SHORT_TAG}-jdk${jdk}${equal(jdk, 25) ? "-preview" : ""}"
+      : "",
    # If there is a tag and if the jdk is the default one, add Alpine short tags


suggestion: restore spacing on the lines below, no need for a space indentation on them.

alternative: wait for #944 to be merged.

lemeurherveCB · 2025-03-02T13:01:10Z

docker-bake.hcl

+    type = windowsagenttypes(WINDOWS_AGENT_TYPE_OVERRIDE)
+    jdk = jdks_to_build


Suggested change

type = windowsagenttypes(WINDOWS_AGENT_TYPE_OVERRIDE)

jdk = jdks_to_build

type = windowsagenttypes(WINDOWS_AGENT_TYPE_OVERRIDE)

jdk = jdks_to_build

suggestion: restore spacing, part of HCL formatting.

lemeurherveCB · 2025-03-02T13:01:29Z

docker-bake.hcl

  ]
  platforms = ["windows/amd64"]
 }

 target "windowsservercore" {
  matrix = {
-    type            = windowsagenttypes(WINDOWS_AGENT_TYPE_OVERRIDE)
-    jdk             = jdks_to_build
+    type = windowsagenttypes(WINDOWS_AGENT_TYPE_OVERRIDE)


Same as above

lemeurherveCB · 2025-03-02T13:01:41Z

docker-bake.hcl

@@ -352,11 +380,13 @@ target "windowsservercore" {
  target = type
  tags = [


Same as above

gounthar added 9 commits February 12, 2025 11:21

feat(jdk): JDK 25 early access

6e1ba2c

feat(jdk): JDK 21 is back.

eb5aa18

feat(jdk): JDK 25 will come back later on.

2011f99

fix(jdk): Back to standard.

9b8ed16

fix(jdk): Back to standard.

09ac717

Revert build.ps1 to the state at commit 45b864e

a97f43e

fix(jdk): JDK25 is available for JDK25

c1f0535

fix(jdk): Missing item separator

9457b49

gounthar marked this pull request as ready for review February 12, 2025 16:02

gounthar requested a review from a team as a code owner February 12, 2025 16:02

timja reviewed Feb 12, 2025

View reviewed changes

docker-bake.hcl Outdated Show resolved Hide resolved

Update docker-bake.hcl

b8938c7

Co-authored-by: Tim Jacomb <[email protected]>

timja previously approved these changes Feb 13, 2025

View reviewed changes

lemeurherveCB reviewed Feb 13, 2025

View reviewed changes

alpine/Dockerfile Outdated Show resolved Hide resolved

rhel/ubi9/Dockerfile Outdated Show resolved Hide resolved

debian/Dockerfile Outdated Show resolved Hide resolved

Apply suggestions from Hervé's code review.

6126454

Thanks, Hervé! 👍 Co-authored-by: lemeurherveCB <[email protected]>

gounthar dismissed timja’s stale review via 6126454 February 13, 2025 13:38

gounthar changed the title ~~feat(jdk): Add Java 25 target for all images~~ feat(jdk): Add Java 25 preview target for all images Feb 13, 2025

gounthar added 2 commits February 13, 2025 19:40

fix(docker): Revert the && instead of ;

215794f

fix(docker): Revert the && instead of ;

b6c9019

lemeurherveCB reviewed Feb 13, 2025

View reviewed changes

gounthar and others added 2 commits February 13, 2025 19:59

Update rhel/ubi9/Dockerfile

32f750b

Co-authored-by: lemeurherveCB <[email protected]>

fix(docker-bake): Using preview make the build fail

11aaa53

The `-preview` is replicated in the URL (https://api.adoptium.net/v3/binary/version/jdk-25%2B9-ea-beta-preview/alpine-linux/x64/jdk/hotspot/normal/eclipse?project=jdk.), leading to a 404. We have to find a workaround.

lemeurherveCB reviewed Feb 13, 2025

View reviewed changes

gounthar marked this pull request as draft February 14, 2025 08:17

gounthar added 2 commits February 17, 2025 11:48

Merge branch 'master' into add-java-25

6f496f7

fix(docker-bake): Add preview suffix for JDK 25 tags

7fd7bb8

gounthar added 2 commits February 17, 2025 14:49

fix(docker-bake): Simplify JDK tag generation logic for Alpine images

9a06ba1

fix(docker-bake): Refactor JDK tag generation to remove redundant pre…

24534b4

…view suffix logic

gounthar added 5 commits February 17, 2025 14:51

fix(docker-bake): Remove redundant preview suffix logic for default J…

343949c

…DK tags

fix(docker-bake): Simplify tag generation logic for default JDK images

f51a91f

fix(docker-bake): Simplify tag generation logic for Windows Server Co…

20e3c22

…re images

Merge branch 'master' into add-java-25

71197d4

Merge branch 'master' into add-java-25

5c176e2

gounthar marked this pull request as ready for review February 27, 2025 13:38

lemeurherveCB mentioned this pull request Mar 2, 2025

chore: add tags functions to docker bake #944

Open

6 tasks

lemeurherveCB reviewed Mar 2, 2025

View reviewed changes

lemeurherveCB mentioned this pull request Mar 2, 2025

chore: remove linux-agent-only and linux-inbound-agent-only groups #946

Open

6 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat(jdk): Add Java 25 preview target for all images #939

feat(jdk): Add Java 25 preview target for all images #939

gounthar commented Feb 12, 2025 •

edited

Loading

timja left a comment

lemeurherveCB left a comment

lemeurherveCB Feb 13, 2025 •

edited

Loading

lemeurherveCB Feb 13, 2025 •

edited

Loading

gounthar Feb 13, 2025

lemeurherveCB Feb 13, 2025

gounthar Feb 13, 2025

lemeurherveCB Feb 13, 2025

lemeurherveCB Mar 2, 2025 •

edited

Loading

gounthar commented Feb 17, 2025

lemeurherveCB left a comment

lemeurherveCB Mar 2, 2025

lemeurherveCB Mar 2, 2025

lemeurherveCB Mar 2, 2025

lemeurherveCB Mar 2, 2025 •

edited

Loading

lemeurherveCB Mar 2, 2025 •

edited

Loading

lemeurherveCB Mar 2, 2025

lemeurherveCB Mar 2, 2025

		@@ -324,19 +350,21 @@ target "nanoserver" {
		target = type
		tags = [

		type = windowsagenttypes(WINDOWS_AGENT_TYPE_OVERRIDE)
		jdk = jdks_to_build

		@@ -352,11 +380,13 @@ target "windowsservercore" {
		target = type
		tags = [

feat(jdk): Add Java 25 preview target for all images #939

Are you sure you want to change the base?

feat(jdk): Add Java 25 preview target for all images #939

Conversation

gounthar commented Feb 12, 2025 • edited Loading

Introduction

Why Start with Jenkins Agent Images?

Keeping the JDK25 version updated

Testing done

Submitter checklist

timja left a comment

Choose a reason for hiding this comment

lemeurherveCB left a comment

Choose a reason for hiding this comment

lemeurherveCB Feb 13, 2025 • edited Loading

Choose a reason for hiding this comment

lemeurherveCB Feb 13, 2025 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

lemeurherveCB Mar 2, 2025 • edited Loading

Choose a reason for hiding this comment

gounthar commented Feb 17, 2025

lemeurherveCB left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

lemeurherveCB Mar 2, 2025 • edited Loading

Choose a reason for hiding this comment

lemeurherveCB Mar 2, 2025 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

gounthar commented Feb 12, 2025 •

edited

Loading

lemeurherveCB Feb 13, 2025 •

edited

Loading

lemeurherveCB Feb 13, 2025 •

edited

Loading

lemeurherveCB Mar 2, 2025 •

edited

Loading

lemeurherveCB Mar 2, 2025 •

edited

Loading

lemeurherveCB Mar 2, 2025 •

edited

Loading