From 742c6e278378a63cec1a7a3ef7adefc0d6c6a82a Mon Sep 17 00:00:00 2001
From: Vincent Massol <vincent@massol.net>
Date: Wed, 7 Feb 2024 15:41:33 +0100
Subject: [PATCH] [Misc] Upgrade to MariaDB 11.2 in the
documentation/docker-compose since that's now our latest supported tag
---
14/mariadb-tomcat/docker-compose.yml | 2 +-
15.5/mariadb-tomcat/docker-compose.yml | 2 +-
15/mariadb-tomcat/docker-compose.yml | 2 +-
16/mariadb-tomcat/docker-compose.yml | 2 +-
README.md | 6 +++---
template/docker-compose.yml | 2 +-
6 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/14/mariadb-tomcat/docker-compose.yml b/14/mariadb-tomcat/docker-compose.yml
index 4199985..005baeb 100644
--- a/14/mariadb-tomcat/docker-compose.yml
+++ b/14/mariadb-tomcat/docker-compose.yml
@@ -46,7 +46,7 @@ services:
- bridge
# The container that runs the database (mariadb)
db:
- image: "mariadb:11.1"
+ image: "mariadb:11.2"
container_name: xwiki-mariadb-db
# - Provide a name instead of an auto-generated id for the mariadb data, to make it simpler to identify in
# 'docker volume ls'
diff --git a/15.5/mariadb-tomcat/docker-compose.yml b/15.5/mariadb-tomcat/docker-compose.yml
index 4199985..005baeb 100644
--- a/15.5/mariadb-tomcat/docker-compose.yml
+++ b/15.5/mariadb-tomcat/docker-compose.yml
@@ -46,7 +46,7 @@ services:
- bridge
# The container that runs the database (mariadb)
db:
- image: "mariadb:11.1"
+ image: "mariadb:11.2"
container_name: xwiki-mariadb-db
# - Provide a name instead of an auto-generated id for the mariadb data, to make it simpler to identify in
# 'docker volume ls'
diff --git a/15/mariadb-tomcat/docker-compose.yml b/15/mariadb-tomcat/docker-compose.yml
index 4199985..005baeb 100644
--- a/15/mariadb-tomcat/docker-compose.yml
+++ b/15/mariadb-tomcat/docker-compose.yml
@@ -46,7 +46,7 @@ services:
- bridge
# The container that runs the database (mariadb)
db:
- image: "mariadb:11.1"
+ image: "mariadb:11.2"
container_name: xwiki-mariadb-db
# - Provide a name instead of an auto-generated id for the mariadb data, to make it simpler to identify in
# 'docker volume ls'
diff --git a/16/mariadb-tomcat/docker-compose.yml b/16/mariadb-tomcat/docker-compose.yml
index 4199985..005baeb 100644
--- a/16/mariadb-tomcat/docker-compose.yml
+++ b/16/mariadb-tomcat/docker-compose.yml
@@ -46,7 +46,7 @@ services:
- bridge
# The container that runs the database (mariadb)
db:
- image: "mariadb:11.1"
+ image: "mariadb:11.2"
container_name: xwiki-mariadb-db
# - Provide a name instead of an auto-generated id for the mariadb data, to make it simpler to identify in
# 'docker volume ls'
diff --git a/README.md b/README.md
index 426f6df..3a1a1dc 100644
--- a/README.md
+++ b/README.md
@@ -113,12 +113,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:11.1`.
+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.2`.
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:11.1 --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.2 --character-set-server=utf8mb4 --collation-server=utf8mb4_bin --explicit-defaults-for-timestamp=1
```
#### Starting PostgreSQL
@@ -260,7 +260,7 @@ services:
networks:
- bridge
db:
- image: "mariadb:11.1"
+ image: "mariadb:11.2"
container_name: xwiki-mariadb-db
volumes:
- mariadb-data:/var/lib/mysql
diff --git a/template/docker-compose.yml b/template/docker-compose.yml
index f311c26..33565a8 100644
--- a/template/docker-compose.yml
+++ b/template/docker-compose.yml
@@ -70,7 +70,7 @@ services:
- "--collation-server=utf8mb4_bin"
- "--explicit-defaults-for-timestamp=1"'''
- else if (db == 'mariadb') print '''image: "mariadb:11.1"
+ else if (db == 'mariadb') print '''image: "mariadb:11.2"
container_name: xwiki-mariadb-db
# - Provide a name instead of an auto-generated id for the mariadb data, to make it simpler to identify in
# 'docker volume ls'
--
GitLab