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 3029] no singleton jdk required for openjdk-21 #496

Merged
merged 1 commit into from
May 22, 2024

Conversation

jmtd
Copy link
Member

@jmtd jmtd commented May 22, 2024

This used to be required to remove the system JDK, as pulled in by Maven, prior to the introduction of the maven-openjdk21 package.

Test coverage exists in modules/jdk/tests/features/openjdk.feature

https://issues.redhat.com/browse/OPENJDK-3029

This used to be required to remove the system JDK, as pulled in by
Maven, prior to the introduction of the maven-openjdk21 package.

Test coverage exists in modules/jdk/tests/features/openjdk.feature

Signed-off-by: Jonathan Dowland <[email protected]>
@jmtd jmtd requested review from jerboaa and sefroberg May 22, 2024 12:11
@jmtd
Copy link
Member Author

jmtd commented May 22, 2024

Since the source change is a one-liner, for clarity here's the impact it has on the generated Dockerfile

@@ -283,22 +283,12 @@
 ###### /
 ###### END module 'jboss.container.java.s2i.bash:1.0'
 
-###### START module 'jboss.container.java.singleton-jdk:1.0'
-###### \
-        # Copy 'jboss.container.java.singleton-jdk' module content
-        COPY modules/jboss.container.java.singleton-jdk /tmp/scripts/jboss.container.java.singleton-jdk
-        # Custom scripts from 'jboss.container.java.singleton-jdk' module
-        USER root
-        RUN [ "sh", "-x", "/tmp/scripts/jboss.container.java.singleton-jdk/configure.sh" ]
-###### /
-###### END module 'jboss.container.java.singleton-jdk:1.0'
-
 ###### START image 'ubi8/openjdk-21:1.19'
 ###### \
         # Set 'ubi8/openjdk-21' image defined environment variables

And the code that isn't called anymore is https://github.com/jboss-container-images/openjdk/blob/ubi8/modules/singleton-jdk/configure.sh

Copy link

@sefroberg sefroberg left a comment

Choose a reason for hiding this comment

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

Looks good to me.

@jmtd jmtd merged commit 285cb98 into rh-openjdk:ubi8 May 22, 2024
0 of 8 checks passed
@jmtd jmtd deleted the OPENJDK-3029-no-singleton-jdk branch May 22, 2024 15:12
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