Merge pull request #3 from final-gene/fix-sql-error

Fix database settings

.docker/mysql/Dockerfile

@@ -1 +1,3 @@
 FROM mysql/mysql-server:5.7
+
+COPY etc/my.cnf /etc/my.cnf

.docker/mysql/etc/my.cnf

@@ -0,0 +1,33 @@
+# For advice on how to change settings please see
+# http://dev.mysql.com/doc/refman/5.7/en/server-configuration-defaults.html
+
+[mysqld]
+#
+# Remove leading # and set to the amount of RAM for the most important data
+# cache in MySQL. Start at 70% of total RAM for dedicated server, else 10%.
+# innodb_buffer_pool_size = 128M
+#
+# Remove leading # to turn on a very important data integrity option: logging
+# changes to the binary log between backups.
+# log_bin
+#
+# Remove leading # to set options mainly useful for reporting servers.
+# The server defaults are faster for transactions and fast SELECTs.
+# Adjust sizes as needed, experiment to find the optimal values.
+# join_buffer_size = 128M
+# sort_buffer_size = 2M
+# read_rnd_buffer_size = 2M
+skip-host-cache
+skip-name-resolve
+datadir=/var/lib/mysql
+socket=/var/lib/mysql/mysql.sock
+secure-file-priv=/var/lib/mysql-files
+user=mysql
+
+# Disabling symbolic-links is recommended to prevent assorted security risks
+symbolic-links=0
+
+log-error=/var/log/mysqld.log
+pid-file=/var/run/mysqld/mysqld.pid
+
+sql_mode="STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION"

Makefile

@@ -1,7 +1,7 @@
 NAME = mrpassword
 VERSION = 4.0.1
 
-.PHONY: create-network build-dev install-dev uninstall-dev rebuild-dev clean
+.PHONY: create-network build-dev install-dev uninstall-dev rebuild-dev clean clean-config
 
 create-network:
 	$(if $(shell docker network ls | grep mrpassword),,docker network create mrpassword)
@@ -15,9 +15,11 @@ install-dev: create-network
 uninstall-dev:
 	docker-compose -f docker-compose.dev.yml down
 
-clean:
+clean-config:
+	-rm .htaccess .mrp_test_file user/settings/.mrp_test_file user/settings/config.php
+
+clean: clean-config
 	-docker rmi -f `docker images mrpassword/* -q`
 	-docker volume rm `docker volume ls --filter name=mrpassword_* -q`
-	-rm .htaccess .mrp_test_file user/settings/.mrp_test_file user/settings/config.php
 
-rebuild-dev: uninstall-dev build-dev install-dev
+rebuild-dev: uninstall-dev build-dev clean-config install-dev