bonkmaykr/ojrc
1
0
Fork 0
mirror of https://git.ngram.ca/OpenJam/rc-servers synced 2026-08-23 23:08:52 +00:00
Code Activity

Merge pull request 'small fixes related to docker' (#111) from MaxSignal/rc-servers:main into main

Browse Source 
Reviewed-on: https://git.ngram.ca/OpenJam/rc-servers/pulls/111
This commit is contained in:
NGnius
2026-04-09 20:45:05 +00:00
parent 5df580c116 13f9da827d
commit e09aeceed3
3 changed files with 18 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
docker-compose.dev.yml
View File

@@ -154,7 +154,7 @@ services:
rc_services_release: rc_services_release:
<<: *shared-release <<: *shared-release
working_dir: /app/rc_services 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"] profiles: ["release"]
rc_services_room_release: rc_services_room_release:
@@ -165,7 +165,7 @@ services:
rc_social_release: rc_social_release:
<<: *shared-release <<: *shared-release
working_dir: /app/rc_social 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"] profiles: ["release"]
rc_social_room_release: rc_social_room_release:
@@ -176,7 +176,7 @@ services:
rc_chat_release: rc_chat_release:
<<: *shared-release <<: *shared-release
working_dir: /app/rc_chat 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"] profiles: ["release"]
rc_chat_room_release: rc_chat_room_release:
@@ -187,7 +187,7 @@ services:
rc_singleplayer_release: rc_singleplayer_release:
<<: *shared-release <<: *shared-release
working_dir: /app/rc_singleplayer 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"] profiles: ["release"]
rc_singleplayer_room_release: rc_singleplayer_room_release:
@@ -198,13 +198,13 @@ services:
rc_lobby_release: rc_lobby_release:
<<: *shared-release <<: *shared-release
working_dir: /app/rc_lobby 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"] profiles: ["release"]
rc_lobby_room_release: rc_lobby_room_release:
<<: *shared-release <<: *shared-release
working_dir: /app/rc_lobby_room 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"] profiles: ["release"]
rc_multiplayer_release: rc_multiplayer_release:

12
docker-compose.release.yml
View File

@@ -14,7 +14,7 @@ services:
rc_services: rc_services:
<<: *shared-release <<: *shared-release
working_dir: /app/rc_services 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: rc_services_room:
<<: *shared-release <<: *shared-release
@@ -24,7 +24,7 @@ services:
rc_social: rc_social:
<<: *shared-release <<: *shared-release
working_dir: /app/rc_social 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: rc_social_room:
<<: *shared-release <<: *shared-release
@@ -34,7 +34,7 @@ services:
rc_chat: rc_chat:
<<: *shared-release <<: *shared-release
working_dir: /app/rc_chat 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: rc_chat_room:
<<: *shared-release <<: *shared-release
@@ -44,7 +44,7 @@ services:
rc_singleplayer: rc_singleplayer:
<<: *shared-release <<: *shared-release
working_dir: /app/rc_singleplayer 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: rc_singleplayer_room:
<<: *shared-release <<: *shared-release
@@ -54,12 +54,12 @@ services:
rc_lobby: rc_lobby:
<<: *shared-release <<: *shared-release
working_dir: /app/rc_lobby 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: rc_lobby_room:
<<: *shared-release <<: *shared-release
working_dir: /app/rc_lobby_room 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: rc_multiplayer:
<<: *shared-release <<: *shared-release

7
utils/package_release.py
View File

@@ -50,6 +50,8 @@ PROJECT_ASSETS_TO_INCLUDE = [
"utils/cube_gen.py", "utils/cube_gen.py",
"LICENSE", "LICENSE",
"README.md", "README.md",
"Dockerfile",
"docker-compose.release.yml"
] ]
BLANK_FOLDERS_TO_CREATE = [ BLANK_FOLDERS_TO_CREATE = [
@@ -90,7 +92,10 @@ def main(build_root: str, outfile: str):
add_folder_to_zip(archive, folder) add_folder_to_zip(archive, folder)
print("Adding", len(PROJECT_ASSETS_TO_INCLUDE), "extra assets") print("Adding", len(PROJECT_ASSETS_TO_INCLUDE), "extra assets")
for asset in PROJECT_ASSETS_TO_INCLUDE: 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 # handle project setup niceties
print("Creating", len(BLANK_FOLDERS_TO_CREATE), "blank folders") print("Creating", len(BLANK_FOLDERS_TO_CREATE), "blank folders")
for folder in BLANK_FOLDERS_TO_CREATE: for folder in BLANK_FOLDERS_TO_CREATE: