From 7f43be68e06741ed627a6e3ee81696527bdf0d30 Mon Sep 17 00:00:00 2001
From: Vincent Massol <vincent@massol.net>
Date: Thu, 28 Sep 2023 16:50:05 +0200
Subject: [PATCH] [Misc] Upgrade MariaDB version to 11.1 (latest stable) in our
documentation + docker compose example
---
README.md | 6 +++---
template/docker-compose.yml | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/README.md b/README.md
index 46f82fa..22ef4a3 100644
--- a/README.md
+++ b/README.md
@@ -120,12 +120,12 @@ Notes:
#### Starting MariaDB
-This is exactly similar to starting MySQL and you should thus follow exactly the same steps as for MySQL. The only thing to change is the docker image for MariaDB: instead of `mysql:<tag>`, use `mariadb:<tag>`. For example: `mariadb:10.5`.
+This is exactly similar to starting MySQL and you should thus follow exactly the same steps as for MySQL. The only thing to change is the docker image for MariaDB: instead of `mysql:<tag>`, use `mariadb:<tag>`. For example: `mariadb:11.1`.
Full command example:
```console
-docker run --net=xwiki-nw --name mysql-xwiki -v /my/path/mariadb:/var/lib/mysql -v /my/path/mariadb-init:/docker-entrypoint-initdb.d -e MYSQL_ROOT_PASSWORD=xwiki -e MYSQL_USER=xwiki -e MYSQL_PASSWORD=xwiki -e MYSQL_DATABASE=xwiki -d mariadb:10.5 --character-set-server=utf8mb4 --collation-server=utf8mb4_bin --explicit-defaults-for-timestamp=1
+docker run --net=xwiki-nw --name mysql-xwiki -v /my/path/mariadb:/var/lib/mysql -v /my/path/mariadb-init:/docker-entrypoint-initdb.d -e MYSQL_ROOT_PASSWORD=xwiki -e MYSQL_USER=xwiki -e MYSQL_PASSWORD=xwiki -e MYSQL_DATABASE=xwiki -d mariadb:11.1 --character-set-server=utf8mb4 --collation-server=utf8mb4_bin --explicit-defaults-for-timestamp=1
```
#### Starting PostgreSQL
@@ -266,7 +266,7 @@ services:
networks:
- bridge
db:
- image: "mariadb:10.5"
+ image: "mariadb:11.1"
container_name: xwiki-mariadb-db
volumes:
- ./xwiki.cnf:/etc/mysql/conf.d/xwiki.cnf
diff --git a/template/docker-compose.yml b/template/docker-compose.yml
index 58c8cfa..786d5a7 100644
--- a/template/docker-compose.yml
+++ b/template/docker-compose.yml
@@ -67,7 +67,7 @@ services:
- MYSQL_PASSWORD=\${DB_PASSWORD}
- MYSQL_DATABASE=\${DB_DATABASE}'''
- else if (db == 'mariadb') print '''image: "mariadb:10.5"
+ else if (db == 'mariadb') print '''image: "mariadb:11.1"
container_name: xwiki-mariadb-db
# - We provide a xwiki.cnf file in order to configure the mysql db to support UTF8 and be case-insensitive
# We have to do it here since we use an existing image and that's how this image allows customizations.
--
GitLab