Skip to content

Merge UBI9 and UBI10 Dockerfile templates into single ubi-minimal template#918

Merged
gdams merged 1 commit into
adoptium:mainfrom
gdams:ubi
May 5, 2026
Merged

Merge UBI9 and UBI10 Dockerfile templates into single ubi-minimal template#918
gdams merged 1 commit into
adoptium:mainfrom
gdams:ubi

Conversation

@gdams

@gdams gdams commented Apr 27, 2026

Copy link
Copy Markdown
Member

Combines the two separate UBI Dockerfile templates (ubi9-minimal.Dockerfile.j2 and ubi10-minimal.Dockerfile.j2) into a single ubi-minimal.Dockerfile.j2 template with a conditional for gnupg2 (only needed on UBI 10).

Changes

  • Merge ubi9-minimal.Dockerfile.j2 and ubi10-minimal.Dockerfile.j2 into ubi-minimal.Dockerfile.j2
  • Use base_image conditional for gnupg2 package (only required 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

Verification

Regenerated all Dockerfiles with python generate_dockerfiles.py --force — no output changes.

@github-actions github-actions Bot left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

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.

…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
@gdams

gdams commented May 5, 2026

Copy link
Copy Markdown
Member Author

/thaw

@github-actions github-actions Bot dismissed their stale review May 5, 2026 08:32

Pull Request unblocked - code freeze is over.

@gdams gdams enabled auto-merge (squash) May 5, 2026 08:33

@andrew-m-leonard andrew-m-leonard left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

lgtm

@gdams gdams merged commit 5b99f76 into adoptium:main May 5, 2026
123 checks passed
@gdams gdams deleted the ubi branch May 5, 2026 08:43
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