From c1897c07c7bf903027c374f031ee0fbe4817253f Mon Sep 17 00:00:00 2001 From: lladdy Date: Tue, 8 Aug 2023 13:28:46 +0930 Subject: [PATCH 1/2] Revert "fix: bots failing to connect via localhost" This reverts commit 3cd7d3be5da41e4c8a21010fa356dcc3f31a8ec6. --- docker-compose.yml | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 71c2078..9b60fbc 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,13 +1,12 @@ version: "3.9" services: sc2_controller: - network_mode: host image: aiarena/arenaclient-sc2:v0.4.3 environment: - "ACSC2_PORT=8083" - - "ACSC2_PROXY_HOST=127.0.0.1" + - "ACSC2_PROXY_HOST=proxy_controller" volumes: - - "./logs:/logs" # a sc2_controller folder will be created in the logs folder + - "./logs/sc2_controller:/logs" # a sc2_controller folder will be created in the logs folder # SC2 Maps Path # Set this as "- PATH_TO_YOUR_MAPS_FOLDER:/root/StarCraftII/maps" # - C:\Program Files (x86)\StarCraft II\Maps:/root/StarCraftII/maps # Standard windows SC2 maps path @@ -15,36 +14,33 @@ services: # - ~/StarCraftII/maps:/root/StarCraftII/maps # Relatively standard linux SC2 maps path bot_controller1: - network_mode: host image: aiarena/arenaclient-bot:v0.4.3 volumes: - "./bots:/bots" - "./logs/bot_controller1:/logs" environment: - "ACBOT_PORT=8081" - - "ACBOT_PROXY_HOST=127.0.0.1" + - "ACBOT_PROXY_HOST=proxy_controller" bot_controller2: - network_mode: host image: aiarena/arenaclient-bot:v0.4.3 volumes: - "./bots:/bots" - "./logs/bot_controller2:/logs" environment: - "ACBOT_PORT=8082" - - "ACBOT_PROXY_HOST=127.0.0.1" + - "ACBOT_PROXY_HOST=proxy_controller" proxy_controller: - network_mode: host image: aiarena/arenaclient-proxy:v0.4.3 environment: - "ACPROXY_PORT=8080" - - "ACPROXY_BOT_CONT_1_HOST=127.0.0.1" - - "ACPROXY_BOT_CONT_2_HOST=127.0.0.1" - - "ACPROXY_SC2_CONT_HOST=127.0.0.1" + - "ACPROXY_BOT_CONT_1_HOST=bot_controller1" + - "ACPROXY_BOT_CONT_2_HOST=bot_controller2" + - "ACPROXY_SC2_CONT_HOST=sc2_controller" volumes: - "./matches:/app/matches" - "./config.toml:/app/config.toml" - "./results.json:/app/results.json" - "./replays:/replays" - - "./logs:/logs" # a proxy_controller folder will be created in the logs folder + - "./logs:/logs" # a proxy_controller folder will be created in the logs folder \ No newline at end of file From f443e6d94ae406f82e177ca43460523a9abc9314 Mon Sep 17 00:00:00 2001 From: lladdy Date: Tue, 8 Aug 2023 13:28:57 +0930 Subject: [PATCH 2/2] docs: fix typo --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 48b2677..0fd6911 100644 --- a/README.md +++ b/README.md @@ -35,7 +35,7 @@ You can run the test match by executing `docker-compose up` in the base folder o Refer to [multithread-example.py](./multithread-example.py) for an example of how to run multiple matches in parallel. -Not that there are aspects of bot games that would need more work to be thread safe, +Note that there are aspects of bot games that would need more work to be thread safe, such as bots which save data to their data folder. ## Troubleshooting