Skip to content
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.

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

[OPENJDK-2411] JDK21 images for UBI8 #415

Merged
merged 12 commits into from
Nov 10, 2023
Merged

[OPENJDK-2411] JDK21 images for UBI8 #415

merged 12 commits into from
Nov 10, 2023

Conversation

jmtd
Copy link
Member

@jmtd jmtd commented Nov 9, 2023

jmtd added 11 commits November 6, 2023 08:48
This is/was used in order to let non-privileged scripts adjust
the running user's GECOS field information, by re-directing
lookups from /etc/passwd to $HOME/passwd. See OPENJDK-312.

More modern container runtimes (e.g. CRI-O) now update the GECOS
for the running user.

Signed-off-by: Jonathan Dowland <[email protected]>
Define environment variables capturing the values for the user's name
(USER), uid (UID) and user-name/comment/gecos (GECOS, see passwd(5))
in the jboss.container.user module.

Replace hard-coded references to those values in scripts across all the
other modules. For those modules which now use these variables, add an
explicit dependency on jboss.container.user if it wasn't already
present.

The primary reason for this change is to reduce the delta between the
ubi8 and ubi9 branches, which will avoid merge conflicts for future
backports from ubi9 to ubi8. The secondary reason is to reduce the
risk of a discrepancy for the values across the scripts.

Signed-off-by: Jonathan Dowland <[email protected]>
Signed-off-by: Jonathan Dowland <[email protected]>
Signed-off-by: Jonathan Dowland <[email protected]>
It is not useful to test for the mere presence of the 'release'
label, since we inherit it from our base image. It's not especially
helpful to check architecture=x86_64 either, which rules out running
the test suit on any other architecture.

Signed-off-by: Jonathan Dowland <[email protected]>
Don't test for 'release' or 'architecture' labels which we don't set
in our image sources anyway.

Check for strings in the values of the 'version' and 'name' labels,
to be sure we've set them and not just inherited them.

Split the label-check test into those which apply to all images,
and those which are builder-only.

Signed-off-by: Jonathan Dowland <[email protected]>
Signed-off-by: Jonathan Dowland <[email protected]>
Signed-off-by: Jonathan Dowland <[email protected]>
Signed-off-by: Jonathan Dowland <[email protected]>
@jmtd
Copy link
Member Author

jmtd commented Nov 9, 2023

I am doing a round of scratch builds for these and running the behave test suite locally.

@jmtd
Copy link
Member Author

jmtd commented Nov 9, 2023

I am doing a round of scratch builds for these and running the behave test suite locally.

all passed

@jmtd jmtd requested a review from jerboaa November 9, 2023 15:30
ubi8-openjdk-21.yaml Outdated Show resolved Hide resolved
- name: jboss.container.openjdk.jdk
version: "21"
- name: jboss.container.maven
version: "3.8.17"
Copy link
Contributor

Choose a reason for hiding this comment

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

3.8.21?

Copy link
Member Author

@jmtd jmtd Nov 10, 2023

Choose a reason for hiding this comment

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

Good catch. At the moment there is no maven-openjdk21 RPM package, which would be what 3.8.21 should install (once the module exists), but we expect there to be in the future. So I think for now it's ok to use the 17 one in conjunction with singleton-jdk.

Copy link
Contributor

Choose a reason for hiding this comment

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

OK.

Choose a reason for hiding this comment

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

@jmtd is there a ticket to track the creation of maven-openjdk21?

Copy link
Member Author

Choose a reason for hiding this comment

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

There is for RHEL 9.4 (RHEL-13046), but not (yet) for 8.10. I asked the filer of the former whether they'd like me to clone for the latter and haven't yet had a response.

@jmtd jmtd merged commit 9b8a913 into rh-openjdk:ubi8 Nov 10, 2023
0 of 6 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants