From 13f9da827dc192e04ff00feb13fdda8674180d38 Mon Sep 17 00:00:00 2001 From: MaxSignal Date: Thu, 9 Apr 2026 11:04:39 +0000 Subject: [PATCH] small fixes related to docker --- docker-compose.dev.yml | 12 ++++++------ docker-compose.release.yml | 12 ++++++------ utils/package_release.py | 7 ++++++- 3 files changed, 18 insertions(+), 13 deletions(-) diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml index 8d1e413..7ea2a11 100644 --- a/docker-compose.dev.yml +++ b/docker-compose.dev.yml @@ -154,7 +154,7 @@ services: rc_services_release: <<: *shared-release working_dir: /app/rc_services - command: cargo run --release -- --ip "0.0.0.0" --redirect "domain_or_ip_address:4533" + command: cargo run --release -- --ip "0.0.0.0" --redirect "${REDIRECT:-127.0.0.1}:4533" profiles: ["release"] rc_services_room_release: @@ -165,7 +165,7 @@ services: rc_social_release: <<: *shared-release working_dir: /app/rc_social - command: cargo run --release -- --ip "0.0.0.0" --redirect "domain_or_ip_address:4535" + command: cargo run --release -- --ip "0.0.0.0" --redirect "${REDIRECT:-127.0.0.1}:4535" profiles: ["release"] rc_social_room_release: @@ -176,7 +176,7 @@ services: rc_chat_release: <<: *shared-release working_dir: /app/rc_chat - command: cargo run --release -- --ip "0.0.0.0" --redirect "domain_or_ip_address:4537" + command: cargo run --release -- --ip "0.0.0.0" --redirect "${REDIRECT:-127.0.0.1}:4537" profiles: ["release"] rc_chat_room_release: @@ -187,7 +187,7 @@ services: rc_singleplayer_release: <<: *shared-release working_dir: /app/rc_singleplayer - command: cargo run --release -- --ip "0.0.0.0" --redirect "domain_or_ip_address:4539" + command: cargo run --release -- --ip "0.0.0.0" --redirect "${REDIRECT:-127.0.0.1}:4539" profiles: ["release"] rc_singleplayer_room_release: @@ -198,13 +198,13 @@ services: rc_lobby_release: <<: *shared-release working_dir: /app/rc_lobby - command: cargo run --release -- --ip "0.0.0.0" --redirect "domain_or_ip_address:4541" + command: cargo run --release -- --ip "0.0.0.0" --redirect "${REDIRECT:-127.0.0.1}:4541" profiles: ["release"] rc_lobby_room_release: <<: *shared-release working_dir: /app/rc_lobby_room - command: cargo run --release -- --ip "0.0.0.0" --redirect "domain_or_ip_address:4542" + command: cargo run --release -- --ip "0.0.0.0" --redirect "${REDIRECT:-127.0.0.1}:4542" profiles: ["release"] rc_multiplayer_release: diff --git a/docker-compose.release.yml b/docker-compose.release.yml index cee4d4a..83d664c 100644 --- a/docker-compose.release.yml +++ b/docker-compose.release.yml @@ -14,7 +14,7 @@ services: rc_services: <<: *shared-release working_dir: /app/rc_services - command: ./oj_rc_services --ip "0.0.0.0" --redirect "domain_or_ip_address:4533" + command: ./oj_rc_services --ip "0.0.0.0" --redirect "${REDIRECT:-127.0.0.1}:4533" rc_services_room: <<: *shared-release @@ -24,7 +24,7 @@ services: rc_social: <<: *shared-release working_dir: /app/rc_social - command: ./oj_rc_social --ip "0.0.0.0" --redirect "domain_or_ip_address:4535" + command: ./oj_rc_social --ip "0.0.0.0" --redirect "${REDIRECT:-127.0.0.1}:4535" rc_social_room: <<: *shared-release @@ -34,7 +34,7 @@ services: rc_chat: <<: *shared-release working_dir: /app/rc_chat - command: ./oj_rc_chat --ip "0.0.0.0" --redirect "domain_or_ip_address:4537" + command: ./oj_rc_chat --ip "0.0.0.0" --redirect "${REDIRECT:-127.0.0.1}:4537" rc_chat_room: <<: *shared-release @@ -44,7 +44,7 @@ services: rc_singleplayer: <<: *shared-release working_dir: /app/rc_singleplayer - command: ./oj_rc_singleplayer --ip "0.0.0.0" --redirect "domain_or_ip_address:4539" + command: ./oj_rc_singleplayer --ip "0.0.0.0" --redirect "${REDIRECT:-127.0.0.1}:4539" rc_singleplayer_room: <<: *shared-release @@ -54,12 +54,12 @@ services: rc_lobby: <<: *shared-release working_dir: /app/rc_lobby - command: ./oj_rc_lobby --ip "0.0.0.0" --redirect "domain_or_ip_address:4541" + command: ./oj_rc_lobby --ip "0.0.0.0" --redirect "${REDIRECT:-127.0.0.1}:4541" rc_lobby_room: <<: *shared-release working_dir: /app/rc_lobby_room - command: ./oj_rc_lobby_room --ip "0.0.0.0" --redirect "domain_or_ip_address:4542" + command: ./oj_rc_lobby_room --ip "0.0.0.0" --redirect "${REDIRECT:-127.0.0.1}:4542" rc_multiplayer: <<: *shared-release diff --git a/utils/package_release.py b/utils/package_release.py index 131f51c..af6b4ed 100755 --- a/utils/package_release.py +++ b/utils/package_release.py @@ -50,6 +50,8 @@ PROJECT_ASSETS_TO_INCLUDE = [ "utils/cube_gen.py", "LICENSE", "README.md", + "Dockerfile", + "docker-compose.release.yml" ] BLANK_FOLDERS_TO_CREATE = [ @@ -90,7 +92,10 @@ def main(build_root: str, outfile: str): add_folder_to_zip(archive, folder) print("Adding", len(PROJECT_ASSETS_TO_INCLUDE), "extra assets") for asset in PROJECT_ASSETS_TO_INCLUDE: - archive.write(asset) + if asset == "docker-compose.release.yml": + archive.write(asset, arcname="docker-compose.yml") + else: + archive.write(asset) # handle project setup niceties print("Creating", len(BLANK_FOLDERS_TO_CREATE), "blank folders") for folder in BLANK_FOLDERS_TO_CREATE: