diff options
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | compose.yml | 12 | ||||
| -rwxr-xr-x | server/start.sh | 10 |
3 files changed, 10 insertions, 13 deletions
@@ -1,3 +1,4 @@ +.env config.json server/FreeSOServer game diff --git a/compose.yml b/compose.yml index 285c66c..2ff4edd 100644 --- a/compose.yml +++ b/compose.yml @@ -4,11 +4,12 @@ services: volumes: - db:/var/lib/mysql restart: unless-stopped + env_file: + - .env environment: - MARIADB_USER: fsoserver - MARIADB_PASSWORD: password - MARIADB_DATABASE: fso - MARIADB_ROOT_PASSWORD: wordpass + MARIADB_USER: ${DB_USERNAME} + MARIADB_PASSWORD: ${DB_PASSWORD} + MARIADB_DATABASE: ${DB_NAME} ports: - 3306:3306 networks: @@ -21,7 +22,7 @@ services: - ./game:/app/game - ./nfs:/app/nfs - ./vars:/app/vars - restart: unless-stopped + restart: on-failure depends_on: - db ports: @@ -39,6 +40,7 @@ services: volumes: - ./auth/.env:/app/.env - ./auth/database.db:/app/database.db + restart: unless-stopped ports: - "127.0.0.1:3000:3000" networks: diff --git a/server/start.sh b/server/start.sh index 96471e4..1e05862 100755 --- a/server/start.sh +++ b/server/start.sh @@ -4,12 +4,6 @@ if [ ! -e "./vars/db-initiated" ]; then sleep 5 echo "y" | dotnet exec FSO.Server.Core.dll db-init touch vars/db-initiated -else -#while [ $? -ne 2 ]; do - #mono watchdog.exe run --core - #dotnet exec FSO.Server.Core.dll run -#done -# dotnet exec watchdog.exe run --core - dotnet exec FSO.Server.Core.dll run - sleep 5 fi + +dotnet exec FSO.Server.Core.dll run |