From 55ed94cafc44d680676788edcd3bf8651e9af6cf Mon Sep 17 00:00:00 2001
From: cytopia <cytopia@everythingcli.org>
Date: Sun, 8 Nov 2020 13:08:24 +0100
Subject: [PATCH] Add MariaDB 10.5

---
 .travis.yml              |  1 +
 Dockerfiles/mariadb-10.5 | 13 +++++++++++++
 Makefile                 |  9 +++++++--
 README.md                |  1 +
 4 files changed, 22 insertions(+), 2 deletions(-)
 create mode 100644 Dockerfiles/mariadb-10.5

diff --git a/.travis.yml b/.travis.yml
index e639720..09d66ca 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -42,6 +42,7 @@ env:
     - V=mariadb-10.2
     - V=mariadb-10.3
     - V=mariadb-10.4
+    - V=mariadb-10.5
     - V=percona-5.5
     - V=percona-5.6
     - V=percona-5.7
diff --git a/Dockerfiles/mariadb-10.5 b/Dockerfiles/mariadb-10.5
new file mode 100644
index 0000000..d3cae5c
--- /dev/null
+++ b/Dockerfiles/mariadb-10.5
@@ -0,0 +1,13 @@
+# vi: ft=dockerfile
+FROM mariadb:10.5
+
+RUN set -eux \
+	&& mkdir -p /etc/mysql/docker-default.d/ \
+	&& if [ -f /etc/my.cnf ]; then \
+		echo '!'"includedir /etc/mysql/docker-default.d/" >> /etc/my.cnf; \
+	elif [ -f /etc/mysql/my.cnf ]; then \
+		echo '!'"includedir /etc/mysql/docker-default.d/" >> /etc/mysql/my.cnf; \
+	else \
+		echo "/etc/my.cnf and /etc/mysql/my.cnf are not availanle"; \
+		false; \
+	fi
diff --git a/Makefile b/Makefile
index e1a2011..1fe3b7e 100644
--- a/Makefile
+++ b/Makefile
@@ -6,9 +6,9 @@ FILES = Dockerfiles/
 # CONVENIENCE TARGETS
 # -------------------------------------------------------------------------------------------------
 
-build: build-mysql-5.5 build-mysql-5.6 build-mysql-5.7 build-mysql-8.0 build-mariadb-5.5 build-mariadb-10.0 build-mariadb-10.1 build-mariadb-10.2 build-mariadb-10.3 build-mariadb-10.4 build-percona-5.5 build-percona-5.6 build-percona-5.7 build-percona-8.0
+build: build-mysql-5.5 build-mysql-5.6 build-mysql-5.7 build-mysql-8.0 build-mariadb-5.5 build-mariadb-10.0 build-mariadb-10.1 build-mariadb-10.2 build-mariadb-10.3 build-mariadb-10.4 build-mariadb-10.5 build-percona-5.5 build-percona-5.6 build-percona-5.7 build-percona-8.0
 
-test: test-mysql-5.5 test-mysql-5.6 test-mysql-5.7 test-mysql-8.0 test-mariadb-5.5 test-mariadb-10.0 test-mariadb-10.1 test-mariadb-10.2 test-mariadb-10.3 test-mariadb-10.4 test-percona-5.5 test-percona-5.6 test-percona-5.7 test-percona-8.0
+test: test-mysql-5.5 test-mysql-5.6 test-mysql-5.7 test-mysql-8.0 test-mariadb-5.5 test-mariadb-10.0 test-mariadb-10.1 test-mariadb-10.2 test-mariadb-10.3 test-mariadb-10.4 test-mariadb-10.5 test-percona-5.5 test-percona-5.6 test-percona-5.7 test-percona-8.0
 
 login:
 	yes | docker login --username $(USER) --password $(PASS)
@@ -61,6 +61,9 @@ build-mariadb-10.3:
 build-mariadb-10.4:
 	while ! docker pull mariadb:10.4; do sleep 1; done
 	docker build --no-cache -t $(IMAGE):mariadb-10.4 -f $(FILES)/mariadb-10.4 $(FILES)
+build-mariadb-10.5:
+	while ! docker pull mariadb:10.5; do sleep 1; done
+	docker build --no-cache -t $(IMAGE):mariadb-10.5 -f $(FILES)/mariadb-10.5 $(FILES)
 
 test-mariadb-5.5:
 	./tests/tests.sh "mariadb" "5.5"
@@ -74,6 +77,8 @@ test-mariadb-10.3:
 	./tests/tests.sh "mariadb" "10.3"
 test-mariadb-10.4:
 	./tests/tests.sh "mariadb" "10.4"
+test-mariadb-10.5:
+	./tests/tests.sh "mariadb" "10.5"
 
 
 # -------------------------------------------------------------------------------------------------
diff --git a/README.md b/README.md
index a2cfbb4..3b5c278 100644
--- a/README.md
+++ b/README.md
@@ -94,6 +94,7 @@ For retagged information see below.
 | `mariadb:10.2`         | `devilbox/mysql:mariadb-10.2` |
 | `mariadb:10.3`         | `devilbox/mysql:mariadb-10.3` |
 | `mariadb:10.4`         | `devilbox/mysql:mariadb-10.4` |
+| `mariadb:10.5`         | `devilbox/mysql:mariadb-10.5` |
 
 #### Percona