[Misc] Fix typo in docker-entrypoint.sh that prevented using a custom mysql...

[Misc] Fix typo in docker-entrypoint.sh that prevented using a custom mysql user name + Removed unnecessary env variable at runtime

README.md

@@ -73,11 +73,11 @@ services:
       - db
     ports:
       - "8080:8080"
-    volumes:
-      - xwiki-data:/usr/local/xwiki
     environment:
       - MYSQL_USER=xwiki
       - MYSQL_PASSWORD=xwiki
+    volumes:
+      - xwiki-data:/usr/local/xwiki
   db:
     image: "mysql:5.7"
     volumes:

xwiki-mysql-tomcat/docker-compose-using.yml

@@ -27,11 +27,10 @@ services:
       - db
     ports:
       - "8080:8080"
-    # The MYSQL_USER/MYSQL_PASSWORD/MYSQL_DATABASE variables are used in the hibernate.cfg.xml file.
+    # The MYSQL_USER/MYSQL_PASSWORD variables are used in the hibernate.cfg.xml file.
     environment:
       - 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:

xwiki-mysql-tomcat/xwiki/docker-entrypoint.sh

@@ -47,7 +47,7 @@ function xwiki_set_properties() {
 
 function configure() {
   echo 'Configuring XWiki...'
-  sed -i "s/replacemysqluser/${MYSQL_USERNAME:-xwiki}/g" /usr/local/tomcat/webapps/ROOT/WEB-INF/hibernate.cfg.xml
+  sed -i "s/replacemysqluser/${MYSQL_USER:-xwiki}/g" /usr/local/tomcat/webapps/ROOT/WEB-INF/hibernate.cfg.xml
   sed -i "s/replacemysqlpassword/${MYSQL_PASSWORD:-xwiki}/g" /usr/local/tomcat/webapps/ROOT/WEB-INF/hibernate.cfg.xml
 
   echo '  Using filesystem-based attachments...'