merge: Merge branch 'master' into feature/bots

Author: Byloth

builder/InstallFullDB.config

@@ -37,10 +37,10 @@ CHAR_DB_NAME="${MANGOS_CHARACTERS_DBNAME}"
 LOGS_DB_NAME="${MANGOS_LOGS_DBNAME}"
 
 ## Define your mysql programm if this differs
-MYSQL_PATH="/usr/bin/mysql"
+MYSQL_PATH="/usr/bin/mariadb"
 
 ## Define the path to your mysql dump binary folder
-MYSQL_DUMP_PATH="/usr/bin/mysqldump"
+MYSQL_DUMP_PATH="/usr/bin/mariadb-dump"
 
 ## Define the path to your core's folder
 CORE_PATH="${MANGOS_DIR}"

builder/entrypoint.sh

@@ -41,14 +41,14 @@ function error()
 
 function mysql_execute()
 {
-    mysql "-h${MANGOS_DBHOST}" "-P${MANGOS_DBPORT}" "-u${MYSQL_SUPERUSER}" "-p${MYSQL_SUPERPASS}" ${@}
+    mariadb "-h${MANGOS_DBHOST}" "-P${MANGOS_DBPORT}" "-u${MYSQL_SUPERUSER}" "-p${MYSQL_SUPERPASS}" ${@}
 }
 function mysql_dump()
 {
     local DATABASE_NAME="${1}"
     local OUTPUT_FILE="${2}"
 
-    mysqldump "-h${MANGOS_DBHOST}" "-P${MANGOS_DBPORT}" "-u${MYSQL_SUPERUSER}" "-p${MYSQL_SUPERPASS}" \
+    mariadb-dump "-h${MANGOS_DBHOST}" "-P${MANGOS_DBPORT}" "-u${MYSQL_SUPERUSER}" "-p${MYSQL_SUPERPASS}" \
         "${DATABASE_NAME}" --opt --result-file="${OUTPUT_FILE}"
 }
 

docker-compose.yml

@@ -1,9 +1,9 @@
 name: cmangos
 services:
   mariadb:
-    image: mariadb:11.5
+    image: mariadb:11.8
     environment:
-      MYSQL_ROOT_PASSWORD: "${MYSQL_SUPERPASS}"
+      MARIADB_ROOT_PASSWORD: "${MYSQL_SUPERPASS}"
 
     networks:
       - default