MariaDB urgent reissue #16293
Merged
MariaDB urgent reissue #16293
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Unfortunately the last latest release broken PHP and nodejs because of a protocol issue. The configuration item character-set-collations added in the default 11.3/11.4 image generated this. Closes: MariaDB/mariadb-docker#560
Diff for e74e846:diff --git a/_bashbrew-cat b/_bashbrew-cat
index 6b37338..12fd282 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -8,40 +8,40 @@ Directory: 10.4
Tags: 10.5.24-focal, 10.5-focal, 10.5.24, 10.5
Architectures: amd64, arm64v8, ppc64le, s390x
-GitCommit: 1d95dfc811b0666ab39cecdbf88c4d956e74f765
+GitCommit: d7a950d41e9347ac94ad2d2f28469bff74858db7
Directory: 10.5
Tags: 10.6.17-focal, 10.6-focal, 10.6.17, 10.6
Architectures: amd64, arm64v8, ppc64le, s390x
-GitCommit: 1d95dfc811b0666ab39cecdbf88c4d956e74f765
+GitCommit: d7a950d41e9347ac94ad2d2f28469bff74858db7
Directory: 10.6
Tags: 10.11.7-jammy, 10.11-jammy, 10-jammy, lts-jammy, 10.11.7, 10.11, 10, lts
Architectures: amd64, arm64v8, ppc64le, s390x
-GitCommit: 1d95dfc811b0666ab39cecdbf88c4d956e74f765
+GitCommit: d7a950d41e9347ac94ad2d2f28469bff74858db7
Directory: 10.11
Tags: 11.0.5-jammy, 11.0-jammy, 11.0.5, 11.0
Architectures: amd64, arm64v8, ppc64le, s390x
-GitCommit: 1d95dfc811b0666ab39cecdbf88c4d956e74f765
+GitCommit: d7a950d41e9347ac94ad2d2f28469bff74858db7
Directory: 11.0
Tags: 11.1.4-jammy, 11.1-jammy, 11.1.4, 11.1
Architectures: amd64, arm64v8, ppc64le, s390x
-GitCommit: 1d95dfc811b0666ab39cecdbf88c4d956e74f765
+GitCommit: d7a950d41e9347ac94ad2d2f28469bff74858db7
Directory: 11.1
Tags: 11.2.3-jammy, 11.2-jammy, 11.2.3, 11.2
Architectures: amd64, arm64v8, ppc64le, s390x
-GitCommit: 1d95dfc811b0666ab39cecdbf88c4d956e74f765
+GitCommit: d7a950d41e9347ac94ad2d2f28469bff74858db7
Directory: 11.2
Tags: 11.3.2-jammy, 11.3-jammy, 11-jammy, jammy, 11.3.2, 11.3, 11, latest
Architectures: amd64, arm64v8, ppc64le, s390x
-GitCommit: 0c710468e3fb2ccec6cdc14350ee0f1eaf668307
+GitCommit: d7a950d41e9347ac94ad2d2f28469bff74858db7
Directory: 11.3
Tags: 11.4.1-rc-jammy, 11.4-rc-jammy, 11.4.1-rc, 11.4-rc
Architectures: amd64, arm64v8, ppc64le, s390x
-GitCommit: 174b68b5ef90f92902c15d73a0cfdd1cb99146d8
+GitCommit: d7a950d41e9347ac94ad2d2f28469bff74858db7
Directory: 11.4
diff --git a/mariadb_10.5/Dockerfile b/mariadb_10.5/Dockerfile
index 5dc76d5..87fa3de 100644
--- a/mariadb_10.5/Dockerfile
+++ b/mariadb_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/mariadb_10.6/Dockerfile b/mariadb_10.6/Dockerfile
index 6d173a2..a1e6406 100644
--- a/mariadb_10.6/Dockerfile
+++ b/mariadb_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/mariadb_11.0/Dockerfile b/mariadb_11.0/Dockerfile
index b5db3d6..279c81b 100644
--- a/mariadb_11.0/Dockerfile
+++ b/mariadb_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/mariadb_11.1/Dockerfile b/mariadb_11.1/Dockerfile
index e62f5f8..90304b2 100644
--- a/mariadb_11.1/Dockerfile
+++ b/mariadb_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/mariadb_11.2/Dockerfile b/mariadb_11.2/Dockerfile
index fb3a553..0016c7a 100644
--- a/mariadb_11.2/Dockerfile
+++ b/mariadb_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/mariadb_11.4-rc/Dockerfile b/mariadb_11.4-rc/Dockerfile
index 575013f..704f735 100644
--- a/mariadb_11.4-rc/Dockerfile
+++ b/mariadb_11.4-rc/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/mariadb_latest/Dockerfile b/mariadb_latest/Dockerfile
index 45acd7e..3b553ce 100644
--- a/mariadb_latest/Dockerfile
+++ b/mariadb_latest/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/mariadb_lts/Dockerfile b/mariadb_lts/Dockerfile
index 1dfbb5a..eb0ffd3 100644
--- a/mariadb_lts/Dockerfile
+++ b/mariadb_lts/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+Relevant Maintainers:
|
tianon
approved these changes
Feb 22, 2024
|
Thanks very much @tianon for responding so very late your day. |
|
I just happened to still be sitting here and looking at the list; you got really lucky. 😄 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Unfortunately the last latest release broken PHP and nodejs because of a protocol issue. The configuration item character-set-collations added in the default 11.3/11.4 image generated this.
Closes: MariaDB/mariadb-docker#560