From 9e32c2213e8a1e92112bd099b2e20c00a9855c06 Mon Sep 17 00:00:00 2001
From: paspo <paolo@asperti.com>
Date: Sun, 24 Nov 2019 11:15:26 +0100
Subject: [PATCH] fix mysql custom config

---
 Dockerfile           | 3 ++-
 docker-entrypoint.sh | 8 ++------
 mysql.cnf            | 5 +++++
 3 files changed, 9 insertions(+), 7 deletions(-)
 create mode 100644 mysql.cnf

diff --git a/Dockerfile b/Dockerfile
index c23d9bc..99537be 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,8 +1,9 @@
 FROM mariadb:10
 
 RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -q -y cron sudo automysqlbackup
-RUN touch /etc/mysql/mariadb.conf.d/settings.cnf && chown mysql /etc/mysql/mariadb.conf.d/settings.cnf
 
+COPY mysql.cnf /etc/mysql/mariadb.conf.d/settings.cnf
+RUN chown mysql /etc/mysql/mariadb.conf.d/settings.cnf
 COPY docker-entrypoint.sh /usr/local/bin/
 COPY automysqlbackup /etc/default
 COPY sudoers /etc/sudoers.d/mysudoers
diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh
index 1190f8a..7e962af 100755
--- a/docker-entrypoint.sh
+++ b/docker-entrypoint.sh
@@ -327,15 +327,11 @@ _main() {
 
 # If we are sourced from elsewhere, don't perform any further actions
 if ! _is_sourced; then
-	SERVER_ID=${SERVERID:-33}
+	SERVER_ID=${SERVER_ID:-33}
 	READONLY=${READONLY:-1}
 
-	cat >/etc/mysql/mariadb.conf.d/settings.cnf <<EOF
-[mysqld]
+	cat >>/etc/mysql/mariadb.conf.d/settings.cnf <<EOF
 server_id = ${SERVER_ID}
-log_bin
-log-bin = binlog
-max-binlog-size = 500M
 replicate-do-db=${REPLICATE_DO_DB}
 EOF
 	if [ "$READONLY" = "1" ] ; then
diff --git a/mysql.cnf b/mysql.cnf
new file mode 100644
index 0000000..a4ad33e
--- /dev/null
+++ b/mysql.cnf
@@ -0,0 +1,5 @@
+[mysqld]
+log_bin
+log-bin = binlog
+max-binlog-size = 500M
+