diff --git a/apps/wiki/xwiki.md b/apps/wiki/xwiki.md index 58eae6d..4ddb83b 100644 --- a/apps/wiki/xwiki.md +++ b/apps/wiki/xwiki.md @@ -13,17 +13,30 @@ ## Prerequisities First run these: ```sh -wget https://raw.githubusercontent.com/xwiki-contrib/docker-xwiki/master/11/mysql-tomcat/mysql/xwiki.cnf -wget https://raw.githubusercontent.com/xwiki-contrib/docker-xwiki/master/11/mysql-tomcat/mysql/init.sql +wget https://raw.githubusercontent.com/xwiki-contrib/docker-xwiki/master/12/mysql-tomcat/mysql/xwiki.cnf +wget https://raw.githubusercontent.com/xwiki-contrib/docker-xwiki/master/12/mysql-tomcat/mysql/init.sql ``` ## docker-compose.yml ```yml +--- version: '2' services: - web: - image: "xwiki:lts-mysql-tomcat" - container_name: xwiki-mysql-tomcat-web + db: + image: mysql:5.7 + container_name: xwiki-db + volumes: + - ./xwiki.cnf:/etc/mysql/conf.d/xwiki.cnf + - ./init.sql:/docker-entrypoint-initdb.d/init.sql + - ./db:/var/lib/mysql + environment: + - MYSQL_ROOT_PASSWORD=xwiki + - MYSQL_USER=xwiki + - MYSQL_PASSWORD=xwiki + - MYSQL_DATABASE=xwiki + xwiki: + image: xwiki:lts-mysql-tomcat + container_name: xwiki depends_on: - db ports: @@ -34,16 +47,4 @@ services: - DB_HOST=xwiki-mysql-db volumes: - ./data:/usr/local/xwiki - db: - image: "mysql:5.7" - container_name: xwiki-mysql-db - volumes: - - ./xwiki.cnf:/etc/mysql/conf.d/xwiki.cnf - - ./db:/var/lib/mysql - - ./init.sql:/docker-entrypoint-initdb.d/init.sql - environment: - - MYSQL_ROOT_PASSWORD=xwiki - - MYSQL_USER=xwiki - - MYSQL_PASSWORD=xwiki - - MYSQL_DATABASE=xwiki ```