From d7a950d41e9347ac94ad2d2f28469bff74858db7 Mon Sep 17 00:00:00 2001 From: Daniel Black Date: Thu, 22 Feb 2024 11:49:46 +1100 Subject: [PATCH] Workaround issue #560 by removing character-set-collations This only has an effect on the 11.3 and 11.4 that have the configuration item set in their configuration file. The 10.4 instance doesn't have this file. --- 10.11/Dockerfile | 2 ++ 10.5/Dockerfile | 2 ++ 10.6/Dockerfile | 2 ++ 11.0/Dockerfile | 2 ++ 11.1/Dockerfile | 2 ++ 11.2/Dockerfile | 2 ++ 11.3/Dockerfile | 2 ++ 11.4/Dockerfile | 2 ++ Dockerfile.template | 2 ++ update.sh | 5 ++++- 10 files changed, 22 insertions(+), 1 deletion(-) diff --git a/10.11/Dockerfile b/10.11/Dockerfile index 1dfbb5a7..eb0ffd31 100644 --- a/10.11/Dockerfile +++ b/10.11/Dockerfile @@ -125,6 +125,8 @@ RUN set -ex; \ | xargs -rt -0 sed -Ei 's/^(bind-address|log|user\s)/#&/'; \ # don't reverse lookup hostnames, they are usually another container printf "[mariadb]\nhost-cache-size=0\nskip-name-resolve\n" > /etc/mysql/mariadb.conf.d/05-skipcache.cnf; \ +# Issue #560 + sed -i -e '/character-set-collations/d' /etc/mysql/mariadb.conf.d/50-server.cnf; \ # Issue #327 Correct order of reading directories /etc/mysql/mariadb.conf.d before /etc/mysql/conf.d (mount-point per documentation) if [ -L /etc/mysql/my.cnf ]; then \ # 10.5+ diff --git a/10.5/Dockerfile b/10.5/Dockerfile index 5dc76d5b..87fa3de0 100644 --- a/10.5/Dockerfile +++ b/10.5/Dockerfile @@ -127,6 +127,8 @@ RUN set -ex; \ | xargs -rt -0 sed -Ei 's/^(bind-address|log|user\s)/#&/'; \ # don't reverse lookup hostnames, they are usually another container printf "[mariadb]\nhost-cache-size=0\nskip-name-resolve\n" > /etc/mysql/mariadb.conf.d/05-skipcache.cnf; \ +# Issue #560 + sed -i -e '/character-set-collations/d' /etc/mysql/mariadb.conf.d/50-server.cnf; \ # Issue #327 Correct order of reading directories /etc/mysql/mariadb.conf.d before /etc/mysql/conf.d (mount-point per documentation) if [ -L /etc/mysql/my.cnf ]; then \ # 10.5+ diff --git a/10.6/Dockerfile b/10.6/Dockerfile index 6d173a23..a1e6406b 100644 --- a/10.6/Dockerfile +++ b/10.6/Dockerfile @@ -127,6 +127,8 @@ RUN set -ex; \ | xargs -rt -0 sed -Ei 's/^(bind-address|log|user\s)/#&/'; \ # don't reverse lookup hostnames, they are usually another container printf "[mariadb]\nhost-cache-size=0\nskip-name-resolve\n" > /etc/mysql/mariadb.conf.d/05-skipcache.cnf; \ +# Issue #560 + sed -i -e '/character-set-collations/d' /etc/mysql/mariadb.conf.d/50-server.cnf; \ # Issue #327 Correct order of reading directories /etc/mysql/mariadb.conf.d before /etc/mysql/conf.d (mount-point per documentation) if [ -L /etc/mysql/my.cnf ]; then \ # 10.5+ diff --git a/11.0/Dockerfile b/11.0/Dockerfile index b5db3d65..279c81b2 100644 --- a/11.0/Dockerfile +++ b/11.0/Dockerfile @@ -125,6 +125,8 @@ RUN set -ex; \ | xargs -rt -0 sed -Ei 's/^(bind-address|log|user\s)/#&/'; \ # don't reverse lookup hostnames, they are usually another container printf "[mariadb]\nhost-cache-size=0\nskip-name-resolve\n" > /etc/mysql/mariadb.conf.d/05-skipcache.cnf; \ +# Issue #560 + sed -i -e '/character-set-collations/d' /etc/mysql/mariadb.conf.d/50-server.cnf; \ # Issue #327 Correct order of reading directories /etc/mysql/mariadb.conf.d before /etc/mysql/conf.d (mount-point per documentation) if [ -L /etc/mysql/my.cnf ]; then \ # 10.5+ diff --git a/11.1/Dockerfile b/11.1/Dockerfile index e62f5f83..90304b2a 100644 --- a/11.1/Dockerfile +++ b/11.1/Dockerfile @@ -125,6 +125,8 @@ RUN set -ex; \ | xargs -rt -0 sed -Ei 's/^(bind-address|log|user\s)/#&/'; \ # don't reverse lookup hostnames, they are usually another container printf "[mariadb]\nhost-cache-size=0\nskip-name-resolve\n" > /etc/mysql/mariadb.conf.d/05-skipcache.cnf; \ +# Issue #560 + sed -i -e '/character-set-collations/d' /etc/mysql/mariadb.conf.d/50-server.cnf; \ # Issue #327 Correct order of reading directories /etc/mysql/mariadb.conf.d before /etc/mysql/conf.d (mount-point per documentation) if [ -L /etc/mysql/my.cnf ]; then \ # 10.5+ diff --git a/11.2/Dockerfile b/11.2/Dockerfile index fb3a5535..0016c7a6 100644 --- a/11.2/Dockerfile +++ b/11.2/Dockerfile @@ -125,6 +125,8 @@ RUN set -ex; \ | xargs -rt -0 sed -Ei 's/^(bind-address|log|user\s)/#&/'; \ # don't reverse lookup hostnames, they are usually another container printf "[mariadb]\nhost-cache-size=0\nskip-name-resolve\n" > /etc/mysql/mariadb.conf.d/05-skipcache.cnf; \ +# Issue #560 + sed -i -e '/character-set-collations/d' /etc/mysql/mariadb.conf.d/50-server.cnf; \ # Issue #327 Correct order of reading directories /etc/mysql/mariadb.conf.d before /etc/mysql/conf.d (mount-point per documentation) if [ -L /etc/mysql/my.cnf ]; then \ # 10.5+ diff --git a/11.3/Dockerfile b/11.3/Dockerfile index 45acd7ed..3b553cef 100644 --- a/11.3/Dockerfile +++ b/11.3/Dockerfile @@ -125,6 +125,8 @@ RUN set -ex; \ | xargs -rt -0 sed -Ei 's/^(bind-address|log|user\s)/#&/'; \ # don't reverse lookup hostnames, they are usually another container printf "[mariadb]\nhost-cache-size=0\nskip-name-resolve\n" > /etc/mysql/mariadb.conf.d/05-skipcache.cnf; \ +# Issue #560 + sed -i -e '/character-set-collations/d' /etc/mysql/mariadb.conf.d/50-server.cnf; \ # Issue #327 Correct order of reading directories /etc/mysql/mariadb.conf.d before /etc/mysql/conf.d (mount-point per documentation) if [ -L /etc/mysql/my.cnf ]; then \ # 10.5+ diff --git a/11.4/Dockerfile b/11.4/Dockerfile index 575013f5..704f7353 100644 --- a/11.4/Dockerfile +++ b/11.4/Dockerfile @@ -125,6 +125,8 @@ RUN set -ex; \ | xargs -rt -0 sed -Ei 's/^(bind-address|log|user\s)/#&/'; \ # don't reverse lookup hostnames, they are usually another container printf "[mariadb]\nhost-cache-size=0\nskip-name-resolve\n" > /etc/mysql/mariadb.conf.d/05-skipcache.cnf; \ +# Issue #560 + sed -i -e '/character-set-collations/d' /etc/mysql/mariadb.conf.d/50-server.cnf; \ # Issue #327 Correct order of reading directories /etc/mysql/mariadb.conf.d before /etc/mysql/conf.d (mount-point per documentation) if [ -L /etc/mysql/my.cnf ]; then \ # 10.5+ diff --git a/Dockerfile.template b/Dockerfile.template index 57a966c2..f58ca090 100644 --- a/Dockerfile.template +++ b/Dockerfile.template @@ -127,6 +127,8 @@ RUN set -ex; \ | xargs -rt -0 sed -Ei 's/^(bind-address|log|user\s)/#&/'; \ # don't reverse lookup hostnames, they are usually another container printf "[mariadb]\nhost-cache-size=0\nskip-name-resolve\n" > /etc/mysql/mariadb.conf.d/05-skipcache.cnf; \ +# Issue #560 + sed -i -e '/character-set-collations/d' /etc/mysql/mariadb.conf.d/50-server.cnf; \ # Issue #327 Correct order of reading directories /etc/mysql/mariadb.conf.d before /etc/mysql/conf.d (mount-point per documentation) if [ -L /etc/mysql/my.cnf ]; then \ # 10.5+ diff --git a/update.sh b/update.sh index 99eb043b..83593806 100755 --- a/update.sh +++ b/update.sh @@ -65,7 +65,10 @@ update_version() -e '/memory\.pressure/,+7d' \ "$version/docker-entrypoint.sh" sed -i -e 's/ REPLICA\$/ SLAVE$/' "$version"/healthcheck.sh - sed -i -e 's/\/run/\/var\/run\//g' "$version/Dockerfile" + sed -i -e 's/\/run/\/var\/run\//g' \ + -e '/character-set-collations/d' \ + -e '/^# Issue #560/d' \ + "$version/Dockerfile" ;; # almost nothing to see/do here 10.5) sed -i -e '/--old-mode/d' \