diff options
| -rw-r--r-- | .gitignore | 3 | ||||
| -rw-r--r-- | compose.yml | 17 | ||||
| -rwxr-xr-x | server/start.sh | 6 |
3 files changed, 19 insertions, 7 deletions
@@ -2,3 +2,6 @@ config.json server/FreeSOServer game nfs +auth/database.db +auth/.env +vars diff --git a/compose.yml b/compose.yml index e650915..285c66c 100644 --- a/compose.yml +++ b/compose.yml @@ -20,20 +20,29 @@ services: - ./config.json:/app/config.json - ./game:/app/game - ./nfs:/app/nfs + - ./vars:/app/vars restart: unless-stopped depends_on: - db ports: - 35:35 - 34:34 + - 35101:35101 + - 33101:33101 + - 34101:34101 - 9000:9000 networks: - freeso - #bnbso-auth: - # image: bnbso-auth - # ports: - # - "127.0.0.1:3060:3000" + auth: + image: freeso-auth + volumes: + - ./auth/.env:/app/.env + - ./auth/database.db:/app/database.db + ports: + - "127.0.0.1:3000:3000" + networks: + - freeso volumes: db: diff --git a/server/start.sh b/server/start.sh index 7748b11..96471e4 100755 --- a/server/start.sh +++ b/server/start.sh @@ -1,9 +1,9 @@ #!/bin/bash -if [ ! -e "./db-initiated" ]; then - sleep 10 +if [ ! -e "./vars/db-initiated" ]; then + sleep 5 echo "y" | dotnet exec FSO.Server.Core.dll db-init - touch db-initiated + touch vars/db-initiated else #while [ $? -ne 2 ]; do #mono watchdog.exe run --core |