[bugfix] The version must be set in a separate stage, so it can be re-used in the other calls

otherwise it's not available when the rest of the ENV block is processed
and the ENV values relying on this variable are malformed.

This commit was mistakenly reverted as a part of revert of a different change

Author: FaramosCZ

8.0/Dockerfile.c9s

@@ -10,13 +10,14 @@ FROM quay.io/sclorg/s2i-core-c9s:c9s
 #  * $MYSQL_DATABASE - Name of the database to create
 #  * $MYSQL_ROOT_PASSWORD (Optional) - Password for the 'root' MySQL account
 
+# Standalone ENV call so these values can be re-used in the other ENV calls
 ENV MYSQL_VERSION=8.0 \
-    MYSQL_SHORT_VERSION=80 \
-    APP_DATA=/opt/app-root/src \
-    HOME=/var/lib/mysql \
-    NAME=mysql
+    MYSQL_SHORT_VERSION=80
 
-ENV SUMMARY="MySQL ${MYSQL_VERSION} SQL database server" \
+ENV APP_DATA=/opt/app-root/src \
+    HOME=/var/lib/mysql \
+    NAME=mysql \
+    SUMMARY="MySQL ${MYSQL_VERSION} 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 \

8.0/Dockerfile.fedora

@@ -10,13 +10,14 @@ FROM quay.io/fedora/s2i-core:42
 #  * $MYSQL_DATABASE - Name of the database to create
 #  * $MYSQL_ROOT_PASSWORD (Optional) - Password for the 'root' MySQL account
 
+# Standalone ENV call so these values can be re-used in the other ENV calls
 ENV MYSQL_VERSION=8.0 \
-    MYSQL_SHORT_VERSION=80 \
-    APP_DATA=/opt/app-root/src \
-    HOME=/var/lib/mysql \
-    NAME=mysql
+    MYSQL_SHORT_VERSION=80
 
-ENV SUMMARY="MySQL ${MYSQL_VERSION} SQL database server" \
+ENV APP_DATA=/opt/app-root/src \
+    HOME=/var/lib/mysql \
+    NAME=mysql \
+    SUMMARY="MySQL ${MYSQL_VERSION} 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 \

8.0/Dockerfile.rhel9

@@ -10,13 +10,14 @@ FROM ubi9/s2i-core
 #  * $MYSQL_DATABASE - Name of the database to create
 #  * $MYSQL_ROOT_PASSWORD (Optional) - Password for the 'root' MySQL account
 
+# Standalone ENV call so these values can be re-used in the other ENV calls
 ENV MYSQL_VERSION=8.0 \
-    MYSQL_SHORT_VERSION=80 \
-    APP_DATA=/opt/app-root/src \
-    HOME=/var/lib/mysql \
-    NAME=mysql
+    MYSQL_SHORT_VERSION=80
 
-ENV SUMMARY="MySQL ${MYSQL_VERSION} SQL database server" \
+ENV APP_DATA=/opt/app-root/src \
+    HOME=/var/lib/mysql \
+    NAME=mysql \
+    SUMMARY="MySQL ${MYSQL_VERSION} 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 \

8.4/Dockerfile.c10s

@@ -10,13 +10,14 @@ FROM quay.io/sclorg/s2i-core-c10s:c10s
 #  * $MYSQL_DATABASE - Name of the database to create
 #  * $MYSQL_ROOT_PASSWORD (Optional) - Password for the 'root' MySQL account
 
+# Standalone ENV call so these values can be re-used in the other ENV calls
 ENV MYSQL_VERSION=8.4 \
-    MYSQL_SHORT_VERSION=84 \
-    APP_DATA=/opt/app-root/src \
-    HOME=/var/lib/mysql \
-    NAME=mysql
+    MYSQL_SHORT_VERSION=84
 
-ENV SUMMARY="MySQL ${MYSQL_VERSION} SQL database server" \
+ENV APP_DATA=/opt/app-root/src \
+    HOME=/var/lib/mysql \
+    NAME=mysql \
+    SUMMARY="MySQL ${MYSQL_VERSION} 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 \

8.4/Dockerfile.c9s

@@ -10,13 +10,14 @@ FROM quay.io/sclorg/s2i-core-c9s:c9s
 #  * $MYSQL_DATABASE - Name of the database to create
 #  * $MYSQL_ROOT_PASSWORD (Optional) - Password for the 'root' MySQL account
 
+# Standalone ENV call so these values can be re-used in the other ENV calls
 ENV MYSQL_VERSION=8.4 \
-    MYSQL_SHORT_VERSION=84 \
-    APP_DATA=/opt/app-root/src \
-    HOME=/var/lib/mysql \
-    NAME=mysql
+    MYSQL_SHORT_VERSION=84
 
-ENV SUMMARY="MySQL ${MYSQL_VERSION} SQL database server" \
+ENV APP_DATA=/opt/app-root/src \
+    HOME=/var/lib/mysql \
+    NAME=mysql \
+    SUMMARY="MySQL ${MYSQL_VERSION} 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 \

8.4/Dockerfile.fedora

@@ -10,13 +10,14 @@ FROM quay.io/fedora/s2i-core:42
 #  * $MYSQL_DATABASE - Name of the database to create
 #  * $MYSQL_ROOT_PASSWORD (Optional) - Password for the 'root' MySQL account
 
+# Standalone ENV call so these values can be re-used in the other ENV calls
 ENV MYSQL_VERSION=8.4 \
-    MYSQL_SHORT_VERSION=84 \
-    APP_DATA=/opt/app-root/src \
-    HOME=/var/lib/mysql \
-    NAME=mysql
+    MYSQL_SHORT_VERSION=84
 
-ENV SUMMARY="MySQL ${MYSQL_VERSION} SQL database server" \
+ENV APP_DATA=/opt/app-root/src \
+    HOME=/var/lib/mysql \
+    NAME=mysql \
+    SUMMARY="MySQL ${MYSQL_VERSION} 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 \

8.4/Dockerfile.rhel10

@@ -10,13 +10,14 @@ FROM ubi10/s2i-core:latest
 #  * $MYSQL_DATABASE - Name of the database to create
 #  * $MYSQL_ROOT_PASSWORD (Optional) - Password for the 'root' MySQL account
 
+# Standalone ENV call so these values can be re-used in the other ENV calls
 ENV MYSQL_VERSION=8.4 \
-    MYSQL_SHORT_VERSION=84 \
-    APP_DATA=/opt/app-root/src \
-    HOME=/var/lib/mysql \
-    NAME=mysql
+    MYSQL_SHORT_VERSION=84
 
-ENV SUMMARY="MySQL ${MYSQL_VERSION} SQL database server" \
+ENV APP_DATA=/opt/app-root/src \
+    HOME=/var/lib/mysql \
+    NAME=mysql \
+    SUMMARY="MySQL ${MYSQL_VERSION} 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 \

8.4/Dockerfile.rhel9

@@ -10,13 +10,14 @@ FROM ubi9/s2i-core
 #  * $MYSQL_DATABASE - Name of the database to create
 #  * $MYSQL_ROOT_PASSWORD (Optional) - Password for the 'root' MySQL account
 
+# Standalone ENV call so these values can be re-used in the other ENV calls
 ENV MYSQL_VERSION=8.4 \
-    MYSQL_SHORT_VERSION=84 \
-    APP_DATA=/opt/app-root/src \
-    HOME=/var/lib/mysql \
-    NAME=mysql
+    MYSQL_SHORT_VERSION=84
 
-ENV SUMMARY="MySQL ${MYSQL_VERSION} SQL database server" \
+ENV APP_DATA=/opt/app-root/src \
+    HOME=/var/lib/mysql \
+    NAME=mysql \
+    SUMMARY="MySQL ${MYSQL_VERSION} 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 \