From 3e9bcec90bda9d214aad5ee2c735fdbd51a15677 Mon Sep 17 00:00:00 2001
From: cytopia <cytopia@everythingcli.org>
Date: Sun, 8 Nov 2020 13:52:33 +0100
Subject: [PATCH] Add MariaDB 10.5

---
 CHANGELOG.md                                 | 3 ++-
 README.md                                    | 2 +-
 cfg/mariadb-10.5/.keepme                     | 0
 cfg/mariadb-10.5/devilbox-custom.cnf-example | 5 +++++
 docker-compose.yml                           | 3 ++-
 docs/configuration-files/env-file.rst        | 5 +++--
 env-example                                  | 3 ++-
 7 files changed, 15 insertions(+), 6 deletions(-)
 create mode 100644 cfg/mariadb-10.5/.keepme
 create mode 100644 cfg/mariadb-10.5/devilbox-custom.cnf-example

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 81cc88d0..fd4a6d76 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -20,6 +20,7 @@ major versions.
 - Added Redis images: 6.0
 - Added Memcache images: 1.6
 - Added MongoDB images: 4.4
+- Added MySQL images: MariaDB 10.5
 
 #### Changed
 - [#736](https://github.com/cytopia/devilbox/issues/736) Composer is updated to v2 (`/usr/local/bin/composer`)
@@ -29,7 +30,7 @@ major versions.
 - Updated Adminer from 4.7.5 to 4.7.7
 - Composer is available as v1 and v2 (`/usr/local/bin/composer-1` and `/usr/local/bin/composer-2`)
 - New default PHP version: 7.4
-- New default MySQL version: MariaDB 10.4
+- New default MySQL version: MariaDB 10.5
 - New default Postgres version: 12.4
 - New default Redis version: 6.0
 - New default Memcached version 1.6
diff --git a/README.md b/README.md
index 903284c4..f49e0d7e 100644
--- a/README.md
+++ b/README.md
@@ -302,7 +302,7 @@ Every single attachable container comes with many different versions. In order t
       <td></td>
       <td><a target="_blank" title="PHP 7.1"          href="https://github.com/devilbox/docker-php-fpm">7.1</a></td>
       <td></td>
-      <td></td>
+      <td><a target="_blank" title="MariaDB 10.5"     href="https://github.com/devilbox/docker-mysql">10.5</a></td>
       <td></td>
       <td><a target="_blank" title="PgSQL 9.6"        href="https://github.com/docker-library/postgres">9.6</a></td>
       <td><a target="_blank" title="Redis latest"     href="https://github.com/docker-library/redis">latest</a></td>
diff --git a/cfg/mariadb-10.5/.keepme b/cfg/mariadb-10.5/.keepme
new file mode 100644
index 00000000..e69de29b
diff --git a/cfg/mariadb-10.5/devilbox-custom.cnf-example b/cfg/mariadb-10.5/devilbox-custom.cnf-example
new file mode 100644
index 00000000..6d2549fa
--- /dev/null
+++ b/cfg/mariadb-10.5/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
index 3b08c09f..cc0563fb 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -317,7 +317,7 @@ services:
   # MySQL Database
   # ------------------------------------------------------------
   mysql:
-    image: devilbox/mysql:${MYSQL_SERVER}-0.5
+    image: devilbox/mysql:${MYSQL_SERVER}-0.6
     hostname: mysql
 
     environment:
@@ -506,6 +506,7 @@ volumes:
   devilbox-mariadb-10.2:
   devilbox-mariadb-10.3:
   devilbox-mariadb-10.4:
+  devilbox-mariadb-10.5:
   devilbox-percona-5.5:
   devilbox-percona-5.6:
   devilbox-percona-5.7:
diff --git a/docs/configuration-files/env-file.rst b/docs/configuration-files/env-file.rst
index 92a8bc3e..e2faa374 100644
--- a/docs/configuration-files/env-file.rst
+++ b/docs/configuration-files/env-file.rst
@@ -629,7 +629,7 @@ This variable choses your desired MySQL server version to be started.
 +-------------------------+------------------------------------------------------------------------------------------------+------------------+
 | Name                    | Allowed values                                                                                 | Default value    |
 +=========================+================================================================================================+==================+
-| ``MYSQL_SERVER``        | ``mysql-5.5`` |br| ``mysql-5.6`` |br| ``mariadb-10.2`` |br| ``percona-5.7`` |br| and many more | ``mariadb-10.4`` |
+| ``MYSQL_SERVER``        | ``mysql-5.5`` |br| ``mysql-5.6`` |br| ``mariadb-10.2`` |br| ``percona-5.7`` |br| and many more | ``mariadb-10.5`` |
 +-------------------------+------------------------------------------------------------------------------------------------+------------------+
 
 All values are already available in the ``.env`` file and just need to be commented or uncommented. If multiple values are uncommented, the last uncommented variable one takes precedences:
@@ -649,7 +649,8 @@ All values are already available in the ``.env`` file and just need to be commen
    #MYSQL_SERVER=mariadb-10.1
    #MYSQL_SERVER=mariadb-10.2
    #MYSQL_SERVER=mariadb-10.3
-   MYSQL_SERVER=mariadb-10.4
+   #MYSQL_SERVER=mariadb-10.4
+   MYSQL_SERVER=mariadb-10.5
    #MYSQL_SERVER=percona-5.5
    #MYSQL_SERVER=percona-5.6
    #MYSQL_SERVER=percona-5.7
diff --git a/env-example b/env-example
index 605fd92d..59ab07aa 100644
--- a/env-example
+++ b/env-example
@@ -290,7 +290,8 @@ HTTPD_SERVER=nginx-stable
 #MYSQL_SERVER=mariadb-10.1
 #MYSQL_SERVER=mariadb-10.2
 #MYSQL_SERVER=mariadb-10.3
-MYSQL_SERVER=mariadb-10.4
+#MYSQL_SERVER=mariadb-10.4
+MYSQL_SERVER=mariadb-10.5
 #MYSQL_SERVER=percona-5.5
 #MYSQL_SERVER=percona-5.6
 #MYSQL_SERVER=percona-5.7