From a9ff92e1d1b5dcd67fa9fb875d98689b48f7f5d9 Mon Sep 17 00:00:00 2001 From: SCOPEDD Date: Tue, 29 Sep 2026 03:59:17 -0400 Subject: [PATCH] chore(docker): ensure resilient multi-arch detection and explicit ziglang dependency --- Dockerfile | 10 +++++----- docker-compose.yml | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index f3a1f2a..38f8b7c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -18,11 +18,11 @@ ARG TARGETARCH # zig (via the cargo-zigbuild wheel) is the cross C toolchain for musl targets. RUN apt-get update && apt-get install -y --no-install-recommends python3-pip \ && rm -rf /var/lib/apt/lists/* \ - && pip install --no-cache-dir --break-system-packages cargo-zigbuild -RUN case "$TARGETARCH" in \ - amd64) echo x86_64-unknown-linux-musl ;; \ - arm64) echo aarch64-unknown-linux-musl ;; \ - *) echo "unsupported arch $TARGETARCH" >&2; exit 1 ;; \ + && pip install --no-cache-dir --break-system-packages cargo-zigbuild ziglang +RUN case "${TARGETARCH:-$(uname -m)}" in \ + amd64|x86_64) echo x86_64-unknown-linux-musl ;; \ + arm64|aarch64) echo aarch64-unknown-linux-musl ;; \ + *) echo "unsupported arch ${TARGETARCH:-$(uname -m)}" >&2; exit 1 ;; \ esac > /rust-target \ && rustup target add "$(cat /rust-target)" WORKDIR /src diff --git a/docker-compose.yml b/docker-compose.yml index 25868ad..497b730 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,7 +1,7 @@ # SCOPENET admin panel # # cp .env.example .env # set ADMIN_PASSWORD at least -# docker compose up -d +# docker compose up -d --build # # Then open http://localhost:8080 (or your domain behind a reverse proxy). services: