From 7858731dfe1b15f34e33d41b38ca4c8e60efe15b Mon Sep 17 00:00:00 2001
From: cytopia <cytopia@everythingcli.org>
Date: Fri, 21 Apr 2017 23:17:59 +0200
Subject: [PATCH] DVL-006 Adding devilbox custom mysql configuration

---
 .devilbox/etc/mariadb-10.0/.keepme  |  0
 .devilbox/etc/mariadb-10.1/.keepme  |  0
 .devilbox/etc/mariadb-10.2/.keepme  |  0
 .devilbox/etc/mariadb-5.5/.keepme   |  0
 .devilbox/etc/mysql-5.5/.keepme     |  0
 .devilbox/etc/mysql-5.6/.keepme     |  0
 .devilbox/etc/mysql-5.7/.keepme     |  0
 .devilbox/etc/mysql-8.0/.keepme     |  0
 .devilbox/etc/mysql-8.0/charset.cnf | 10 ++++++++++
 docker-compose.yml                  |  3 +++
 10 files changed, 13 insertions(+)
 create mode 100644 .devilbox/etc/mariadb-10.0/.keepme
 create mode 100644 .devilbox/etc/mariadb-10.1/.keepme
 create mode 100644 .devilbox/etc/mariadb-10.2/.keepme
 create mode 100644 .devilbox/etc/mariadb-5.5/.keepme
 create mode 100644 .devilbox/etc/mysql-5.5/.keepme
 create mode 100644 .devilbox/etc/mysql-5.6/.keepme
 create mode 100644 .devilbox/etc/mysql-5.7/.keepme
 create mode 100644 .devilbox/etc/mysql-8.0/.keepme
 create mode 100644 .devilbox/etc/mysql-8.0/charset.cnf

diff --git a/.devilbox/etc/mariadb-10.0/.keepme b/.devilbox/etc/mariadb-10.0/.keepme
new file mode 100644
index 00000000..e69de29b
diff --git a/.devilbox/etc/mariadb-10.1/.keepme b/.devilbox/etc/mariadb-10.1/.keepme
new file mode 100644
index 00000000..e69de29b
diff --git a/.devilbox/etc/mariadb-10.2/.keepme b/.devilbox/etc/mariadb-10.2/.keepme
new file mode 100644
index 00000000..e69de29b
diff --git a/.devilbox/etc/mariadb-5.5/.keepme b/.devilbox/etc/mariadb-5.5/.keepme
new file mode 100644
index 00000000..e69de29b
diff --git a/.devilbox/etc/mysql-5.5/.keepme b/.devilbox/etc/mysql-5.5/.keepme
new file mode 100644
index 00000000..e69de29b
diff --git a/.devilbox/etc/mysql-5.6/.keepme b/.devilbox/etc/mysql-5.6/.keepme
new file mode 100644
index 00000000..e69de29b
diff --git a/.devilbox/etc/mysql-5.7/.keepme b/.devilbox/etc/mysql-5.7/.keepme
new file mode 100644
index 00000000..e69de29b
diff --git a/.devilbox/etc/mysql-8.0/.keepme b/.devilbox/etc/mysql-8.0/.keepme
new file mode 100644
index 00000000..e69de29b
diff --git a/.devilbox/etc/mysql-8.0/charset.cnf b/.devilbox/etc/mysql-8.0/charset.cnf
new file mode 100644
index 00000000..ffc8846f
--- /dev/null
+++ b/.devilbox/etc/mysql-8.0/charset.cnf
@@ -0,0 +1,10 @@
+[client]
+default-character-set=utf8
+
+[mysql]
+default-character-set=utf8
+
+
+[mysqld]
+collation-server = utf8_unicode_ci
+character-set-server = utf8
diff --git a/docker-compose.yml b/docker-compose.yml
index ca81a6ca..db2a8e9d 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -243,6 +243,9 @@ services:
       # Mount MySQL Socket directory
       - mysql_socket_volume:/tmp/mysql
 
+      # Mount devilbox default overwrites
+      - ${DEVILBOX_PATH}/.devilbox/etc/${MYSQL_SERVER}:/etc/mysql/docker-default.d:ro
+
       # Mount devilbox user-defined cnf files in order
       # to overwrite the MySQL server configuration
       - ${DEVILBOX_PATH}/cfg/${MYSQL_SERVER}:/etc/mysql/conf.d:ro