Building testing postgresql-container on RHEL10 #604

phracek · 2025-01-15T11:21:31Z

This pull request is separated into two commit.

The first commit adds support for dist-gen source files for RHEL10. In this case PostgreSQL 16.
The second commit adds distgen generated files.

README.md files are also updated.

github-actions · 2025-01-15T11:22:16Z

Pull Request validation

Failed

🔴 Review - Missing review from a member (1 required)

Success

🟢 CI - All checks have passed

phracek · 2025-01-15T11:23:04Z

Differences between C10S and RHEL10 Dockerfiles:

 diff -u 16/Dockerfile.c10s 16/Dockerfile.rhel10
--- 16/Dockerfile.c10s  2025-01-15 11:11:03
+++ 16/Dockerfile.rhel10        2025-01-15 11:11:03
@@ -1,4 +1,4 @@
-FROM quay.io/sclorg/s2i-core-c10s:c10s
+FROM ubi10/s2i-core

 # PostgreSQL image for OpenShift.
 # Volumes:
@@ -28,10 +28,11 @@
       io.openshift.expose-services="5432:postgresql" \
       io.openshift.tags="database,postgresql,postgresql16,postgresql-16" \
       io.openshift.s2i.assemble-user="26" \
-      name="sclorg/postgresql-16-c10s" \
+      name="rhel10/postgresql-16" \
       com.redhat.component="postgresql-16-container" \
       version="1" \
-      usage="podman run -d --name postgresql_database -e POSTGRESQL_USER=user -e POSTGRESQL_PASSWORD=pass -e POSTGRESQL_DATABASE=db -p 5432:5432 sclorg/postgresql-16-c10s" \
+      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 rhel10/postgresql-16" \
       maintainer="SoftwareCollections.org <[email protected]>"

 EXPOSE 5432
@@ -42,10 +43,11 @@
 # safe in the future. This should *never* change, the last test is there
 # to make sure of that.
 RUN INSTALL_PKGS="rsync tar gettext-envsubst bind-utils nss_wrapper-libs glibc-locale-source xz" && \
-    PSQL_PKGS="postgresql16-server postgresql16-contrib postgresql16-upgrade" && \
+    PSQL_PKGS="postgresql16-server postgresql16-contrib" && \
     INSTALL_PKGS="$INSTALL_PKGS pgaudit" && \
+    INSTALL_PKGS="$INSTALL_PKGS procps-ng util-linux postgresql-upgrade" && \
     yum -y --setopt=tsflags=nodocs install $INSTALL_PKGS $PSQL_PKGS  && \
-    rpm -V $INSTALL_PKGS postgresql-server postgresql-contrib postgresql-upgrade && \
+    rpm -V $INSTALL_PKGS  && \
     postgres -V | grep -qe "$POSTGRESQL_VERSION\." && echo "Found VERSION $POSTGRESQL_VERSION" && \
     yum -y clean all --enablerepo='*' && \
     localedef -f UTF-8 -i en_US en_US.UTF-8 && \

Differences between RHEL9 and RHEL10 dockerfiles:

 diff -u 16/Dockerfile.rhel9 16/Dockerfile.rhel10
--- 16/Dockerfile.rhel9 2025-01-15 11:11:03
+++ 16/Dockerfile.rhel10        2025-01-15 11:11:03
@@ -1,4 +1,4 @@
-FROM ubi9/s2i-core
+FROM registry.stage.redhat.io/ubi10/s2i-core

 # PostgreSQL image for OpenShift.
 # Volumes:
@@ -28,11 +28,11 @@
       io.openshift.expose-services="5432:postgresql" \
       io.openshift.tags="database,postgresql,postgresql16,postgresql-16" \
       io.openshift.s2i.assemble-user="26" \
-      name="rhel9/postgresql-16" \
+      name="rhel10/postgresql-16" \
       com.redhat.component="postgresql-16-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 rhel9/postgresql-16" \
+      usage="podman run -d --name postgresql_database -e POSTGRESQL_USER=user -e POSTGRESQL_PASSWORD=pass -e POSTGRESQL_DATABASE=db -p 5432:5432 rhel10/postgresql-16" \
       maintainer="SoftwareCollections.org <[email protected]>"

 EXPOSE 5432
@@ -42,14 +42,13 @@
 # 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:16 || :; } && \
-    INSTALL_PKGS="rsync tar gettext bind-utils nss_wrapper-libs postgresql-server postgresql-contrib" && \
+RUN INSTALL_PKGS="rsync tar gettext-envsubst bind-utils nss_wrapper-libs glibc-locale-source xz" && \
+    PSQL_PKGS="postgresql16-server postgresql16-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 && \
+    yum -y --setopt=tsflags=nodocs install $INSTALL_PKGS $PSQL_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)" && \

phracek · 2025-01-15T11:23:45Z

[test]

phracek · 2025-01-15T11:24:56Z

Hi @pkubatrh @hhorak @fila43 If you have a spare time. Review it please. LGTM or Approval is welcome.

Tests are locally passing:

==============================================
Tests were run for image rhel10/postgresql-16:1
==============================================
Test cases results:

 [PASSED] for 'postgresql-container_tests' run_container_creation_tests (00:00:34)
 [PASSED] for 'postgresql-container_tests' run_general_tests (00:01:06)
 [PASSED] for 'postgresql-container_tests' run_change_password_test (00:00:11)
 [PASSED] for 'postgresql-container_tests' run_replication_test (00:00:08)
 [PASSED] for 'postgresql-container_tests' run_s2i_test (00:00:20)
 [PASSED] for 'postgresql-container_tests' run_test_cfg_hook (00:00:12)
 [PASSED] for 'postgresql-container_tests' run_s2i_bake_data_test (00:00:15)
 [PASSED] for 'postgresql-container_tests' run_s2i_enable_ssl_test (00:00:09)
 [PASSED] for 'postgresql-container_tests' run_upgrade_test (00:00:00)
 [PASSED] for 'postgresql-container_tests' run_migration_test (00:00:00)
 [PASSED] for 'postgresql-container_tests' run_pgaudit_test (00:00:03)
 [PASSED] for 'postgresql-container_tests' run_env_extension_load_test (00:00:03)
 [PASSED] for 'postgresql-container_tests' run_logging_test (00:00:03)

Tests for rhel10/postgresql-16:1 succeeded.

github-actions · 2025-01-15T11:31:40Z

Testing Farm results

name	compose	arch	status	started (UTC)	time	logs
CentOS Stream 10 - 16	CentOS-Stream-10	x86_64	✅ passed	30.01.2025 09:39:25	8min 9s	test pipeline
CentOS Stream 9 - 15	CentOS-Stream-9	x86_64	✅ passed	30.01.2025 09:39:18	10min 19s	test pipeline
CentOS Stream 9 - 16	CentOS-Stream-9	x86_64	✅ passed	30.01.2025 09:39:22	10min 39s	test pipeline
Fedora - 15	Fedora-latest	x86_64	✅ passed	30.01.2025 09:39:18	11min 37s	test pipeline
Fedora - 16	Fedora-latest	x86_64	✅ passed	30.01.2025 09:39:22	11min 15s	test pipeline
RHEL9 - 13	RHEL-9.4.0-Nightly	x86_64	✅ passed	30.01.2025 15:58:07	15min 23s	test pipeline
RHEL9 - 15	RHEL-9.4.0-Nightly	x86_64	✅ passed	30.01.2025 09:40:12	16min 36s	test pipeline
RHEL9 - 16	RHEL-9.4.0-Nightly	x86_64	✅ passed	30.01.2025 09:39:27	17min 10s	test pipeline
RHEL8 - 12	RHEL-8.10.0-Nightly	x86_64	✅ passed	30.01.2025 09:39:08	17min 37s	test pipeline
RHEL8 - 13	RHEL-8.10.0-Nightly	x86_64	✅ passed	30.01.2025 15:58:08	19min 43s	test pipeline
RHEL8 - 15	RHEL-8.10.0-Nightly	x86_64	✅ passed	30.01.2025 09:39:22	18min 42s	test pipeline
RHEL8 - 16	RHEL-8.10.0-Nightly	x86_64	✅ passed	30.01.2025 15:58:09	20min 16s	test pipeline
CentOS Stream 9 - 13	CentOS-Stream-9	x86_64	✅ passed	30.01.2025 09:39:11	9min 32s	test pipeline
RHEL10 - 16	RHEL-10-Nightly	x86_64	✅ passed	30.01.2025 15:58:12	14min 39s	test pipeline

phracek · 2025-01-15T12:12:19Z

@hhorak @fila43 @pkubatrh @SlouchyButton In case you have spare time, please review it and give Approval.

phracek · 2025-01-16T09:31:06Z

Building on RHEL10 is allowed. Re-run again
[test]

PostgreSQL 16 is supported on RHEL10. README.md file is updated for the each version as well. Signed-off-by: Petr "Stone" Hracek <[email protected]>

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

phracek · 2025-01-28T15:02:12Z

Fixed base image for 16/Dockerfile.rhel10.

[test]

phracek · 2025-01-30T09:38:20Z

[test]

fila43 · 2025-02-03T08:45:06Z

LGTM

github-actions bot added the pr/missing-review label Jan 15, 2025

phracek requested a review from fila43 January 15, 2025 11:23

phracek added enhancement ready for review labels Jan 15, 2025

sclorg deleted a comment from github-actions bot Jan 15, 2025

phracek force-pushed the building_testing_rhel10 branch from d4b5140 to 078251e Compare January 23, 2025 14:49

phracek added the READY-to-MERGE label Jan 27, 2025

phracek added 2 commits January 28, 2025 15:59

Add support for RHEL10 for dist-gen source files.

db06191

PostgreSQL 16 is supported on RHEL10. README.md file is updated for the each version as well. Signed-off-by: Petr "Stone" Hracek <[email protected]>

Update README.md files and add generated 16/Dockerfile.rhel10

005cbc7

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

phracek force-pushed the building_testing_rhel10 branch from 078251e to 005cbc7 Compare January 28, 2025 15:01

github-actions bot added pr/failing-ci and removed pr/failing-ci labels Jan 30, 2025

phracek removed the enhancement label Feb 3, 2025

phracek merged commit 30c08c7 into master Feb 3, 2025
16 checks passed

phracek deleted the building_testing_rhel10 branch February 3, 2025 10:46

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Building testing postgresql-container on RHEL10 #604

Building testing postgresql-container on RHEL10 #604

phracek commented Jan 15, 2025 •

edited by github-actions bot

Loading

github-actions bot commented Jan 15, 2025 •

edited

Loading

phracek commented Jan 15, 2025 •

edited

Loading

phracek commented Jan 15, 2025

phracek commented Jan 15, 2025

github-actions bot commented Jan 15, 2025 •

edited

Loading

phracek commented Jan 15, 2025

phracek commented Jan 16, 2025

phracek commented Jan 28, 2025

phracek commented Jan 30, 2025

fila43 commented Feb 3, 2025

Building testing postgresql-container on RHEL10 #604

Building testing postgresql-container on RHEL10 #604

Conversation

phracek commented Jan 15, 2025 • edited by github-actions bot Loading

github-actions bot commented Jan 15, 2025 • edited Loading

Pull Request validation

Failed

Success

phracek commented Jan 15, 2025 • edited Loading

phracek commented Jan 15, 2025

phracek commented Jan 15, 2025

github-actions bot commented Jan 15, 2025 • edited Loading

Testing Farm results

phracek commented Jan 15, 2025

phracek commented Jan 16, 2025

phracek commented Jan 28, 2025

phracek commented Jan 30, 2025

fila43 commented Feb 3, 2025

phracek commented Jan 15, 2025 •

edited by github-actions bot

Loading

github-actions bot commented Jan 15, 2025 •

edited

Loading

phracek commented Jan 15, 2025 •

edited

Loading

github-actions bot commented Jan 15, 2025 •

edited

Loading