Support building and testing httpd-container on RHEL10

[phracek]

The pull request is separated into three commits.

The first commit adds support for building and testing httpd-container especially version '2.4' on RHEL10.
The second commit updates README.md file with RHEL10 support.
The third commit updates the container-common-scripts to the latest one.

The 2.4-micro is skipped.

[github-actions]

Pull Request validation

Failed

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

Success

🟢 CI - All checks have passed

[phracek]

Difference between C10S and RHEL10:

$  diff -u 2.4/Dockerfile.c10s 2.4/Dockerfile.rhel10
--- 2.4/Dockerfile.c10s 2024-11-07 10:06:41
+++ 2.4/Dockerfile.rhel10       2025-01-14 12:10:22
@@ -1,4 +1,4 @@
-FROM quay.io/sclorg/s2i-core-c10s:c10s
+FROM registry.stage.redhat.io/ubi10/s2i-core

 # Apache HTTP Server image.
 #
@@ -26,11 +26,11 @@
       io.k8s.display-name="Apache httpd $HTTPD_VERSION" \
       io.openshift.expose-services="8080:http,8443:https" \
       io.openshift.tags="builder,$NAME,$NAME-$HTTPD_SHORT_VERSION" \
-      name="sclorg/$NAME-$HTTPD_SHORT_VERSION-c10s" \
+      name="rhel10/httpd-24" \
       version="1" \
       com.redhat.license_terms="https://www.redhat.com/en/about/red-hat-end-user-license-agreements#rhel" \
       com.redhat.component="httpd-24-container" \
-      usage="s2i build https://github.com/sclorg/httpd-container.git --context-dir=examples/sample-test-app/ quay.io/sclorg/$NAME-$HTTPD_SHORT_VERSION-c10s sample-server" \
+      usage="s2i build https://github.com/sclorg/httpd-container.git --context-dir=examples/sample-test-app/ rhel10/httpd-24 sample-server" \
       maintainer="SoftwareCollections.org <[email protected]>"

 EXPOSE 8080

Difference between RHEL9 and RHEL10 is:

$ diff -u 2.4/Dockerfile.rhel9 2.4/Dockerfile.rhel10
--- 2.4/Dockerfile.rhel9        2024-11-07 10:06:41
+++ 2.4/Dockerfile.rhel10       2025-01-14 12:10:22
@@ -1,4 +1,4 @@
-FROM ubi9/s2i-core:1
+FROM registry.stage.redhat.io/ubi10/s2i-core

 # Apache HTTP Server image.
 #
@@ -10,7 +10,8 @@

 ENV HTTPD_VERSION=2.4 \
     HTTPD_SHORT_VERSION=24 \
-    NAME=httpd
+    NAME=httpd \
+    ARCH=x86_64

 ENV SUMMARY="Platform for running Apache httpd $HTTPD_VERSION or building httpd-based application" \
     DESCRIPTION="Apache httpd $HTTPD_VERSION available as container, is a powerful, efficient, \
@@ -25,21 +26,21 @@
       io.k8s.display-name="Apache httpd $HTTPD_VERSION" \
       io.openshift.expose-services="8080:http,8443:https" \
       io.openshift.tags="builder,$NAME,$NAME-$HTTPD_SHORT_VERSION" \
-      name="rhel9/$NAME-$HTTPD_SHORT_VERSION" \
+      name="rhel10/httpd-24" \
       version="1" \
-      com.redhat.license_terms="https://www.redhat.com/en/about/red-hat-end-user-license-agreements#UBI" \
-      com.redhat.component="$NAME-$HTTPD_SHORT_VERSION-container" \
-      usage="s2i build https://github.com/sclorg/httpd-container.git --context-dir=examples/sample-test-app/ rhel9/$NAME-$HTTPD_SHORT_VERSION sample-server" \
+      com.redhat.license_terms="https://www.redhat.com/en/about/red-hat-end-user-license-agreements#rhel" \
+      com.redhat.component="httpd-24-container" \
+      usage="s2i build https://github.com/sclorg/httpd-container.git --context-dir=examples/sample-test-app/ rhel10/httpd-24 sample-server" \
       maintainer="SoftwareCollections.org <[email protected]>"

 EXPOSE 8080
 EXPOSE 8443

-RUN INSTALL_PKGS="gettext hostname nss_wrapper-libs bind-utils httpd mod_ssl mod_ldap mod_session mod_security mod_auth_mellon sscg" && \
-    yum install -y --setopt=tsflags=nodocs $INSTALL_PKGS && \
+RUN INSTALL_PKGS="gettext hostname nss_wrapper-libs bind-utils httpd mod_ssl mod_ldap mod_session sscg" && \
+    dnf install -y --setopt=tsflags=nodocs $INSTALL_PKGS && \
     rpm -V $INSTALL_PKGS && \
     httpd -v | grep -qe "Apache/$HTTPD_VERSION" && echo "Found VERSION $HTTPD_VERSION" && \
-    yum -y clean all --enablerepo='*'
+    dnf -y clean all --enablerepo='*'

 ENV HTTPD_CONTAINER_SCRIPTS_PATH=/usr/share/container-scripts/httpd/ \
     HTTPD_APP_ROOT=${APP_ROOT} \

The local tests have PASSED

==============================================
Tests were run for image rhel10/httpd-24:1
==============================================
Test cases results:

 [PASSED] for 'all' run_self_cert_test (00:00:07)
 [PASSED] for 'all' run_default_page_test (00:00:04)
 [PASSED] for 'all' run_as_root_test (00:00:03)
 [PASSED] for 'all' run_log_to_volume_test (00:00:07)
 [PASSED] for 'all' run_data_volume_test (00:00:03)
 [PASSED] for 'all' run_s2i_test (00:00:08)
 [PASSED] for 'all' run_cert_age_test (00:00:06)
 [PASSED] for 'all' run_pre_init_test (00:00:08)
 [PASSED] for 'all' run_mpm_config_test (00:00:10)
 [PASSED] for 'all' run_dockerfiles_test (00:00:18)

Tests for rhel10/httpd-24:1 succeeded.

[phracek]

Let's first test shot:

[test]

[github-actions]

Testing Farm results

name	compose	arch	status	started (UTC)	time	logs
CentOS Stream 10 - 2.4	CentOS-Stream-10	x86_64	✅ passed	21.01.2025 10:51:25	5min 8s	test pipeline
CentOS Stream 9 - 2.4	CentOS-Stream-9	x86_64	✅ passed	21.01.2025 10:51:25	5min 49s	test pipeline
CentOS Stream 10 - 2.4-micro	CentOS-Stream-10	x86_64	✅ passed	21.01.2025 10:51:23	4min 57s	test pipeline
CentOS Stream 9 - 2.4-micro	CentOS-Stream-9	x86_64	✅ passed	21.01.2025 10:51:23	5min 45s	test pipeline
RHEL10 - 2.4	RHEL-10-Nightly	x86_64	✅ passed	21.01.2025 10:51:23	12min 31s	test pipeline
Fedora - 2.4	Fedora-latest	x86_64	✅ passed	21.01.2025 10:51:26	8min 32s	test pipeline
Fedora - 2.4-micro	Fedora-latest	x86_64	✅ passed	21.01.2025 10:51:23	9min 4s	test pipeline
RHEL9 - 2.4	RHEL-9.4.0-Nightly	x86_64	✅ passed	21.01.2025 10:51:24	12min 43s	test pipeline
RHEL8 - 2.4	RHEL-8.10.0-Nightly	x86_64	✅ passed	21.01.2025 10:51:22	17min 27s	test pipeline

[phracek]

[test]

[phracek]

@notroj @uhliarik Can you please review it? Test should passed for RHEL10

[phracek]

[test]

[phracek]

[test]

[uhliarik]

Changes between RHEL9 and RHEL10 files look correct. Tests passed. LGTM.