From cc52f980b35131b2eec95bad3937ca5711853433 Mon Sep 17 00:00:00 2001 From: Armand du Parc Locmaria Date: Thu, 2 Oct 2025 15:31:39 -0700 Subject: [PATCH] Dockerfile.openpilot uv run scons (#36236) * Dockerfile.openpilot_base use UV_PROJECT_ENVIRONMENT * Revert "Dockerfile.openpilot_base use UV_PROJECT_ENVIRONMENT" This reverts commit 3725e54ce0727077ca4347d24ca38e25d5864d47. * Reapply "Dockerfile.openpilot_base use UV_PROJECT_ENVIRONMENT" This reverts commit 11b04f57acb9c81fcc5a22a6a6d78d666c59ca6c. * use uv run to pick up correct ppath --- Dockerfile.openpilot | 4 +++- Dockerfile.openpilot_base | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Dockerfile.openpilot b/Dockerfile.openpilot index d85be77121..14c1e64774 100644 --- a/Dockerfile.openpilot +++ b/Dockerfile.openpilot @@ -9,4 +9,6 @@ WORKDIR ${OPENPILOT_PATH} COPY . ${OPENPILOT_PATH}/ -RUN scons --cache-readonly -j$(nproc) +ENV UV_BIN="/home/batman/.local/bin/" +ENV PATH="$UV_BIN:$PATH" +RUN uv run scons --cache-readonly -j$(nproc) diff --git a/Dockerfile.openpilot_base b/Dockerfile.openpilot_base index 44d8d95e95..e3bb03de07 100644 --- a/Dockerfile.openpilot_base +++ b/Dockerfile.openpilot_base @@ -71,8 +71,8 @@ USER $USER COPY --chown=$USER pyproject.toml uv.lock /home/$USER COPY --chown=$USER tools/install_python_dependencies.sh /home/$USER/tools/ -ENV VIRTUAL_ENV=/home/$USER/.venv -ENV PATH="$VIRTUAL_ENV/bin:$PATH" +ENV UV_PROJECT_ENVIRONMENT=/home/$USER/.venv +ENV PATH="$UV_PROJECT_ENVIRONMENT/bin:$PATH" RUN cd /home/$USER && \ tools/install_python_dependencies.sh && \ rm -rf tools/ pyproject.toml uv.lock .cache