[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.

Author: FaramosCZ

10.11/Dockerfile.c10s

@@ -10,8 +10,10 @@ 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
 
-ENV MYSQL_VERSION=10.11 \
-    MYSQL_SHORT_VERSION=${MYSQL_VERSION//./} \
+# Standalone ENV call so this value can be re-used in the other ENVs
+ENV MYSQL_VERSION=10.11
+
+ENV MYSQL_SHORT_VERSION=${MYSQL_VERSION//./} \
     VERSION=${MYSQL_VERSION} \
     APP_DATA=/opt/app-root/src \
     HOME=/var/lib/mysql \

10.11/Dockerfile.c9s

@@ -10,8 +10,10 @@ 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
 
-ENV MYSQL_VERSION=10.11 \
-    MYSQL_SHORT_VERSION=${MYSQL_VERSION//./} \
+# Standalone ENV call so this value can be re-used in the other ENVs
+ENV MYSQL_VERSION=10.11
+
+ENV MYSQL_SHORT_VERSION=${MYSQL_VERSION//./} \
     VERSION=${MYSQL_VERSION} \
     APP_DATA=/opt/app-root/src \
     HOME=/var/lib/mysql \

10.11/Dockerfile.fedora

@@ -10,8 +10,10 @@ 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
 
-ENV MYSQL_VERSION=10.11 \
-    MYSQL_SHORT_VERSION=${MYSQL_VERSION//./} \
+# Standalone ENV call so this value can be re-used in the other ENVs
+ENV MYSQL_VERSION=10.11
+
+ENV MYSQL_SHORT_VERSION=${MYSQL_VERSION//./} \
     VERSION=${MYSQL_VERSION} \
     APP_DATA=/opt/app-root/src \
     HOME=/var/lib/mysql \

10.11/Dockerfile.rhel10

@@ -10,8 +10,10 @@ FROM ubi10/s2i-core
 #  * $MYSQL_DATABASE - Name of the database to create
 #  * $MYSQL_ROOT_PASSWORD (Optional) - Password for the 'root' MySQL account
 
-ENV MYSQL_VERSION=10.11 \
-    MYSQL_SHORT_VERSION=${MYSQL_VERSION//./} \
+# Standalone ENV call so this value can be re-used in the other ENVs
+ENV MYSQL_VERSION=10.11
+
+ENV MYSQL_SHORT_VERSION=${MYSQL_VERSION//./} \
     VERSION=${MYSQL_VERSION} \
     APP_DATA=/opt/app-root/src \
     HOME=/var/lib/mysql \

10.11/Dockerfile.rhel9

@@ -10,8 +10,10 @@ FROM ubi9/s2i-core
 #  * $MYSQL_DATABASE - Name of the database to create
 #  * $MYSQL_ROOT_PASSWORD (Optional) - Password for the 'root' MySQL account
 
-ENV MYSQL_VERSION=10.11 \
-    MYSQL_SHORT_VERSION=${MYSQL_VERSION//./} \
+# Standalone ENV call so this value can be re-used in the other ENVs
+ENV MYSQL_VERSION=10.11
+
+ENV MYSQL_SHORT_VERSION=${MYSQL_VERSION//./} \
     VERSION=${MYSQL_VERSION} \
     APP_DATA=/opt/app-root/src \
     HOME=/var/lib/mysql \

10.5/Dockerfile.c9s

@@ -10,8 +10,10 @@ 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
 
-ENV MYSQL_VERSION=10.5 \
-    MYSQL_SHORT_VERSION=${MYSQL_VERSION//./} \
+# Standalone ENV call so this value can be re-used in the other ENVs
+ENV MYSQL_VERSION=10.5
+
+ENV MYSQL_SHORT_VERSION=${MYSQL_VERSION//./} \
     VERSION=${MYSQL_VERSION} \
     APP_DATA=/opt/app-root/src \
     HOME=/var/lib/mysql \

10.5/Dockerfile.rhel9

@@ -10,8 +10,10 @@ FROM ubi9/s2i-core
 #  * $MYSQL_DATABASE - Name of the database to create
 #  * $MYSQL_ROOT_PASSWORD (Optional) - Password for the 'root' MySQL account
 
-ENV MYSQL_VERSION=10.5 \
-    MYSQL_SHORT_VERSION=${MYSQL_VERSION//./} \
+# Standalone ENV call so this value can be re-used in the other ENVs
+ENV MYSQL_VERSION=10.5
+
+ENV MYSQL_SHORT_VERSION=${MYSQL_VERSION//./} \
     VERSION=${MYSQL_VERSION} \
     APP_DATA=/opt/app-root/src \
     HOME=/var/lib/mysql \