Add support for Testing MariaDB 10.11 in CentOS Stream 10

[phracek]

This pull request contains three updates.

• Adds Dockerfile.c10s for building and testing mariadb-container
• Updates README's
• Update build-and-push action

[phracek]

Differences between Dockerfiles.

RHEL9 against C10S:

$ diff 10.11/Dockerfile.rhel9 10.11/Dockerfile.c10s
1c1
< FROM ubi9/s2i-core
---
> FROM quay.io/sclorg/s2i-core-c10s:c10s
15a16,18
>     NAME=mariadb \
>     VERSION=10.11 \
>     ARCH=x86_64 \
25c28
<       io.k8s.display-name="MariaDB 10.11" \
---
>       io.k8s.display-name="MariaDB $VERSION" \
28,29c31,32
<       com.redhat.component="mariadb-1011-container" \
<       name="rhel9/mariadb-1011" \
---
>       com.redhat.component="$NAME-1011-container" \
>       name="sclorg/$NAME-1011-c10s" \
31c34
<       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 quay.io/sclorg/$NAME-1011-c10s" \
39,41c42,43
< 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 gettext hostname bind-utils groff-base mariadb-server" && \
>     dnf install -y --setopt=tsflags=nodocs $INSTALL_PKGS && \
44c46
<     yum -y clean all --enablerepo='*' && \
---
>     dnf -y clean all --enablerepo='*' && \

C9S against C10S:

$  diff 10.11/Dockerfile.c9s 10.11/Dockerfile.c10s
1c1
< FROM quay.io/sclorg/s2i-core-c9s:c9s
---
> FROM quay.io/sclorg/s2i-core-c10s:c10s
15a16,18
>     NAME=mariadb \
>     VERSION=10.11 \
>     ARCH=x86_64 \
25c28
<       io.k8s.display-name="MariaDB 10.11" \
---
>       io.k8s.display-name="MariaDB $VERSION" \
28,29c31,32
<       com.redhat.component="mariadb-1011-container" \
<       name="sclorg/mariadb-1011-c9s" \
---
>       com.redhat.component="$NAME-1011-container" \
>       name="sclorg/$NAME-1011-c10s" \
31c34
<       usage="podman run -d -e MYSQL_USER=user -e MYSQL_PASSWORD=pass -e MYSQL_DATABASE=db -p 3306:3306 quay.io/sclorg/mariadb-1011-c9s" \
---
>       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" \
39,41c42,43
< 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 gettext hostname bind-utils groff-base mariadb-server" && \
>     dnf install -y --setopt=tsflags=nodocs $INSTALL_PKGS && \
44c46
<     yum -y clean all --enablerepo='*' && \
---
>     dnf -y clean all --enablerepo='*' && \

Fedora against C10S:

$ diff 10.11/Dockerfile.fedora 10.11/Dockerfile.c10s
1c1
< FROM quay.io/fedora/s2i-core:40
---
> FROM quay.io/sclorg/s2i-core-c10s:c10s
27,28c27,28
<       io.k8s.description="MariaDB is a multi-user, multi-threaded SQL database server" \
<       io.k8s.display-name="MariaDB 10.11" \
---
>       io.k8s.description="$DESCRIPTION" \
>       io.k8s.display-name="MariaDB $VERSION" \
30,34c30,34
<       io.openshift.tags="database,mysql,mariadb,mariadb1011,galera" \
<       com.redhat.component="$NAME" \
<       name="fedora/$NAME-1011" \
<       version="$VERSION" \
<       usage="docker run -d -e MYSQL_USER=user -e MYSQL_PASSWORD=pass -e MYSQL_DATABASE=db -p 3306:3306 quay.io/fedora/$NAME-1011" \
---
>       io.openshift.tags="database,mysql,mariadb,mariadb1011,mariadb-1011" \
>       com.redhat.component="$NAME-1011-container" \
>       name="sclorg/$NAME-1011-c10s" \
>       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" \
46c46
<     dnf clean all && \
---
>     dnf -y clean all --enablerepo='*' && \

[phracek]

Running OpenShift tests is not needed. Only RHEL8, RHEL9 supports it.

[test]

[phracek]

Locally tests passed:

==============================================
Tests were run for image quay.io/sclorg/mariadb-1011-c10s:1
==============================================
Test cases results:

 [PASSED] for 'appnamenotset' run_container_creation_tests (00:00:06)
 [PASSED] for 'appnamenotset' run_configuration_tests (00:00:16)
 [PASSED] for 'appnamenotset' run_general_tests (00:00:41)
 [PASSED] for 'appnamenotset' run_change_password_test (00:00:09)
 [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_doc_test (00:00:00)
 [PASSED] for 'appnamenotset' run_s2i_test (00:00:18)
 [PASSED] for 'appnamenotset' run_ssl_test (00:00:06)
 [PASSED] for 'appnamenotset' run_upgrade_test (00:00:31)
 [PASSED] for 'appnamenotset' run_plugin_test (00:00:07)

Tests for quay.io/sclorg/mariadb-1011-c10s:1 succeeded.
[root@root-1mt-rhel-9 mariadb-container]#

[hhorak]

Some differences between Dockerfile.fedora nd Dockerfile.cXs to be changed in https://github.com/sclorg/mariadb-container/pull/253/files.

[phracek]

Rebased #253 .

New diff:

$ diff -u 10.11/Dockerfile.fedora 10.11/Dockerfile.c10s
--- 10.11/Dockerfile.fedora	2024-07-26 14:37:56
+++ 10.11/Dockerfile.c10s	2024-07-26 14:37:56
@@ -1,4 +1,4 @@
-FROM quay.io/fedora/s2i-core:40
+FROM quay.io/sclorg/s2i-core-c10s:c10s

 # MariaDB image for OpenShift.
 #
@@ -28,10 +28,10 @@
       io.k8s.display-name="MariaDB $VERSION" \
       io.openshift.expose-services="3306:mysql" \
       io.openshift.tags="database,mysql,mariadb,mariadb1011,mariadb-1011" \
-      com.redhat.component="$NAME" \
-      name="fedora/$NAME-1011" \
-      version="$VERSION" \
-      usage="podman run -d -e MYSQL_USER=user -e MYSQL_PASSWORD=pass -e MYSQL_DATABASE=db -p 3306:3306 quay.io/fedora/$NAME-1011" \
+      com.redhat.component="$NAME-1011-container" \
+      name="sclorg/$NAME-1011-c10s" \
+      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" \
       maintainer="SoftwareCollections.org <[email protected]>"

 EXPOSE 3306

[phracek]

[test]

[FaramosCZ]

LGTM