Merge pull request #23 from pipech/Fixed---MariaDB-is-not-properly-co…

…nfigured change mariadb config adding method
pipech · Aug 1, 2018 · b662160 · b662160
2 parents 384d15e + 40b801d
commit b662160
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 45 deletions.
diff --git a/development_setup/conf/mariadb-conf/mariadb.cnf b/development_setup/conf/mariadb-conf/mariadb.cnf
diff --git a/development_setup/docker-compose.yml b/development_setup/docker-compose.yml
@@ -2,7 +2,7 @@ version: '2'
 
 services:
   frappe:
-    build: .
+    build: ./image/frappe/.
     ports:
       - "8000-8005:8000-8005" #webserver_port
       - "9000-9005:9000-9005" #socketio_port
@@ -19,15 +19,13 @@ services:
     command: tail -f /dev/null
 
   mariadb:
-    image: mariadb:10.2.12
+    build: ./image/mariadb/.
     environment:
       - MYSQL_USER=root
       - MYSQL_ROOT_PASSWORD=mysql
     volumes:
       # persisting data
       - mariadb-data-volumes:/var/lib/mysql
-      # config
-      - ./conf/mariadb-conf/mariadb.cnf:/etc/mysql/conf.d/mariadb.cnf
     ports:
       - "3306:3306"
 

diff --git a/development_setup/Dockerfile → development_setup/image/frappe/Dockerfile b/development_setup/Dockerfile → development_setup/image/frappe/Dockerfile
diff --git a/development_setup/image/mariadb/Dockerfile b/development_setup/image/mariadb/Dockerfile
@@ -0,0 +1,3 @@
+FROM mariadb:10.2.12
+
+COPY ./mariadb.cnf /etc/mysql/mariadb.conf.d/frappe.cnf
diff --git a/development_setup/image/mariadb/mariadb.cnf b/development_setup/image/mariadb/mariadb.cnf
@@ -0,0 +1,20 @@
+[mysqld]
+bind-address = 0.0.0.0
+
+innodb-file-format=barracuda
+innodb-file-per-table=1
+innodb-large-prefix=1
+character-set-client-handshake = FALSE
+character-set-server = utf8mb4
+collation-server = utf8mb4_unicode_ci
+
+
+[mysqld_safe]
+skip_log_error
+syslog
+
+
+[mysqldump]
+quick
+quote-names
+max_allowed_packet	= 16M