From a1c4a63f7087ebf903f4d5307a24992775876e45 Mon Sep 17 00:00:00 2001 From: bfs2021 <101915083+bfs2021@users.noreply.github.com> Date: Sat, 7 Nov 2026 06:46:53 +0800 Subject: [PATCH] Respect uv.lock in the Dockerfile instead of re-resolving with uv pip install uv pip install ignores uv.lock, so every image build re-resolved the dependency set from pyproject.toml: a build made today installed 64 packages at versions different from the lock, including major drift (pydicom 2.4.4 -> 3.0.2, python-dateutil 2.8.2 -> 4.0.0, virtualenv 20 -> 21). Install the locked dependency set with uv sync --locked (UV_PROJECT_ENVIRONMENT=/usr/local to target the system interpreter), install the project itself with --no-deps, and apply the same treatment to the optional coverage build. Fixes #119 --- Dockerfile | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 96ddd34..4d2cadb 100644 --- a/Dockerfile +++ b/Dockerfile @@ -15,16 +15,20 @@ ARG UVCACHE=/root/.cache/uv COPY PIXL /PIXL WORKDIR /app COPY waveform-controller/pyproject.toml waveform-controller/uv.lock /app/ -RUN --mount=type=cache,target=${UVCACHE} uv pip install --system . +# Install the locked dependency set into the system environment (uv sync +# normally targets a venv, hence UV_PROJECT_ENVIRONMENT). +RUN --mount=type=cache,target=${UVCACHE} \ + UV_PROJECT_ENVIRONMENT=/usr/local uv sync --locked --no-dev --no-install-project COPY waveform-controller/. /app/ -RUN --mount=type=cache,target=${UVCACHE} uv pip install --system . +RUN --mount=type=cache,target=${UVCACHE} uv pip install --system --no-deps . # Optional: only for integration-test image builds (compose/build-arg INSTALL_COVERAGE=1). # Editable install so imports resolve under /app/src (matches source=["src"] for coverage). # coverage.py is inert unless COVERAGE_PROCESS_START is set. ARG INSTALL_COVERAGE=0 RUN --mount=type=cache,target=${UVCACHE} \ if [ "$INSTALL_COVERAGE" = "1" ]; then \ - uv pip install --system -e '.[coverage]'; \ + UV_PROJECT_ENVIRONMENT=/usr/local uv sync --locked --no-dev --extra coverage --no-install-project && \ + uv pip install --system --no-deps -e '.[coverage]'; \ fi FROM waveform_base AS waveform_controller CMD ["emap-extract-waveform"]