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

- 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

Author: gdams

.github/workflows/dockerfile-readiness.lock.yml

@@ -21,6 +21,8 @@ features:
 safe-outputs:
   add-comment:
     hide-older-comments: true
+  noop:
+    report-as-issue: false
 
 checkout:
   fetch-depth: 0

.github/workflows/dockerfile-readiness.md

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

config/temurin.yml

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

docker_templates/entrypoint.sh.j2

@@ -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 -%}

docker_templates/partials/arch-variable.j2

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