From d703c82c46f903ffb3710209c44c620e2e404871 Mon Sep 17 00:00:00 2001 From: Dmitry Pupinin Date: Wed, 16 Nov 2016 15:58:42 +0700 Subject: [PATCH 1/2] Exclude sites configuration from image and just use volume --- docker-compose.yml | 1 + nginx/Dockerfile | 1 - nginx/sites/.gitignore | 2 ++ 3 files changed, 3 insertions(+), 1 deletion(-) create mode 100644 nginx/sites/.gitignore diff --git a/docker-compose.yml b/docker-compose.yml index 22848b10..f34c9453 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/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 From 6bbd1fbe192b07a864693dd7e7697064653eb763 Mon Sep 17 00:00:00 2001 From: Dmitry Pupinin Date: Wed, 16 Nov 2016 16:06:30 +0700 Subject: [PATCH 2/2] Use mysql 5.7 with disabled option ONLY_FULL_GROUP_BY (which causes many problem to people) --- mysql/Dockerfile | 2 +- mysql/my.cnf | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/mysql/Dockerfile b/mysql/Dockerfile index 73bd8335..d6aa3eb0 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"