From 44ed2e231207787c08d56acc94b79d5f06efe006 Mon Sep 17 00:00:00 2001 From: Daniel Black Date: Mon, 20 May 2024 09:36:24 +1000 Subject: [PATCH] Hardcode version into entrypoint rather than rely on env --- 10.11/docker-entrypoint.sh | 4 +--- 10.4/docker-entrypoint.sh | 4 +--- 10.5/docker-entrypoint.sh | 4 +--- 10.6/docker-entrypoint.sh | 4 +--- 11.0/docker-entrypoint.sh | 4 +--- 11.1/docker-entrypoint.sh | 4 +--- 11.2/docker-entrypoint.sh | 4 +--- 11.4/docker-entrypoint.sh | 4 +--- 11.5/docker-entrypoint.sh | 4 +--- docker-entrypoint.sh | 4 +--- update.sh | 4 ++++ 11 files changed, 14 insertions(+), 30 deletions(-) diff --git a/10.11/docker-entrypoint.sh b/10.11/docker-entrypoint.sh index 22c45d3d..6e50e1c0 100755 --- 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 index 7447669a..85110e81 100755 --- 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 index 838d5f3e..f6c5dd5b 100755 --- 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 index 49a3f0d9..4738c6a9 100755 --- 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 index 08c08d97..a7579f51 100755 --- 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 index 08c08d97..8e15ea0a 100755 --- 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 index 08c08d97..e41ed9c7 100755 --- 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 index 08c08d97..baa01fd2 100755 --- 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 index 08c08d97..3ec4d26b 100755 --- 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 index cf079bc5..db0464bc 100755 --- 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 index e2a9222e..787ede6a 100755 --- 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)