Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support for building and testing perl container on RHEL10 #327

Open
wants to merge 3 commits into
base: master
Choose a base branch
from

Conversation

phracek
Copy link
Member

@phracek phracek commented Jan 17, 2025

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

The pull request is separated into three commits.

  • updates container-common-scripts to the latest
  • Add Dockerfile.rhel10 to corresponding version in order to support RHEL10
  • Update README.md files with support RHEL10

Copy link

github-actions bot commented Jan 17, 2025

Pull Request validation

Failed

🔴 Failed or pending statuses - Testing Farm - RHEL8 - 5.26-mod_fcgid[pending],Testing Farm - CentOS Stream 9 - 5.32[pending],Testing Farm - RHEL8 - 5.32[pending],Testing Farm - RHEL9 - 5.32[pending],Testing Farm - Fedora - 5.36[pending],Testing Farm - CentOS Stream 10 - 5.40[pending],Testing Farm - Fedora - 5.38[pending],Testing Farm - RHEL10 - 5.40[pending],Testing Farm - Fedora - 5.40[pending]
🔴 Review - Missing review from a member (2 required)

@phracek
Copy link
Member Author

phracek commented Jan 17, 2025

Differences between C10S and RHEL10 are:

$ diff -u 5.40/Dockerfile.c10s 5.40/Dockerfile.rhel10
--- 5.40/Dockerfile.c10s        2024-09-09 15:08:47
+++ 5.40/Dockerfile.rhel10      2025-01-17 09:38:13
@@ -1,4 +1,4 @@
-FROM quay.io/sclorg/s2i-base-c10s:c10s
+FROM registry.stage.redhat.io/ubi10/s2i-base

 # This image provides a Perl 5.40 environment you can use to run your Perl applications.

@@ -26,13 +26,13 @@
       io.openshift.tags="builder,${NAME},${NAME}${PERL_SHORT_VER}","${NAME}-${PERL_SHORT_VER}" \
       io.openshift.s2i.scripts-url="image:///usr/libexec/s2i" \
       io.s2i.scripts-url="image:///usr/libexec/s2i" \
-      name="sclorg/${NAME}-${PERL_SHORT_VER}-c10s" \
+      name="ubi10/${NAME}-${PERL_SHORT_VER}" \
       com.redhat.component="${NAME}-${PERL_SHORT_VER}-container" \
       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/s2i-${NAME}-container" \
-      usage="s2i build <SOURCE-REPOSITORY> quay.io/sclorg/${NAME}-${PERL_SHORT_VER}-c10s:latest <APP-NAME>"
+      usage="s2i build <SOURCE-REPOSITORY> ubi10/${NAME}-${PERL_SHORT_VER} <APP-NAME>"

 # Deselect a default stream
 RUN dnf -y --allowerasing distrosync && \

It should help for easier review.

@phracek phracek force-pushed the building_testing_rhel10 branch from a90ddc4 to 3098014 Compare January 17, 2025 09:35
@phracek
Copy link
Member Author

phracek commented Jan 17, 2025

Rebased against master.

[test]

Copy link

github-actions bot commented Jan 17, 2025

Testing Farm results

namecomposearchstatusstarted (UTC)timelogs
CentOS Stream 10 - 5.40CentOS-Stream-10x86_64✅ passed17.01.2025 09:35:4112min 15stest pipeline
CentOS Stream 9 - 5.32CentOS-Stream-9x86_64✅ passed17.01.2025 09:35:2812min 47stest pipeline
Fedora - 5.36Fedora-latestx86_64✅ passed17.01.2025 09:35:3618min 17stest pipeline
Fedora - 5.40Fedora-latestx86_64✅ passed17.01.2025 09:35:4418min 14stest pipeline
Fedora - 5.38Fedora-latestx86_64✅ passed17.01.2025 09:35:4219min 28stest pipeline
RHEL10 - 5.40RHEL-10-Nightlyx86_64✅ passed17.01.2025 09:35:4320min 44stest pipeline
RHEL8 - 5.26-mod_fcgidRHEL-8.10.0-Nightlyx86_64✅ passed17.01.2025 09:35:2728min 3stest pipeline
RHEL9 - 5.32RHEL-9.4.0-Nightlyx86_64✅ passed17.01.2025 09:35:3527min 52stest pipeline
RHEL8 - 5.32RHEL-8.10.0-Nightlyx86_64✅ passed17.01.2025 09:35:3228min 11stest pipeline

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant