From db0516a105a290ceaee2d58d38fdf45886befa7d Mon Sep 17 00:00:00 2001 From: xavo95 Date: Thu, 12 Sep 2024 23:19:15 +0200 Subject: [PATCH] Tested setup --- docker-compose.yml | 12 ++++++------ {assets/docker => docker}/configserver.toml | 0 {assets/docker => docker}/gameserver.toml | 0 {assets/docker => docker}/gateway.toml | 0 {assets/docker => docker}/hotpatch.toml | 0 {assets/docker => docker}/loginserver.toml | 0 .../docker => docker}/postgres/scripts/0_INIT.sql | 0 .../docker => docker}/postgres/scripts/1_PERMS.sql | 0 8 files changed, 6 insertions(+), 6 deletions(-) rename {assets/docker => docker}/configserver.toml (100%) rename {assets/docker => docker}/gameserver.toml (100%) rename {assets/docker => docker}/gateway.toml (100%) rename {assets/docker => docker}/hotpatch.toml (100%) rename {assets/docker => docker}/loginserver.toml (100%) rename {assets/docker => docker}/postgres/scripts/0_INIT.sql (100%) rename {assets/docker => docker}/postgres/scripts/1_PERMS.sql (100%) diff --git a/docker-compose.yml b/docker-compose.yml index c7e07f0..c88aef3 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -9,7 +9,7 @@ services: ports: - '10001:10001' volumes: - - "./assets/docker/configserver.toml:/app/configserver.toml" + - "./docker/configserver.toml:/app/configserver.toml" - "./assets/config:/app/assets/config" shorekeeper-hotpatch-server: image: shorekeeper-hotpatch-server:1.3.0-SNAPSHOT @@ -19,7 +19,7 @@ services: ports: - '10002:10002' volumes: - - "./assets/docker/hotpatch.toml:/app/hotpatch.toml" + - "./docker/hotpatch.toml:/app/hotpatch.toml" - "./assets/hotpatch:/app/assets/hotpatch" shorekeeper-login-server: image: shorekeeper-login-server:1.3.0-SNAPSHOT @@ -29,7 +29,7 @@ services: ports: - '5500:5500' volumes: - - "./assets/docker/loginserver.toml:/app/loginserver.toml" + - "./docker/loginserver.toml:/app/loginserver.toml" shorekeeper-gateway-server: image: shorekeeper-gateway-server:1.3.0-SNAPSHOT depends_on: @@ -40,7 +40,7 @@ services: # - '10003:10003' - '7777:7777/udp' volumes: - - "./assets/docker/gateway.toml:/app/gateway.toml" + - "./docker/gateway.toml:/app/gateway.toml" shorekeeper-game-server: image: shorekeeper-game-server:1.3.0-SNAPSHOT depends_on: @@ -50,7 +50,7 @@ services: # ports: # - '10004:10004' volumes: - - "./assets/docker/gameserver.toml:/app/gameserver.toml" + - "./docker/gameserver.toml:/app/gameserver.toml" - "./assets/logic:/app/assets/logic" shorekeeper-postgres: image: postgres:16.4-alpine3.20 @@ -66,7 +66,7 @@ services: environment: - "POSTGRES_PASSWORD=toor" volumes: - - "./assets/docker/postgres/scripts:/docker-entrypoint-initdb.d" + - "./docker/postgres/scripts:/docker-entrypoint-initdb.d" - shorekeeper-postgres-vol:/var/lib/postgresql/data volumes: shorekeeper-postgres-vol: diff --git a/assets/docker/configserver.toml b/docker/configserver.toml similarity index 100% rename from assets/docker/configserver.toml rename to docker/configserver.toml diff --git a/assets/docker/gameserver.toml b/docker/gameserver.toml similarity index 100% rename from assets/docker/gameserver.toml rename to docker/gameserver.toml diff --git a/assets/docker/gateway.toml b/docker/gateway.toml similarity index 100% rename from assets/docker/gateway.toml rename to docker/gateway.toml diff --git a/assets/docker/hotpatch.toml b/docker/hotpatch.toml similarity index 100% rename from assets/docker/hotpatch.toml rename to docker/hotpatch.toml diff --git a/assets/docker/loginserver.toml b/docker/loginserver.toml similarity index 100% rename from assets/docker/loginserver.toml rename to docker/loginserver.toml diff --git a/assets/docker/postgres/scripts/0_INIT.sql b/docker/postgres/scripts/0_INIT.sql similarity index 100% rename from assets/docker/postgres/scripts/0_INIT.sql rename to docker/postgres/scripts/0_INIT.sql diff --git a/assets/docker/postgres/scripts/1_PERMS.sql b/docker/postgres/scripts/1_PERMS.sql similarity index 100% rename from assets/docker/postgres/scripts/1_PERMS.sql rename to docker/postgres/scripts/1_PERMS.sql