flanandClaude Sonnet 4.6
85e499a677
- immich_api: `score or confidence` treated 0.0 score as falsy; use explicit None check - diversity: same falsy-zero fix in _get_face_confidence - diversity: _crop_face_from_thumbnail scale loop now filters by person_id (was using first person's imageWidth/imageHeight regardless of target in group photos) - jobs: partially-trained auto mode kept limit="auto" for adaptive stopping, then caps result to remaining capacity (was converting to int, silently disabling FPS adaptive threshold and early-stop) - embeddings: _suppress_output finally block wraps first dup2 in try/finally so stderr is always restored even if stdout restore raises OSError - Dockerfile: ldconfig find uses python3.* glob instead of hardcoded python3.13 - scheduler: sleep until next_run instead of fixed 60s; eliminates late-fire jitter and unnecessary wakeups on long schedules Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
94 lines
4.1 KiB
Docker
94 lines
4.1 KiB
Docker
# ── Base images ───────────────────────────────────────────────────────────────
|
|
# amd64 + gpu: NVIDIA CUDA 13.3 + cuDNN (GPU acceleration when available)
|
|
# amd64 + cpu: Ubuntu 22.04 (CPU-only, ~2 GB smaller image)
|
|
# arm64: Ubuntu 24.04 (CPU-only; no CUDA wheels on ARM)
|
|
|
|
ARG VARIANT=gpu
|
|
|
|
FROM --platform=$BUILDPLATFORM nvidia/cuda:13.3.0-cudnn-runtime-ubuntu22.04 AS base-amd64-gpu
|
|
FROM ubuntu:22.04 AS base-amd64-cpu
|
|
FROM ubuntu:24.04 AS base-arm64-gpu
|
|
FROM ubuntu:24.04 AS base-arm64-cpu
|
|
|
|
# ── Build stage ───────────────────────────────────────────────────────────────
|
|
ARG TARGETARCH
|
|
|
|
FROM base-${TARGETARCH}-${VARIANT} AS build
|
|
|
|
ARG VARIANT=gpu
|
|
ENV DEBIAN_FRONTEND=noninteractive
|
|
|
|
# Both Ubuntu 22.04 and 24.04 get Python 3.13 from the deadsnakes PPA.
|
|
# GNUPGHOME is isolated so gpg never contacts an agent socket under QEMU.
|
|
RUN apt-get update && apt-get install -y --no-install-recommends \
|
|
ca-certificates curl gnupg software-properties-common \
|
|
&& GNUPGHOME=$(mktemp -d) add-apt-repository ppa:deadsnakes/ppa -y \
|
|
&& apt-get update \
|
|
&& apt-get install -y --no-install-recommends \
|
|
python3.13 python3.13-venv python3.13-dev \
|
|
libgl1 libglib2.0-0 libxext6 g++ \
|
|
&& rm -rf /var/lib/apt/lists/* \
|
|
&& ln -sf /usr/bin/python3.13 /usr/bin/python3
|
|
|
|
RUN curl -LsSf https://astral.sh/uv/install.sh | sh \
|
|
&& cp /root/.local/bin/uv /usr/local/bin/uv
|
|
|
|
WORKDIR /app
|
|
|
|
# For cpu variant, swap in the CPU-only pyproject and lockfile before syncing.
|
|
COPY pyproject.toml uv.lock pyproject-cpu.toml uv-cpu.lock ./
|
|
RUN if [ "$VARIANT" = "cpu" ]; then \
|
|
cp pyproject-cpu.toml pyproject.toml && \
|
|
cp uv-cpu.lock uv.lock; \
|
|
fi && \
|
|
uv sync --frozen --no-dev \
|
|
&& uv cache clean
|
|
|
|
COPY winnow/ winnow/
|
|
COPY entrypoint.sh scheduler.py ./
|
|
RUN chmod +x /app/entrypoint.sh
|
|
|
|
# ── Runtime stage ─────────────────────────────────────────────────────────────
|
|
# Starts fresh from the base image — excludes build tools (g++,
|
|
# python3.13-dev, gnupg, software-properties-common) not needed at runtime.
|
|
|
|
FROM base-${TARGETARCH}-${VARIANT} AS runtime
|
|
|
|
ARG VARIANT=gpu
|
|
ENV DEBIAN_FRONTEND=noninteractive
|
|
|
|
RUN apt-get update && apt-get install -y --no-install-recommends \
|
|
ca-certificates curl gnupg software-properties-common tini \
|
|
&& GNUPGHOME=$(mktemp -d) add-apt-repository ppa:deadsnakes/ppa -y \
|
|
&& apt-get update \
|
|
&& apt-get install -y --no-install-recommends \
|
|
python3.13 python3.13-venv \
|
|
libgl1 libglib2.0-0 libxext6 \
|
|
&& apt-get purge -y --auto-remove curl gnupg software-properties-common \
|
|
&& rm -rf /var/lib/apt/lists/* \
|
|
&& ln -sf /usr/bin/python3.13 /usr/bin/python3
|
|
|
|
# Copy app (with .venv) and uv from build stage
|
|
COPY --from=build /app /app
|
|
COPY --from=build /usr/local/bin/uv /usr/local/bin/uv
|
|
|
|
# Register every nvidia pip-package lib/ directory with ldconfig so that
|
|
# onnxruntime-gpu and torch can find libcudnn, libcublas, libcufft, etc.
|
|
# without a hand-maintained LD_LIBRARY_PATH. Skipped silently on cpu builds.
|
|
RUN find /app/.venv/lib/python3.*/site-packages/nvidia -type d -name "lib" \
|
|
2>/dev/null > /etc/ld.so.conf.d/nvidia-pip.conf && ldconfig || true
|
|
|
|
RUN groupadd -g 568 apps && useradd -u 568 -g apps -m -s /bin/bash appuser \
|
|
&& mkdir -p /models/.insightface /models/huggingface \
|
|
&& chown -R appuser:apps /app /models
|
|
|
|
WORKDIR /app
|
|
USER appuser
|
|
# PYTHONPATH=/app makes the winnow package importable from the entry point script.
|
|
# uv sync builds the wheel before winnow/ is COPY'd, so site-packages has only
|
|
# the dist-info. Explicitly adding /app lets Python find winnow/__init__.py there.
|
|
ENV HF_HOME=/models/huggingface INSIGHTFACE_HOME=/models/.insightface PYTHONPATH=/app
|
|
|
|
HEALTHCHECK CMD test -f /app/entrypoint.sh || exit 1
|
|
ENTRYPOINT ["tini", "--", "/app/entrypoint.sh"]
|