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

[CLOUD-2868] Preparations for OpenJDK 11 / RHEL8 / UBI image #335

Merged
merged 9 commits into from
May 1, 2019

Commits on Mar 5, 2019

  1. rename existing maven module to 35scl; introduce 35

    Signed-off-by: Jonathan Dowland <jdowland@redhat.com>
    jmtd committed Mar 5, 2019
    Configuration menu
    Copy the full SHA
    b143f93 View commit details
    Browse the repository at this point in the history

Commits on Mar 18, 2019

  1. stop installing yum-utils

    not available on RHEL8, but we aren't using it on RHEL7 anyway
    
    Signed-off-by: Jonathan Dowland <jdowland@redhat.com>
    jmtd committed Mar 18, 2019
    Configuration menu
    Copy the full SHA
    b1fad65 View commit details
    Browse the repository at this point in the history

Commits on Mar 19, 2019

  1. Conditionally source scl-enable-maven if it exists

    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>
    jmtd committed Mar 19, 2019
    Configuration menu
    Copy the full SHA
    0561dce View commit details
    Browse the repository at this point in the history
  2. Rename/move maven modules to provide versions alternatives

    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>
    jmtd committed Mar 19, 2019
    Configuration menu
    Copy the full SHA
    d5e432e View commit details
    Browse the repository at this point in the history

Commits on Apr 1, 2019

  1. Remove repository definition from modules

    Repositories should be defined on image level.
    goldmann authored and jmtd committed Apr 1, 2019
    Configuration menu
    Copy the full SHA
    673f494 View commit details
    Browse the repository at this point in the history

Commits on Apr 3, 2019

  1. Capture shadow-utils dependency

    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>
    jmtd committed Apr 3, 2019
    Configuration menu
    Copy the full SHA
    f8c6769 View commit details
    Browse the repository at this point in the history

Commits on Apr 11, 2019

  1. just use rpm for this ...

    luck3y authored and jmtd committed Apr 11, 2019
    Configuration menu
    Copy the full SHA
    3525c8a View commit details
    Browse the repository at this point in the history
  2. Remove JDK 1.8.0 if installed and not default

    Based on the corresponding script from the 35scl package
    
    Signed-off-by: Jonathan Dowland <jdowland@redhat.com>
    jmtd committed Apr 11, 2019
    Configuration menu
    Copy the full SHA
    f5b7fd1 View commit details
    Browse the repository at this point in the history

Commits on Apr 16, 2019

  1. Port over script improvements from other maven module

    Signed-off-by: Jonathan Dowland <jdowland@redhat.com>
    jmtd committed Apr 16, 2019
    Configuration menu
    Copy the full SHA
    50a68f5 View commit details
    Browse the repository at this point in the history