Merge pull request #451 from Blaasvis/master

Update MySQL startup script

README.md

@@ -214,7 +214,7 @@ Choose the setup the best suits your needs.
 *(In case you want a Docker environment for each project)*
 
 ##### A.1) Setup environment in existing Project:
-*(In case you already have a project, and you want to setup an environemnt to run it)*
+*(In case you already have a project, and you want to setup an environment to run it)*
 
 1 - Clone this repository on your project root directory:
 

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"

mysql/Dockerfile

@@ -1,4 +1,4 @@
-FROM mysql:5.6
+FROM mysql:5.7
 
 MAINTAINER Mahmoud Zalt <mahmoud@zalt.me>
 

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"

mysql/startup

@@ -1,3 +1,4 @@
-DROP USER 'homestead';
+DROP USER IF EXISTS 'MYSQL_USER'; 
-CREATE DATABASE IF NOT EXISTS MYSQL_DATABASE;
+CREATE USER 'MYSQL_USER'@'%'; 
-GRANT ALL ON `MYSQL_DATABASE`.* TO 'MYSQL_USER'@'%' IDENTIFIED BY 'MYSQL_PASSWORD';
+CREATE DATABASE IF NOT EXISTS MYSQL_DATABASE; 
+GRANT ALL ON MYSQL_DATABASE.* TO 'MYSQL_USER'@'%' IDENTIFIED BY 'MYSQL_PASSWORD';

nginx/Dockerfile

@@ -3,7 +3,6 @@ FROM nginx:alpine
 MAINTAINER Mahmoud Zalt <mahmoud@zalt.me>
 
 ADD nginx.conf /etc/nginx/
-COPY sites/*.conf /etc/nginx/sites-available/
 
 ARG PHP_UPSTREAM=php-fpm
 

nginx/sites/.gitignore

@@ -0,0 +1,2 @@
+*.conf
+!default.conf