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