Merge UBI9 and UBI10 Dockerfile templates into single ubi-minimal template#918
Merged
Conversation
Contributor
There was a problem hiding this comment.
A block has been put on this Pull Request as this repository is temporarily under a code freeze due to an ongoing release cycle.
If this pull request needs to be merged during the release cycle then please comment /merge and a PMC member will be able to remove the block.
If the code freeze is over you can remove this block by commenting /thaw.
karianna
approved these changes
Apr 27, 2026
…plate - Combine ubi9-minimal.Dockerfile.j2 and ubi10-minimal.Dockerfile.j2 into ubi-minimal.Dockerfile.j2 - Use base_image conditional for gnupg2 (only needed on UBI 10) - Set os: ubi-minimal for both UBI entries in temurin.yml - Add EOL date comments for UBI 9 (May 2032) and UBI 10 (May 2035) - Update os checks in entrypoint.sh.j2 and arch-variable.j2 - Simplify template selection in generate_dockerfiles.py
Member
Author
|
/thaw |
Pull Request unblocked - code freeze is over.
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
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.
Combines the two separate UBI Dockerfile templates (
ubi9-minimal.Dockerfile.j2andubi10-minimal.Dockerfile.j2) into a singleubi-minimal.Dockerfile.j2template with a conditional forgnupg2(only needed on UBI 10).Changes
ubi9-minimal.Dockerfile.j2andubi10-minimal.Dockerfile.j2intoubi-minimal.Dockerfile.j2base_imageconditional forgnupg2package (only required on UBI 10)os: ubi-minimalfor both UBI entries intemurin.ymloschecks inentrypoint.sh.j2andarch-variable.j2generate_dockerfiles.pyVerification
Regenerated all Dockerfiles with
python generate_dockerfiles.py --force— no output changes.