diff --git a/.gitignore b/.gitignore index 1f25c88..4fbb4fa 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,5 @@ secret.key *.ipr *.iws .vscode/launch.json + +#local stuff diff --git a/.vs/ProjectSettings.json b/.vs/ProjectSettings.json new file mode 100644 index 0000000..f8b4888 --- /dev/null +++ b/.vs/ProjectSettings.json @@ -0,0 +1,3 @@ +{ + "CurrentProjectSetting": null +} \ No newline at end of file diff --git a/.vs/VSWorkspaceState.json b/.vs/VSWorkspaceState.json new file mode 100644 index 0000000..0c22be8 --- /dev/null +++ b/.vs/VSWorkspaceState.json @@ -0,0 +1,8 @@ +{ + "ExpandedNodes": [ + "", + "\\api" + ], + "SelectedNode": "\\api\\endpoints.go", + "PreviewInSolutionExplorer": false +} \ No newline at end of file diff --git a/.vs/slnx.sqlite b/.vs/slnx.sqlite new file mode 100644 index 0000000..9464812 Binary files /dev/null and b/.vs/slnx.sqlite differ diff --git a/beta.env b/beta.env new file mode 100644 index 0000000..bd0f9a8 --- /dev/null +++ b/beta.env @@ -0,0 +1,13 @@ +VITE_BYPASS_LOGIN=0 +VITE_BYPASS_TUTORIAL=0 +VITE_SERVER_URL=https://192.168.1.101:8001 +VITE_DISCORD_CLIENT_ID=1248062921129459756 +VITE_GOOGLE_CLIENT_ID=955345393540-2k6lfftf0fdnb0krqmpthjnqavfvvf73.apps.googleusercontent.com +VITE_I18N_DEBUG=1 +debug=true +dbaddr=db +dbuser=pokerogue +dbpass=pokerogue +dbname=pokeroguedb +gameurl=http://192.168.1.100:8000 +callbackurl=http://192.168.1.101:8001 \ No newline at end of file diff --git a/beta.env.bak b/beta.env.bak new file mode 100644 index 0000000..f554063 --- /dev/null +++ b/beta.env.bak @@ -0,0 +1,13 @@ +VITE_BYPASS_LOGIN=0 +VITE_BYPASS_TUTORIAL=0 +VITE_SERVER_URL=http://192.168.1.101:8001 +VITE_DISCORD_CLIENT_ID=1248062921129459756 +VITE_GOOGLE_CLIENT_ID=955345393540-2k6lfftf0fdnb0krqmpthjnqavfvvf73.apps.googleusercontent.com +VITE_I18N_DEBUG=1 +debug=true +dbaddr=db +dbuser=pokerogue +dbpass=pokerogue +dbname=pokeroguedb +gameurl=http://192.168.1.100:8000 +callbackurl=http://192.168.1.101:8001 \ No newline at end of file diff --git a/docker-compose.Example.yml b/docker-compose.Example.yml index 3eee682..1bb7c4a 100644 --- a/docker-compose.Example.yml +++ b/docker-compose.Example.yml @@ -1,6 +1,7 @@ services: server: - command: --debug --dbaddr db --dbuser pokerogue --dbpass pokerogue --dbname pokeroguedb --gameurl http://localhost:8000 --callbackurl http://localhost:8001 + env_file: + - beta.env image: ghcr.io/pagefaultgames/rogueserver:master restart: unless-stopped depends_on: @@ -30,6 +31,8 @@ services: - database:/var/lib/mysql networks: - internal + ports: + - "3306:3306" # Watchtower is a service that will automatically update your running containers # when a new image is available. This is useful for keeping your server up-to-date. diff --git a/docker-compose.Example.yml.bak b/docker-compose.Example.yml.bak new file mode 100644 index 0000000..bf85862 --- /dev/null +++ b/docker-compose.Example.yml.bak @@ -0,0 +1,57 @@ +services: + server: + env_file: + - beta.env + image: ghcr.io/pagefaultgames/rogueserver:master + restart: unless-stopped + depends_on: + db: + condition: service_healthy + networks: + - internal + ports: + - "8001:8001" + + db: + image: mariadb:11 + restart: unless-stopped + healthcheck: + test: [ "CMD", "healthcheck.sh", "--su-mysql", "--connect", "--innodb_initialized" ] + start_period: 10s + start_interval: 10s + interval: 1m + timeout: 5s + retries: 3 + environment: + MYSQL_ROOT_PASSWORD: admin + MYSQL_DATABASE: pokeroguedb + MYSQL_USER: pokerogue + MYSQL_PASSWORD: pokerogue + volumes: + - database:/var/lib/mysql + networks: + - internal + ports: + - "3036:3036" + + # Watchtower is a service that will automatically update your running containers + # when a new image is available. This is useful for keeping your server up-to-date. + # see https://containrrr.dev/watchtower/ for more information. + watchtower: + image: containrrr/watchtower + container_name: watchtower + restart: always + security_opt: + - no-new-privileges:true + environment: + WATCHTOWER_CLEANUP: true + WATCHTOWER_SCHEDULE: "@midnight" + volumes: + - /etc/localtime:/etc/localtime:ro + - /var/run/docker.sock:/var/run/docker.sock + +volumes: + database: + +networks: + internal: