VladPolskiy/mariadb-docker
1
0
Fork 0
mirror of https://github.com/MariaDB/mariadb-docker.git synced 2025-08-16 15:55:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Hardcode version into entrypoint rather than rely on env

Browse Source
This commit is contained in:
Daniel Black
2024-05-20 09:36:24 +10:00
parent d68b27a0ca
commit 44ed2e2312
11 changed files with 14 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
10.11/docker-entrypoint.sh
View File

@ -218,9 +218,7 @@ docker_create_db_directories() {
} }
_mariadb_version() { _mariadb_version() {
local mariaVersion="${MARIADB_VERSION##*:}" echo -n "10.11.8-MariaDB"
mariaVersion="${mariaVersion%%[-+~]*}"
echo -n "${mariaVersion}-MariaDB"
} }
# initializes the database directory # initializes the database directory

4
10.4/docker-entrypoint.sh
View File

@ -210,9 +210,7 @@ docker_create_db_directories() {
} }
_mariadb_version() { _mariadb_version() {
local mariaVersion="${MARIADB_VERSION##*:}" echo -n "10.4.34-MariaDB"
mariaVersion="${mariaVersion%%[-+~]*}"
echo -n "${mariaVersion}-MariaDB"
} }
# initializes the database directory # initializes the database directory

4
10.5/docker-entrypoint.sh
View File

@ -210,9 +210,7 @@ docker_create_db_directories() {
} }
_mariadb_version() { _mariadb_version() {
local mariaVersion="${MARIADB_VERSION##*:}" echo -n "10.5.25-MariaDB"
mariaVersion="${mariaVersion%%[-+~]*}"
echo -n "${mariaVersion}-MariaDB"
} }
# initializes the database directory # initializes the database directory

4
10.6/docker-entrypoint.sh
View File

@ -210,9 +210,7 @@ docker_create_db_directories() {
} }
_mariadb_version() { _mariadb_version() {
local mariaVersion="${MARIADB_VERSION##*:}" echo -n "10.6.18-MariaDB"
mariaVersion="${mariaVersion%%[-+~]*}"
echo -n "${mariaVersion}-MariaDB"
} }
# initializes the database directory # initializes the database directory

4
11.0/docker-entrypoint.sh
View File

@ -218,9 +218,7 @@ docker_create_db_directories() {
} }
_mariadb_version() { _mariadb_version() {
local mariaVersion="${MARIADB_VERSION##*:}" echo -n "11.0.6-MariaDB"
mariaVersion="${mariaVersion%%[-+~]*}"
echo -n "${mariaVersion}-MariaDB"
} }
# initializes the database directory # initializes the database directory

4
11.1/docker-entrypoint.sh
View File

@ -218,9 +218,7 @@ docker_create_db_directories() {
} }
_mariadb_version() { _mariadb_version() {
local mariaVersion="${MARIADB_VERSION##*:}" echo -n "11.1.5-MariaDB"
mariaVersion="${mariaVersion%%[-+~]*}"
echo -n "${mariaVersion}-MariaDB"
} }
# initializes the database directory # initializes the database directory

4
11.2/docker-entrypoint.sh
View File

@ -218,9 +218,7 @@ docker_create_db_directories() {
} }
_mariadb_version() { _mariadb_version() {
local mariaVersion="${MARIADB_VERSION##*:}" echo -n "11.2.4-MariaDB"
mariaVersion="${mariaVersion%%[-+~]*}"
echo -n "${mariaVersion}-MariaDB"
} }
# initializes the database directory # initializes the database directory

4
11.4/docker-entrypoint.sh
View File

@ -218,9 +218,7 @@ docker_create_db_directories() {
} }
_mariadb_version() { _mariadb_version() {
local mariaVersion="${MARIADB_VERSION##*:}" echo -n "11.4.1-MariaDB"
mariaVersion="${mariaVersion%%[-+~]*}"
echo -n "${mariaVersion}-MariaDB"
} }
# initializes the database directory # initializes the database directory

4
11.5/docker-entrypoint.sh
View File

@ -218,9 +218,7 @@ docker_create_db_directories() {
} }
_mariadb_version() { _mariadb_version() {
local mariaVersion="${MARIADB_VERSION##*:}" echo -n "11.5.0-MariaDB"
mariaVersion="${mariaVersion%%[-+~]*}"
echo -n "${mariaVersion}-MariaDB"
} }
# initializes the database directory # initializes the database directory

4
docker-entrypoint.sh
View File

@ -218,9 +218,7 @@ docker_create_db_directories() {
} }
_mariadb_version() { _mariadb_version() {
local mariaVersion="${MARIADB_VERSION##*:}" echo -n "%%MARIADB_VERSION_BASIC%%-MariaDB"
mariaVersion="${mariaVersion%%[-+~]*}"
echo -n "${mariaVersion}-MariaDB"
} }
# initializes the database directory # initializes the database directory

4
update.sh
View File

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