Hardcode version into entrypoint rather than rely on env

MariaDB · May 19, 2024 · 44ed2e2 · 44ed2e2
1 parent d68b27a
commit 44ed2e2
Show file tree

Hide file tree

Showing 11 changed files with 14 additions and 30 deletions.
diff --git a/10.11/docker-entrypoint.sh b/10.11/docker-entrypoint.sh
@@ -218,9 +218,7 @@ docker_create_db_directories() {
 }
 
 _mariadb_version() {
-        local mariaVersion="${MARIADB_VERSION##*:}"
-        mariaVersion="${mariaVersion%%[-+~]*}"
-	echo -n "${mariaVersion}-MariaDB"
+	echo -n "10.11.8-MariaDB"
 }
 
 # initializes the database directory

diff --git a/10.4/docker-entrypoint.sh b/10.4/docker-entrypoint.sh
@@ -210,9 +210,7 @@ docker_create_db_directories() {
 }
 
 _mariadb_version() {
-        local mariaVersion="${MARIADB_VERSION##*:}"
-        mariaVersion="${mariaVersion%%[-+~]*}"
-	echo -n "${mariaVersion}-MariaDB"
+	echo -n "10.4.34-MariaDB"
 }
 
 # initializes the database directory

diff --git a/10.5/docker-entrypoint.sh b/10.5/docker-entrypoint.sh
@@ -210,9 +210,7 @@ docker_create_db_directories() {
 }
 
 _mariadb_version() {
-        local mariaVersion="${MARIADB_VERSION##*:}"
-        mariaVersion="${mariaVersion%%[-+~]*}"
-	echo -n "${mariaVersion}-MariaDB"
+	echo -n "10.5.25-MariaDB"
 }
 
 # initializes the database directory

diff --git a/10.6/docker-entrypoint.sh b/10.6/docker-entrypoint.sh
@@ -210,9 +210,7 @@ docker_create_db_directories() {
 }
 
 _mariadb_version() {
-        local mariaVersion="${MARIADB_VERSION##*:}"
-        mariaVersion="${mariaVersion%%[-+~]*}"
-	echo -n "${mariaVersion}-MariaDB"
+	echo -n "10.6.18-MariaDB"
 }
 
 # initializes the database directory

diff --git a/11.0/docker-entrypoint.sh b/11.0/docker-entrypoint.sh
@@ -218,9 +218,7 @@ docker_create_db_directories() {
 }
 
 _mariadb_version() {
-        local mariaVersion="${MARIADB_VERSION##*:}"
-        mariaVersion="${mariaVersion%%[-+~]*}"
-	echo -n "${mariaVersion}-MariaDB"
+	echo -n "11.0.6-MariaDB"
 }
 
 # initializes the database directory

diff --git a/11.1/docker-entrypoint.sh b/11.1/docker-entrypoint.sh
@@ -218,9 +218,7 @@ docker_create_db_directories() {
 }
 
 _mariadb_version() {
-        local mariaVersion="${MARIADB_VERSION##*:}"
-        mariaVersion="${mariaVersion%%[-+~]*}"
-	echo -n "${mariaVersion}-MariaDB"
+	echo -n "11.1.5-MariaDB"
 }
 
 # initializes the database directory

diff --git a/11.2/docker-entrypoint.sh b/11.2/docker-entrypoint.sh
@@ -218,9 +218,7 @@ docker_create_db_directories() {
 }
 
 _mariadb_version() {
-        local mariaVersion="${MARIADB_VERSION##*:}"
-        mariaVersion="${mariaVersion%%[-+~]*}"
-	echo -n "${mariaVersion}-MariaDB"
+	echo -n "11.2.4-MariaDB"
 }
 
 # initializes the database directory

diff --git a/11.4/docker-entrypoint.sh b/11.4/docker-entrypoint.sh
@@ -218,9 +218,7 @@ docker_create_db_directories() {
 }
 
 _mariadb_version() {
-        local mariaVersion="${MARIADB_VERSION##*:}"
-        mariaVersion="${mariaVersion%%[-+~]*}"
-	echo -n "${mariaVersion}-MariaDB"
+	echo -n "11.4.1-MariaDB"
 }
 
 # initializes the database directory

diff --git a/11.5/docker-entrypoint.sh b/11.5/docker-entrypoint.sh
@@ -218,9 +218,7 @@ docker_create_db_directories() {
 }
 
 _mariadb_version() {
-        local mariaVersion="${MARIADB_VERSION##*:}"
-        mariaVersion="${mariaVersion%%[-+~]*}"
-	echo -n "${mariaVersion}-MariaDB"
+	echo -n "11.5.0-MariaDB"
 }
 
 # initializes the database directory

diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh
@@ -218,9 +218,7 @@ docker_create_db_directories() {
 }
 
 _mariadb_version() {
-        local mariaVersion="${MARIADB_VERSION##*:}"
-        mariaVersion="${mariaVersion%%[-+~]*}"
-	echo -n "${mariaVersion}-MariaDB"
+	echo -n "%%MARIADB_VERSION_BASIC%%-MariaDB"
 }
 
 # initializes the database directory

diff --git a/update.sh b/update.sh
@@ -62,6 +62,10 @@ update_version()
 		-e 's!%%ARCHES%%! '"$arches"'!g' \
 		"$version/Dockerfile"
 
+	sed -i \
+		-e 's!%%MARIADB_VERSION_BASIC%%!'"$mariaVersion"'!g' \
+		"$version/docker-entrypoint.sh"
+
 	# Start using the new executable names
 	case "$version" in
 		10.4)