From 1ed00c21fd8b9bf0b1768d2c0088c2f8b4038b3b Mon Sep 17 00:00:00 2001 From: Joe Ferguson Date: Wed, 8 Feb 2017 14:22:12 -0800 Subject: [PATCH] xwiki, adjust white-space for markdownfmt --- xwiki/content.md | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/xwiki/content.md b/xwiki/content.md index 7498ebf5d..34d174411 100644 --- a/xwiki/content.md +++ b/xwiki/content.md @@ -11,8 +11,9 @@ As an application wiki, XWiki allows for the storing of structured data and the # Introduction The goal is to provide a production-ready XWiki system running in Docker. This is why: + - The OS is based on Debian and not on some smaller-footprint distribution like Alpine -- Several containers are used with Docker Compose: one for the DB and another for XWiki + Servlet container. This allows the ability to run them on different machines for example. +- Several containers are used with Docker Compose: one for the DB and another for XWiki + Servlet container. This allows the ability to run them on different machines for example. # How to use this image @@ -28,17 +29,18 @@ Then there are several options: ## Pulling existing image You need to run 2 containers: + - One for the XWiki image - One for the database image to which XWiki connects to The simplest is to use the Docker Compose file we provide. Run the following steps: + - `wget https://raw.githubusercontent.com/xwiki-contrib/docker-xwiki/master/xwiki-mysql-tomcat/docker-compose-using.yml` - If you're not using the `latest` tag then use the corresponding GitHub branch/tag. For example for the `8.x` branch: `wget https://raw.githubusercontent.com/xwiki-contrib/docker-xwiki/8.x/xwiki-mysql-tomcat/docker-compose-using.yml` - You can edit the compose file retrieved to change the default username/password and other environment variables. - `docker-compose up` -For reference here's a minimal Docker Compose file using MySQL that you could use as an example (full example -[here](https://github.com/xwiki-contrib/docker-xwiki/blob/master/xwiki-mysql-tomcat/docker-compose-using.yml)): +For reference here's a minimal Docker Compose file using MySQL that you could use as an example (full example [here](https://github.com/xwiki-contrib/docker-xwiki/blob/master/xwiki-mysql-tomcat/docker-compose-using.yml)): ```yaml version: '2'