Merge release/v1.4.0 into master

synapsestudios · Oct 3, 2017 · aef3a7d · aef3a7d
2 parents d482fc0 + 49ede6f
commit aef3a7d
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,6 @@
+## [v1.4.0](https://github.com/synapsestudios/oidc-platform/compare/v1.3.1...release/v1.4.0) - 2017-10-3
+### Added
+- [#127](https://github.com/synapsestudios/oidc-platform/pull/127) Update mysql config to be closer to AWS RDS mysql
 
 ## [v1.3.1](https://github.com/synapsestudios/oidc-platform/compare/v1.3.0...release/v1.3.1) - 2017-10-2
 ### Added

diff --git a/Dockerfile.mysql b/Dockerfile.mysql
@@ -0,0 +1,3 @@
+FROM mysql:5.7.16
+
+COPY ./mysql.cnf /etc/mysql/conf.d/custom.cnf
diff --git a/docker-compose.mysql.yml b/docker-compose.mysql.yml
@@ -1,9 +1,11 @@
 version: '2'
 services:
     mysql:
-        image: mysql:5.7.16
+        build:
+            context: .
+            dockerfile: Dockerfile.mysql
         env_file:
-          - ./common.env
+            - ./common.env
         environment:
             - MYSQL_DATABASE=database
             - MYSQL_ROOT_PASSWORD=root

diff --git a/mysql.cnf b/mysql.cnf
@@ -0,0 +1,2 @@
+[mysqld]
+sql_mode = NO_ENGINE_SUBSTITUTION