Update dist-gen files to generate desired results

Author: pkhartsk

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

@@ -1,9 +1,6 @@
 # PostgreSQL 12 SQL Database Server Container Image
 
-This container image features the PostgreSQL 12 SQL database server, suitable for OpenShift and general applications.
-Only RHEL based images are available.
-RHEL images can be found in the [Red Hat Container Catalog](https://access.redhat.com/containers/).
-The resulting image can be executed using [podman](https://github.com/containers/libpod).
+This container image features the PostgreSQL 12 SQL database server, suitable for OpenShift and general applications. Users have the option to select from RHEL, CentOS Stream, and Fedora-based images. RHEL images can be found in the [Red Hat Container Catalog](https://access.redhat.com/containers/), while CentOS Stream images are available on [Quay.io](https://quay.io/organization/sclorg), and Fedora images can be accessed in [Quay.io](https://quay.io/organization/fedora). The resulting image can be executed using [podman](https://github.com/containers/libpod).
 
 Please note that while the examples provided in this README utilize `podman`, it is possible to substitute any instance of `podman` with `docker` and the same arguments. `podman` can be installed with on Fedora with command `dnf install podman-docker`.
 
@@ -113,7 +110,7 @@ $ podman run -d --name postgresql_database \
     -e POSTGRESQL_MIGRATION_REMOTE_HOST=172.17.0.2 \
     -e POSTGRESQL_MIGRATION_ADMIN_PASSWORD=remoteAdminP@ssword \
     [ OPTIONAL_CONFIGURATION_VARIABLES ]
-    rhel8/postgresql-13
+    rhel8/postgresql-12
 ```
 
 The migration is performed using the **dump and restore** method (running `pg_dumpall` against the remote cluster and importing the dump locally using `psql`). The process is streamed (via a Unix pipeline), eliminating the need for intermediate dump files and conserving storage space.
@@ -227,4 +224,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 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, the CentOS Stream 9 Dockerfile is named Dockerfile.c9s, the CentOS Stream 10 Dockerfile is named Dockerfile.c10s, and the Fedora Dockerfile is named Dockerfile.fedora.

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

@@ -1,6 +1,6 @@
 # PostgreSQL 13 SQL Database Server Container Image
 
-This container image features the PostgreSQL 13 SQL database server, suitable for OpenShift and general applications. Users have the option to select from RHEL, CentOS Stream, and Fedora-based images. RHEL images can be found in the [Red Hat Container Catalog](https://access.redhat.com/containers/), while CentOS Stream images are available on [Quay.io](https://quay.io/organization/sclorg). The resulting image can be executed using [podman](https://github.com/containers/libpod).
+This container image features the PostgreSQL 13 SQL database server, suitable for OpenShift and general applications. Users have the option to select from RHEL, CentOS Stream, and Fedora-based images. RHEL images can be found in the [Red Hat Container Catalog](https://access.redhat.com/containers/), while CentOS Stream images are available on [Quay.io](https://quay.io/organization/sclorg), and Fedora images can be accessed in [Quay.io](https://quay.io/organization/fedora). The resulting image can be executed using [podman](https://github.com/containers/libpod).
 
 Please note that while the examples provided in this README utilize `podman`, it is possible to substitute any instance of `podman` with `docker` and the same arguments. `podman` can be installed with on Fedora with command `dnf install podman-docker`.
 
@@ -224,4 +224,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 CentOS Stream 9 Dockerfile is named Dockerfile.c9s.
+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, the CentOS Stream 9 Dockerfile is named Dockerfile.c9s, the CentOS Stream 10 Dockerfile is named Dockerfile.c10s, and the Fedora Dockerfile is named Dockerfile.fedora.

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

@@ -224,4 +224,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 CentOS Stream 9 Dockerfile is named Dockerfile.c9s.
+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, the CentOS Stream 9 Dockerfile is named Dockerfile.c9s, the CentOS Stream 10 Dockerfile is named Dockerfile.c10s, and the Fedora Dockerfile is named Dockerfile.fedora.

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

@@ -170,7 +170,7 @@ Data files are hard-linked from the old to the new data directory, providing per
 
 ## Extending Image
 
-You can extend this image in Openshift using the `Source` build strategy or via the standalone [source-to-image](https://github.com/openshift/source-to-image) application (where available). For this example, assume that you are using the `rhel10-postgresql-16` image, available via `postgresql:16` imagestream tag in Openshift.
+You can extend this image in Openshift using the `Source` build strategy or via the standalone [source-to-image](https://github.com/openshift/source-to-image) application (where available). For this example, assume that you are using the `rhel10/postgresql-16` image, available via `postgresql:16` imagestream tag in Openshift.
 
 To build a customized image `new-postgresql` with configuration from `https://github.com/sclorg/postgresql-container/tree/master/examples/extending-image`, run:
 

manifest.yml

@@ -51,9 +51,6 @@ COPY_RULES:
   - src: src/root/usr/share/container-scripts/postgresql/openshift-custom-postgresql.conf.template
     dest: root/usr/share/container-scripts/postgresql/openshift-custom-postgresql.conf.template
 
-  - src: src/root/usr/share/container-scripts/postgresql/scl_enable
-    dest: root/usr/share/container-scripts/postgresql/scl_enable
-
   - src: src/root/usr/bin/run-postgresql
     dest: root/usr/bin/run-postgresql
     mode: "0755"

specs/multispec.yml

@@ -104,7 +104,7 @@ specs:
       prev_short: "12"
       common_image_name: "{{ spec.org }}/postgresql-{{ spec.short }}-{{ spec.prod }}"
       c9s_image_name: "sclorg/postgresql-{{ spec.short }}-c9s"
-      rhel_image_name: "rhel8/postgresql-{{ spec.short }}"
+      rhel_image_name: "rhel9/postgresql-{{ spec.short }}"
       latest_fedora: "f38"
 
     "15":
@@ -113,7 +113,8 @@ specs:
       short: "15"
       prev_short: "13"
       common_image_name: "{{ spec.org }}/postgresql-{{ spec.short }}-{{ spec.prod }}"
-      rhel_image_name: "rhel8/postgresql-{{ spec.short }}"
+      c9s_image_name: "sclorg/postgresql-{{ spec.short }}-c9s"
+      rhel_image_name: "rhel9/postgresql-{{ spec.short }}"
       latest_fedora: "f40"
 
     "16":
@@ -122,7 +123,8 @@ specs:
       short: "16"
       prev_short: "15"
       common_image_name: "{{ spec.org }}/postgresql-{{ spec.short }}-{{ spec.prod }}"
-      c9s_image_name: "sclorg/postgresql-{{ spec.short }}-c9s"
+      c9s_image_name: "sclorg/postgresql-{{ spec.short }}-c10s"
+      rhel_image_name: "rhel10/postgresql-{{ spec.short }}"
       latest_fedora: "f40"
 
 

src/root/usr/libexec/check-container

@@ -7,8 +7,6 @@
 # wait for it (this script might run forever, we expect that the timeout is
 # maintained externally).
 
-test -z "$ENABLED_COLLECTIONS" || . scl_source enable $ENABLED_COLLECTIONS
-
 if test x"$1" = "x--live"; then
     # Since livenessProbe is about to detect container deadlocks, and we
     # so far don't know about real deadlocks to be detected -- we keep

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

@@ -110,7 +110,7 @@ $ podman run -d --name postgresql_database \
     -e POSTGRESQL_MIGRATION_REMOTE_HOST=172.17.0.2 \
     -e POSTGRESQL_MIGRATION_ADMIN_PASSWORD=remoteAdminP@ssword \
     [ OPTIONAL_CONFIGURATION_VARIABLES ]
-    rhel8/postgresql-13
+    {{ spec.rhel_image_name }}
 ```
 
 The migration is performed using the **dump and restore** method (running `pg_dumpall` against the remote cluster and importing the dump locally using `psql`). The process is streamed (via a Unix pipeline), eliminating the need for intermediate dump files and conserving storage space.
@@ -224,4 +224,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, the RHEL10 Dockerfile is named Dockerfile.rhel10, 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, the CentOS Stream 9 Dockerfile is named Dockerfile.c9s, the CentOS Stream 10 Dockerfile is named Dockerfile.c10s, and the Fedora Dockerfile is named Dockerfile.fedora.