diff --git a/14/mariadb-tomcat/docker-compose.yml b/14/mariadb-tomcat/docker-compose.yml index 4199985e282e9b1c95834f4aa6d33a657ab7ba1d..005baebff78b66231d99ee5a1e5402d0d96b8f70 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 4199985e282e9b1c95834f4aa6d33a657ab7ba1d..005baebff78b66231d99ee5a1e5402d0d96b8f70 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 4199985e282e9b1c95834f4aa6d33a657ab7ba1d..005baebff78b66231d99ee5a1e5402d0d96b8f70 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 4199985e282e9b1c95834f4aa6d33a657ab7ba1d..005baebff78b66231d99ee5a1e5402d0d96b8f70 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 426f6df570c3915e4b7660cb85a6b8f3571efd18..3a1a1dcf77431bc618a05d8e644818698b2eb8ed 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 f311c26cec61af9efd2d7417963f4016d1e86d70..33565a80643fcf40cddcfcb430db74b434e38395 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'