diff --git a/xwiki-mysql-tomcat/docker-compose-using.yml b/xwiki-mysql-tomcat/docker-compose-using.yml index 79dd974d4e485e1d525cbd713abdf33df06b571e..fd21584ffd3585ee569f8edafdc52c2aa24c4cc2 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: {}