[CLOUD-2868] Preparations for OpenJDK 11 / RHEL8 / UBI image #335
Conversation
This file contains 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
Signed-off-by: Jonathan Dowland <jdowland@redhat.com>
not available on RHEL8, but we aren't using it on RHEL7 anyway Signed-off-by: Jonathan Dowland <jdowland@redhat.com>
The module jboss.container.maven.s2i.bash depends upon the script /opt/jboss/container/maven/35/scl-enable-maven provided in module jboss.container.maven.35scl but does not depend upon that module. Therefore make sourcing that script conditional upon it existing. Signed-off-by: Jonathan Dowland <jdowland@redhat.com>
The module name "jboss.container.maven.35.bash" is now provided by two
modules, at jboss/container/maven/35/{default,35}. The default one is
the older SCL-based one that is in use by many images. The '35/' path
is a simpler one for when the maven package is available without SCL,
simply as "maven".
For the OpenJDK image at least, we can force the use of the newer module
by depending upon it in an overrides file and setting the version
requirement accordingly. By default, the "default" module *appears* to
be chosen by Cekit's module resolver, so the older images get the right
one automatically. If this was found to not be true in some
circumstances the old module could be forced using the same technique
as the new one.
Signed-off-by: Jonathan Dowland <jdowland@redhat.com>
Repositories should be defined on image level.
This was implicit and only came to light when exploring ubi8-minimal, which doesn't have it installed by default. (Thanks Ken Wills) Signed-off-by: Jonathan Dowland <jdowland@redhat.com>
|
For existing images, this should effectively be a no-op, but we need to determine whether this causes build problems for them, with either the latest released version of Cekit or with the develop branch (or both) |
jmtd
added a commit
to jmtd/redhat-openjdk-container-images
that referenced
this pull request
Apr 11, 2019
https://issues.jboss.org/browse/CLOUD-2868 This depends upon the following changes made to cct_module: jboss-openshift/cct_module#335 Signed-off-by: Jonathan Dowland <jdowland@redhat.com>
Based on the corresponding script from the 35scl package Signed-off-by: Jonathan Dowland <jdowland@redhat.com>
luck3y
previously approved these changes
Apr 16, 2019
Signed-off-by: Jonathan Dowland <jdowland@redhat.com>
luck3y
approved these changes
Apr 16, 2019
luck3y
reviewed
Apr 16, 2019
jmtd
changed the title
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.jboss.org/browse/CLOUD-2868