diff --git a/docker-compose.yml b/docker-compose.yml index 1a35157e..9ecc41b7 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -75,6 +75,7 @@ services: - applications volumes: - ./logs/nginx/:/var/log/nginx + - ./nginx/sites/:/etc/nginx/sites-available ports: - "80:80" - "443:443" diff --git a/mysql/Dockerfile b/mysql/Dockerfile index 372adac8..420ddfaa 100644 --- a/mysql/Dockerfile +++ b/mysql/Dockerfile @@ -1,4 +1,4 @@ -FROM mysql:5.6 +FROM mysql:5.7 MAINTAINER Mahmoud Zalt diff --git a/mysql/my.cnf b/mysql/my.cnf index e4c1ddbd..2983739a 100644 --- a/mysql/my.cnf +++ b/mysql/my.cnf @@ -4,3 +4,6 @@ # http://dev.mysql.com/doc/mysql/en/server-system-variables.html [mysql] + +[mysqld] +sql-mode="STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION" diff --git a/nginx/Dockerfile b/nginx/Dockerfile index 2aece34b..1a1db96f 100644 --- a/nginx/Dockerfile +++ b/nginx/Dockerfile @@ -3,7 +3,6 @@ FROM nginx:alpine MAINTAINER Mahmoud Zalt ADD nginx.conf /etc/nginx/ -COPY sites/*.conf /etc/nginx/sites-available/ ARG PHP_UPSTREAM=php-fpm diff --git a/nginx/sites/.gitignore b/nginx/sites/.gitignore new file mode 100644 index 00000000..dcb7ef9e --- /dev/null +++ b/nginx/sites/.gitignore @@ -0,0 +1,2 @@ +*.conf +!default.conf