From f3bc022a36915463e9079fe008be50943810d98b Mon Sep 17 00:00:00 2001 From: CJACK Date: Mon, 23 Feb 2026 03:52:55 +0800 Subject: [PATCH 1/2] feat: Implement multi-stage Docker build for releases, reusing pre-built artifacts from CI and updating documentation. --- .dockerignore | 4 +++- .github/workflows/release-artifacts.yml | 11 ++++++++++ DEPLOY.en.md | 9 +++++---- DEPLOY.md | 9 +++++---- Dockerfile | 27 ++++++++++++++++++++++++- 5 files changed, 50 insertions(+), 10 deletions(-) diff --git a/.dockerignore b/.dockerignore index a33226a..fecc5f7 100644 --- a/.dockerignore +++ b/.dockerignore @@ -10,7 +10,9 @@ __pycache__ .Python build/ develop-eggs/ -dist/ +dist/* +!dist/docker-input/ +!dist/docker-input/*.tar.gz downloads/ eggs/ .eggs/ diff --git a/.github/workflows/release-artifacts.yml b/.github/workflows/release-artifacts.yml index 5fa13d1..3293fb8 100644 --- a/.github/workflows/release-artifacts.yml +++ b/.github/workflows/release-artifacts.yml @@ -87,6 +87,14 @@ jobs: rm -rf "${STAGE}" done + - name: Prepare Docker release inputs + run: | + set -euo pipefail + TAG="${RELEASE_TAG}" + mkdir -p dist/docker-input + cp "dist/ds2api_${TAG}_linux_amd64.tar.gz" "dist/docker-input/linux_amd64.tar.gz" + cp "dist/ds2api_${TAG}_linux_arm64.tar.gz" "dist/docker-input/linux_arm64.tar.gz" + - name: Set up QEMU uses: docker/setup-qemu-action@v3 @@ -136,6 +144,7 @@ jobs: with: context: . file: ./Dockerfile + target: runtime-from-dist push: true platforms: linux/amd64,linux/arm64 tags: ${{ steps.meta_release.outputs.tags }} @@ -148,11 +157,13 @@ jobs: docker buildx build \ --platform linux/amd64 \ + --target runtime-from-dist \ --output type=docker,dest="dist/ds2api_${TAG}_docker_linux_amd64.tar" \ . docker buildx build \ --platform linux/arm64 \ + --target runtime-from-dist \ --output type=docker,dest="dist/ds2api_${TAG}_docker_linux_arm64.tar" \ . diff --git a/DEPLOY.en.md b/DEPLOY.en.md index 19c3999..a558ae3 100644 --- a/DEPLOY.en.md +++ b/DEPLOY.en.md @@ -135,11 +135,12 @@ docker-compose up -d --build ### 2.3 Docker Architecture -The `Dockerfile` uses a three-stage build: +The `Dockerfile` now provides two image paths: -1. **WebUI build stage**: `node:20` image, runs `npm ci && npm run build` -2. **Go build stage**: `golang:1.24` image, compiles the binary -3. **Runtime stage**: `debian:bookworm-slim` minimal image +1. **Default local/dev path (`runtime-from-source`)**: a three-stage build (WebUI build + Go build + runtime). +2. **Release path (`runtime-from-dist`)**: CI first creates `dist/ds2api__linux_.tar.gz`, then Docker directly reuses the binary and `static/admin` assets from those release archives, without running `npm build`/`go build` again. + +The release path keeps Docker images aligned with release archives and reduces duplicate build work. Container entry command: `/usr/local/bin/ds2api`, default exposed port: `5001`. diff --git a/DEPLOY.md b/DEPLOY.md index e2e484a..b07c5a9 100644 --- a/DEPLOY.md +++ b/DEPLOY.md @@ -135,11 +135,12 @@ docker-compose up -d --build ### 2.3 Docker 架构说明 -`Dockerfile` 使用三阶段构建： +`Dockerfile` 提供两条构建路径： -1. **WebUI 构建阶段**：`node:20` 镜像，执行 `npm ci && npm run build` -2. **Go 构建阶段**：`golang:1.24` 镜像，编译二进制文件 -3. **运行阶段**：`debian:bookworm-slim` 精简镜像 +1. **本地/开发默认路径（`runtime-from-source`）**：三阶段构建（WebUI 构建 + Go 构建 + 运行阶段）。 +2. **Release 路径（`runtime-from-dist`）**：CI 先生成 `dist/ds2api__linux_.tar.gz`，再由 Docker 直接复用该发布包内的二进制和 `static/admin` 产物组装运行镜像，不再重复执行 `npm build`/`go build`。 + +Release 路径可确保 Docker 镜像与 release 压缩包使用同一套产物，减少重复构建带来的差异。 容器内启动命令：`/usr/local/bin/ds2api`，默认暴露端口 `5001`。 diff --git a/Dockerfile b/Dockerfile index a67dfd1..f9e8bf3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -15,12 +15,37 @@ RUN go mod download COPY . . RUN CGO_ENABLED=0 GOOS=${TARGETOS} GOARCH=${TARGETARCH} go build -o /out/ds2api ./cmd/ds2api -FROM debian:bookworm-slim +FROM debian:bookworm-slim AS runtime-base WORKDIR /app RUN apt-get update && apt-get install -y --no-install-recommends ca-certificates wget && rm -rf /var/lib/apt/lists/* + +FROM runtime-base AS runtime-from-source COPY --from=go-builder /out/ds2api /usr/local/bin/ds2api COPY --from=go-builder /app/sha3_wasm_bg.7b9ca65ddd.wasm /app/sha3_wasm_bg.7b9ca65ddd.wasm COPY --from=go-builder /app/config.example.json /app/config.example.json COPY --from=webui-builder /app/static/admin /app/static/admin + +FROM runtime-base AS runtime-from-dist +ARG TARGETARCH +COPY dist/docker-input/linux_amd64.tar.gz /tmp/ds2api_linux_amd64.tar.gz +COPY dist/docker-input/linux_arm64.tar.gz /tmp/ds2api_linux_arm64.tar.gz +RUN set -eux; \ + case "${TARGETARCH}" in \ + amd64) ARCHIVE="/tmp/ds2api_linux_amd64.tar.gz" ;; \ + arm64) ARCHIVE="/tmp/ds2api_linux_arm64.tar.gz" ;; \ + *) echo "unsupported TARGETARCH: ${TARGETARCH}" >&2; exit 1 ;; \ + esac; \ + tar -xzf "${ARCHIVE}" -C /tmp; \ + PKG_DIR="$(find /tmp -maxdepth 1 -type d -name "ds2api_*_linux_${TARGETARCH}" | head -n1)"; \ + test -n "${PKG_DIR}"; \ + install -Dm755 "${PKG_DIR}/ds2api" /usr/local/bin/ds2api; \ + install -Dm644 "${PKG_DIR}/sha3_wasm_bg.7b9ca65ddd.wasm" /app/sha3_wasm_bg.7b9ca65ddd.wasm; \ + install -Dm644 "${PKG_DIR}/config.example.json" /app/config.example.json; \ + mkdir -p /app/static; \ + cp -R "${PKG_DIR}/static/admin" /app/static/admin; \ + rm -rf /tmp/ds2api_* /tmp/ds2api_linux_amd64.tar.gz /tmp/ds2api_linux_arm64.tar.gz + EXPOSE 5001 CMD ["/usr/local/bin/ds2api"] + +FROM runtime-from-source AS final From a086e0cfa19067d5084f3af0c600b9ff3c4f2359 Mon Sep 17 00:00:00 2001 From: CJACK Date: Mon, 23 Feb 2026 04:05:22 +0800 Subject: [PATCH 2/2] feat: Refactor Dockerfile to use BusyBox for core utilities and update healthcheck commands in Docker Compose and deployment documentation. --- DEPLOY.en.md | 2 +- DEPLOY.md | 2 +- Dockerfile | 27 +++++++++++++++++---------- docker-compose.yml | 2 +- 4 files changed, 20 insertions(+), 13 deletions(-) diff --git a/DEPLOY.en.md b/DEPLOY.en.md index a558ae3..2ff3250 100644 --- a/DEPLOY.en.md +++ b/DEPLOY.en.md @@ -161,7 +161,7 @@ Docker Compose includes a built-in health check: ```yaml healthcheck: - test: ["CMD", "wget", "-qO-", "http://localhost:${PORT:-5001}/healthz"] + test: ["CMD", "/usr/local/bin/busybox", "wget", "-qO-", "http://localhost:${PORT:-5001}/healthz"] interval: 30s timeout: 10s retries: 3 diff --git a/DEPLOY.md b/DEPLOY.md index b07c5a9..d7d74d3 100644 --- a/DEPLOY.md +++ b/DEPLOY.md @@ -161,7 +161,7 @@ Docker Compose 已配置内置健康检查： ```yaml healthcheck: - test: ["CMD", "wget", "-qO-", "http://localhost:${PORT:-5001}/healthz"] + test: ["CMD", "/usr/local/bin/busybox", "wget", "-qO-", "http://localhost:${PORT:-5001}/healthz"] interval: 30s timeout: 10s retries: 3 diff --git a/Dockerfile b/Dockerfile index f9e8bf3..c86f82d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -15,9 +15,14 @@ RUN go mod download COPY . . RUN CGO_ENABLED=0 GOOS=${TARGETOS} GOARCH=${TARGETARCH} go build -o /out/ds2api ./cmd/ds2api +FROM busybox:1.36.1-musl AS busybox-tools + FROM debian:bookworm-slim AS runtime-base WORKDIR /app -RUN apt-get update && apt-get install -y --no-install-recommends ca-certificates wget && rm -rf /var/lib/apt/lists/* +COPY --from=go-builder /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certificates.crt +COPY --from=busybox-tools /bin/busybox /usr/local/bin/busybox +EXPOSE 5001 +CMD ["/usr/local/bin/ds2api"] FROM runtime-base AS runtime-from-source COPY --from=go-builder /out/ds2api /usr/local/bin/ds2api @@ -25,7 +30,7 @@ COPY --from=go-builder /app/sha3_wasm_bg.7b9ca65ddd.wasm /app/sha3_wasm_bg.7b9ca COPY --from=go-builder /app/config.example.json /app/config.example.json COPY --from=webui-builder /app/static/admin /app/static/admin -FROM runtime-base AS runtime-from-dist +FROM busybox-tools AS dist-extract ARG TARGETARCH COPY dist/docker-input/linux_amd64.tar.gz /tmp/ds2api_linux_amd64.tar.gz COPY dist/docker-input/linux_arm64.tar.gz /tmp/ds2api_linux_arm64.tar.gz @@ -38,14 +43,16 @@ RUN set -eux; \ tar -xzf "${ARCHIVE}" -C /tmp; \ PKG_DIR="$(find /tmp -maxdepth 1 -type d -name "ds2api_*_linux_${TARGETARCH}" | head -n1)"; \ test -n "${PKG_DIR}"; \ - install -Dm755 "${PKG_DIR}/ds2api" /usr/local/bin/ds2api; \ - install -Dm644 "${PKG_DIR}/sha3_wasm_bg.7b9ca65ddd.wasm" /app/sha3_wasm_bg.7b9ca65ddd.wasm; \ - install -Dm644 "${PKG_DIR}/config.example.json" /app/config.example.json; \ - mkdir -p /app/static; \ - cp -R "${PKG_DIR}/static/admin" /app/static/admin; \ - rm -rf /tmp/ds2api_* /tmp/ds2api_linux_amd64.tar.gz /tmp/ds2api_linux_arm64.tar.gz + mkdir -p /out/static; \ + cp "${PKG_DIR}/ds2api" /out/ds2api; \ + cp "${PKG_DIR}/sha3_wasm_bg.7b9ca65ddd.wasm" /out/sha3_wasm_bg.7b9ca65ddd.wasm; \ + cp "${PKG_DIR}/config.example.json" /out/config.example.json; \ + cp -R "${PKG_DIR}/static/admin" /out/static/admin -EXPOSE 5001 -CMD ["/usr/local/bin/ds2api"] +FROM runtime-base AS runtime-from-dist +COPY --from=dist-extract /out/ds2api /usr/local/bin/ds2api +COPY --from=dist-extract /out/sha3_wasm_bg.7b9ca65ddd.wasm /app/sha3_wasm_bg.7b9ca65ddd.wasm +COPY --from=dist-extract /out/config.example.json /app/config.example.json +COPY --from=dist-extract /out/static/admin /app/static/admin FROM runtime-from-source AS final diff --git a/docker-compose.yml b/docker-compose.yml index a3f93f7..2ac83e1 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -11,7 +11,7 @@ services: - HOST=0.0.0.0 restart: unless-stopped healthcheck: - test: ["CMD", "wget", "-qO-", "http://localhost:${PORT:-5001}/healthz"] + test: ["CMD", "/usr/local/bin/busybox", "wget", "-qO-", "http://localhost:${PORT:-5001}/healthz"] interval: 30s timeout: 10s retries: 3