Add support for building and testing mariadb-container on RHEL10 #262

phracek · 2025-01-14T09:52:55Z

The pull request is separated into two commits.

The first commit adds support for building and testing mariadb-container especially version '10.11' on RHEL10.
The second commit updates README.md file with RHEL10 support.

…r on RHEL10 Signed-off-by: Petr "Stone" Hracek <[email protected]>

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

github-actions · 2025-01-14T09:53:35Z

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 · 2025-01-14T09:55:00Z

Differences between C10S and RHEL10 are here:

diff -u 10.11/Dockerfile.c10s 10.11/Dockerfile.rhel10
--- 10.11/Dockerfile.c10s       2024-11-04 14:50:40
+++ 10.11/Dockerfile.rhel10     2025-01-14 10:21:43
@@ -1,4 +1,4 @@
-FROM quay.io/sclorg/s2i-core-c10s:c10s
+FROM registry.stage.redhat.io/ubi10/s2i-core

 # MariaDB image for OpenShift.
 #
@@ -29,9 +29,9 @@
       io.openshift.expose-services="3306:mysql" \
       io.openshift.tags="database,mysql,mariadb,mariadb1011,mariadb-1011" \
       com.redhat.component="$NAME-1011-container" \
-      name="sclorg/$NAME-1011-c10s" \
+      name="rhel10/mariadb-1011" \
       version="1" \
-      usage="podman run -d -e MYSQL_USER=user -e MYSQL_PASSWORD=pass -e MYSQL_DATABASE=db -p 3306:3306 quay.io/sclorg/$NAME-1011-c10s" \
+      usage="podman run -d -e MYSQL_USER=user -e MYSQL_PASSWORD=pass -e MYSQL_DATABASE=db -p 3306:3306 rhel10/mariadb-1011" \
       maintainer="SoftwareCollections.org <[email protected]>"

 EXPOSE 3306

Differences between RHEL9 and RHEL10 are:

diff -u 10.11/Dockerfile.rhel9 10.11/Dockerfile.rhel10
--- 10.11/Dockerfile.rhel9      2024-05-09 12:28:45
+++ 10.11/Dockerfile.rhel10     2025-01-14 10:21:43
@@ -1,4 +1,4 @@
-FROM ubi9/s2i-core
+FROM registry.stage.redhat.io/ubi10/s2i-core

 # MariaDB image for OpenShift.
 #
@@ -13,6 +13,9 @@
 ENV MYSQL_VERSION=10.11 \
     APP_DATA=/opt/app-root/src \
     HOME=/var/lib/mysql \
+    NAME=mariadb \
+    VERSION=10.11 \
+    ARCH=x86_64 \
     SUMMARY="MariaDB 10.11 SQL database server" \
     DESCRIPTION="MariaDB is a multi-user, multi-threaded SQL database server. The container \
 image provides a containerized packaging of the MariaDB mysqld daemon and client application. \
@@ -22,13 +25,13 @@
 LABEL summary="$SUMMARY" \
       description="$DESCRIPTION" \
       io.k8s.description="$DESCRIPTION" \
-      io.k8s.display-name="MariaDB 10.11" \
+      io.k8s.display-name="MariaDB $VERSION" \
       io.openshift.expose-services="3306:mysql" \
       io.openshift.tags="database,mysql,mariadb,mariadb1011,mariadb-1011" \
-      com.redhat.component="mariadb-1011-container" \
-      name="rhel9/mariadb-1011" \
+      com.redhat.component="$NAME-1011-container" \
+      name="rhel10/mariadb-1011" \
       version="1" \
-      usage="podman run -d -e MYSQL_USER=user -e MYSQL_PASSWORD=pass -e MYSQL_DATABASE=db -p 3306:3306 rhel9/mariadb-1011" \
+      usage="podman run -d -e MYSQL_USER=user -e MYSQL_PASSWORD=pass -e MYSQL_DATABASE=db -p 3306:3306 rhel10/mariadb-1011" \
       maintainer="SoftwareCollections.org <[email protected]>"

 EXPOSE 3306
@@ -36,12 +39,11 @@
 # This image must forever use UID 27 for mysql user so our volumes are
 # safe in the future. This should *never* change, the last test is there
 # to make sure of that.
-RUN yum -y module enable mariadb:$MYSQL_VERSION && \
-    INSTALL_PKGS="policycoreutils rsync tar gettext hostname bind-utils groff-base mariadb-server" && \
-    yum install -y --setopt=tsflags=nodocs $INSTALL_PKGS && \
+RUN INSTALL_PKGS="policycoreutils rsync tar xz gettext hostname bind-utils groff-base mariadb-server" && \
+    dnf install -y --setopt=tsflags=nodocs $INSTALL_PKGS && \
     rpm -V $INSTALL_PKGS && \
     /usr/libexec/mysqld -V | grep -qe "$MYSQL_VERSION\." && echo "Found VERSION $MYSQL_VERSION" && \
-    yum -y clean all --enablerepo='*' && \
+    dnf -y clean all --enablerepo='*' && \
     mkdir -p /var/lib/mysql/data && chown -R mysql.0 /var/lib/mysql && \
     test "$(id mysql)" = "uid=27(mysql) gid=27(mysql) groups=27(mysql)"

phracek · 2025-01-14T09:55:42Z

Local tests PASSED:

==============================================
Tests were run for image rhel10/mariadb-1011:1
==============================================
Test cases results:

 [PASSED] for 'appnamenotset' run_container_creation_tests (00:00:06)
 [PASSED] for 'appnamenotset' run_configuration_tests (00:00:13)
 [PASSED] for 'appnamenotset' run_general_tests (00:00:41)
 [PASSED] for 'appnamenotset' run_change_password_test (00:00:10)
 [PASSED] for 'appnamenotset' run_change_password_new_user_test (00:00:10)
 [PASSED] for 'appnamenotset' run_replication_test (00:00:09)
 [PASSED] for 'appnamenotset' run_s2i_test (00:00:17)
 [PASSED] for 'appnamenotset' run_ssl_test (00:00:08)
 [PASSED] for 'appnamenotset' run_upgrade_test (00:00:33)
 [PASSED] for 'appnamenotset' run_plugin_test (00:00:06)

Tests for rhel10/mariadb-1011:1 succeeded.

phracek · 2025-01-14T09:55:54Z

Let's first shot.

[test]

github-actions · 2025-01-14T10:05:42Z

Testing Farm results

name	compose	arch	status	started (UTC)	time	logs
CentOS Stream 10 - 10.11	CentOS-Stream-10	x86_64	✅ passed	15.01.2025 09:59:39	6min 44s	test pipeline
CentOS Stream 9 - 10.5	CentOS-Stream-9	x86_64	✅ passed	15.01.2025 09:59:48	7min 23s	test pipeline
CentOS Stream 9 - 10.11	CentOS-Stream-9	x86_64	✅ passed	15.01.2025 09:59:39	7min 33s	test pipeline
Fedora - 10.5	Fedora-latest	x86_64	✅ passed	15.01.2025 09:59:47	12min 39s	test pipeline
RHEL10 - 10.11	RHEL-10-Nightly	x86_64	✅ passed	15.01.2025 09:59:39	15min	test pipeline
RHEL9 - 10.5	RHEL-9.4.0-Nightly	x86_64	✅ passed	15.01.2025 09:59:57	17min 10s	test pipeline
RHEL9 - 10.11	RHEL-9.4.0-Nightly	x86_64	✅ passed	15.01.2025 09:59:40	18min 6s	test pipeline
RHEL8 - 10.5	RHEL-8.10.0-Nightly	x86_64	✅ passed	15.01.2025 09:59:58	18min 49s	test pipeline
RHEL8 - 10.11	RHEL-8.10.0-Nightly	x86_64	✅ passed	15.01.2025 09:59:39	19min 19s	test pipeline
RHEL8 - 10.3	RHEL-8.10.0-Nightly	x86_64	✅ passed	15.01.2025 09:59:39	21min 1s	test pipeline

10.11/Dockerfile.rhel10

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

phracek · 2025-01-14T13:26:39Z

[test]

ljavorsk

LGTM

FaramosCZ · 2025-01-14T13:22:46Z

10.11/Dockerfile.rhel10

+    rpm -V $INSTALL_PKGS && \
+    /usr/libexec/mysqld -V | grep -qe "$MYSQL_VERSION\." && echo "Found VERSION $MYSQL_VERSION" && \
+    dnf -y clean all --enablerepo='*' && \
+    mkdir -p /var/lib/mysql/data && chown -R mysql.0 /var/lib/mysql && \


chown -R mysql.0
Is the user really named mysql.0, or is it just a typo from mysql or mysql:0 ?

It's even present in every dockerfile (fedora, centos, rhel) in every version

As you can see here. It is present for really long. time. I have google it find in 'coreutils'
https://serverfault.com/questions/194295/using-dot-as-delimiter-to-specify-group-in-chown

Some older scripts may still use '.' in place of the ':' separator. POSIX 1003.1-2001 (see [Standards conformance](http://www.gnu.org/software/coreutils/manual/html_node/Standards-conformance.html)) does not require support for that, but for backward compatibility GNU chown supports '.' so long as no ambiguity results. New scripts should avoid the use of '.' because it is not portable, and because it has undesirable results if the entire owner'.'group happens to identify a user whose name contains '.'.

Some older scripts may still use ‘.’ in place of the ‘:’ separator. POSIX 1003.1-2001 (see Standards conformance) does not require support for that, but for backward compatibility GNU chown supports ‘.’ so long as no ambiguity results, although it issues a warning and support may be removed in future versions. New scripts should avoid the use of ‘.’ because it is not portable, and because it has undesirable results if the entire owner‘.’group happens to identify a user whose name contains ‘.’.

From: https://www.gnu.org/software/coreutils/manual/html_node/chown-invocation.html#chown-invocation

After a discussion let's change it got ':' only for relevant Dockerfiles.

This is fixed by 41d3ed4

While we are at it, I suggest to clear it up a bit more, and use the same data type in the whole expression, so either only integers 27:0 or preferably only strings mysql:root

10.11/Dockerfile.rhel10

---- Some older scripts may still use '.' in place of the ':' separator. POSIX 1003.1-2001 (see [Standards conformance](http://www.gnu.org/software/coreutils/manual/html_node/Standards-conformance.html)) does not require support for that, but for backward compatibility GNU chown supports '.' so long as no ambiguity results. New scripts should avoid the use of '.' because it is not portable, and because it has undesirable results if the entire owner'.'group happens to identify a user whose name contains '.'. ---- Signed-off-by: Petr "Stone" Hracek <[email protected]>

phracek · 2025-01-15T09:59:26Z

Let's test it again after change chown from '.' to ':'

[test]

1) Use common ':' separator instead of unusual '.' one, as disscussed here: sclorg#262 (comment) 2) Use the same data type in the whole expression, so either only integers '27:0' or preferably only strings 'mysql:root' as suggested here: sclorg#262 (comment)

phracek added 2 commits January 14, 2025 10:50

Add 10.11/Dockerfile.rhel10 for building and testing mariadb-containe…

4077337

…r on RHEL10 Signed-off-by: Petr "Stone" Hracek <[email protected]>

Update README.md files with RHEL10 support

2624423

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

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

phracek added the ready for review label Jan 14, 2025

ljavorsk reviewed Jan 14, 2025

View reviewed changes

10.11/Dockerfile.rhel10 Outdated Show resolved Hide resolved

Remove ARCH environment variable. It is not used in our CI.

c815204

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

ljavorsk approved these changes Jan 14, 2025

View reviewed changes

FaramosCZ reviewed Jan 14, 2025

View reviewed changes

pkubatrh reviewed Jan 15, 2025

View reviewed changes

10.11/Dockerfile.rhel10 Show resolved Hide resolved

pkubatrh approved these changes Jan 16, 2025

View reviewed changes

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

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

phracek merged commit 5c55819 into master Jan 16, 2025
11 checks passed

phracek deleted the building_testing_rhel10 branch January 16, 2025 13:34

FaramosCZ mentioned this pull request Jan 16, 2025

Enhance 'chown' call #263

Open

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add support for building and testing mariadb-container on RHEL10 #262

Add support for building and testing mariadb-container on RHEL10 #262

phracek commented Jan 14, 2025 •

edited by github-actions bot

Loading

github-actions bot commented Jan 14, 2025 •

edited

Loading

phracek commented Jan 14, 2025

phracek commented Jan 14, 2025

phracek commented Jan 14, 2025

github-actions bot commented Jan 14, 2025 •

edited

Loading

phracek commented Jan 14, 2025

ljavorsk left a comment

FaramosCZ Jan 14, 2025

ljavorsk Jan 14, 2025 •

edited

Loading

phracek Jan 15, 2025 •

edited

Loading

pkubatrh Jan 15, 2025

phracek Jan 15, 2025

phracek Jan 15, 2025

FaramosCZ Jan 15, 2025

phracek commented Jan 15, 2025

Add support for building and testing mariadb-container on RHEL10 #262

Add support for building and testing mariadb-container on RHEL10 #262

Conversation

phracek commented Jan 14, 2025 • edited by github-actions bot Loading

github-actions bot commented Jan 14, 2025 • edited Loading

Pull Request validation

Success

Auto Merge

Failed

Success

phracek commented Jan 14, 2025

phracek commented Jan 14, 2025

phracek commented Jan 14, 2025

github-actions bot commented Jan 14, 2025 • edited Loading

Testing Farm results

phracek commented Jan 14, 2025

ljavorsk left a comment

Choose a reason for hiding this comment

FaramosCZ Jan 14, 2025

Choose a reason for hiding this comment

ljavorsk Jan 14, 2025 • edited Loading

Choose a reason for hiding this comment

phracek Jan 15, 2025 • edited Loading

Choose a reason for hiding this comment

pkubatrh Jan 15, 2025

Choose a reason for hiding this comment

phracek Jan 15, 2025

Choose a reason for hiding this comment

phracek Jan 15, 2025

Choose a reason for hiding this comment

FaramosCZ Jan 15, 2025

Choose a reason for hiding this comment

phracek commented Jan 15, 2025

phracek commented Jan 14, 2025 •

edited by github-actions bot

Loading

github-actions bot commented Jan 14, 2025 •

edited

Loading

github-actions bot commented Jan 14, 2025 •

edited

Loading

ljavorsk Jan 14, 2025 •

edited

Loading

phracek Jan 15, 2025 •

edited

Loading