phracek
commented
3 months ago Dockerfile diffs.
Difference Dockerfile.c9s against Dockerfile.c10s:
$ diff -u Dockerfile.c9s Dockerfile.c10s
--- Dockerfile.c9s 2024-08-08 09:40:02
+++ Dockerfile.c10s 2024-08-08 09:32:14
@@ -1,4 +1,4 @@
-FROM quay.io/sclorg/s2i-core-c9s:c9s
+FROM quay.io/sclorg/s2i-core-c10s:c10s
# MySQL image for OpenShift.
#
@@ -10,13 +10,13 @@
# * $MYSQL_DATABASE - Name of the database to create
# * $MYSQL_ROOT_PASSWORD (Optional) - Password for the 'root' MySQL account
-ENV MYSQL_VERSION=8.0 \
- MYSQL_SHORT_VERSION=80 \
+ENV MYSQL_VERSION=8.4 \
+ MYSQL_SHORT_VERSION=84 \
APP_DATA=/opt/app-root/src \
HOME=/var/lib/mysql \
NAME=mysql
-ENV SUMMARY="MySQL 8.0 SQL database server" \
+ENV SUMMARY="MySQL 8.4 SQL database server" \
DESCRIPTION="MySQL is a multi-user, multi-threaded SQL database server. The container \
image provides a containerized packaging of the MySQL mysqld daemon and client application. \
The mysqld server daemon accepts connections from clients and provides access to content from \
@@ -29,10 +29,10 @@
io.openshift.expose-services="3306:mysql" \
io.openshift.tags="database,mysql,mysql$MYSQL_SHORT_VERSION,mysql-$MYSQL_SHORT_VERSION" \
com.redhat.component="$NAME-$MYSQL_SHORT_VERSION-container" \
- name="sclorg/$NAME-$MYSQL_SHORT_VERSION-c9s" \
+ name="sclorg/$NAME-$MYSQL_SHORT_VERSION-c10s" \
version="1" \
com.redhat.license_terms="https://www.redhat.com/en/about/red-hat-end-user-license-agreements#rhel" \
- usage="podman run -d -e MYSQL_USER=user -e MYSQL_PASSWORD=pass -e MYSQL_DATABASE=db -p 3306:3306 quay.io/sclorg/$NAME-$MYSQL_SHORT_VERSION-c9s:c9s" \
+ usage="podman run -d -e MYSQL_USER=user -e MYSQL_PASSWORD=pass -e MYSQL_DATABASE=db -p 3306:3306 quay.io/sclorg/$NAME-$MYSQL_SHORT_VERSION-c10s:c10s" \
maintainer="SoftwareCollections.org <sclorg@redhat.com>"
EXPOSE 3306
@@ -51,9 +51,9 @@
ENV CONTAINER_SCRIPTS_PATH=/usr/share/container-scripts/mysql \
MYSQL_PREFIX=/usr
-COPY 8.0/root-common /
-COPY 8.0/s2i-common/bin/ $STI_SCRIPTS_PATH
-COPY 8.0/root /
+COPY 8.4/root-common /
+COPY 8.4/s2i-common/bin/ $STI_SCRIPTS_PATH
+COPY 8.4/root /
# Hard links are not supported in Testing Farm approach during sync to guest
# operation system. Therefore tests are failing on errorDifferences between Dockerfile.fedora against Dockerfile.c10s
$ diff -u Dockerfile.fedora Dockerfile.c10s
--- Dockerfile.fedora 2024-08-08 08:36:43
+++ Dockerfile.c10s 2024-08-08 09:32:14
@@ -1,4 +1,4 @@
-FROM quay.io/fedora/s2i-core:40
+FROM quay.io/sclorg/s2i-core-c10s:c10s
# MySQL image for OpenShift.
#
@@ -13,37 +13,34 @@
ENV MYSQL_VERSION=8.4 \
MYSQL_SHORT_VERSION=84 \
APP_DATA=/opt/app-root/src \
- HOME=/var/lib/mysql
+ HOME=/var/lib/mysql \
+ NAME=mysql
-ENV SUMMARY="MySQL $MYSQL_VERSION SQL database server" \
+ENV SUMMARY="MySQL 8.4 SQL database server" \
DESCRIPTION="MySQL is a multi-user, multi-threaded SQL database server. The container \
image provides a containerized packaging of the MySQL mysqld daemon and client application. \
The mysqld server daemon accepts connections from clients and provides access to content from \
-MySQL databases on behalf of the clients." \
- NAME=mysql
+MySQL databases on behalf of the clients."
LABEL summary="$SUMMARY" \
description="$DESCRIPTION" \
io.k8s.description="$DESCRIPTION" \
io.k8s.display-name="MySQL $MYSQL_VERSION" \
io.openshift.expose-services="3306:mysql" \
- io.openshift.tags="database,mysql,mysql$MYSQL_SHORT_VERSION" \
- com.redhat.component="$NAME" \
- name="fedora/$NAME-$MYSQL_SHORT_VERSION" \
- version="$MYSQL_VERSION" \
- usage="docker run -d -e MYSQL_USER=user -e MYSQL_PASSWORD=pass -e MYSQL_DATABASE=db -p 3306:3306 quay.io/fedora/$NAME-$MYSQL_SHORT_VERSION" \
+ io.openshift.tags="database,mysql,mysql$MYSQL_SHORT_VERSION,mysql-$MYSQL_SHORT_VERSION" \
+ com.redhat.component="$NAME-$MYSQL_SHORT_VERSION-container" \
+ name="sclorg/$NAME-$MYSQL_SHORT_VERSION-c10s" \
+ version="1" \
+ com.redhat.license_terms="https://www.redhat.com/en/about/red-hat-end-user-license-agreements#rhel" \
+ usage="podman run -d -e MYSQL_USER=user -e MYSQL_PASSWORD=pass -e MYSQL_DATABASE=db -p 3306:3306 quay.io/sclorg/$NAME-$MYSQL_SHORT_VERSION-c10s:c10s" \
maintainer="SoftwareCollections.org <sclorg@redhat.com>"
EXPOSE 3306
-# On Fedora, we fake missing python binary. In case user installs the python2
-# in the container, this hack will be removed by installing /usr/bin/python from RPM.
-RUN ln -s /usr/bin/python3 /usr/bin/python
-
# 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 INSTALL_PKGS="rsync tar gettext hostname bind-utils groff-base community-mysql-server policycoreutils" && \
+RUN INSTALL_PKGS="policycoreutils rsync tar gettext hostname bind-utils groff-base mysql-server" && \
dnf install -y --setopt=tsflags=nodocs $INSTALL_PKGS && \
rpm -V $INSTALL_PKGS && \
dnf -y clean all --enablerepo='*' && \
@@ -54,9 +51,9 @@
ENV CONTAINER_SCRIPTS_PATH=/usr/share/container-scripts/mysql \
MYSQL_PREFIX=/usr
-COPY 8.0/root-common /
-COPY 8.0/s2i-common/bin/ $STI_SCRIPTS_PATH
-COPY 8.0/root /
+COPY 8.4/root-common /
+COPY 8.4/s2i-common/bin/ $STI_SCRIPTS_PATH
+COPY 8.4/root /
# Hard links are not supported in Testing Farm approach during sync to guest
# operation system. Therefore tests are failing on errorDifferences between Dockerfile.rhel9 and Dockerfile.c10s
$ diff -u Dockerfile.rhel9 Dockerfile.c10s
--- Dockerfile.rhel9 2024-08-08 09:43:05
+++ Dockerfile.c10s 2024-08-08 09:32:14
@@ -1,4 +1,4 @@
-FROM ubi9/s2i-core
+FROM quay.io/sclorg/s2i-core-c10s:c10s
# MySQL image for OpenShift.
#
@@ -10,13 +10,13 @@
# * $MYSQL_DATABASE - Name of the database to create
# * $MYSQL_ROOT_PASSWORD (Optional) - Password for the 'root' MySQL account
-ENV MYSQL_VERSION=8.0 \
- MYSQL_SHORT_VERSION=80 \
+ENV MYSQL_VERSION=8.4 \
+ MYSQL_SHORT_VERSION=84 \
APP_DATA=/opt/app-root/src \
HOME=/var/lib/mysql \
NAME=mysql
-ENV SUMMARY="MySQL 8.0 SQL database server" \
+ENV SUMMARY="MySQL 8.4 SQL database server" \
DESCRIPTION="MySQL is a multi-user, multi-threaded SQL database server. The container \
image provides a containerized packaging of the MySQL mysqld daemon and client application. \
The mysqld server daemon accepts connections from clients and provides access to content from \
@@ -29,10 +29,10 @@
io.openshift.expose-services="3306:mysql" \
io.openshift.tags="database,mysql,mysql$MYSQL_SHORT_VERSION,mysql-$MYSQL_SHORT_VERSION" \
com.redhat.component="$NAME-$MYSQL_SHORT_VERSION-container" \
- name="rhel9/$NAME-$MYSQL_SHORT_VERSION" \
+ name="sclorg/$NAME-$MYSQL_SHORT_VERSION-c10s" \
version="1" \
com.redhat.license_terms="https://www.redhat.com/en/about/red-hat-end-user-license-agreements#rhel" \
- usage="podman run -d -e MYSQL_USER=user -e MYSQL_PASSWORD=pass -e MYSQL_DATABASE=db -p 3306:3306 rhel9/$NAME-$MYSQL_SHORT_VERSION" \
+ usage="podman run -d -e MYSQL_USER=user -e MYSQL_PASSWORD=pass -e MYSQL_DATABASE=db -p 3306:3306 quay.io/sclorg/$NAME-$MYSQL_SHORT_VERSION-c10s:c10s" \
maintainer="SoftwareCollections.org <sclorg@redhat.com>"
EXPOSE 3306
@@ -51,9 +51,9 @@
ENV CONTAINER_SCRIPTS_PATH=/usr/share/container-scripts/mysql \
MYSQL_PREFIX=/usr
-COPY 8.0/root-common /
-COPY 8.0/s2i-common/bin/ $STI_SCRIPTS_PATH
-COPY 8.0/root /
+COPY 8.4/root-common /
+COPY 8.4/s2i-common/bin/ $STI_SCRIPTS_PATH
+COPY 8.4/root /
# Hard links are not supported in Testing Farm approach during sync to guest
# operation system. Therefore tests are failing on error
FaramosCZ
hhorak
This pull request adds support for testing Mysql 8.4 on CentOS Stream 10. The rest of operation systems is skipped for now.
The pull request is separated into several commit for better review.
1) Moving sources from 8.0 -> 8.4 2) Copy sources from 8.4 -> 8.0 3) Add some changes in 8.4 4) Update Documentation and Makefile with support 8.4 5) Some fixes caught by testing