From 61480978d24c4b9c388d2e8b6ac09c41dc11e53b Mon Sep 17 00:00:00 2001
From: Pascal Vizeli <pascal.vizeli@syshack.ch>
Date: Sun, 10 Mar 2019 21:01:38 +0100
Subject: [PATCH] Fix mariadb (#539)

---
 mariadb/CHANGELOG.md       |  3 ++-
 mariadb/Dockerfile         |  1 +
 mariadb/config.json        |  2 +-
 mariadb/mariadb-server.cnf | 10 ++++++++++
 mariadb/run.sh             |  3 +++
 5 files changed, 17 insertions(+), 2 deletions(-)
 create mode 100644 mariadb/mariadb-server.cnf

diff --git a/mariadb/CHANGELOG.md b/mariadb/CHANGELOG.md
index 62a646d..64d5fad 100644
--- a/mariadb/CHANGELOG.md
+++ b/mariadb/CHANGELOG.md
@@ -1,6 +1,7 @@
 # Changelog
 
-**Warning**: Could be that you need delete this add-on first and lost all old data. Currently we don't support database migration on update.
+## 1.1
+- Fix connection issue with 10.3.13
 
 ## 1.0
 - Update MariaDB to 10.3.13
diff --git a/mariadb/Dockerfile b/mariadb/Dockerfile
index c7e9a96..a9ea75b 100644
--- a/mariadb/Dockerfile
+++ b/mariadb/Dockerfile
@@ -9,5 +9,6 @@ RUN apk add --no-cache mariadb mariadb-client
 
 # Copy data
 COPY run.sh /
+COPY mariadb-server.cnf /etc/my.cnf.d/
 
 CMD [ "/run.sh" ]
diff --git a/mariadb/config.json b/mariadb/config.json
index 80f5f23..d399309 100644
--- a/mariadb/config.json
+++ b/mariadb/config.json
@@ -1,6 +1,6 @@
 {
   "name": "MariaDB",
-  "version": "1.0",
+  "version": "1.1",
   "slug": "mariadb",
   "description": "An SQL database server",
   "url": "https://home-assistant.io/addons/mariadb/",
diff --git a/mariadb/mariadb-server.cnf b/mariadb/mariadb-server.cnf
new file mode 100644
index 0000000..7e67d2d
--- /dev/null
+++ b/mariadb/mariadb-server.cnf
@@ -0,0 +1,10 @@
+
+[server]
+
+[mysqld]
+
+datadir=/data/databases
+
+[galera]
+
+[mariadb]
diff --git a/mariadb/run.sh b/mariadb/run.sh
index b70c839..05268d9 100755
--- a/mariadb/run.sh
+++ b/mariadb/run.sh
@@ -14,6 +14,9 @@ if [ ! -d "$MARIADB_DATA" ]; then
     mysql_install_db --user=root --datadir="$MARIADB_DATA" > /dev/null
 else
     echo "[INFO] Use exists mariadb initial system"
+    mysqlcheck --no-defaults --check-upgrade --auto-repair --databases mysql --skip-write-binlog > /dev/null || true
+    mysqlcheck --no-defaults --all-databases --fix-db-names --fix-table-names --skip-write-binlog > /dev/null || true
+    mysqlcheck --no-defaults --check-upgrade --all-databases --auto-repair --skip-write-binlog > /dev/null || true
 fi
 
 # Start mariadb