Merge pull request #2 from jgkawell/db-with-volume

DB migrations from volume
DarkflameUniverse · Dec 7, 2021 · 9b0ba22 · 9b0ba22
2 parents 0d910e3 + b1e700e
commit 9b0ba22
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 13 deletions.
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -11,6 +11,7 @@ services:
       - MARIADB_DATABASE=${MARIADB_DATABASE:-darkflame}
     volumes:
       - database:/var/lib/mysql
+      - migrations/dlu:/docker-entrypoint-initdb.d
     networks:
       - darkflame
 

diff --git a/docker/start_server.sh b/docker/start_server.sh
@@ -80,17 +80,6 @@ function fdb_to_sqlite() {
     )
 }
 
-function run_db_migrations() {
-    (
-        cd /app/migrations/dlu
-        readarray -d '' entries < <(printf '%s\0' *.sql | sort -zV)
-        for entry in "${entries[@]}"; do
-            echo "Execute $entry"
-            mysql -h"$DATABASE_HOST" -P"$DATABASE_PORT" -u"$DATABASE_USER" -p"$DATABASE_PASSWORD" $DATABASE < $entry
-        done
-    )
-}
-
 set_defaults
 
 check_sql_connection
@@ -118,8 +107,6 @@ symlink_client_files
 
 fdb_to_sqlite
 
-run_db_migrations
-
 echo "Start MasterServer"
 
 ./MasterServer