From e0677724cbe9f932a568c8f85bca6c14d460bbb4 Mon Sep 17 00:00:00 2001 From: Daniel Black Date: Thu, 23 May 2024 15:34:53 +1000 Subject: [PATCH] Reapply "Workaround issue #560 by removing character-set-collations" This reverts commit 1e14bcaa60fcacbfbd9191d1138869b5dc81fed7. but only for 11.3/11.4 which haven't been updated. --- 11.3/Dockerfile | 2 ++ 11.4/Dockerfile | 2 ++ 11.5/Dockerfile | 2 ++ Dockerfile.template | 2 ++ update.sh | 14 ++++++++++++-- versions.json | 28 ++++++++++++++-------------- 6 files changed, 34 insertions(+), 16 deletions(-) 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 1e91dd5b..5145a92c 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/11.5/Dockerfile b/11.5/Dockerfile index 3551d84f..a2106aa3 100644 --- a/11.5/Dockerfile +++ b/11.5/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 4b936db9..6a6c356b 100755 --- a/update.sh +++ b/update.sh @@ -76,12 +76,16 @@ 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 '/^# Issue #560/,+1d' \ + "$version/Dockerfile" ;; # almost nothing to see/do here 10.5) sed -i -e '/--old-mode/d' \ -e '/memory\.pressure/,+7d' "$version/docker-entrypoint.sh" - sed -i '/backwards compat/d' "$version/Dockerfile" + sed -i -e '/backwards compat/d' \ + -e '/^# Issue #560/,+1d' \ + "$version/Dockerfile" ;; *) sed -i -e '/^CMD/s/mysqld/mariadbd/' \ @@ -97,6 +101,8 @@ update_version() # my_print_defaults didn't recognise --mysqld until 10.11 sed -i -e '0,/#ENDOFSUBSTITUTIONS/s/\([^-]\)mysqld/\1mariadbd/g' \ "$version/docker-entrypoint.sh" + sed -i -e '/^# Issue #560/,+1d' \ + "$version/Dockerfile" else sed -i -e '0,/#ENDOFSUBSTITUTIONS/s/\mysqld/mariadbd/g' \ "$version/docker-entrypoint.sh" @@ -119,6 +125,10 @@ update_version() if [[ $version =~ 11.[01] ]]; then sed -i -e 's/50-mysqld_safe.cnf/50-mariadb_safe.cnf/' "$version/Dockerfile" fi + if [[ $version =~ 11.[012] ]] || [ "$version" = 10.11 ]; then + sed -i -e '/^# Issue #560/,+1d' \ + "$version/Dockerfile" + fi ;& esac diff --git a/versions.json b/versions.json index b96fcfe4..4ac67fcb 100644 --- a/versions.json +++ b/versions.json @@ -27,6 +27,20 @@ "s390x" ] }, + "11.3": { + "milestone": "11.3", + "version": "11.3.2", + "fullVersion": "1:11.3.2+maria~ubu2204", + "releaseStatus": "Stable", + "supportType": "Short Term Support", + "base": "ubuntu:jammy", + "arches": [ + "amd64", + "arm64v8", + "ppc64le", + "s390x" + ] + }, "11.2": { "milestone": "11.2", "version": "11.2.4", @@ -123,19 +137,5 @@ "arm64v8", "ppc64le" ] - }, - "11.3": { - "milestone": "11.3", - "version": "11.3.2", - "fullVersion": "1:11.3.2+maria~ubu2204", - "releaseStatus": "Stable", - "supportType": "Short Term Support", - "base": "ubuntu:jammy", - "arches": [ - "amd64", - "arm64v8", - "ppc64le", - "s390x" - ] } }