Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

mariadb fix /docker-entrypoint-initdb.d replication #12073

Merged
merged 1 commit into from
Mar 18, 2022

Conversation

grooverdan
Copy link
Contributor

A regression that a container master doesn't contain
the binary logs of its initdb.d data and cannot replicate this.

Fix details: MariaDB/mariadb-docker#421.

A regression that a container master doesn't contain
the binary logs of its initdb.d data and cannot replicate this.

Fix details: MariaDB/mariadb-docker#421.
@grooverdan grooverdan changed the title mariadb fix /docker-entrypoint-initdb.d replicatation mariadb fix /docker-entrypoint-initdb.d replication Mar 17, 2022
@github-actions
Copy link

Diff for 52da42e:
diff --git a/_bashbrew-cat b/_bashbrew-cat
index daaa227..ec081af 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -3,35 +3,35 @@ GitRepo: https://github.com/MariaDB/mariadb-docker.git
 
 Tags: 10.2.43-bionic, 10.2-bionic, 10.2.43, 10.2
 Architectures: amd64, arm64v8, ppc64le
-GitCommit: a36b14438a8400d7478da4f5f7974dba150d668d
+GitCommit: 5b93a88ae340de53d621125bef89e3571a325cfa
 Directory: 10.2
 
 Tags: 10.3.34-focal, 10.3-focal, 10.3.34, 10.3
 Architectures: amd64, arm64v8, ppc64le
-GitCommit: a36b14438a8400d7478da4f5f7974dba150d668d
+GitCommit: 5b93a88ae340de53d621125bef89e3571a325cfa
 Directory: 10.3
 
 Tags: 10.4.24-focal, 10.4-focal, 10.4.24, 10.4
 Architectures: amd64, arm64v8, ppc64le
-GitCommit: a36b14438a8400d7478da4f5f7974dba150d668d
+GitCommit: 5b93a88ae340de53d621125bef89e3571a325cfa
 Directory: 10.4
 
 Tags: 10.5.15-focal, 10.5-focal, 10.5.15, 10.5
 Architectures: amd64, arm64v8, ppc64le, s390x
-GitCommit: a36b14438a8400d7478da4f5f7974dba150d668d
+GitCommit: 5b93a88ae340de53d621125bef89e3571a325cfa
 Directory: 10.5
 
 Tags: 10.6.7-focal, 10.6-focal, 10.6.7, 10.6
 Architectures: amd64, arm64v8, ppc64le, s390x
-GitCommit: a36b14438a8400d7478da4f5f7974dba150d668d
+GitCommit: 5b93a88ae340de53d621125bef89e3571a325cfa
 Directory: 10.6
 
 Tags: 10.7.3-focal, 10.7-focal, 10-focal, focal, 10.7.3, 10.7, 10, latest
 Architectures: amd64, arm64v8, ppc64le, s390x
-GitCommit: a36b14438a8400d7478da4f5f7974dba150d668d
+GitCommit: 5b93a88ae340de53d621125bef89e3571a325cfa
 Directory: 10.7
 
 Tags: 10.8.2-rc-focal, 10.8-rc-focal, 10.8.2-rc, 10.8-rc
 Architectures: amd64, arm64v8, ppc64le, s390x
-GitCommit: a36b14438a8400d7478da4f5f7974dba150d668d
+GitCommit: 5b93a88ae340de53d621125bef89e3571a325cfa
 Directory: 10.8
diff --git a/mariadb_10.2/docker-entrypoint.sh b/mariadb_10.2/docker-entrypoint.sh
index a438b84..08a1c0b 100755
--- a/mariadb_10.2/docker-entrypoint.sh
+++ b/mariadb_10.2/docker-entrypoint.sh
@@ -120,7 +120,7 @@ mysql_get_config() {
 
 # Do a temporary startup of the MariaDB server, for init purposes
 docker_temp_server_start() {
-	"$@" --skip-networking --default-time-zone=SYSTEM --socket="${SOCKET}" --wsrep_on=OFF --skip-log-bin \
+	"$@" --skip-networking --default-time-zone=SYSTEM --socket="${SOCKET}" --wsrep_on=OFF \
 		--loose-innodb_buffer_pool_load_at_startup=0 &
 	declare -g MARIADB_PID
 	MARIADB_PID=$!
diff --git a/mariadb_10.3/docker-entrypoint.sh b/mariadb_10.3/docker-entrypoint.sh
index a438b84..08a1c0b 100755
--- a/mariadb_10.3/docker-entrypoint.sh
+++ b/mariadb_10.3/docker-entrypoint.sh
@@ -120,7 +120,7 @@ mysql_get_config() {
 
 # Do a temporary startup of the MariaDB server, for init purposes
 docker_temp_server_start() {
-	"$@" --skip-networking --default-time-zone=SYSTEM --socket="${SOCKET}" --wsrep_on=OFF --skip-log-bin \
+	"$@" --skip-networking --default-time-zone=SYSTEM --socket="${SOCKET}" --wsrep_on=OFF \
 		--loose-innodb_buffer_pool_load_at_startup=0 &
 	declare -g MARIADB_PID
 	MARIADB_PID=$!
diff --git a/mariadb_10.4/docker-entrypoint.sh b/mariadb_10.4/docker-entrypoint.sh
index a438b84..08a1c0b 100755
--- a/mariadb_10.4/docker-entrypoint.sh
+++ b/mariadb_10.4/docker-entrypoint.sh
@@ -120,7 +120,7 @@ mysql_get_config() {
 
 # Do a temporary startup of the MariaDB server, for init purposes
 docker_temp_server_start() {
-	"$@" --skip-networking --default-time-zone=SYSTEM --socket="${SOCKET}" --wsrep_on=OFF --skip-log-bin \
+	"$@" --skip-networking --default-time-zone=SYSTEM --socket="${SOCKET}" --wsrep_on=OFF \
 		--loose-innodb_buffer_pool_load_at_startup=0 &
 	declare -g MARIADB_PID
 	MARIADB_PID=$!
diff --git a/mariadb_10.5/docker-entrypoint.sh b/mariadb_10.5/docker-entrypoint.sh
index a438b84..08a1c0b 100755
--- a/mariadb_10.5/docker-entrypoint.sh
+++ b/mariadb_10.5/docker-entrypoint.sh
@@ -120,7 +120,7 @@ mysql_get_config() {
 
 # Do a temporary startup of the MariaDB server, for init purposes
 docker_temp_server_start() {
-	"$@" --skip-networking --default-time-zone=SYSTEM --socket="${SOCKET}" --wsrep_on=OFF --skip-log-bin \
+	"$@" --skip-networking --default-time-zone=SYSTEM --socket="${SOCKET}" --wsrep_on=OFF \
 		--loose-innodb_buffer_pool_load_at_startup=0 &
 	declare -g MARIADB_PID
 	MARIADB_PID=$!
diff --git a/mariadb_10.6/docker-entrypoint.sh b/mariadb_10.6/docker-entrypoint.sh
index c20348b..c52ad59 100755
--- a/mariadb_10.6/docker-entrypoint.sh
+++ b/mariadb_10.6/docker-entrypoint.sh
@@ -120,7 +120,7 @@ mysql_get_config() {
 
 # Do a temporary startup of the MariaDB server, for init purposes
 docker_temp_server_start() {
-	"$@" --skip-networking --default-time-zone=SYSTEM --socket="${SOCKET}" --wsrep_on=OFF --skip-log-bin \
+	"$@" --skip-networking --default-time-zone=SYSTEM --socket="${SOCKET}" --wsrep_on=OFF \
 		--loose-innodb_buffer_pool_load_at_startup=0 &
 	declare -g MARIADB_PID
 	MARIADB_PID=$!
diff --git a/mariadb_10.8-rc/docker-entrypoint.sh b/mariadb_10.8-rc/docker-entrypoint.sh
index c20348b..c52ad59 100755
--- a/mariadb_10.8-rc/docker-entrypoint.sh
+++ b/mariadb_10.8-rc/docker-entrypoint.sh
@@ -120,7 +120,7 @@ mysql_get_config() {
 
 # Do a temporary startup of the MariaDB server, for init purposes
 docker_temp_server_start() {
-	"$@" --skip-networking --default-time-zone=SYSTEM --socket="${SOCKET}" --wsrep_on=OFF --skip-log-bin \
+	"$@" --skip-networking --default-time-zone=SYSTEM --socket="${SOCKET}" --wsrep_on=OFF \
 		--loose-innodb_buffer_pool_load_at_startup=0 &
 	declare -g MARIADB_PID
 	MARIADB_PID=$!
diff --git a/mariadb_latest/docker-entrypoint.sh b/mariadb_latest/docker-entrypoint.sh
index c20348b..c52ad59 100755
--- a/mariadb_latest/docker-entrypoint.sh
+++ b/mariadb_latest/docker-entrypoint.sh
@@ -120,7 +120,7 @@ mysql_get_config() {
 
 # Do a temporary startup of the MariaDB server, for init purposes
 docker_temp_server_start() {
-	"$@" --skip-networking --default-time-zone=SYSTEM --socket="${SOCKET}" --wsrep_on=OFF --skip-log-bin \
+	"$@" --skip-networking --default-time-zone=SYSTEM --socket="${SOCKET}" --wsrep_on=OFF \
 		--loose-innodb_buffer_pool_load_at_startup=0 &
 	declare -g MARIADB_PID
 	MARIADB_PID=$!

Relevant Maintainers:

@tianon tianon merged commit da00a45 into docker-library:master Mar 18, 2022
@grooverdan
Copy link
Contributor Author

Thank you @tianon

@grooverdan grooverdan deleted the march2022_3 branch March 18, 2022 00:34
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants