Add MariaDB 10.6 and 10.7

Author: cytopia

.github/workflows/build.yml

@@ -42,6 +42,8 @@ jobs:
  - 'mariadb 10.3'
  - 'mariadb 10.4'
  - 'mariadb 10.5'
+ - 'mariadb 10.6'
+ - 'mariadb 10.7'
  - 'percona 5.5'
  - 'percona 5.6'
  - 'percona 5.7'

.github/workflows/nightly.yml

@@ -37,6 +37,8 @@ jobs:
  - 'mariadb 10.3'
  - 'mariadb 10.4'
  - 'mariadb 10.5'
+ - 'mariadb 10.6'
+ - 'mariadb 10.7'
  - 'percona 5.5'
  - 'percona 5.6'
  - 'percona 5.7'

Dockerfiles/mariadb-10.6

@@ -0,0 +1,23 @@
+# vi: ft=dockerfile
+FROM mariadb:10.6
+
+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 available"; \
+false; \
+fi \
+&& if [ -f "/entrypoint.sh" ]; then \
+mv "/entrypoint.sh" "/docker-entrypoint.sh"; \
+fi \
+&& if [ ! -f "/docker-entrypoint.sh" ]; then \
+ln -s "/usr/local/bin/docker-entrypoint.sh" "/docker-entrypoint.sh"; \
+fi \
+&& chmod +x "/docker-entrypoint.sh"
+
+ENTRYPOINT ["/docker-entrypoint.sh"]
+CMD ["mysqld"]

Dockerfiles/mariadb-10.7

@@ -0,0 +1,23 @@
+# vi: ft=dockerfile
+FROM mariadb:10.7
+
+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 available"; \
+false; \
+fi \
+&& if [ -f "/entrypoint.sh" ]; then \
+mv "/entrypoint.sh" "/docker-entrypoint.sh"; \
+fi \
+&& if [ ! -f "/docker-entrypoint.sh" ]; then \
+ln -s "/usr/local/bin/docker-entrypoint.sh" "/docker-entrypoint.sh"; \
+fi \
+&& chmod +x "/docker-entrypoint.sh"
+
+ENTRYPOINT ["/docker-entrypoint.sh"]
+CMD ["mysqld"]

README.md

@@ -116,6 +116,8 @@ For retagged information see below.
 | `mariadb:10.3` | `devilbox/mysql:mariadb-10.3` |
 | `mariadb:10.4` | `devilbox/mysql:mariadb-10.4` |
 | `mariadb:10.5` | `devilbox/mysql:mariadb-10.5` |
+| `mariadb:10.6` | `devilbox/mysql:mariadb-10.6` |
+| `mariadb:10.7` | `devilbox/mysql:mariadb-10.7` |
 
 #### Percona