Skip to content

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

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.

Sign up for GitHub

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

Merged
gdams merged 1 commit into from
May 5, 2026
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 14 additions & 14 deletions .github/workflows/dockerfile-readiness.lock.yml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions .github/workflows/dockerfile-readiness.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@ features:
safe-outputs:
add-comment:
hide-older-comments: true
noop:
report-as-issue: false

checkout:
fetch-depth: 0
Expand Down
6 changes: 4 additions & 2 deletions config/temurin.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,16 +32,18 @@ configurations:
architectures: [aarch64, arm, ppc64le, s390x, x64]
os: ubuntu

# EOL May 2035
- directory: ubi/ubi10-minimal
architectures: [aarch64, ppc64le, s390x, x64]
image: redhat/ubi10-minimal
os: ubi10-minimal
os: ubi-minimal

# EOL May 2032
- directory: ubi/ubi9-minimal
architectures: [aarch64, ppc64le, s390x, x64]
image: redhat/ubi9-minimal
deprecated: 25
os: ubi9-minimal
os: ubi-minimal

alpine-linux:
# EOL 01 Nov 2027
Expand Down
4 changes: 2 additions & 2 deletions docker_templates/entrypoint.sh.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,14 +92,14 @@ if [ -n "$USE_SYSTEM_CA_CERTS" ]; then
if [ -d /certificates ] && [ "$(ls -A /certificates 2>/dev/null)" ]; then
{%- if os == "ubuntu" or os == "alpine-linux" %}
cp -La /certificates/* /usr/local/share/ca-certificates/
{%- elif os == "ubi9-minimal" or os == "ubi10-minimal" %}
{%- elif os == "ubi-minimal" %}
cp -La /certificates/* /usr/share/pki/ca-trust-source/anchors/
{%- endif %}
fi

{%- if os == "ubuntu" or os == "alpine-linux" %}
update-ca-certificates
{%- elif os == "ubi9-minimal" or os == "ubi10-minimal" %}
{%- elif os == "ubi-minimal" %}
update-ca-trust
{%- endif %}
else
Expand Down
2 changes: 1 addition & 1 deletion docker_templates/partials/arch-variable.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
ARCH="$(dpkg --print-architecture)";
{%- elif os == "alpine-linux" %}
ARCH="$(apk --print-arch)";
{%- elif os == "ubi9-minimal" or os == "ubi10-minimal" %}
{%- elif os == "ubi-minimal" %}
ARCH="$(rpm --query --queryformat='%{ARCH}' rpm)";
{%- endif -%}
2 changes: 2 additions & 0 deletions docker_templates/ubi10-minimal.Dockerfile.j2 → docker_templates/ubi-minimal.Dockerfile.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,10 @@ RUN set -eux; \
# https://github.com/docker-library/openjdk/pull/235#issuecomment-424466077
fontconfig \
glibc-langpack-en \
{%- if "ubi10" in base_image %}
# Required for gpg in multi-arch-install
gnupg2 \
{%- endif %}
; \
microdnf clean all

Expand Down
34 changes: 0 additions & 34 deletions docker_templates/ubi9-minimal.Dockerfile.j2
View file
Open in desktop

This file was deleted.

Loading