Skip to content

chore(updatecli): track JDK21 version in Dockerfiles#2337

Merged
dduportal merged 1 commit into
masterfrom
lemeurherve-patch-1
May 11, 2026
Merged

chore(updatecli): track JDK21 version in Dockerfiles#2337
dduportal merged 1 commit into
masterfrom
lemeurherve-patch-1

Conversation

@lemeurherve
Copy link
Copy Markdown
Member

@lemeurherve lemeurherve commented May 11, 2026

This changes restores the target updating all Dockerfiles for the main JDK (21).

Ref:

Testing done

CI

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 demonstrate the feature works or the issue is fixed

@lemeurherve lemeurherve requested a review from a team as a code owner May 11, 2026 07:34
@dduportal dduportal added chore and removed bug labels May 11, 2026
@dduportal dduportal changed the title fix(updatecli): bump JDK21 version in Dockerfiles chore(updatecli): treack JDK21 version in Dockerfiles May 11, 2026
@dduportal dduportal changed the title chore(updatecli): treack JDK21 version in Dockerfiles chore(updatecli): track JDK21 version in Dockerfiles May 11, 2026
Copy link
Copy Markdown
Contributor

@dduportal dduportal left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM! the CI checks shows the new targets will update the expected ARG values:

target: setJDK21Version
-----------------------

Repository	: github.com/jenkinsci/docker@master

[transformers]
✔ Result correctly transformed from "21.0.11+10" to "21.0.11_10"
⚠ The line #5, matched by the keyword "ARG" and the matcher "JAVA_VERSION", is changed from "ARG JAVA_VERSION=21.0.10_7" to "ARG JAVA_VERSION=21.0.11_10".
⚠ The line #8, matched by the keyword "ARG" and the matcher "JAVA_VERSION", is changed from "ARG JAVA_VERSION=21.0.10_7" to "ARG JAVA_VERSION=21.0.11_10".
⚠ The line #5, matched by the keyword "ARG" and the matcher "JAVA_VERSION", is changed from "ARG JAVA_VERSION=21.0.10_7" to "ARG JAVA_VERSION=21.0.11_10".
⚠ The line #4, matched by the keyword "ARG" and the matcher "JAVA_VERSION", is changed from "ARG JAVA_VERSION=21.0.10_7" to "ARG JAVA_VERSION=21.0.11_10".
⚠ The line #12, matched by the keyword "ARG" and the matcher "JAVA_VERSION", is changed from "ARG JAVA_VERSION=21.0.10_7" to "ARG JAVA_VERSION=21.0.11_10".
⚠ - changed lines [5] of file "alpine/hotspot/Dockerfile", changed lines [8] of file "debian/Dockerfile", changed lines [5] of file "rhel/Dockerfile", changed lines [4 12] of file "windows/windowsservercore/hotspot/Dockerfile"

and no regression on the existing target:

target: setJDK21VersionDockerBake
---------------------------------

Repository	: github.com/jenkinsci/docker@master

[transformers]
✔ Result correctly transformed from "21.0.11+10" to "21.0.11_10"
✔ - no changes detected:
	path "variable.JAVA21_VERSION.default" already set to "21.0.11_10", from file "docker-bake.hcl", 

@dduportal
Copy link
Copy Markdown
Contributor

FTR, updated title and labels:

  • It's a chore and not fix (does not change anything on the built artifacts, it's only tooling change with no user-facing direct impact)
    -The title was mentioning a JDK21 update, but it only adds targets to updatecli jdk21 manifest. Update accordingly.

@dduportal dduportal merged commit 7e8fd6b into master May 11, 2026
12 of 14 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants