[syntax enhancement] [environment variable addition] MYSQL_VERSION rework

- utilize the ${MYSQL_VERSION} variable through the containerfile
- replace all ${VERSION} with ${MYSQL_VERSION}
- introduce ${MYSQL_SHORT_VERSION} environment variable
- utilize the ${MYSQL_SHORT_VERSION} variable through the containerfile
- move all DB version variables together

Removal of seemingly redundant ${VERSION} variable was discussed.
Great caution should be employed when removing existing environment variables,
as users can depend on them.
${VERSION} is currently kept for the compatibility purposes

Change of ${MYSQL_VERSION} to ${MARIADB_VERSION} variable was discussed.
Convincing positives not found at this moment. Might reconsider later.
- note: ${MYSQL_VERSION} is also used in scripts outside of the containerfile
- note: in case of removal of ${MYSQL_VERSION}, caution is advised as described above.

WARNING:
  this introduces the ${VERSION} environmental variable to the RHEL 9 and C9S variants !

Author: FaramosCZ

10.11/Dockerfile.c10s

@@ -11,12 +11,13 @@ FROM quay.io/sclorg/s2i-core-c10s:c10s
 #  * $MYSQL_ROOT_PASSWORD (Optional) - Password for the 'root' MySQL account
 
 ENV MYSQL_VERSION=10.11 \
+    MYSQL_SHORT_VERSION=1011 \
+    VERSION=${MYSQL_VERSION} \
     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" \
+    SUMMARY="MariaDB ${MYSQL_VERSION} 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. \
 The mysqld server daemon accepts connections from clients and provides access to content from \
@@ -25,13 +26,13 @@ MariaDB databases on behalf of the clients."
 LABEL summary="${SUMMARY}" \
       description="${DESCRIPTION}" \
       io.k8s.description="${DESCRIPTION}" \
-      io.k8s.display-name="MariaDB ${VERSION}" \
+      io.k8s.display-name="MariaDB ${MYSQL_VERSION}" \
       io.openshift.expose-services="3306:mysql" \
-      io.openshift.tags="database,mysql,${NAME},${NAME}1011,${NAME}-1011" \
-      com.redhat.component="${NAME}-1011-container" \
-      name="sclorg/${NAME}-1011-c10s" \
+      io.openshift.tags="database,mysql,${NAME},${NAME}${MYSQL_SHORT_VERSION},${NAME}-${MYSQL_SHORT_VERSION}" \
+      com.redhat.component="${NAME}-${MYSQL_SHORT_VERSION}-container" \
+      name="sclorg/${NAME}-${MYSQL_SHORT_VERSION}-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" \
+      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" \
       maintainer="SoftwareCollections.org <[email protected]>"
 
 EXPOSE 3306
@@ -51,9 +52,9 @@ RUN INSTALL_PKGS="policycoreutils rsync tar xz gettext hostname bind-utils groff
 ENV CONTAINER_SCRIPTS_PATH=/usr/share/container-scripts/mysql \
     MYSQL_PREFIX=/usr
 
-COPY 10.11/root-common /
-COPY 10.11/s2i-common/bin/ ${STI_SCRIPTS_PATH}
-COPY 10.11/root /
+COPY ${MYSQL_VERSION}/root-common /
+COPY ${MYSQL_VERSION}/s2i-common/bin/ ${STI_SCRIPTS_PATH}
+COPY ${MYSQL_VERSION}/root /
 
 # Hard links are not supported in Testing Farm approach during sync to guest
 # operation system. Therefore tests are failing on error

10.11/Dockerfile.c9s

@@ -11,10 +11,12 @@ FROM quay.io/sclorg/s2i-core-c9s:c9s
 #  * $MYSQL_ROOT_PASSWORD (Optional) - Password for the 'root' MySQL account
 
 ENV MYSQL_VERSION=10.11 \
+    MYSQL_SHORT_VERSION=1011 \
+    VERSION=${MYSQL_VERSION} \
     APP_DATA=/opt/app-root/src \
     HOME=/var/lib/mysql \
     NAME=mariadb \
-    SUMMARY="MariaDB 10.11 SQL database server" \
+    SUMMARY="MariaDB ${MYSQL_VERSION} 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. \
 The mysqld server daemon accepts connections from clients and provides access to content from \
@@ -23,13 +25,13 @@ MariaDB databases on behalf of the clients."
 LABEL summary="${SUMMARY}" \
       description="${DESCRIPTION}" \
       io.k8s.description="${DESCRIPTION}" \
-      io.k8s.display-name="MariaDB 10.11" \
+      io.k8s.display-name="MariaDB ${MYSQL_VERSION}" \
       io.openshift.expose-services="3306:mysql" \
-      io.openshift.tags="database,mysql,${NAME},${NAME}1011,${NAME}-1011" \
-      com.redhat.component="${NAME}-1011-container" \
-      name="sclorg/${NAME}-1011-c9s" \
+      io.openshift.tags="database,mysql,${NAME},${NAME}${MYSQL_SHORT_VERSION},${NAME}-${MYSQL_SHORT_VERSION}" \
+      com.redhat.component="${NAME}-${MYSQL_SHORT_VERSION}-container" \
+      name="sclorg/${NAME}-${MYSQL_SHORT_VERSION}-c9s" \
       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-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}-c9s" \
       maintainer="SoftwareCollections.org <[email protected]>"
 
 EXPOSE 3306
@@ -50,9 +52,9 @@ RUN yum -y module enable ${NAME}:${MYSQL_VERSION} && \
 ENV CONTAINER_SCRIPTS_PATH=/usr/share/container-scripts/mysql \
     MYSQL_PREFIX=/usr
 
-COPY 10.11/root-common /
-COPY 10.11/s2i-common/bin/ ${STI_SCRIPTS_PATH}
-COPY 10.11/root /
+COPY ${MYSQL_VERSION}/root-common /
+COPY ${MYSQL_VERSION}/s2i-common/bin/ ${STI_SCRIPTS_PATH}
+COPY ${MYSQL_VERSION}/root /
 
 # Hard links are not supported in Testing Farm approach during sync to guest
 # operation system. Therefore tests are failing on error

10.11/Dockerfile.fedora

@@ -11,12 +11,13 @@ FROM quay.io/fedora/s2i-core:40
 #  * $MYSQL_ROOT_PASSWORD (Optional) - Password for the 'root' MySQL account
 
 ENV MYSQL_VERSION=10.11 \
+    MYSQL_SHORT_VERSION=1011 \
+    VERSION=${MYSQL_VERSION} \
     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" \
+    SUMMARY="MariaDB ${MYSQL_VERSION} 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. \
 The mysqld server daemon accepts connections from clients and provides access to content from \
@@ -25,13 +26,13 @@ MariaDB databases on behalf of the clients."
 LABEL summary="${SUMMARY}" \
       description="${DESCRIPTION}" \
       io.k8s.description="${DESCRIPTION}" \
-      io.k8s.display-name="MariaDB ${VERSION}" \
+      io.k8s.display-name="MariaDB ${MYSQL_VERSION}" \
       io.openshift.expose-services="3306:mysql" \
-      io.openshift.tags="database,mysql,${NAME},${NAME}1011,${NAME}-1011" \
+      io.openshift.tags="database,mysql,${NAME},${NAME}${MYSQL_SHORT_VERSION},${NAME}-${MYSQL_SHORT_VERSION}" \
       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" \
+      name="fedora/${NAME}-${MYSQL_SHORT_VERSION}" \
+      version="${MYSQL_VERSION}" \
+      usage="podman run -d -e MYSQL_USER=user -e MYSQL_PASSWORD=pass -e MYSQL_DATABASE=db -p 3306:3306 quay.io/fedora/${NAME}-${MYSQL_SHORT_VERSION}" \
       maintainer="SoftwareCollections.org <[email protected]>"
 
 EXPOSE 3306
@@ -51,9 +52,9 @@ RUN INSTALL_PKGS="policycoreutils rsync tar gettext hostname bind-utils groff-ba
 ENV CONTAINER_SCRIPTS_PATH=/usr/share/container-scripts/mysql \
     MYSQL_PREFIX=/usr
 
-COPY 10.11/root-common /
-COPY 10.11/s2i-common/bin/ ${STI_SCRIPTS_PATH}
-COPY 10.11/root /
+COPY ${MYSQL_VERSION}/root-common /
+COPY ${MYSQL_VERSION}/s2i-common/bin/ ${STI_SCRIPTS_PATH}
+COPY ${MYSQL_VERSION}/root /
 
 # Hard links are not supported in Testing Farm approach during sync to guest
 # operation system. Therefore tests are failing on error

10.11/Dockerfile.rhel10

@@ -11,11 +11,13 @@ FROM ubi10/s2i-core
 #  * $MYSQL_ROOT_PASSWORD (Optional) - Password for the 'root' MySQL account
 
 ENV MYSQL_VERSION=10.11 \
+    MYSQL_SHORT_VERSION=1011 \
+    VERSION=${MYSQL_VERSION} \
     APP_DATA=/opt/app-root/src \
     HOME=/var/lib/mysql \
     NAME=mariadb \
-    VERSION=10.11 \
-    SUMMARY="MariaDB 10.11 SQL database server" \
+    VERSION=${MYSQL_VERSION} \
+    SUMMARY="MariaDB ${MYSQL_VERSION} 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. \
 The mysqld server daemon accepts connections from clients and provides access to content from \
@@ -24,13 +26,13 @@ MariaDB databases on behalf of the clients."
 LABEL summary="${SUMMARY}" \
       description="${DESCRIPTION}" \
       io.k8s.description="${DESCRIPTION}" \
-      io.k8s.display-name="MariaDB ${VERSION}" \
+      io.k8s.display-name="MariaDB ${MYSQL_VERSION}" \
       io.openshift.expose-services="3306:mysql" \
-      io.openshift.tags="database,mysql,${NAME},${NAME}1011,${NAME}-1011" \
-      com.redhat.component="${NAME}-1011-container" \
-      name="rhel10/${NAME}-1011" \
+      io.openshift.tags="database,mysql,${NAME},${NAME}${MYSQL_SHORT_VERSION},${NAME}-${MYSQL_SHORT_VERSION}" \
+      com.redhat.component="${NAME}-${MYSQL_SHORT_VERSION}-container" \
+      name="rhel10/${NAME}-${MYSQL_SHORT_VERSION}" \
       version="1" \
-      usage="podman run -d -e MYSQL_USER=user -e MYSQL_PASSWORD=pass -e MYSQL_DATABASE=db -p 3306:3306 rhel10/${NAME}-1011" \
+      usage="podman run -d -e MYSQL_USER=user -e MYSQL_PASSWORD=pass -e MYSQL_DATABASE=db -p 3306:3306 rhel10/${NAME}-${MYSQL_SHORT_VERSION}" \
       maintainer="SoftwareCollections.org <[email protected]>"
 
 EXPOSE 3306
@@ -50,9 +52,9 @@ RUN INSTALL_PKGS="policycoreutils rsync tar xz gettext hostname bind-utils groff
 ENV CONTAINER_SCRIPTS_PATH=/usr/share/container-scripts/mysql \
     MYSQL_PREFIX=/usr
 
-COPY 10.11/root-common /
-COPY 10.11/s2i-common/bin/ ${STI_SCRIPTS_PATH}
-COPY 10.11/root /
+COPY ${MYSQL_VERSION}/root-common /
+COPY ${MYSQL_VERSION}/s2i-common/bin/ ${STI_SCRIPTS_PATH}
+COPY ${MYSQL_VERSION}/root /
 
 # Hard links are not supported in Testing Farm approach during sync to guest
 # operation system. Therefore tests are failing on error

10.11/Dockerfile.rhel9

@@ -11,10 +11,12 @@ FROM ubi9/s2i-core
 #  * $MYSQL_ROOT_PASSWORD (Optional) - Password for the 'root' MySQL account
 
 ENV MYSQL_VERSION=10.11 \
+    MYSQL_SHORT_VERSION=1011 \
+    VERSION=${MYSQL_VERSION} \
     APP_DATA=/opt/app-root/src \
     HOME=/var/lib/mysql \
     NAME=mariadb \
-    SUMMARY="MariaDB 10.11 SQL database server" \
+    SUMMARY="MariaDB ${MYSQL_VERSION} 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. \
 The mysqld server daemon accepts connections from clients and provides access to content from \
@@ -23,13 +25,13 @@ MariaDB databases on behalf of the clients."
 LABEL summary="${SUMMARY}" \
       description="${DESCRIPTION}" \
       io.k8s.description="${DESCRIPTION}" \
-      io.k8s.display-name="MariaDB 10.11" \
+      io.k8s.display-name="MariaDB ${MYSQL_VERSION}" \
       io.openshift.expose-services="3306:mysql" \
-      io.openshift.tags="database,mysql,${NAME},${NAME}1011,${NAME}-1011" \
-      com.redhat.component="${NAME}-1011-container" \
-      name="rhel9/${NAME}-1011" \
+      io.openshift.tags="database,mysql,${NAME},${NAME}${MYSQL_SHORT_VERSION},${NAME}-${MYSQL_SHORT_VERSION}" \
+      com.redhat.component="${NAME}-${MYSQL_SHORT_VERSION}-container" \
+      name="rhel9/${NAME}-${MYSQL_SHORT_VERSION}" \
       version="1" \
-      usage="podman run -d -e MYSQL_USER=user -e MYSQL_PASSWORD=pass -e MYSQL_DATABASE=db -p 3306:3306 rhel9/${NAME}-1011" \
+      usage="podman run -d -e MYSQL_USER=user -e MYSQL_PASSWORD=pass -e MYSQL_DATABASE=db -p 3306:3306 rhel9/${NAME}-${MYSQL_SHORT_VERSION}" \
       maintainer="SoftwareCollections.org <[email protected]>"
 
 EXPOSE 3306
@@ -50,9 +52,9 @@ RUN yum -y module enable ${NAME}:${MYSQL_VERSION} && \
 ENV CONTAINER_SCRIPTS_PATH=/usr/share/container-scripts/mysql \
     MYSQL_PREFIX=/usr
 
-COPY 10.11/root-common /
-COPY 10.11/s2i-common/bin/ ${STI_SCRIPTS_PATH}
-COPY 10.11/root /
+COPY ${MYSQL_VERSION}/root-common /
+COPY ${MYSQL_VERSION}/s2i-common/bin/ ${STI_SCRIPTS_PATH}
+COPY ${MYSQL_VERSION}/root /
 
 # Hard links are not supported in Testing Farm approach during sync to guest
 # operation system. Therefore tests are failing on error

10.5/Dockerfile.c9s

@@ -11,10 +11,12 @@ FROM quay.io/sclorg/s2i-core-c9s:c9s
 #  * $MYSQL_ROOT_PASSWORD (Optional) - Password for the 'root' MySQL account
 
 ENV MYSQL_VERSION=10.5 \
+    MYSQL_SHORT_VERSION=105 \
+    VERSION=${MYSQL_VERSION} \
     APP_DATA=/opt/app-root/src \
     HOME=/var/lib/mysql \
     NAME=mariadb \
-    SUMMARY="MariaDB 10.5 SQL database server" \
+    SUMMARY="MariaDB ${MYSQL_VERSION} 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. \
 The mysqld server daemon accepts connections from clients and provides access to content from \
@@ -23,13 +25,13 @@ MariaDB databases on behalf of the clients."
 LABEL summary="${SUMMARY}" \
       description="${DESCRIPTION}" \
       io.k8s.description="${DESCRIPTION}" \
-      io.k8s.display-name="MariaDB 10.5" \
+      io.k8s.display-name="MariaDB ${MYSQL_VERSION}" \
       io.openshift.expose-services="3306:mysql" \
-      io.openshift.tags="database,mysql,${NAME},${NAME}105,${NAME}-105" \
-      com.redhat.component="${NAME}-105-container" \
-      name="sclorg/${NAME}-105-c9s" \
+      io.openshift.tags="database,mysql,${NAME},${NAME}${MYSQL_SHORT_VERSION},${NAME}-${MYSQL_SHORT_VERSION}" \
+      com.redhat.component="${NAME}-${MYSQL_SHORT_VERSION}-container" \
+      name="sclorg/${NAME}-${MYSQL_SHORT_VERSION}-c9s" \
       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}-105-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}-c9s" \
       maintainer="SoftwareCollections.org <[email protected]>"
 
 EXPOSE 3306
@@ -50,9 +52,9 @@ RUN yum -y module disable ${NAME} && \
 ENV CONTAINER_SCRIPTS_PATH=/usr/share/container-scripts/mysql \
     MYSQL_PREFIX=/usr
 
-COPY 10.5/root-common /
-COPY 10.5/s2i-common/bin/ ${STI_SCRIPTS_PATH}
-COPY 10.5/root /
+COPY ${MYSQL_VERSION}/root-common /
+COPY ${MYSQL_VERSION}/s2i-common/bin/ ${STI_SCRIPTS_PATH}
+COPY ${MYSQL_VERSION}/root /
 
 # Hard links are not supported in Testing Farm approach during sync to guest
 # operation system. Therefore tests are failing on error

10.5/Dockerfile.rhel9

@@ -11,10 +11,12 @@ FROM ubi9/s2i-core
 #  * $MYSQL_ROOT_PASSWORD (Optional) - Password for the 'root' MySQL account
 
 ENV MYSQL_VERSION=10.5 \
+    MYSQL_SHORT_VERSION=105 \
+    VERSION=${MYSQL_VERSION} \
     APP_DATA=/opt/app-root/src \
     HOME=/var/lib/mysql \
     NAME=mariadb \
-    SUMMARY="MariaDB 10.5 SQL database server" \
+    SUMMARY="MariaDB ${MYSQL_VERSION} 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. \
 The mysqld server daemon accepts connections from clients and provides access to content from \
@@ -23,13 +25,13 @@ MariaDB databases on behalf of the clients."
 LABEL summary="${SUMMARY}" \
       description="${DESCRIPTION}" \
       io.k8s.description="${DESCRIPTION}" \
-      io.k8s.display-name="MariaDB 10.5" \
+      io.k8s.display-name="MariaDB ${MYSQL_VERSION}" \
       io.openshift.expose-services="3306:mysql" \
-      io.openshift.tags="database,mysql,${NAME},${NAME}105,${NAME}-105" \
-      com.redhat.component="${NAME}-105-container" \
-      name="rhel9/${NAME}-105" \
+      io.openshift.tags="database,mysql,${NAME},${NAME}${MYSQL_SHORT_VERSION},${NAME}-${MYSQL_SHORT_VERSION}" \
+      com.redhat.component="${NAME}-${MYSQL_SHORT_VERSION}-container" \
+      name="rhel9/${NAME}-${MYSQL_SHORT_VERSION}" \
       version="1" \
-      usage="podman run -d -e MYSQL_USER=user -e MYSQL_PASSWORD=pass -e MYSQL_DATABASE=db -p 3306:3306 rhel9/${NAME}-105" \
+      usage="podman run -d -e MYSQL_USER=user -e MYSQL_PASSWORD=pass -e MYSQL_DATABASE=db -p 3306:3306 rhel9/${NAME}-${MYSQL_SHORT_VERSION}" \
       maintainer="SoftwareCollections.org <[email protected]>"
 
 EXPOSE 3306
@@ -49,9 +51,9 @@ RUN INSTALL_PKGS="policycoreutils rsync tar gettext hostname bind9.18-utils grof
 ENV CONTAINER_SCRIPTS_PATH=/usr/share/container-scripts/mysql \
     MYSQL_PREFIX=/usr
 
-COPY 10.5/root-common /
-COPY 10.5/s2i-common/bin/ ${STI_SCRIPTS_PATH}
-COPY 10.5/root /
+COPY ${MYSQL_VERSION}/root-common /
+COPY ${MYSQL_VERSION}/s2i-common/bin/ ${STI_SCRIPTS_PATH}
+COPY ${MYSQL_VERSION}/root /
 
 # Hard links are not supported in Testing Farm approach during sync to guest
 # operation system. Therefore tests are failing on error