Add support for RHEL10 for dist-gen source files

Signed-off-by: Petr "Stone" Hracek <[email protected]>

Author: phracek

manifest.yml

@@ -29,6 +29,9 @@ DISTGEN_MULTI_RULES:
   - src: src/Dockerfile
     dest: Dockerfile.rhel9
 
+  - src: src/Dockerfile
+    dest: Dockerfile.rhel10
+
   - src: src/Dockerfile
     dest: Dockerfile.c9s
 

specs/multispec.yml

@@ -52,6 +52,16 @@ specs:
            { yum -y module enable postgresql:{{ spec.version }} || :; } && \
        post_install: >-4
            (yum -y reinstall tzdata || yum -y update tzdata ) && \
+    rhel10:
+       distros:
+         - rhel-10-x86_64
+       s2i_base: registry.stage.redhat.io/ubi10/s2i-core
+       org: "rhel10"
+       prod: "rhel10"
+       openshift_tags: "database,postgresql,postgresql{{ spec.short }},postgresql-{{ spec.short }}"
+       redhat_component: "postgresql-{{ spec.short }}-container"
+       img_name: "{{ spec.org }}/postgresql-{{ spec.short }}"
+       pkgs: "postgresql{{ spec.short }}-server postgresql{{ spec.short }}-contrib"
     c9s:
       distros:
         - centos-stream-9-x86_64
@@ -139,3 +149,4 @@ matrix:
         - centos-stream-9-x86_64
         - fedora-40-x86_64
         - centos-stream-10-x86_64
+        - rhel-10-x86_64

src/Dockerfile

@@ -55,7 +55,7 @@ COPY root/usr/libexec/fix-permissions /usr/libexec/fix-permissions
 {% if spec.repo_enable_reason %}
 {{ spec.repo_enable_reason }}
 {% endif %}
-{% if spec.prod == "c10s" %}
+{% if spec.prod == "c10s" or spec.prod == "rhel10" %}
 RUN INSTALL_PKGS="rsync tar gettext-envsubst bind-utils nss_wrapper-libs glibc-locale-source xz" && \
     PSQL_PKGS="{{ spec.pkgs }}" && \
 {% elif spec.prod == "rhel9" and spec.version == "13" %} \
@@ -70,7 +70,7 @@ RUN {{ spec.environment_setup }}
     INSTALL_PKGS="$INSTALL_PKGS procps-ng util-linux postgresql-upgrade" && \
     {% endif %}
 {% endif %}
-{% if spec.prod == "c10s" %}
+{% if spec.prod == "c10s" or spec.prod == "rhel10" %}
     yum -y --setopt=tsflags=nodocs install $INSTALL_PKGS $PSQL_PKGS  && \
     rpm -V $INSTALL_PKGS {{ spec.check_pkgs }} && \
 {% else %}

src/root/usr/share/container-scripts/postgresql/README.md

@@ -200,4 +200,4 @@ Subsequently, log output is redirected to the logging collector process and will
 
 ## Additional Resources
 
-The Dockerfile and other sources related to this container image can be found at https://github.com/sclorg/postgresql-container. In this repository, the RHEL8 Dockerfile is named Dockerfile.rhel8, the RHEL9 Dockerfile is named Dockerfile.rhel9, and the Fedora Dockerfile is named Dockerfile.fedora.
+The Dockerfile and other sources related to this container image can be found at https://github.com/sclorg/postgresql-container. In this repository, the RHEL8 Dockerfile is named Dockerfile.rhel8, the RHEL9 Dockerfile is named Dockerfile.rhel9, the RHEL10 Dockerfile is named Dockerfile.rhel10, and the Fedora Dockerfile is named Dockerfile.fedora.