From 0c408107ab505de8e64d8a6757c9a500129a9999 Mon Sep 17 00:00:00 2001 From: Vincent Massol Date: Mon, 14 Jan 2019 13:28:33 +0100 Subject: [PATCH 1/2] [Misc] Update for MySQL 5.5 --- xwiki/content.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/xwiki/content.md b/xwiki/content.md index 99917dbd5..ea0360e6c 100644 --- a/xwiki/content.md +++ b/xwiki/content.md @@ -54,6 +54,12 @@ docker run --net=xwiki-nw --name mysql-xwiki -v /my/own/mysql:/var/lib/mysql -e You should adapt the command line to use the passwords that you wish for the MySQL root password and for the xwiki user password. +Note: If you're using MySQL < 5.6.6, you'll need to start MySQL with: + +```console +docker run --net=xwiki-nw --name mysql-xwiki -v /my/own/mysql:/var/lib/mysql -e MYSQL_ROOT_PASSWORD=xwiki -e MYSQL_USER=xwiki -e MYSQL_PASSWORD=xwiki -e MYSQL_DATABASE=xwiki -d mysql:5.7 --character-set-server=utf8 --collation-server=utf8_bin +``` + #### Starting PostgreSQL The command below will also configure the PostgreSQL container to save its data on your localhost in a `/my/own/postgres` directory: From 04590de350f36cf082b4022c907cb8caded69df6 Mon Sep 17 00:00:00 2001 From: Vincent Massol Date: Tue, 15 Jan 2019 07:26:28 +0100 Subject: [PATCH 2/2] [Misc] Rephrased to better explain the 5.6.6 magical version --- xwiki/content.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xwiki/content.md b/xwiki/content.md index ea0360e6c..a67967f54 100644 --- a/xwiki/content.md +++ b/xwiki/content.md @@ -54,7 +54,7 @@ docker run --net=xwiki-nw --name mysql-xwiki -v /my/own/mysql:/var/lib/mysql -e You should adapt the command line to use the passwords that you wish for the MySQL root password and for the xwiki user password. -Note: If you're using MySQL < 5.6.6, you'll need to start MySQL with: +Note: The `explicit-defaults-for-timestamp` parameter was introduced in MySQL 5.6.6 and will thus work only for that version and beyond. If you are using an older MySQL version, please use the following instead: ```console docker run --net=xwiki-nw --name mysql-xwiki -v /my/own/mysql:/var/lib/mysql -e MYSQL_ROOT_PASSWORD=xwiki -e MYSQL_USER=xwiki -e MYSQL_PASSWORD=xwiki -e MYSQL_DATABASE=xwiki -d mysql:5.7 --character-set-server=utf8 --collation-server=utf8_bin