4002 ubi10 merge jlink #610
Open
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
For push actions only (e.g., post-PR merge), after successfully
completing the behave-test step, Log into GitHub container registry
(ghcr.io) and push the image.
Add the necessary permissions to write to the GHCR repository.
Adjust the build and test steps to use a predictable,
version-independent image name ("localimage") which we can reference
in the new steps.
Signed-off-by: Jonathan Dowland <[email protected]>
This allows GitHub to provide links back from the Container Images to the source repository that built them. See <https://github.com/opencontainers/image-spec/blob/main/annotations.md#pre-defined-annotation-keys> Signed-off-by: Jonathan Dowland <[email protected]>
…ontainer application
[OPENJDK-2063] Add dockerfile to do a multi-stage build for jlink JRE light weight container application
…nto run-java.sh - This tweak is to avoid defining JBOSS_CONTAINER_UTIL_LOGGING_MODULE as ENV in templates/jlink/Dokcerfile - Deleted run-env.sh and folded its content to run-java.sh as its not doing anything much other than setting value of JAVA_APP_DIR Signed-off-by: Jayashree Huttanagoudar <[email protected]>
Signed-off-by: Jayashree Huttanagoudar <[email protected]>
…GING_MODULE and JBOSS_CONTAINER_JAVA_RUN_MODULE Signed-off-by: Jayashree Huttanagoudar <[email protected]>
This is a hail-mary change: we are experiencing problems with GHA runs timing out (behave tests taking up to five hours to run). We were running on a not-current GHA runner version, and I think the old runners get fewer resources than the newer ones. Signed-off-by: Jonathan Dowland <[email protected]>
[OPENJDK-2063] Tweak run scripts to support docker multistage build for jlinked JRE container application
…nd also remove ENV setting as they are taken care in run-java.sh Signed-off-by: Jayashree Huttanagoudar <[email protected]>
[OPENJDK-2063] Modify Dockerfile to consolidate destination path for image scripts
Signed-off-by: Jayashree Huttanagoudar <[email protected]>
https://github.com/jboss-openshift/openshift-examples/ https://github.com/jboss-container-images/openjdk : tests/OPENJDK-1549 https://github.com/jerboaa/quarkus-quickstarts (branch quickstart-2.16-s2i-cds) https://github.com/jmtd/openshift-quickstarts (branch OPENJDK-631-quarkus-fast-jar) Signed-off-by: Jayashree Huttanagoudar <[email protected]>
Signed-off-by: Jayashree Huttanagoudar <[email protected]>
Signed-off-by: Jayashree Huttanagoudar <[email protected]>
Signed-off-by: Jayashree Huttanagoudar <[email protected]>
Signed-off-by: Jayashree Huttanagoudar <[email protected]>
…urce_uri [OPENJDK-2199] Update tests to refer new application source repository
Changes were made to run-java.sh in one branch of a merge that needed to be promoted up to the new pathfinder mdouel from the other branch of a merge. Signed-off-by: Jonathan Dowland <[email protected]>
Signed-off-by: Jonathan Dowland <[email protected]>
README for jlink template directory
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]>
Add JDK21 jmods RPM to builder image
For clarity. Signed-off-by: Jonathan Dowland <[email protected]>
[OPENJDK-3681] get rid of measure.sh
[OPENJDK-3682] Correct org.opencontainers.image.source
Align versions
Signed-off-by: Jonathan Dowland <[email protected]>
Signed-off-by: Jonathan Dowland <[email protected]>
Update the example APP_URI and CONTEXT_DIR
[OPENJDK-3686] update jlink README with RHEC link, customer focus
Signed-off-by: Jonathan Dowland <[email protected]>
Signed-off-by: Jonathan Dowland <[email protected]>
the s2i and jdk modules are used by the non-jlink images; remove the changes to those made in the jlink-dev work. Move those changes to the jlink module. Note: prior commit added an explicit dependency on the jlink module to the jlink-dev image descriptor. Signed-off-by: Jonathan Dowland <[email protected]>
Adjusting jlink-dev work to the expectations after OPENJDK-3655 Signed-off-by: Jonathan Dowland <[email protected]>
Signed-off-by: Jonathan Dowland <[email protected]>
s2i-core-hooks only defined one function, s2i_core_env_init_hook This was only called by s2i_core_env_init in s2i-core (it overrides an empty definition of the same function name in s2i-core) Fold the content of the function into s2i_core_env_init and remove the s2i-core-hooks file Remove includes of it from s2i/assemble and run (which didn't call the function anyway) Signed-off-by: Jonathan Dowland <[email protected]>
The function maven_s2i_deploy_artifacts checked for the existence of maven_s2i_deploy_artifacts_override, and if it exists, calls it and returns. The implementation of maven_s2i_deploy_artifacts_override simply deleted itself and called maven_s2i_deploy_artifacts again. Signed-off-by: Jonathan Dowland <[email protected]>
Contributor
|
@jmtd Could we merge latesest ubi10 branch into this. Which should make the labelling issue go away. Also have we considered adding a JDK 25 based GHA check now that JDK 25 is installable via the ubi10 repos? |
Member
Author
|
@jerboaa :
Sure. I'll push that now. In doing so it looks like commits from #607 snuck in (last merge), which shouldn't be there, so I'll resolve that too.
I'll raise a JIRA, we should definitely do this. Edit: OPENJDK-4195 Add GHA checks for JDK25 images |
Contributor
Member
Author
Seems I forgot to push it? Sorry. I need to get those unwanted commits out from #607 before it can be looked at again anyway. I'll untag you as reviewer until I get that sorted. Sorry! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
https://issues.redhat.com/browse/OPENJDK-4002
Following the suggestion in #596 , this is a merge-down of the
jlink-devbranch targetting ubi10.I've aimed to preserve the commit history of the work (and the attribution), so there are a huge number of commits and various views onto the changes are useless.
The clearest diff view (for me) is
git diff 397d0f4 eeb56296aa6bf4018e04e221e379d1e8e3e19e80, i.e. from the merge base to the HEAD of the PR branch. The changes made to existing images arerun-java.shrequires and includes thepathfindermodule, to where we've moved the logic to detect various types of jar file in the deployments directory,THe PR adds a new image, openjdk-21-jlink-rhel9, which is unusual as it's based on UBI9 in this branch rather than UBI10.
This does not enable the jlink functionality in the UBI10 images -- but -- that's something we should discuss separately.