From d632537934953431a186a64df516e2529e83c3d5 Mon Sep 17 00:00:00 2001 From: Daniel Black Date: Thu, 17 Feb 2022 12:04:06 +1100 Subject: [PATCH] XDOCKER-165: Add image for XWiki on MariaDB (docs) * Add a section for starting XWiki with MariaDB * Changes starting mariadb using name mariadb-xwiki * Used MARIADB_* environment variables for initialization of MariaDB container. * --character-set-server=utf8mb4 is the default in MariaDB container, omit for simplicity. --- README.md | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 770b6098..56191cca 100644 --- a/README.md +++ b/README.md @@ -124,7 +124,7 @@ This is exactly similar to starting MySQL and you should thus follow exactly the 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 mariadb-xwiki -v /my/path/mariadb:/var/lib/mysql -v /my/path/mariadb-init:/docker-entrypoint-initdb.d -e MARIADB_ROOT_PASSWORD=xwiki -e MARIADB_USER=xwiki -e MARIADB_PASSWORD=xwiki -e MARIADB_DATABASE=xwiki -d mariadb:10.5 --collation-server=utf8mb4_bin --explicit-defaults-for-timestamp=1 ``` #### Starting PostgreSQL @@ -159,6 +159,11 @@ For MySQL: docker run --net=xwiki-nw --name xwiki -p 8080:8080 -v /my/path/xwiki:/usr/local/xwiki -e DB_USER=xwiki -e DB_PASSWORD=xwiki -e DB_DATABASE=xwiki -e DB_HOST=mysql-xwiki xwiki:lts-mysql-tomcat ``` +For MariaDB: +```console +docker run --net=xwiki-nw --name xwiki -p 8080:8080 -v /my/path/xwiki:/usr/local/xwiki -e DB_USER=xwiki -e DB_PASSWORD=xwiki -e DB_DATABASE=xwiki -e DB_HOST=mariadb-xwiki xwiki:stable-mariadb +``` + For PostgreSQL: ```console