Use MySQL 5.7

README.md

@@ -38,5 +38,7 @@ docker build images/apache2_php5/ -t dockerdrupaldev/apache2-php5:latest
 docker build images/apache2_php7/ -t dockerdrupaldev/apache2-php7:latest
 docker build images/cli_tools_php5/ -t dockerdrupaldev/cli-tools-php5:latest
 docker build images/cli_tools_php7/ -t dockerdrupaldev/cli-tools-php7:latest
+docker build images/mysql/ -t dockerdrupaldev/mysql:latest
+docker build images/web_tools/ -t dockerdrupaldev/web-tools:latest
 docker build images/varnish/ -t dockerdrupaldev/varnish:latest
 ```

docker-compose.yml

@@ -19,18 +19,19 @@ services:
     volumes:
       - ./sites:/var/www
       - apache_logs:/var/log/apache2
-      - ./etc/PHP/docker.ini:/etc/php/5.6/conf.d/docker.ini
+      - ./etc/php/docker.ini:/etc/php/5.6/conf.d/docker.ini
 
   # Database server
   db:
-    build: images/mysql
+    image: dockerdrupaldev/mysql:latest
     hostname: mysql
     environment:
       - MYSQL_ROOT_PASSWORD=root
     ports:
       - "3306:3306"
     volumes:
       - mysql:/var/lib/mysql
+      - ./etc/mysql/my.cnf:/etc/mysql/conf.d/95-overrides.cnf
 
   # Email catcher
   mailcatcher:
@@ -42,7 +43,7 @@ services:
 
   # Web development tools
   web_tools:
-    build: images/web_tools
+    image: dockerdrupaldev/web-tools:latest
     hostname: web-tools
     links:
       - db:mysql

etc/mysql/my.cnf

@@ -1,6 +1,6 @@
 ##
 # Docker Drupal Development
 #
-# MySQL override config
+# Override MySQL default config
 
 [mysqld]

images/mysql/Dockerfile

@@ -3,11 +3,12 @@
 #
 # Database server container
 
-FROM mysql:5.5
+FROM mysql:5.7
 
 LABEL maintainer="[email protected]"
 
-ADD config/my.cnf /etc/mysql/conf.d/my.cnf
+ADD config/docker.cnf /etc/mysql/conf.d/90-docker.cnf
+ADD config/overrides.cnf /etc/mysql/conf.d/95-overrides.cnf
 
 VOLUME /var/lib/mysql
 

images/mysql/config/my.cnf → images/mysql/config/docker.cnf

@@ -5,12 +5,6 @@
 
 [mysqld]
 
-bind-address=0.0.0.0
-console=1
-general_log=1
-general_log_file=/dev/stdout
-log_error=/dev/stderr
-
 # Defaults
 character_set_server = utf8
 collation_server = utf8_general_ci
@@ -28,4 +22,3 @@ max_connections = 320
 query_cache_limit = 1M
 query_cache_size = 16M
 sync_binlog = 1
-table_cache = 500

images/mysql/config/overrides.cnf

@@ -0,0 +1,6 @@
+##
+# Docker Drupal Development
+#
+# Override config
+
+[mysqld]