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

Testing, building RHEL10 container-images #323

Merged
merged 4 commits into from
Jan 30, 2025
Merged

Conversation

phracek
Copy link
Member

@phracek phracek commented Jan 13, 2025

This pull request enables building and testing RHEL10 container images
for base and core version.

Copy link

github-actions bot commented Jan 13, 2025

Pull Request validation

Success

🟢 CI - All checks have passed
🟢 Review - Reviewed by a member
🟢 Approval - Changes were approved


Auto Merge

Failed

🔴 Pull Request has unsupported target branch master, expected branches are: ''

Success

🟢 Pull Request is not marked as draft and it's not blocked by dont-merge label
🟢 Pull Request meet requirements, title has correct form
🟢 Pull Request meet requirements, mergeable is true
🟢 Pull Request meet requirements, mergeable_state is clean

@phracek
Copy link
Member Author

phracek commented Jan 13, 2025

Diff core between RHEL9 and RHEL10:

$ diff -u core/Dockerfile.rhel9 core/Dockerfile.rhel10
--- core/Dockerfile.rhel9       2024-12-05 11:02:58
+++ core/Dockerfile.rhel10      2025-01-13 13:19:34
@@ -1,10 +1,12 @@
 # This image is the base image for all s2i configurable container images.
-FROM registry.access.redhat.com/ubi9:latest
+FROM ubi10:latest

 ENV SUMMARY="Base image which allows using of source-to-image."        \
     DESCRIPTION="The s2i-core image provides any images layered on top of it \
 with all the tools needed to use source-to-image functionality while keeping \
-the image size as small as possible."
+the image size as small as possible." \
+    NAME=s2i-core \
+    VERSION=10

 LABEL summary="$SUMMARY" \
       description="$DESCRIPTION" \
@@ -12,9 +14,9 @@
       io.k8s.display-name="s2i core" \
       io.openshift.s2i.scripts-url=image:///usr/libexec/s2i \
       io.s2i.scripts-url=image:///usr/libexec/s2i \
-      io.openshift.tags="s2i-core rhel9" \
+      io.openshift.tags="s2i-core rhel10" \
       com.redhat.component="s2i-core-container" \
-      name="ubi9/s2i-core" \
+      name="ubi10/s2i-core" \
       version="1" \
       com.redhat.license_terms="https://www.redhat.com/en/about/red-hat-end-user-license-agreements#UBI"

@@ -27,7 +29,7 @@
     # The $HOME is not set by default, but some applications needs this variable
     HOME=/opt/app-root/src \
     PATH=/opt/app-root/src/bin:/opt/app-root/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin \
-    PLATFORM="el9"
+    PLATFORM="el10"

 # This is the list of basic dependencies that all language container image can
 # consume.
@@ -37,21 +39,18 @@

 RUN INSTALL_PKGS="bsdtar \
   findutils \
-  groff-base \
-  glibc-locale-source \
-  glibc-langpack-en \
   gettext \
+  glibc-langpack-en \
+  groff-base \
   rsync \
-  scl-utils \
   tar \
   unzip \
-  xz \
   yum" && \
   mkdir -p ${HOME}/.pki/nssdb && \
   chown -R 1001:0 ${HOME}/.pki && \
-  yum install -y --setopt=tsflags=nodocs $INSTALL_PKGS && \
+  dnf install -y --setopt=tsflags=nodocs $INSTALL_PKGS && \
   rpm -V $INSTALL_PKGS && \
-  yum -y clean all --enablerepo='*'
+  dnf -y clean all --enablerepo='*'

 # Copy extra files to the image.
 COPY ./core/root/ /

Diff for core between CentOS Stream 10 and RHEL10:

$ diff -u core/Dockerfile.c10s core/Dockerfile.rhel10
--- core/Dockerfile.c10s        2025-01-10 13:04:32
+++ core/Dockerfile.rhel10      2025-01-13 13:19:34
@@ -1,5 +1,5 @@
 # This image is the base image for all s2i configurable container images.
-FROM quay.io/centos/centos:stream10
+FROM ubi10:latest

 ENV SUMMARY="Base image which allows using of source-to-image."        \
     DESCRIPTION="The s2i-core image provides any images layered on top of it \
@@ -14,10 +14,11 @@
       io.k8s.display-name="s2i core" \
       io.openshift.s2i.scripts-url=image:///usr/libexec/s2i \
       io.s2i.scripts-url=image:///usr/libexec/s2i \
-      com.redhat.component="$NAME-container" \
-      name="sclorg/$NAME-c10s" \
-      version="$VERSION" \
-      maintainer="SoftwareCollections.org <[email protected]>"
+      io.openshift.tags="s2i-core rhel10" \
+      com.redhat.component="s2i-core-container" \
+      name="ubi10/s2i-core" \
+      version="1" \
+      com.redhat.license_terms="https://www.redhat.com/en/about/red-hat-end-user-license-agreements#UBI"

 ENV \
     # DEPRECATED: Use above LABEL instead, because this will be removed in future versions.

@phracek
Copy link
Member Author

phracek commented Jan 13, 2025

Let's first hit
[test]

Copy link

github-actions bot commented Jan 13, 2025

Testing Farm results

namecomposearchstatusstarted (UTC)timelogs
CentOS Stream 10 - coreCentOS-Stream-10x86_64✅ passed29.01.2025 12:15:315min 60stest pipeline
CentOS Stream 10 - baseCentOS-Stream-10x86_64✅ passed29.01.2025 12:15:326min test pipeline
CentOS Stream 9 - coreCentOS-Stream-9x86_64✅ passed29.01.2025 12:15:317min 26stest pipeline
CentOS Stream 9 - baseCentOS-Stream-9x86_64✅ passed29.01.2025 12:15:338min 19stest pipeline
Fedora - coreFedora-latestx86_64✅ passed29.01.2025 12:15:339min 9stest pipeline
Fedora - baseFedora-latestx86_64✅ passed29.01.2025 12:15:338min 54stest pipeline
RHEL9 - baseRHEL-9.4.0-Nightlyx86_64✅ passed29.01.2025 12:15:3313min 46stest pipeline
RHEL10 - coreRHEL-10-Nightlyx86_64✅ passed29.01.2025 12:15:3114min 15stest pipeline
RHEL9 - coreRHEL-9.4.0-Nightlyx86_64✅ passed29.01.2025 12:15:3113min 29stest pipeline
RHEL10 - baseRHEL-10-Nightlyx86_64✅ passed29.01.2025 12:15:3113min 22stest pipeline
RHEL8 - coreRHEL-8.10.0-Nightlyx86_64✅ passed29.01.2025 12:15:3217min 5stest pipeline
RHEL8 - baseRHEL-8.10.0-Nightlyx86_64✅ passed29.01.2025 12:15:3116min 14stest pipeline

@phracek
Copy link
Member Author

phracek commented Jan 13, 2025

TMT/FMF plans were updated. Let's test it again.

[test]

@phracek
Copy link
Member Author

phracek commented Jan 13, 2025

@pkubatrh @hhorak @SlouchyButton Do you have time for an easy review. The Dockerfile differences are mentioned in the comment here: #323 (comment)

Signed-off-by: Petr "Stone" Hracek <[email protected]>
@phracek phracek force-pushed the testing_building_rhel10 branch from 9ce1150 to 6c94622 Compare January 29, 2025 12:15
@phracek
Copy link
Member Author

phracek commented Jan 29, 2025

[test]

Copy link
Member

@hhorak hhorak left a comment

Choose a reason for hiding this comment

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

The differences (especially in the packages set) seem ok to me. No other issues spotted. LGTM.

@phracek phracek merged commit 331900f into master Jan 30, 2025
13 checks passed
@phracek phracek deleted the testing_building_rhel10 branch January 30, 2025 08:30
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