mirror of
https://github.com/saltbo/zpan.git
synced 2026-08-30 17:50:07 +08:00
Jasper Van
b959e5e6bf
Three related changes hardening the remote downloader, bundled because the module-path rename touches every file — splitting would leave a mid-history commit that doesn't build. Engine supervision: a managed engine subprocess (aria2c / qbittorrent-nox) that exits unexpectedly now crashes the worker. watchEngineProcess waits on the child, logs the exit at error level, and cancels the run context so `downloader up` returns non-zero; the container (restart: unless-stopped) then restarts the whole stack. Previously the exit error was discarded and the worker kept heartbeating as healthy while every task failed against the dead RPC. A deliberate shutdown kill is told apart from a crash via a stopping flag. aria2 GID recovery: waitAria2 re-discovers the live GID via findTask when aria2 reports 'GID ... is not found' mid-download (e.g. after an aria2 restart) instead of failing the task. Adds isAria2GIDNotFound, which matches tellStatus's message format that isAria2DownloadNotFound missed. CLI install: move the entrypoint to the module root (cmd/main.go) and rename the module github.com/saltbo/zpan/cmd -> github.com/saltbo/zpan so `go install .` from cmd/ yields a zpan binary. Internal imports shorten to github.com/saltbo/zpan/internal/...; the Dockerfile builds the module root. Co-authored-by: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
94 lines
3.2 KiB
Docker
94 lines
3.2 KiB
Docker
# syntax=docker/dockerfile:1.7
|
|
|
|
FROM node:24-slim AS builder
|
|
RUN apt-get update \
|
|
&& apt-get install -y --no-install-recommends python3 make g++ \
|
|
&& rm -rf /var/lib/apt/lists/*
|
|
WORKDIR /app
|
|
|
|
COPY package.json pnpm-lock.yaml ./
|
|
RUN --mount=type=cache,target=/root/.local/share/pnpm/store \
|
|
corepack enable \
|
|
&& pnpm install --frozen-lockfile
|
|
|
|
COPY . .
|
|
# .git is excluded from the build context, so git describe cannot run here.
|
|
# The release workflow passes the tag via APP_VERSION and the commit SHA via
|
|
# APP_COMMIT; resolveAppVersion/resolveAppCommit read them.
|
|
ARG APP_VERSION=dev
|
|
ENV ZPAN_APP_VERSION=${APP_VERSION}
|
|
ARG APP_COMMIT=
|
|
ENV ZPAN_APP_COMMIT=${APP_COMMIT}
|
|
RUN pnpm build:node \
|
|
&& pnpm prune --prod --ignore-scripts
|
|
|
|
FROM golang:1.25 AS cli-builder
|
|
WORKDIR /app/cmd
|
|
COPY cmd/go.mod cmd/go.sum ./
|
|
RUN go mod download
|
|
COPY cmd ./
|
|
RUN CGO_ENABLED=0 go build -trimpath -ldflags="-s -w" -o /out/zpan .
|
|
|
|
FROM debian:bookworm-slim AS geoip-db
|
|
ARG GEOIP_DB_MONTH=2026-06
|
|
ARG GEOIP_DB_URL=https://download.db-ip.com/free/dbip-city-lite-${GEOIP_DB_MONTH}.mmdb.gz
|
|
RUN apt-get update \
|
|
&& apt-get install -y --no-install-recommends ca-certificates curl gzip \
|
|
&& rm -rf /var/lib/apt/lists/* \
|
|
&& mkdir -p /out \
|
|
&& curl -fsSL --retry 5 --retry-delay 3 --retry-connrefused "$GEOIP_DB_URL" -o /tmp/geoip.mmdb.gz \
|
|
&& gzip -dc /tmp/geoip.mmdb.gz > /out/geoip.mmdb \
|
|
&& rm -f /tmp/geoip.mmdb.gz
|
|
|
|
FROM debian:bookworm-slim AS cli
|
|
RUN apt-get update \
|
|
&& apt-get install -y --no-install-recommends aria2 ca-certificates qbittorrent-nox \
|
|
&& rm -rf /var/lib/apt/lists/* \
|
|
&& addgroup --system zpan \
|
|
&& adduser --system --ingroup zpan --home /home/zpan zpan \
|
|
&& mkdir -p /home/zpan/.local/share/zpan
|
|
COPY --from=cli-builder /out/zpan /usr/local/bin/zpan
|
|
COPY --from=geoip-db /out/geoip.mmdb /home/zpan/.local/share/zpan/geoip.mmdb
|
|
RUN mkdir -p /home/zpan/.config/zpan /home/zpan/.local/state/zpan/downloader /data /downloads \
|
|
&& chown -R zpan:zpan /data /home/zpan /downloads
|
|
USER zpan
|
|
ENV HOME=/home/zpan
|
|
WORKDIR /downloads
|
|
ENTRYPOINT ["zpan"]
|
|
CMD ["downloader", "up"]
|
|
|
|
FROM node:24-slim
|
|
WORKDIR /app
|
|
|
|
RUN apt-get update \
|
|
&& apt-get install -y --no-install-recommends aria2 ca-certificates qbittorrent-nox \
|
|
&& rm -rf /var/lib/apt/lists/* \
|
|
&& addgroup --system zpan \
|
|
&& adduser --system --ingroup zpan --home /home/zpan zpan \
|
|
&& mkdir -p /home/zpan/.local/share/zpan
|
|
|
|
COPY --from=builder /app/dist ./dist
|
|
COPY --from=builder /app/dist-server ./dist-server
|
|
COPY --from=builder /app/node_modules ./node_modules
|
|
COPY --from=builder /app/package.json ./package.json
|
|
COPY --from=builder /app/migrations ./migrations
|
|
COPY --from=builder /app/scripts/docker-entrypoint.sh /app/scripts/docker-entrypoint.sh
|
|
COPY --from=cli-builder /out/zpan /usr/local/bin/zpan
|
|
COPY --from=geoip-db /out/geoip.mmdb /home/zpan/.local/share/zpan/geoip.mmdb
|
|
|
|
RUN mkdir -p /data /home/zpan/.config/zpan /home/zpan/.local/state/zpan/downloader \
|
|
&& chown -R zpan:zpan /data /home/zpan
|
|
|
|
USER zpan
|
|
|
|
ENV NODE_ENV=production
|
|
ENV HOME=/home/zpan
|
|
ENV PORT=8222
|
|
# Lets the app report its deployment platform as "docker" (Cloud Run overrides
|
|
# this via K_SERVICE, which entry-node checks first).
|
|
ENV ZPAN_RUNTIME=docker
|
|
EXPOSE 8222
|
|
|
|
ENTRYPOINT ["/app/scripts/docker-entrypoint.sh"]
|
|
CMD ["node", "dist-server/entry-node.js"]
|