From 1f845295f650ce5c755712b801b84ad8198b9d7b Mon Sep 17 00:00:00 2001
From: Vincent Massol <vincent@massol.net>
Date: Tue, 24 Jan 2017 14:37:41 +0100
Subject: [PATCH] [Misc] Make it simpler for users to get started by hardcoding
environment variables
---
xwiki-mysql-tomcat/docker-compose-using.yml | 16 +++++++---------
1 file changed, 7 insertions(+), 9 deletions(-)
diff --git a/xwiki-mysql-tomcat/docker-compose-using.yml b/xwiki-mysql-tomcat/docker-compose-using.yml
index 79dd974..fd21584 100644
--- a/xwiki-mysql-tomcat/docker-compose-using.yml
+++ b/xwiki-mysql-tomcat/docker-compose-using.yml
@@ -27,12 +27,11 @@ services:
- db
ports:
- "8080:8080"
- # Default values defined in .env file.
# The MYSQL_USER/MYSQL_PASSWORD/MYSQL_DATABASE variables are used in the hibernate.cfg.xml file.
environment:
- - MYSQL_USER=${MYSQL_USER}
- - MYSQL_PASSWORD=${MYSQL_PASSWORD}
- - MYSQL_DATABASE=${MYSQL_DATABASE}
+ - MYSQL_USER=xwiki
+ - MYSQL_PASSWORD=xwiki
+ - MYSQL_DATABASE=xwiki
# Provide a name instead of an auto-generated id for the xwiki permanent directory configured in the Dockerfile,
# to make it simpler to identify in 'docker volume ls'.
volumes:
@@ -50,12 +49,11 @@ services:
- mysql-data:/var/lib/mysql
# Configure the MySQL database and create a user with provided name/password.
# See https://hub.docker.com/_/mysql/ for more details.
- # Default values defined in .env file.
environment:
- - MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD}
- - MYSQL_USER=${MYSQL_USER}
- - MYSQL_PASSWORD=${MYSQL_PASSWORD}
- - MYSQL_DATABASE=${MYSQL_DATABASE}
+ - MYSQL_ROOT_PASSWORD=xwiki
+ - MYSQL_USER=xwiki
+ - MYSQL_PASSWORD=xwiki
+ - MYSQL_DATABASE=xwiki
volumes:
mysql-data: {}
xwiki-data: {}
--
GitLab