ykxiao
/
laradock
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #303 from appleboy/patch-20 

Revert #297 add mysql custom configuration file.
This commit is contained in:
Mahmoud Zalt 2016-09-11 03:14:18 -04:00 committed by GitHub
parent 2ed475f1ef b254d4a9c9
commit 1b88c2c9d8
3 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
docker-compose.yml
View File

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

6
mysql/Dockerfile
View File

@ -2,11 +2,7 @@ FROM mysql:latest
MAINTAINER Mahmoud Zalt <mahmoud@zalt.me> 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"] CMD ["mysqld"]

6
mysql/my.cnf Normal file
View File

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