Merge branch 'master' into feat/postgresql-database

# Conflicts:
#	docker-compose.yml

docker-compose.yml

@@ -19,9 +19,9 @@ services:
       - ./scripts:/opt/server/scripts
       - ./wz:/opt/server/wz
     environment:
-      DB_HOST: "db"
+      DB_HOST: "db" ## Remember if this is present it will OVERRIDE the host in the config.yaml, if you put here anything other than db, you'll need to change the config.yaml jdbc string to port 3307, and not port 3306
       PG_DB_HOST: "pg_db"
-    
+
   db:
     image: mysql:8.0.23
     ports: