1berry/mariadb-docker
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

UBI default config adjusted by MDEV-34430 (collation) and MDEV-19123 charset

Browse Source
This commit is contained in:
Daniel Black 2024-06-20 15:56:09 +10:00
parent a8aeff35c6
commit 1c10627556
5 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
11.4-ubi/docker.cnf
View File

@ -7,7 +7,7 @@ skip-name-resolve
expire_logs_days=10 expire_logs_days=10
character-set-server=utf8mb4 character-set-server=utf8mb4
character-set-collations=utf8mb4=uca1400_ai_ci # 11.3+ character-set-collations=utf8mb4=uca1400_ai_ci # 11.3, 11.4
[client-server] [client-server]
socket=/run/mariadb/mariadb.sock socket=/run/mariadb/mariadb.sock

1
11.5-ubi/docker.cnf
View File

@ -7,7 +7,6 @@ skip-name-resolve
expire_logs_days=10 expire_logs_days=10
character-set-server=utf8mb4 character-set-server=utf8mb4
character-set-collations=utf8mb4=uca1400_ai_ci # 11.3+
[client-server] [client-server]
socket=/run/mariadb/mariadb.sock socket=/run/mariadb/mariadb.sock

2
11.6-ubi/docker.cnf
View File

@ -5,9 +5,7 @@ host-cache-size=0
skip-name-resolve skip-name-resolve
expire_logs_days=10 expire_logs_days=10
character-set-server=utf8mb4
character-set-collations=utf8mb4=uca1400_ai_ci # 11.3+
[client-server] [client-server]
socket=/run/mariadb/mariadb.sock socket=/run/mariadb/mariadb.sock

2
docker.cnf
View File

@ -7,7 +7,7 @@ skip-name-resolve
expire_logs_days=10 expire_logs_days=10
character-set-server=utf8mb4 character-set-server=utf8mb4
character-set-collations=utf8mb4=uca1400_ai_ci # 11.3+ character-set-collations=utf8mb4=uca1400_ai_ci # 11.3, 11.4
collation-server=utf8mb4_general_ci # 10* collation-server=utf8mb4_general_ci # 10*
[client-server] [client-server]

6
update.sh
View File

@ -55,6 +55,12 @@ update_version()
sed -e '/character-set-collations/d' docker.cnf > "$dir/docker.cnf" sed -e '/character-set-collations/d' docker.cnf > "$dir/docker.cnf"
else else
sed -e '/collation-server/d' docker.cnf > "$dir/docker.cnf" sed -e '/collation-server/d' docker.cnf > "$dir/docker.cnf"
if [[ $version != 11.4 ]]; then
sed -i -e '/character-set-collations/d' "$dir/docker.cnf"
fi
if [[ $version != 11.[45] ]]; then
sed -i -e '/character-set/d' "$dir/docker.cnf"
fi
fi fi
sed -e "s!%%MARIADB_VERSION%%!${version%-*}!" MariaDB-ubi.repo > "$dir"/MariaDB.repo sed -e "s!%%MARIADB_VERSION%%!${version%-*}!" MariaDB-ubi.repo > "$dir"/MariaDB.repo
fi fi