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

Building and testing s2i-ruby-container on RHEL10 #573

Merged
merged 3 commits into from
Jan 22, 2025

Conversation

phracek
Copy link
Member

@phracek phracek commented Jan 16, 2025

This pull request adds support for building and testing container in RHEL10.

The pull request is separated into two commits.

  • 3.3/Dockerfile.rhel10 that enables testing on RHEL10
  • Update README.md file with RHEL10 on-boarding

@phracek
Copy link
Member Author

phracek commented Jan 16, 2025

Differences between C10S and RHEL10:

$  diff -u 3.3/Dockerfile.c10s 3.3/Dockerfile.rhel10
--- 3.3/Dockerfile.c10s 2024-09-10 10:09:55
+++ 3.3/Dockerfile.rhel10       2025-01-16 15:39:22
@@ -1,4 +1,4 @@
-FROM quay.io/sclorg/s2i-base-c10s:c10s
+FROM registry.stage.redhat.io/ubi10/s2i-base

 # This image provides a Ruby environment you can use to run your Ruby
 # applications.
@@ -12,7 +12,7 @@
     RUBY_SCL_NAME_VERSION="${RUBY_MAJOR_VERSION}${RUBY_MINOR_VERSION}"

 ENV RUBY_SCL="ruby-${RUBY_SCL_NAME_VERSION}" \
-    IMAGE_NAME="sclorg/ruby-${RUBY_SCL_NAME_VERSION}-c10s" \
+    IMAGE_NAME="ubi10/ruby-${RUBY_SCL_NAME_VERSION}" \
     SUMMARY="Platform for building and running Ruby $RUBY_VERSION applications" \
     DESCRIPTION="Ruby $RUBY_VERSION available as container is a base platform for \
 building and running various Ruby $RUBY_VERSION applications and frameworks. \

Diferences between RHEL9 and RHEL10:

$diff -u 3.3/Dockerfile.rhel9 3.3/Dockerfile.rhel10
--- 3.3/Dockerfile.rhel9        2024-09-10 10:09:55
+++ 3.3/Dockerfile.rhel10       2025-01-16 15:39:22
@@ -1,4 +1,4 @@
-FROM ubi9/s2i-base
+FROM registry.stage.redhat.io/ubi10/s2i-base

 # This image provides a Ruby environment you can use to run your Ruby
 # applications.
@@ -12,7 +12,7 @@
     RUBY_SCL_NAME_VERSION="${RUBY_MAJOR_VERSION}${RUBY_MINOR_VERSION}"

 ENV RUBY_SCL="ruby-${RUBY_SCL_NAME_VERSION}" \
-    IMAGE_NAME="ubi9/ruby-${RUBY_SCL_NAME_VERSION}" \
+    IMAGE_NAME="ubi10/ruby-${RUBY_SCL_NAME_VERSION}" \
     SUMMARY="Platform for building and running Ruby $RUBY_VERSION applications" \
     DESCRIPTION="Ruby $RUBY_VERSION available as container is a base platform for \
 building and running various Ruby $RUBY_VERSION applications and frameworks. \
@@ -34,8 +34,7 @@
 --context-dir=${RUBY_VERSION}/test/puma-test-app/ ${IMAGE_NAME} ruby-sample-app" \
       maintainer="SoftwareCollections.org <sclorg@redhat.com>"

-RUN dnf -y module enable ruby:$RUBY_VERSION && \
-    INSTALL_PKGS=" \
+RUN INSTALL_PKGS=" \
     libffi-devel \
     ruby \
     ruby-devel \
@@ -45,6 +44,7 @@
     redhat-rpm-config \
     " && \
     dnf install -y --setopt=tsflags=nodocs ${INSTALL_PKGS} && \
+    dnf reinstall -y --setopt=tsflags=nodocs tzdata && \
     dnf -y clean all --enablerepo='*' && \
     ruby -v | grep -qe "^ruby $RUBY_VERSION\." && echo "Found VERSION $RUBY_VERSION" && \
     rpm -V ${INSTALL_PKGS}

@phracek
Copy link
Member Author

phracek commented Jan 16, 2025

[test]

…d testing

container in RHEL10

Signed-off-by: Petr "Stone" Hracek <phracek@redhat.com>
Signed-off-by: Petr "Stone" Hracek <phracek@redhat.com>
@phracek phracek force-pushed the building_testing_rhel10 branch from fd8c855 to 15441fb Compare January 16, 2025 15:07
@phracek
Copy link
Member Author

phracek commented Jan 16, 2025

Rebased against master

[test]

Copy link

github-actions bot commented Jan 16, 2025

Pull Request validation

Failed

🔴 Failed or pending statuses - Testing Farm - Fedora - 3.3[pending]
🔴 Review - Missing review from a member (1 required)

Copy link

github-actions bot commented Jan 16, 2025

Testing Farm results

namecomposearchstatusstarted (UTC)timelogs
RHEL8 - 3.3RHEL-8.10.0-Nightlyx86_64✅ passed22.01.2025 08:17:0616min 47stest pipeline
RHEL10 - 3.3RHEL-10-Nightlyx86_64✅ passed22.01.2025 08:19:2415min 25stest pipeline
RHEL9 - 3.3RHEL-9.4.0-Nightlyx86_64✅ passed22.01.2025 08:19:5614min 59stest pipeline
RHEL9 - 3.0RHEL-9.4.0-Nightlyx86_64✅ passed16.01.2025 15:07:4921min 53stest pipeline
RHEL8 - 3.1RHEL-8.10.0-Nightlyx86_64✅ passed22.01.2025 08:19:1823min 49stest pipeline
RHEL9 - 3.1RHEL-9.4.0-Nightlyx86_64✅ passed22.01.2025 08:17:0425min 60stest pipeline
CentOS Stream 10 - 3.3CentOS-Stream-10x86_64✅ passed22.01.2025 08:17:057min 18stest pipeline
Fedora - 3.3Fedora-latestx86_64✅ passed22.01.2025 08:52:2110min 45stest pipeline
RHEL8 - 2.5RHEL-8.10.0-Nightlyx86_64✅ passed22.01.2025 08:16:1422min 43stest pipeline

@phracek
Copy link
Member Author

phracek commented Jan 17, 2025

@jackorp @pvalena PTAL. I would be glad for Approvals if you not hit any issues. Tests PASSED.

Copy link
Contributor

@jackorp jackorp left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM.

We do not need the full registry name
Signed-off-by: Petr "Stone" Hracek <phracek@redhat.com>
@phracek
Copy link
Member Author

phracek commented Jan 22, 2025

Let's test again after making FROM directive short.

[test]

@phracek phracek merged commit 88ca1f6 into master Jan 22, 2025
10 checks passed
@phracek phracek deleted the building_testing_rhel10 branch January 22, 2025 09:23
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.

2 participants