Building and testing nginx-container on RHEL 10

[phracek]

This pull request supports building and testing nginx-container on RHEL 10 quest.

The first commit adds Dockerfile.rhel10 for building and testing.
The second commit updates README.md files

[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 dockerfiles.

$ diff -u 1.26/Dockerfile.c10s 1.26/Dockerfile.rhel10
--- 1.26/Dockerfile.c10s	2024-09-25 08:05:42
+++ 1.26/Dockerfile.rhel10	2025-01-14 18:30:22
@@ -1,4 +1,4 @@
-FROM quay.io/sclorg/s2i-core-c10s:c10s
+FROM registry.stage.redhat.io/ubi10/s2i-core

 EXPOSE 8080
 EXPOSE 8443
@@ -23,12 +23,12 @@
       io.openshift.expose-services="8443:https" \
       io.openshift.tags="builder,${NAME},${NAME}-${NGINX_SHORT_VER}" \
       com.redhat.component="${NAME}-${NGINX_SHORT_VER}-container" \
-      name="sclorg/${NAME}-${NGINX_SHORT_VER}-c10s" \
+      name="rhel10/nginx-${NGINX_SHORT_VER}" \
       version="1" \
       com.redhat.license_terms="https://www.redhat.com/en/about/red-hat-end-user-license-agreements#UBI" \
       maintainer="SoftwareCollections.org <[email protected]>" \
       help="For more information visit https://github.com/sclorg/${NAME}-container" \
-      usage="s2i build <SOURCE-REPOSITORY> quay.io/sclorg/${NAME}-${NGINX_SHORT_VER}-c10s:latest <APP-NAME>"
+      usage="s2i build <SOURCE-REPOSITORY> rhel10/nginx-${NGINX_SHORT_VER}:latest <APP-NAME>"

 ENV NGINX_CONFIGURATION_PATH=${APP_ROOT}/etc/nginx.d \
     NGINX_CONF_PATH=/etc/nginx/nginx.conf \

Difference between RHEL9 and RHEL10 Dockerfiles

$ diff -u 1.26/Dockerfile.rhel9 1.26/Dockerfile.rhel10
--- 1.26/Dockerfile.rhel9	2024-09-25 08:05:42
+++ 1.26/Dockerfile.rhel10	2025-01-14 18:30:22
@@ -1,4 +1,4 @@
-FROM ubi9/s2i-core:1
+FROM registry.stage.redhat.io/ubi10/s2i-core

 EXPOSE 8080
 EXPOSE 8443
@@ -23,12 +23,12 @@
       io.openshift.expose-services="8443:https" \
       io.openshift.tags="builder,${NAME},${NAME}-${NGINX_SHORT_VER}" \
       com.redhat.component="${NAME}-${NGINX_SHORT_VER}-container" \
-      name="ubi9/${NAME}-${NGINX_SHORT_VER}" \
+      name="rhel10/nginx-${NGINX_SHORT_VER}" \
       version="1" \
       com.redhat.license_terms="https://www.redhat.com/en/about/red-hat-end-user-license-agreements#UBI" \
       maintainer="SoftwareCollections.org <[email protected]>" \
       help="For more information visit https://github.com/sclorg/${NAME}-container" \
-      usage="s2i build <SOURCE-REPOSITORY> ubi9/${NAME}-${NGINX_SHORT_VER}:latest <APP-NAME>"
+      usage="s2i build <SOURCE-REPOSITORY> rhel10/nginx-${NGINX_SHORT_VER}:latest <APP-NAME>"

 ENV NGINX_CONFIGURATION_PATH=${APP_ROOT}/etc/nginx.d \
     NGINX_CONF_PATH=/etc/nginx/nginx.conf \
@@ -38,12 +38,12 @@
     NGINX_LOG_PATH=/var/log/nginx \
     NGINX_PERL_MODULE_PATH=${APP_ROOT}/etc/perl

-RUN yum -y module enable nginx:$NGINX_VERSION && \
-    INSTALL_PKGS="nss_wrapper-libs bind-utils gettext hostname nginx nginx-mod-stream nginx-mod-http-perl" && \
-    yum install -y --setopt=tsflags=nodocs $INSTALL_PKGS && \
+# Modules does not exist
+RUN INSTALL_PKGS="nss_wrapper-libs bind-utils gettext hostname nginx nginx-mod-stream nginx-mod-http-perl" && \
+    dnf install -y --setopt=tsflags=nodocs $INSTALL_PKGS && \
     rpm -V $INSTALL_PKGS && \
     nginx -v 2>&1 | grep -qe "nginx/$NGINX_VERSION\." && echo "Found VERSION $NGINX_VERSION" && \
-    yum -y clean all --enablerepo='*'
+    dnf -y clean all --enablerepo='*'

 # Copy the S2I scripts from the specific language image to $STI_SCRIPTS_PATH
 COPY $NGINX_VERSION/s2i/bin/ $STI_SCRIPTS_PATH

[phracek]

Let's try the first run

[test]

[github-actions]

Testing Farm results

name	compose	arch	status	started (UTC)	time	logs
CentOS Stream 10 - 1.26	CentOS-Stream-10	x86_64	✅ passed	22.01.2025 08:04:27	4min 12s	test pipeline
CentOS Stream 9 - 1.22-micro	CentOS-Stream-9	x86_64	✅ passed	22.01.2025 08:03:25	5min 16s	test pipeline
CentOS Stream 9 - 1.24	CentOS-Stream-9	x86_64	✅ passed	22.01.2025 08:03:32	5min 47s	test pipeline
RHEL10 - 1.26	RHEL-10-Nightly	x86_64	✅ passed	22.01.2025 08:03:36	12min 56s	test pipeline
RHEL9 - Unsubscribed host - 1.20	RHEL-9.4.0-Nightly	x86_64	✅ passed	22.01.2025 08:03:23	10min 57s	test pipeline
RHEL9 - Unsubscribed host - 1.24	RHEL-9.4.0-Nightly	x86_64	✅ passed	22.01.2025 08:03:36	11min 27s	test pipeline
Fedora - 1.26	Fedora-latest	x86_64	✅ passed	22.01.2025 08:03:37	7min 46s	test pipeline
RHEL9 - Unsubscribed host - 1.22	RHEL-9.4.0-Nightly	x86_64	✅ passed	22.01.2025 08:03:25	11min 20s	test pipeline
RHEL9 - 1.20	RHEL-9.4.0-Nightly	x86_64	✅ passed	22.01.2025 08:03:27	12min 34s	test pipeline
RHEL9 - 1.22	RHEL-9.4.0-Nightly	x86_64	✅ passed	22.01.2025 08:03:27	11min 57s	test pipeline
RHEL9 - 1.24	RHEL-9.4.0-Nightly	x86_64	✅ passed	22.01.2025 08:03:33	12min 45s	test pipeline
RHEL8 - 1.22	RHEL-8.10.0-Nightly	x86_64	✅ passed	22.01.2025 08:03:24	15min 9s	test pipeline
RHEL8 - 1.24	RHEL-8.10.0-Nightly	x86_64	✅ passed	22.01.2025 08:03:33	14min 50s	test pipeline
RHEL8 - 1.22-micro	RHEL-8.10.0-Nightly	x86_64	✅ passed	22.01.2025 08:03:27	15min 43s	test pipeline

[phracek]

@uhliarik Please review it. Thanks

[phracek]

As far as I know only nginx-126 is affected.

[phracek]

Retest after changing image name from 'rhel10/nginx-' to 'ubi10/nginx-'

[test]

[phracek]

[test]