Merge pull request #125 from lch24/dev

docker and map

Author: jxd136

dependency/Dockerfile/Dockerfile_run_client

@@ -1,28 +1,29 @@
 # =============================================================================
 # THUAI9 Client Image — runs player AI (Python or C++)
+#   Adapted from THUAI8 pattern
 #
 # Build:
-#   docker build -f dependency/Dockerfile/Dockerfile_run_client \
+#   docker build --build-arg BASE_IMAGE=eesast/thuai9_base:base \
+#     -f dependency/Dockerfile/Dockerfile_run_client \
 #     -t eesast/thuai9_client:latest .
 #
-# Run (Python):
+# Run (competition — code files in /usr/local/code/ named by player label):
 #   docker run --rm \
-#     -e TEAM_ID=1 -e SERVER_IP=host.docker.internal \
-#     -e PLAYER_LANG=python \
-#     eesast/thuai9_client:latest
-#
-# Run (C++ — mount compiled binary):
-#   docker run --rm \
-#     -e TEAM_ID=1 -e SERVER_IP=host.docker.internal \
-#     -e PLAYER_LANG=cpp \
-#     -v "$(pwd)/output/capi:/usr/local/PlayerCode/CAPI/cpp/build/capi" \
+#     -v /path/to/team/code:/usr/local/code \
+#     -v /path/to/output:/usr/local/output \
+#     -e TERMINAL=CLIENT -e TEAM_LABEL=TeamA -e TEAM_SEQ_ID=0 \
+#     -e CONNECT_IP=172.17.0.1 -e GAME_TIME=600 \
 #     eesast/thuai9_client:latest
 # =============================================================================
 ARG BASE_IMAGE=eesast/thuai9_base:base
 FROM ${BASE_IMAGE}
 LABEL maintainer="eesast"
 LABEL description="THUAI9 player client runner"
 
+WORKDIR /usr/local
+
+RUN mkdir -p /usr/local/code /usr/local/output
+
 # Copy player code
 COPY ./CAPI/python       ./PlayerCode/CAPI/python
 COPY ./dependency/proto  ./PlayerCode/dependency/proto
@@ -45,6 +46,5 @@ WORKDIR /usr/local
 COPY ./dependency/shell/run.sh .
 
 ENV TERMINAL=CLIENT
-ENV PLAYER_LANG=python
 
 ENTRYPOINT ["bash", "./run.sh"]

dependency/Dockerfile/Dockerfile_run_server

@@ -1,44 +1,39 @@
 # =============================================================================
 # THUAI9 Server Image — C# game server runner
+#   Adapted from THUAI8 pattern
 #
 # Build:
 #   docker build -f dependency/Dockerfile/Dockerfile_run_server \
 #     -t eesast/thuai9_server:latest .
 #
-# Run:
-#   docker run --rm -p 8888:8888 \
-#     -e TEAM_COUNT=4 -e GAME_TIME_SEC=600 \
+# Run (competition):
+#   docker run --rm \
+#     -v /path/to/map:/usr/local/map \
+#     -v /path/to/output:/usr/local/output \
+#     -e TERMINAL=SERVER -e MODE=COMPETITION -e MAP_ID=xxx \
+#     -e SCORE_URL=... -e TOKEN=... -e FINISH_URL=... \
+#     -e GAME_TIME=600 -e EXPOSED=1 \
 #     eesast/thuai9_server:latest
 # =============================================================================
 FROM mcr.microsoft.com/dotnet/sdk:8.0-jammy AS build
 LABEL maintainer="eesast"
-WORKDIR /usr/local/src
-
-# Copy the entire repo (for logic/ + dependency/)
+WORKDIR /usr/local
 COPY . .
-
-# Publish the server as a self-contained linux-x64 binary
 RUN dotnet publish logic/Server/Server.csproj \
     -c Release \
     -o /usr/local/Server \
     --self-contained true \
     -r linux-x64
 
-# ── Runtime stage ────────────────────────────────────────────────────
 FROM mcr.microsoft.com/dotnet/runtime:8.0-jammy
 LABEL maintainer="eesast"
 LABEL description="THUAI9 game server"
 
 WORKDIR /usr/local
-
 COPY --from=build /usr/local/Server ./Server
 
-# Prepare team and playback directories
-RUN mkdir -p /usr/local/team1 /usr/local/team2 \
-    /usr/local/team3 /usr/local/team4 \
-    /usr/local/playback
+RUN mkdir -p /usr/local/map /usr/local/output
 
-# Copy entrypoint script
 COPY ./dependency/shell/run.sh .
 
 ENV TERMINAL=SERVER