Building and testing container on RHEL10 host #475

phracek · 2025-01-16T07:50:49Z

This pull request enables building and testing s2i-php-container on RHEL10 host.

The pull request is separated into 2 commits:

The first one adds 8.3/Dockerfile.rhel10
The second one updates README.md files with RHEL10 information

github-actions · 2025-01-16T07:51:23Z

Pull Request validation

Failed

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

Success

🟢 CI - All checks have passed

phracek · 2025-01-16T07:52:38Z

Differences between C10S and RHEL10 Dockerfiles for 8.3:

 diff -u 8.3/Dockerfile.c10s 8.3/Dockerfile.rhel10
--- 8.3/Dockerfile.c10s 2024-08-08 10:55:09
+++ 8.3/Dockerfile.rhel10       2025-01-15 15:24:52
@@ -1,4 +1,4 @@
-FROM quay.io/sclorg/s2i-base-c10s:c10s
+FROM registry.stage.redhat.io/ubi10/s2i-base

 # This image provides an Apache+PHP environment for running PHP
 # applications.
@@ -32,12 +32,12 @@
       io.openshift.tags="builder,${NAME},${NAME}${PHP_VER_SHORT},${NAME}-${PHP_VER_SHORT}" \
       io.openshift.s2i.scripts-url="image:///usr/libexec/s2i" \
       io.s2i.scripts-url="image:///usr/libexec/s2i" \
-      name="sclorg/${NAME}-${PHP_VER_SHORT}-c10s" \
+      name="ubi10/${NAME}-${PHP_VER_SHORT}" \
       com.redhat.component="${NAME}-${PHP_VER_SHORT}-container" \
       version="1" \
       com.redhat.license_terms="https://www.redhat.com/en/about/red-hat-end-user-license-agreements#UBI" \
       help="For more information visit https://github.com/sclorg/s2i-${NAME}-container" \
-      usage="s2i build https://github.com/sclorg/s2i-php-container.git --context-dir=${PHP_VERSION}/test/test-app sclorg/${NAME}-${PHP_VER_SHORT}-c10s sample-server" \
+      usage="s2i build https://github.com/sclorg/s2i-php-container.git --context-dir=${PHP_VERSION}/test/test-app ubi10/${NAME}-${PHP_VER_SHORT} sample-server" \
       maintainer="SoftwareCollections.org <[email protected]>"

 # Install Apache httpd and PHP

Differences between RHEL9 and RHEL10 dockerfiles for 8.3 is:

diff -u 8.3/Dockerfile.rhel9 8.3/Dockerfile.rhel10
--- 8.3/Dockerfile.rhel9        2024-08-08 10:55:09
+++ 8.3/Dockerfile.rhel10       2025-01-15 15:24:52
@@ -1,4 +1,4 @@
-FROM ubi9/s2i-base:1
+FROM registry.stage.redhat.io/ubi10/s2i-base

 # This image provides an Apache+PHP environment for running PHP
 # applications.
@@ -7,7 +7,7 @@
 EXPOSE 8443

 # Description
-# This image provides an Apache 2.4 + PHP 8.0 environment for running PHP applications.
+# This image provides an Apache 2.4 + PHP 7.4 environment for running PHP applications.
 # Exposed ports:
 # * 8080 - alternative port for http

@@ -32,12 +32,12 @@
       io.openshift.tags="builder,${NAME},${NAME}${PHP_VER_SHORT},${NAME}-${PHP_VER_SHORT}" \
       io.openshift.s2i.scripts-url="image:///usr/libexec/s2i" \
       io.s2i.scripts-url="image:///usr/libexec/s2i" \
-      name="ubi9/${NAME}-${PHP_VER_SHORT}" \
+      name="ubi10/${NAME}-${PHP_VER_SHORT}" \
       com.redhat.component="${NAME}-${PHP_VER_SHORT}-container" \
       version="1" \
       com.redhat.license_terms="https://www.redhat.com/en/about/red-hat-end-user-license-agreements#UBI" \
       help="For more information visit https://github.com/sclorg/s2i-${NAME}-container" \
-      usage="s2i build https://github.com/sclorg/s2i-php-container.git --context-dir=${PHP_VERSION}/test/test-app ubi9/${NAME}-${PHP_VER_SHORT} sample-server" \
+      usage="s2i build https://github.com/sclorg/s2i-php-container.git --context-dir=${PHP_VERSION}/test/test-app ubi10/${NAME}-${PHP_VER_SHORT} sample-server" \
       maintainer="SoftwareCollections.org <[email protected]>"

 # Install Apache httpd and PHP
@@ -46,8 +46,7 @@
                   php-process php-soap php-opcache php-xml \
                   php-gmp php-pecl-apcu php-pecl-zip mod_ssl hostname"

-RUN dnf module -y enable php:$PHP_VERSION && \
-    dnf install -y --setopt=tsflags=nodocs $INSTALL_PKGS && \
+RUN dnf install -y --setopt=tsflags=nodocs $INSTALL_PKGS && \
     dnf reinstall -y tzdata && \
     rpm -V $INSTALL_PKGS && \
     php -v | grep -qe "v$PHP_VERSION\." && echo "Found VERSION $PHP_VERSION" && \
@@ -61,7 +60,6 @@
     PHP_FPM_CONF_D_PATH=/etc/php-fpm.d \
     PHP_FPM_CONF_FILE=www.conf \
     PHP_FPM_RUN_DIR=/run/php-fpm \
-    PHP_CLEAR_ENV=ON \
     PHP_MAIN_FPM_CONF_FILE=/etc/php-fpm.conf \
     PHP_FPM_LOG_PATH=/var/log/php-fpm \
     HTTPD_CONFIGURATION_PATH=${APP_ROOT}/etc/conf.d \
@@ -82,10 +80,6 @@
 # Reset permissions of filesystem to default values
 RUN /usr/libexec/container-setup && rpm-file-permissions

-# RPM uses a wrong file in the config
-# Related: https://bugzilla.redhat.com/show_bug.cgi?id=2092356
-RUN sed -i "s/mod_php7.c/mod_php.c/" /etc/httpd/conf.d/php.conf
-
 USER 1001

 # Set the default CMD to print the usage of the language image

phracek · 2025-01-20T11:38:29Z

[test]

github-actions · 2025-01-20T11:45:18Z

Testing Farm results

name	compose	arch	status	started (UTC)	time	logs
CentOS Stream 10 - 8.3	CentOS-Stream-10	x86_64	✅ passed	31.01.2025 09:11:31	7min 35s	test pipeline
Fedora - 8.3	Fedora-latest	x86_64	✅ passed	31.01.2025 09:11:27	10min 58s	test pipeline
Fedora - 8.2	Fedora-latest	x86_64	✅ passed	31.01.2025 09:11:25	10min 47s	test pipeline
Fedora - 8.1	Fedora-latest	x86_64	✅ passed	31.01.2025 09:11:20	10min 41s	test pipeline
RHEL10 - 8.3	RHEL-10-Nightly	x86_64	✅ passed	31.01.2025 09:11:29	14min 30s	test pipeline
RHEL9 - 8.0	RHEL-9.4.0-Nightly	x86_64	✅ passed	31.01.2025 09:11:20	15min 42s	test pipeline
RHEL9 - 8.2	RHEL-9.4.0-Nightly	x86_64	✅ passed	29.01.2025 08:49:15	14min 44s	test pipeline
RHEL9 - 8.1	RHEL-9.4.0-Nightly	x86_64	✅ passed	31.01.2025 09:11:19	13min 55s	test pipeline
RHEL8 - 7.4	RHEL-8.10.0-Nightly	x86_64	✅ passed	31.01.2025 09:11:19	16min 51s	test pipeline
RHEL8 - 8.0	RHEL-8.10.0-Nightly	x86_64	✅ passed	29.01.2025 08:49:08	15min 36s	test pipeline
RHEL8 - 8.2	RHEL-8.10.0-Nightly	x86_64	✅ passed	31.01.2025 09:11:25	16min 45s	test pipeline

phracek · 2025-01-20T11:52:32Z

The build RHEL10 failed here:

$ STEP 13/16: RUN /usr/libexec/container-setup && rpm-file-permissions
chmod: cannot access '/etc/pki/tls/certs/localhost.crt': No such file or directory
Error: building at STEP "RUN /usr/libexec/container-setup && rpm-file-permissions": while running runtime: exit status 1
errexit on line 33, common/build.sh
errexit on line 33, common/build.sh
errexit on line 41, common/build.sh
errexit on line 42, common/build.sh
errexit on line 61, common/build.sh
errexit on line 61, common/build.sh
make[1]: *** [common/common.mk:87: 8.3] Error 1

phracek · 2025-01-22T11:20:33Z

Use short names and fix error.

[test]

phracek · 2025-01-29T08:48:52Z

[test]

8.3/Dockerfile.rhel10

remicollet

LGTM

Add OS host also to test/run, container-setup and s2i/bin/run Signed-off-by: Petr "Stone" Hracek <[email protected]>

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

phracek · 2025-01-31T09:11:05Z

Apply fix from #479 into 8.3/Dockerfile.rhel10

[test]

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

github-actions bot added the pr/failing-ci label Jan 20, 2025

github-actions bot removed the pr/failing-ci label Jan 20, 2025

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

phracek force-pushed the building_testing_rhel10 branch from 102d65e to 4b9b133 Compare January 29, 2025 08:48

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

phracek requested review from pkubatrh, remicollet and hhorak January 29, 2025 09:17

phracek added the ready for review label Jan 29, 2025

notroj reviewed Jan 29, 2025

View reviewed changes

8.3/Dockerfile.rhel10 Outdated Show resolved Hide resolved

remicollet approved these changes Jan 30, 2025

View reviewed changes

phracek added 3 commits January 31, 2025 10:07

Building and testing container on RHEL10 host.

56b71de

Add OS host also to test/run, container-setup and s2i/bin/run Signed-off-by: Petr "Stone" Hracek <[email protected]>

Update documentation with RHEL10 support

15d450d

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

use ext name instead of pkg name, and add redis #479

ac616b4

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

phracek force-pushed the building_testing_rhel10 branch from 4b9b133 to ac616b4 Compare January 31, 2025 09:10

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

phracek merged commit b778765 into master Jan 31, 2025
11 checks passed

phracek deleted the building_testing_rhel10 branch January 31, 2025 09:32

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Building and testing container on RHEL10 host #475

Building and testing container on RHEL10 host #475

Uh oh!

phracek commented Jan 16, 2025 •

edited by github-actions bot

Loading

Uh oh!

github-actions bot commented Jan 16, 2025 •

edited

Loading

Uh oh!

phracek commented Jan 16, 2025

Uh oh!

phracek commented Jan 20, 2025

Uh oh!

github-actions bot commented Jan 20, 2025 •

edited

Loading

Uh oh!

phracek commented Jan 20, 2025

Uh oh!

phracek commented Jan 22, 2025

Uh oh!

phracek commented Jan 29, 2025

Uh oh!

Uh oh!

remicollet left a comment

Uh oh!

phracek commented Jan 31, 2025

Uh oh!

Uh oh!

Uh oh!

Building and testing container on RHEL10 host #475

Building and testing container on RHEL10 host #475

Uh oh!

Conversation

phracek commented Jan 16, 2025 • edited by github-actions bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

github-actions bot commented Jan 16, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Pull Request validation

Failed

Success

Uh oh!

phracek commented Jan 16, 2025

Uh oh!

phracek commented Jan 20, 2025

Uh oh!

github-actions bot commented Jan 20, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Testing Farm results

Uh oh!

phracek commented Jan 20, 2025

Uh oh!

phracek commented Jan 22, 2025

Uh oh!

phracek commented Jan 29, 2025

Uh oh!

Uh oh!

remicollet left a comment

Choose a reason for hiding this comment

Uh oh!

phracek commented Jan 31, 2025

Uh oh!

Uh oh!

Uh oh!

phracek commented Jan 16, 2025 •

edited by github-actions bot

Loading

github-actions bot commented Jan 16, 2025 •

edited

Loading

github-actions bot commented Jan 20, 2025 •

edited

Loading