From 150ff72646e7d7f9056246e2898f639fc0e2345f Mon Sep 17 00:00:00 2001
From: Armand du Parc Locmaria <adpl33@gmail.com>
Date: Fri, 3 Oct 2025 14:36:12 -0700
Subject: [PATCH] Dockerfile.openpilot: don't set UV_PROJECT_ENVIRONMENT
 (#36246)

* Dockerfile.openpilot: don't uv sync with root

* Revert "Dockerfile.openpilot: don't uv sync with root"

This reverts commit 2c271d0b5b55d6ae2ece6b28dc90a96e6e891ded.

* don't set UV_PROJECT_ENVIRONMENT
---
 Dockerfile.openpilot      | 2 +-
 Dockerfile.openpilot_base | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Dockerfile.openpilot b/Dockerfile.openpilot
index 14c1e64774..106a06e3a2 100644
--- a/Dockerfile.openpilot
+++ b/Dockerfile.openpilot
@@ -11,4 +11,4 @@ COPY . ${OPENPILOT_PATH}/
 
 ENV UV_BIN="/home/batman/.local/bin/"
 ENV PATH="$UV_BIN:$PATH"
-RUN uv run scons --cache-readonly -j$(nproc)
+RUN UV_PROJECT_ENVIRONMENT=$VIRTUAL_ENV uv run scons --cache-readonly -j$(nproc)
diff --git a/Dockerfile.openpilot_base b/Dockerfile.openpilot_base
index e3bb03de07..44d8d95e95 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 UV_PROJECT_ENVIRONMENT=/home/$USER/.venv
-ENV PATH="$UV_PROJECT_ENVIRONMENT/bin:$PATH"
+ENV VIRTUAL_ENV=/home/$USER/.venv
+ENV PATH="$VIRTUAL_ENV/bin:$PATH"
 RUN cd /home/$USER && \
     tools/install_python_dependencies.sh && \
     rm -rf tools/ pyproject.toml uv.lock .cache