From da4c708076e50ba030c9b574c15a47b821502ed3 Mon Sep 17 00:00:00 2001 From: Nikola Davidova Date: Wed, 29 Jul 2026 12:32:35 +0200 Subject: [PATCH 1/2] Deprecate Postgresql13 image for RHEL8 --- 13/Dockerfile.rhel8 | 93 ----------------------- imagestreams/imagestreams.yaml | 4 +- imagestreams/postgresql-rhel-aarch64.json | 18 ----- imagestreams/postgresql-rhel.json | 18 ----- specs/multispec.yml | 1 - test/conftest.py | 2 +- test/run_test | 2 +- 7 files changed, 4 insertions(+), 134 deletions(-) delete mode 100644 13/Dockerfile.rhel8 diff --git a/13/Dockerfile.rhel8 b/13/Dockerfile.rhel8 deleted file mode 100644 index 49ecc667..00000000 --- a/13/Dockerfile.rhel8 +++ /dev/null @@ -1,93 +0,0 @@ -FROM ubi8/s2i-core - -# PostgreSQL image for OpenShift. -# Volumes: -# * /var/lib/pgsql/data - Database cluster for PostgreSQL -# Environment: -# * $POSTGRESQL_USER - Database user name -# * $POSTGRESQL_PASSWORD - User's password -# * $POSTGRESQL_DATABASE - Name of the database to create -# * $POSTGRESQL_ADMIN_PASSWORD (Optional) - Password for the 'postgres' -# PostgreSQL administrative account - -ENV POSTGRESQL_VERSION=13 \ - POSTGRESQL_PREV_VERSION=12 \ - HOME=/var/lib/pgsql \ - PGUSER=postgres \ - APP_DATA=/opt/app-root - -ENV SUMMARY="PostgreSQL is an advanced Object-Relational database management system" \ - DESCRIPTION="PostgreSQL is an advanced Object-Relational database management system (DBMS). \ -The image contains the client and server programs that you'll need to \ -create, run, maintain and access a PostgreSQL DBMS server." - -LABEL summary="$SUMMARY" \ - description="$DESCRIPTION" \ - io.k8s.description="$DESCRIPTION" \ - io.k8s.display-name="PostgreSQL 13" \ - io.openshift.expose-services="5432:postgresql" \ - io.openshift.tags="database,postgresql,postgresql13,postgresql-13" \ - io.openshift.s2i.assemble-user="26" \ - name="rhel8/postgresql-13" \ - com.redhat.component="postgresql-13-container" \ - version="1" \ - com.redhat.license_terms="https://www.redhat.com/en/about/red-hat-end-user-license-agreements#rhel" \ - usage="podman run -d --name postgresql_database -e POSTGRESQL_USER=user -e POSTGRESQL_PASSWORD=pass -e POSTGRESQL_DATABASE=db -p 5432:5432 rhel8/postgresql-13" \ - maintainer="SoftwareCollections.org " - -EXPOSE 5432 - -COPY root/usr/libexec/fix-permissions /usr/libexec/fix-permissions - -# This image must forever use UID 26 for postgres user so our volumes are -# safe in the future. This should *never* change, the last test is there -# to make sure of that. -RUN yum -y module enable postgresql:13 && \ - INSTALL_PKGS="rsync tar gettext nss_wrapper-libs postgresql-server postgresql-contrib" && \ - INSTALL_PKGS="$INSTALL_PKGS pgaudit" && \ - INSTALL_PKGS="$INSTALL_PKGS procps-ng util-linux postgresql-upgrade" && \ - yum -y --setopt=tsflags=nodocs install $INSTALL_PKGS && \ - rpm -V $INSTALL_PKGS && \ - postgres -V | grep -qe "$POSTGRESQL_VERSION\." && echo "Found VERSION $POSTGRESQL_VERSION" && \ - (yum -y reinstall tzdata || yum -y update tzdata ) && \ - yum -y clean all --enablerepo='*' && \ - localedef -f UTF-8 -i en_US en_US.UTF-8 && \ - test "$(id postgres)" = "uid=26(postgres) gid=26(postgres) groups=26(postgres)" && \ - mkdir -p /var/lib/pgsql/data && \ - mkdir -p /run/postgresql && \ - /usr/libexec/fix-permissions /var/lib/pgsql /run/postgresql - -# Get prefix path and path to scripts rather than hard-code them in scripts -ENV CONTAINER_SCRIPTS_PATH=/usr/share/container-scripts/postgresql \ - ENABLED_COLLECTIONS= - -COPY root / -COPY ./s2i/bin/ $STI_SCRIPTS_PATH - -# Hard links are not supported in Testing Farm approach during sync to guest -# operation system. Therefore tests are failing on error -# /usr/libexec/s2i/run no such file or directory -RUN ln -s /usr/bin/run-postgresql $STI_SCRIPTS_PATH/run - -# Not using VOLUME statement since it's not working in OpenShift Online: -# https://github.com/sclorg/httpd-container/issues/30 -# VOLUME ["/var/lib/pgsql/data"] - -# S2I permission fixes -# -------------------- -# 1. unless specified otherwise (or - equivalently - we are in OpenShift), s2i -# build process would be executed as 'uid=26(postgres) gid=26(postgres)'. -# Such process wouldn't be able to execute the default 'assemble' script -# correctly (it transitively executes 'fix-permissions' script). So let's -# add the 'postgres' user into 'root' group here -# -# 2. we call fix-permissions on $APP_DATA here directly (UID=0 during build -# anyways) to assure that s2i process is actually able to _read_ the -# user-specified scripting. -RUN usermod -a -G root postgres && \ - /usr/libexec/fix-permissions --read-only "$APP_DATA" - -USER 26 - -ENTRYPOINT ["container-entrypoint"] -CMD ["run-postgresql"] diff --git a/imagestreams/imagestreams.yaml b/imagestreams/imagestreams.yaml index 98f750a9..3b9e7e63 100644 --- a/imagestreams/imagestreams.yaml +++ b/imagestreams/imagestreams.yaml @@ -22,7 +22,7 @@ latest: "16-el9" distros: - name: RHEL 8 - app_versions: [12, 13, 15, 16] + app_versions: [12, 15, 16] - name: RHEL 9 app_versions: [13, 15, 16] @@ -34,7 +34,7 @@ latest: "16-el9" distros: - name: RHEL 8 - app_versions: [12, 13, 15, 16] + app_versions: [12, 15, 16] - name: RHEL 9 app_versions: [13, 15, 16] diff --git a/imagestreams/postgresql-rhel-aarch64.json b/imagestreams/postgresql-rhel-aarch64.json index 1f18352c..c7c9e5ae 100644 --- a/imagestreams/postgresql-rhel-aarch64.json +++ b/imagestreams/postgresql-rhel-aarch64.json @@ -27,24 +27,6 @@ "type": "Local" } }, - { - "name": "13-el8", - "annotations": { - "openshift.io/display-name": "PostgreSQL 13 (RHEL 8)", - "openshift.io/provider-display-name": "Red Hat, Inc.", - "description": "Provides a PostgreSQL 13 database on RHEL 8. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/postgresql-container/blob/master/README.md.", - "iconClass": "icon-postgresql", - "tags": "database,postgresql", - "version": "13" - }, - "from": { - "kind": "DockerImage", - "name": "registry.redhat.io/rhel8/postgresql-13:latest" - }, - "referencePolicy": { - "type": "Local" - } - }, { "name": "15-el8", "annotations": { diff --git a/imagestreams/postgresql-rhel.json b/imagestreams/postgresql-rhel.json index 1f18352c..c7c9e5ae 100644 --- a/imagestreams/postgresql-rhel.json +++ b/imagestreams/postgresql-rhel.json @@ -27,24 +27,6 @@ "type": "Local" } }, - { - "name": "13-el8", - "annotations": { - "openshift.io/display-name": "PostgreSQL 13 (RHEL 8)", - "openshift.io/provider-display-name": "Red Hat, Inc.", - "description": "Provides a PostgreSQL 13 database on RHEL 8. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/postgresql-container/blob/master/README.md.", - "iconClass": "icon-postgresql", - "tags": "database,postgresql", - "version": "13" - }, - "from": { - "kind": "DockerImage", - "name": "registry.redhat.io/rhel8/postgresql-13:latest" - }, - "referencePolicy": { - "type": "Local" - } - }, { "name": "15-el8", "annotations": { diff --git a/specs/multispec.yml b/specs/multispec.yml index 6a629ab0..2c80aa49 100644 --- a/specs/multispec.yml +++ b/specs/multispec.yml @@ -167,7 +167,6 @@ matrix: - rhel-8-x86_64 - version: "13" distros: - - rhel-8-x86_64 - rhel-9-x86_64 - centos-stream-9-x86_64 - version: "15" diff --git a/test/conftest.py b/test/conftest.py index c7c6b78b..f77ead37 100644 --- a/test/conftest.py +++ b/test/conftest.py @@ -51,7 +51,7 @@ RHEL9 = ["13", "15", "16", "18"] RHEL10 = ["16", "18"] UPGRADE_PATH_DICT = { - "rhel8": ["12", "13", "15", "16"], + "rhel8": ["12", "15", "16"], "rhel9": RHEL9, "c9s": RHEL9, "rhel10": RHEL10, diff --git a/test/run_test b/test/run_test index 93e60aa1..4f3e886a 100755 --- a/test/run_test +++ b/test/run_test @@ -896,7 +896,7 @@ run_upgrade_test () local upgrade_path= prev= act= case $OS in rhel8) - upgrade_path="none 12 13 15 16 none" + upgrade_path="none 12 15 16 none" ;; rhel9|c9s) upgrade_path="none 13 15 16 18 none" From 3a8d234e45b2b4bb96ed4f7f0ab25b1d60edbfa3 Mon Sep 17 00:00:00 2001 From: Nikola Davidova Date: Wed, 29 Jul 2026 13:57:50 +0200 Subject: [PATCH 2/2] Regenerate all --- 12/root/usr/share/container-scripts/postgresql/README.md | 2 +- 13/root/usr/share/container-scripts/postgresql/README.md | 2 +- 15/root/usr/share/container-scripts/postgresql/README.md | 2 +- 16/root/usr/share/container-scripts/postgresql/README.md | 2 +- 18/root/usr/share/container-scripts/postgresql/README.md | 2 +- README.md | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/12/root/usr/share/container-scripts/postgresql/README.md b/12/root/usr/share/container-scripts/postgresql/README.md index 58944bc3..f11815c5 100644 --- a/12/root/usr/share/container-scripts/postgresql/README.md +++ b/12/root/usr/share/container-scripts/postgresql/README.md @@ -8,7 +8,7 @@ Please note that while the examples provided in this README utilize `podman`, it This container image offers a containerized version of the PostgreSQL postgres daemon and client application. The postgres server daemon accepts client connections and grants access to PostgreSQL database content on behalf of said clients. For more information regarding the PostgreSQL project, please visit the official project website (https://www.postgresql.org/). -See [the Red Hat Enterprise Linux Application Streams Life Cycle page](https://access.redhat.com/support/policy/updates/rhel-app-streams-life-cycle) for information about support for this particular stream. +See [the Red Hat Enterprise Linux Application Streams Life Cycle page](https://access.redhat.com/support/policy/updates/rhel-app-streams-life-cycle) for information about support for a particular stream. ## Usage diff --git a/13/root/usr/share/container-scripts/postgresql/README.md b/13/root/usr/share/container-scripts/postgresql/README.md index 4fddbe26..a75c200b 100644 --- a/13/root/usr/share/container-scripts/postgresql/README.md +++ b/13/root/usr/share/container-scripts/postgresql/README.md @@ -8,7 +8,7 @@ Please note that while the examples provided in this README utilize `podman`, it This container image offers a containerized version of the PostgreSQL postgres daemon and client application. The postgres server daemon accepts client connections and grants access to PostgreSQL database content on behalf of said clients. For more information regarding the PostgreSQL project, please visit the official project website (https://www.postgresql.org/). -See [the Red Hat Enterprise Linux Application Streams Life Cycle page](https://access.redhat.com/support/policy/updates/rhel-app-streams-life-cycle) for information about support for this particular stream. +See [the Red Hat Enterprise Linux Application Streams Life Cycle page](https://access.redhat.com/support/policy/updates/rhel-app-streams-life-cycle) for information about support for a particular stream. ## Usage diff --git a/15/root/usr/share/container-scripts/postgresql/README.md b/15/root/usr/share/container-scripts/postgresql/README.md index cbb1b746..f86c0c2f 100644 --- a/15/root/usr/share/container-scripts/postgresql/README.md +++ b/15/root/usr/share/container-scripts/postgresql/README.md @@ -8,7 +8,7 @@ Please note that while the examples provided in this README utilize `podman`, it This container image offers a containerized version of the PostgreSQL postgres daemon and client application. The postgres server daemon accepts client connections and grants access to PostgreSQL database content on behalf of said clients. For more information regarding the PostgreSQL project, please visit the official project website (https://www.postgresql.org/). -See [the Red Hat Enterprise Linux Application Streams Life Cycle page](https://access.redhat.com/support/policy/updates/rhel-app-streams-life-cycle) for information about support for this particular stream. +See [the Red Hat Enterprise Linux Application Streams Life Cycle page](https://access.redhat.com/support/policy/updates/rhel-app-streams-life-cycle) for information about support for a particular stream. ## Usage diff --git a/16/root/usr/share/container-scripts/postgresql/README.md b/16/root/usr/share/container-scripts/postgresql/README.md index 51e4fe26..e269c155 100644 --- a/16/root/usr/share/container-scripts/postgresql/README.md +++ b/16/root/usr/share/container-scripts/postgresql/README.md @@ -8,7 +8,7 @@ Please note that while the examples provided in this README utilize `podman`, it This container image offers a containerized version of the PostgreSQL postgres daemon and client application. The postgres server daemon accepts client connections and grants access to PostgreSQL database content on behalf of said clients. For more information regarding the PostgreSQL project, please visit the official project website (https://www.postgresql.org/). -See [the Red Hat Enterprise Linux Application Streams Life Cycle page](https://access.redhat.com/support/policy/updates/rhel-app-streams-life-cycle) for information about support for this particular stream. +See [the Red Hat Enterprise Linux Application Streams Life Cycle page](https://access.redhat.com/support/policy/updates/rhel-app-streams-life-cycle) for information about support for a particular stream. ## Usage diff --git a/18/root/usr/share/container-scripts/postgresql/README.md b/18/root/usr/share/container-scripts/postgresql/README.md index aba237d2..4958e29d 100644 --- a/18/root/usr/share/container-scripts/postgresql/README.md +++ b/18/root/usr/share/container-scripts/postgresql/README.md @@ -8,7 +8,7 @@ Please note that while the examples provided in this README utilize `podman`, it This container image offers a containerized version of the PostgreSQL postgres daemon and client application. The postgres server daemon accepts client connections and grants access to PostgreSQL database content on behalf of said clients. For more information regarding the PostgreSQL project, please visit the official project website (https://www.postgresql.org/). -See [the Red Hat Enterprise Linux Application Streams Life Cycle page](https://access.redhat.com/support/policy/updates/rhel-app-streams-life-cycle) for information about support for this particular stream. +See [the Red Hat Enterprise Linux Application Streams Life Cycle page](https://access.redhat.com/support/policy/updates/rhel-app-streams-life-cycle) for information about support for a particular stream. ## Usage diff --git a/README.md b/README.md index 87e016b5..1923bf9e 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ Table start ||CentOS Stream 9|CentOS Stream 10|Fedora|RHEL 8|RHEL 9|RHEL 10| |:--|:--:|:--:|:--:|:--:|:--:|:--:| |12||||
✓`registry.redhat.io/rhel8/postgresql-12`
||| -|13|
✓`quay.io/sclorg/postgresql-13-c9s`
|||
✓`registry.redhat.io/rhel8/postgresql-13`
|
✓`registry.redhat.io/rhel9/postgresql-13`
|| +|13|
✓`quay.io/sclorg/postgresql-13-c9s`
||||
✓`registry.redhat.io/rhel9/postgresql-13`
|| |15|
✓`quay.io/sclorg/postgresql-15-c9s`
||
✓`quay.io/fedora/postgresql-15`
|
✓`registry.redhat.io/rhel8/postgresql-15`
|
✓`registry.redhat.io/rhel9/postgresql-15`
|| |16|
✓`quay.io/sclorg/postgresql-16-c9s`
|
✓`quay.io/sclorg/postgresql-16-c10s`
|
✓`quay.io/fedora/postgresql-16`
|
✓`registry.redhat.io/rhel8/postgresql-16`
|
✓`registry.redhat.io/rhel9/postgresql-16`
|
✓`registry.redhat.io/rhel10/postgresql-16`
| |18|
✓`quay.io/sclorg/postgresql-18-c9s`
|
✓`quay.io/sclorg/postgresql-18-c10s`
|
✓`quay.io/fedora/postgresql-18`
||
✓`registry.redhat.io/rhel9/postgresql-18`
|
✓`registry.redhat.io/rhel10/postgresql-18`
|