Refs: #501 #448 Use Official MySQL, MariaDB and Percona images

cytopia · Feb 10, 2019 · 5e74be0 · 5e74be0
1 parent bf50d2b
commit 5e74be0
Show file tree

Hide file tree

Showing 16 changed files with 109 additions and 387 deletions.
diff --git a/.gitignore b/.gitignore
@@ -50,9 +50,12 @@
 /cfg/mariadb-10.0/*.cnf
 /cfg/mariadb-10.1/*.cnf
 /cfg/mariadb-10.2/*.cnf
+/cfg/mariadb-10.3/*.cnf
+/cfg/mariadb-10.4/*.cnf
 /cfg/percona-5.5/*.cnf
 /cfg/percona-5.6/*.cnf
 /cfg/percona-5.7/*.cnf
+/cfg/percona-8.0/*.cnf
 
 # Ignore custom PHP.ini configs
 /cfg/php-ini-5.2/*.ini

diff --git a/.travis.yml b/.travis.yml
@@ -138,9 +138,12 @@ env:
   - S1=PHP V1=7.2 S2=MYSQL V2=mariadb-10.0
   - S1=PHP V1=7.2 S2=MYSQL V2=mariadb-10.1
   - S1=PHP V1=7.2 S2=MYSQL V2=mariadb-10.2
+  - S1=PHP V1=7.2 S2=MYSQL V2=mariadb-10.3
+  - S1=PHP V1=7.2 S2=MYSQL V2=mariadb-10.4
   - S1=PHP V1=7.2 S2=MYSQL V2=percona-5.5
   - S1=PHP V1=7.2 S2=MYSQL V2=percona-5.6
   - S1=PHP V1=7.2 S2=MYSQL V2=percona-5.7
+  - S1=PHP V1=7.2 S2=MYSQL V2=percona-8.0
   # PHP 7.2 vs PgSQL
   - S1=PHP V1=7.2 S2=PGSQL V2=9.0
   - S1=PHP V1=7.2 S2=PGSQL V2=9.1

diff --git a/cfg/mariadb-10.4/.keepme b/cfg/mariadb-10.4/.keepme
diff --git a/cfg/mariadb-10.4/devilbox-custom.cnf-example b/cfg/mariadb-10.4/devilbox-custom.cnf-example
@@ -0,0 +1,5 @@
+[mysqld]
+;key_buffer_size=16M
+
+[mysqldump]
+;quick
diff --git a/cfg/mariadb-5.5/.keepme b/cfg/mariadb-5.5/.keepme
diff --git a/cfg/mariadb-5.5/devilbox-custom.cnf b/cfg/mariadb-5.5/devilbox-custom.cnf
@@ -0,0 +1,5 @@
+[mysqld]
+key_buffer_size=5M
+
+[mysqldump]
+;quick
diff --git a/cfg/mariadb-5.5/devilbox-custom.cnf-example b/cfg/mariadb-5.5/devilbox-custom.cnf-example
@@ -0,0 +1,5 @@
+[mysqld]
+;key_buffer_size=16M
+
+[mysqldump]
+;quick
diff --git a/cfg/percona-8.0/.keepme b/cfg/percona-8.0/.keepme
diff --git a/cfg/percona-8.0/devilbox-custom.cnf-example b/cfg/percona-8.0/devilbox-custom.cnf-example
@@ -0,0 +1,5 @@
+[mysqld]
+;key_buffer_size=16M
+
+[mysqldump]
+;quick
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -303,35 +303,12 @@ services:
   # MySQL Database
   # ------------------------------------------------------------
   mysql:
-    image: cytopia/${MYSQL_SERVER}:latest
+    image: devilbox/mysql:${MYSQL_SERVER}
     hostname: mysql
 
     environment:
-
-      ##
-      ## Debug?
-      ##
-      - DEBUG_COMPOSE_ENTRYPOINT
-
-      ##
-      ## Adjust timezone
-      ##
-      - TIMEZONE
-
-      ##
-      ## Adjust Root password
-      ##
       - MYSQL_ROOT_PASSWORD
-
-      ##
-      ## Socket directory Path
-      ##
-      - MYSQL_SOCKET_DIR=/tmp/mysql
-
-      ##
-      ## Runtime settings
-      ##
-      - MYSQL_GENERAL_LOG=${MYSQL_GENERAL_LOG}
+      - MYSQL_ALLOW_EMPTY_PASSWORD=yes
 
     ports:
       # [local-machine:]local-port:docker-port
@@ -345,15 +322,8 @@ services:
       # ---- Format: ----
       # HOST-DIRECTORY : DOCKER-DIRECTORY
 
-      # Mount logs
-      - ${DEVILBOX_PATH}/log/${MYSQL_SERVER}:/var/log/mysql:rw${MOUNT_OPTIONS}
-
-      # Mount devilbox default overwrites
-      - ${DEVILBOX_PATH}/.devilbox/etc/${MYSQL_SERVER}:/etc/mysql/conf.d:ro${MOUNT_OPTIONS}
-
       # Mount devilbox user-defined cnf files in order
-      # to overwrite the MySQL server configuration
-      - ${DEVILBOX_PATH}/cfg/${MYSQL_SERVER}:/etc/mysql/docker-default.d:ro${MOUNT_OPTIONS}
+      - ${DEVILBOX_PATH}/cfg/${MYSQL_SERVER}:/etc/mysql/conf.d:ro${MOUNT_OPTIONS}
 
       # Mount MySQL Data directory
       - devilbox-${MYSQL_SERVER}:/var/lib/mysql:rw${MOUNT_OPTIONS}
@@ -526,9 +496,11 @@ volumes:
   devilbox-mariadb-10.1:
   devilbox-mariadb-10.2:
   devilbox-mariadb-10.3:
+  devilbox-mariadb-10.4:
   devilbox-percona-5.5:
   devilbox-percona-5.6:
   devilbox-percona-5.7:
+  devilbox-percona-8.0:
 
   # ------------------------------------------------------------
   # Postgres