Merge pull request #112 from aiarena/fix/bot_controller_crash

Fix bot_controller crash
aiarena · Nov 7, 2024 · ab80a36 · ab80a36
2 parents 24d26bb + 0fc7a89
commit ab80a36
Showing 1 changed file with 133 additions and 133 deletions.
diff --git a/docker/Dockerfile b/docker/Dockerfile
@@ -1,134 +1,134 @@
-FROM lukemathwalker/cargo-chef:latest-rust-1.75-bookworm AS chef
-WORKDIR /app
-
-RUN apt update && apt install -y lld clang
-
-FROM chef as planner
-COPY . .
-RUN cargo chef prepare --recipe-path recipe.json
-
-# Build Stage
-FROM chef as builder
-ARG CARGO_FLAGS="--release"
-
-COPY --from=planner /app/recipe.json recipe.json
-# Build dependencies - this is the caching Docker layer!
-RUN cargo chef cook ${CARGO_FLAGS} --recipe-path recipe.json
-# Build application
-COPY . .
-
-ARG FEATURES=""
-RUN cargo build ${CARGO_FLAGS} --features="${FEATURES}"
-
-
-FROM debian:bookworm-slim as k8s_controller
-ARG APP=/app
-
-RUN apt-get update \
-    && apt-get install -y ca-certificates tzdata \
-    && rm -rf /var/lib/apt/lists/*
-
-ENV TZ=Etc/UTC
-
-RUN mkdir -p ${APP}
-
-WORKDIR ${APP}
-
-COPY --from=builder /app/target/*/k8s_controller ${APP}/k8s_controller
-
-ENTRYPOINT ["./k8s_controller"]
-LABEL service=k8s_controller
-
-FROM aiarena/arenaclient-bot-base:v0.5.0 as bot_controller
-ARG APP=/app
-
-RUN apt-get update \
-    && apt-get install -y ca-certificates tzdata p7zip-full \
-    && rm -rf /var/lib/apt/lists/*
-
-ENV TZ=Etc/UTC
-
-RUN mkdir -p ${APP}
-
-WORKDIR ${APP}
-
-COPY --from=builder /app/target/*/bot_controller ${APP}/bot_controller
-
-ENTRYPOINT ["./bot_controller"]
-LABEL service=bot_controller
-
-FROM aiarena/arenaclient-sc2-base:4.10-bookworm as sc2_controller
-ARG APP=/app
-
-
-RUN apt-get update \
-    && apt-get install -y ca-certificates tzdata p7zip-full \
-    && rm -rf /var/lib/apt/lists/*
-
-WORKDIR ${APP}
-
-COPY --from=builder /app/target/*/sc2_controller ${APP}/sc2_controller
-
-ENTRYPOINT ["./sc2_controller"]
-LABEL service=sc2_controller
-
-FROM debian:bookworm-slim as proxy_controller
-ARG APP=/app
-
-USER root
-WORKDIR /root/
-
-# Update system
-RUN apt-get update \
-    && apt-get upgrade --assume-yes --quiet=2 \
-    && apt-get install --assume-yes --no-install-recommends --no-show-upgraded
-
-
-RUN apt-get update \
-    && apt-get install -y ca-certificates tzdata p7zip-full \
-    && rm -rf /var/lib/apt/lists/*
-
-ENV TZ=Etc/UTC
-
-RUN mkdir -p ${APP}
-
-WORKDIR ${APP}
-
-COPY --from=builder /app/target/*/proxy_controller ${APP}/proxy_controller
-
-ENTRYPOINT ["./proxy_controller"]
-LABEL service=proxy_controller
-
-
-FROM aiarena/arenaclient-bot-base:v0.4.0 as combined
-ARG APP=/app
-
-USER root
-WORKDIR /root/
-
-# Update system
-RUN apt-get update \
-    && apt-get upgrade --assume-yes --quiet=2 \
-    && apt-get install --assume-yes --no-install-recommends --no-show-upgraded
-
-
-RUN apt-get update \
-    && apt-get install -y ca-certificates tzdata p7zip-full supervisor \
-    && rm -rf /var/lib/apt/lists/*
-
-RUN mkdir -p /var/log/supervisor
-
-ENV TZ=Etc/UTC
-
-RUN mkdir -p ${APP}
-
-WORKDIR ${APP}
-COPY --from=sc2_controller /root/StarCraftII/ /root/StarCraftII/
-COPY --from=builder /app/target/*/proxy_controller ${APP}/proxy_controller
-COPY --from=builder /app/target/*/sc2_controller ${APP}/sc2_controller
-COPY --from=builder /app/target/*/bot_controller ${APP}/bot_controller
-
-COPY docker/supervisord.conf /etc/supervisor/conf.d/supervisord.conf
-
-CMD ["/usr/bin/supervisord"]
+FROM lukemathwalker/cargo-chef:latest-rust-1.75-bookworm AS chef
+WORKDIR /app
+
+RUN apt update && apt install -y lld clang
+
+FROM chef as planner
+COPY . .
+RUN cargo chef prepare --recipe-path recipe.json
+
+# Build Stage
+FROM chef as builder
+ARG CARGO_FLAGS="--release"
+
+COPY --from=planner /app/recipe.json recipe.json
+# Build dependencies - this is the caching Docker layer!
+RUN cargo chef cook ${CARGO_FLAGS} --recipe-path recipe.json
+# Build application
+COPY . .
+
+ARG FEATURES=""
+RUN cargo build ${CARGO_FLAGS} --features="${FEATURES}"
+
+
+FROM debian:bookworm-slim as k8s_controller
+ARG APP=/app
+
+RUN apt-get update \
+    && apt-get install -y ca-certificates tzdata \
+    && rm -rf /var/lib/apt/lists/*
+
+ENV TZ=Etc/UTC
+
+RUN mkdir -p ${APP}
+
+WORKDIR ${APP}
+
+COPY --from=builder /app/target/*/k8s_controller ${APP}/k8s_controller
+
+ENTRYPOINT ["./k8s_controller"]
+LABEL service=k8s_controller
+
+FROM aiarena/arenaclient-bot-base:v0.5.1 as bot_controller
+ARG APP=/app
+
+RUN apt-get update \
+    && apt-get install -y ca-certificates tzdata p7zip-full \
+    && rm -rf /var/lib/apt/lists/*
+
+ENV TZ=Etc/UTC
+
+RUN mkdir -p ${APP}
+
+WORKDIR ${APP}
+
+COPY --from=builder /app/target/*/bot_controller ${APP}/bot_controller
+
+ENTRYPOINT ["./bot_controller"]
+LABEL service=bot_controller
+
+FROM aiarena/arenaclient-sc2-base:4.10-bookworm as sc2_controller
+ARG APP=/app
+
+
+RUN apt-get update \
+    && apt-get install -y ca-certificates tzdata p7zip-full \
+    && rm -rf /var/lib/apt/lists/*
+
+WORKDIR ${APP}
+
+COPY --from=builder /app/target/*/sc2_controller ${APP}/sc2_controller
+
+ENTRYPOINT ["./sc2_controller"]
+LABEL service=sc2_controller
+
+FROM debian:bookworm-slim as proxy_controller
+ARG APP=/app
+
+USER root
+WORKDIR /root/
+
+# Update system
+RUN apt-get update \
+    && apt-get upgrade --assume-yes --quiet=2 \
+    && apt-get install --assume-yes --no-install-recommends --no-show-upgraded
+
+
+RUN apt-get update \
+    && apt-get install -y ca-certificates tzdata p7zip-full \
+    && rm -rf /var/lib/apt/lists/*
+
+ENV TZ=Etc/UTC
+
+RUN mkdir -p ${APP}
+
+WORKDIR ${APP}
+
+COPY --from=builder /app/target/*/proxy_controller ${APP}/proxy_controller
+
+ENTRYPOINT ["./proxy_controller"]
+LABEL service=proxy_controller
+
+
+FROM aiarena/arenaclient-bot-base:v0.5.1 as combined
+ARG APP=/app
+
+USER root
+WORKDIR /root/
+
+# Update system
+RUN apt-get update \
+    && apt-get upgrade --assume-yes --quiet=2 \
+    && apt-get install --assume-yes --no-install-recommends --no-show-upgraded
+
+
+RUN apt-get update \
+    && apt-get install -y ca-certificates tzdata p7zip-full supervisor \
+    && rm -rf /var/lib/apt/lists/*
+
+RUN mkdir -p /var/log/supervisor
+
+ENV TZ=Etc/UTC
+
+RUN mkdir -p ${APP}
+
+WORKDIR ${APP}
+COPY --from=sc2_controller /root/StarCraftII/ /root/StarCraftII/
+COPY --from=builder /app/target/*/proxy_controller ${APP}/proxy_controller
+COPY --from=builder /app/target/*/sc2_controller ${APP}/sc2_controller
+COPY --from=builder /app/target/*/bot_controller ${APP}/bot_controller
+
+COPY docker/supervisord.conf /etc/supervisor/conf.d/supervisord.conf
+
+CMD ["/usr/bin/supervisord"]
 LABEL service=combined