Merge pull request #303 from appleboy/patch-20

Revert #297 add mysql custom configuration file.

docker-compose.yml

@@ -101,10 +101,7 @@ services:
 ### MySQL Container #########################################
 
     mysql:
-        build:
+        build: ./mysql
-            context: ./mysql
-            args:
-                - MAX_ALLOWED_PACKET=20M
         volumes_from:
             - volumes_data
         ports:

mysql/Dockerfile

@@ -2,11 +2,7 @@ FROM mysql:latest
 
 MAINTAINER Mahmoud Zalt <mahmoud@zalt.me>
 
-ARG MAX_ALLOWED_PACKET=1M
+ADD my.cnf /etc/mysql/conf.d/my.cnf
-ENV MAX_ALLOWED_PACKET ${MAX_ALLOWED_PACKET}
-
-# Set MAX_ALLOWED_PACKET to /etc/mysql/my.cnf
-RUN sed -i "s/^\[mysqld\]$/\[mysqld\]\nmax_allowed_packet = ${MAX_ALLOWED_PACKET}/g" /etc/mysql/my.cnf
 
 CMD ["mysqld"]
 

mysql/my.cnf

@@ -0,0 +1,6 @@
+# The MySQL  Client configuration file.
+#
+# For explanations see
+# http://dev.mysql.com/doc/mysql/en/server-system-variables.html
+
+[mysql]