From 90954820bc4cec37dc83e95b480aa36e323b3bcf Mon Sep 17 00:00:00 2001
From: Maxime Beauchemin <maximebeauchemin@gmail.com>
Date: Tue, 10 Dec 2024 11:28:52 -0800
Subject: [PATCH 1/3] fix: docker-compose up ModuleNotFoundError: {...}
 superset

---
 Dockerfile            | 1 +
 docker/pip-install.sh | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 60ba12eabff32..485b4feee2f4a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -86,6 +86,7 @@ RUN if [ "$BUILD_TRANSLATIONS" = "true" ]; then \
 # Transition to Python base image
 FROM python:${PY_VER} AS python-base
 RUN pip install --no-cache-dir --upgrade setuptools pip uv
+RUN uv venv
 
 ######################################################################
 # Final lean image...
diff --git a/docker/pip-install.sh b/docker/pip-install.sh
index 7e69a6efba164..7deb4fa19a7dd 100755
--- a/docker/pip-install.sh
+++ b/docker/pip-install.sh
@@ -47,10 +47,10 @@ fi
 # Choose whether to use pip cache
 if $USE_CACHE; then
   echo "Using pip cache..."
-  uv pip install --system "${ARGS[@]}"
+  uv pip install "${ARGS[@]}"
 else
   echo "Disabling pip cache..."
-  uv pip install --system --no-cache-dir "${ARGS[@]}"
+  uv pip install --no-cache-dir "${ARGS[@]}"
 fi
 
 # Remove build-essential if it was installed

From 37f5e95a9b6848648827476dad68307bd93208cf Mon Sep 17 00:00:00 2001
From: Maxime Beauchemin <maximebeauchemin@gmail.com>
Date: Tue, 10 Dec 2024 11:52:01 -0800
Subject: [PATCH 2/3] rm uv

---
 Dockerfile            | 5 ++---
 docker/pip-install.sh | 4 ++--
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 485b4feee2f4a..7cc659a5069ee 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -85,8 +85,7 @@ RUN if [ "$BUILD_TRANSLATIONS" = "true" ]; then \
 
 # Transition to Python base image
 FROM python:${PY_VER} AS python-base
-RUN pip install --no-cache-dir --upgrade setuptools pip uv
-RUN uv venv
+RUN pip install --no-cache-dir --upgrade setuptools pip
 
 ######################################################################
 # Final lean image...
@@ -192,7 +191,7 @@ RUN --mount=type=bind,source=./docker,target=/docker \
 
 # Install Playwright and its dependencies
 RUN --mount=type=cache,target=/root/.cache/pip \
-    uv pip install --system playwright \
+    pip install --system playwright \
     && playwright install-deps
 
 # Optionally install Chromium
diff --git a/docker/pip-install.sh b/docker/pip-install.sh
index 7deb4fa19a7dd..2defc7d1e792a 100755
--- a/docker/pip-install.sh
+++ b/docker/pip-install.sh
@@ -47,10 +47,10 @@ fi
 # Choose whether to use pip cache
 if $USE_CACHE; then
   echo "Using pip cache..."
-  uv pip install "${ARGS[@]}"
+  pip install "${ARGS[@]}"
 else
   echo "Disabling pip cache..."
-  uv pip install --no-cache-dir "${ARGS[@]}"
+  pip install --no-cache-dir "${ARGS[@]}"
 fi
 
 # Remove build-essential if it was installed

From bdb2e5d00d0d623d984b45eb5ade96acaed97359 Mon Sep 17 00:00:00 2001
From: Maxime Beauchemin <maximebeauchemin@gmail.com>
Date: Tue, 10 Dec 2024 11:54:43 -0800
Subject: [PATCH 3/3] rm --system

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 7cc659a5069ee..9a89cef3572ea 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -191,7 +191,7 @@ RUN --mount=type=bind,source=./docker,target=/docker \
 
 # Install Playwright and its dependencies
 RUN --mount=type=cache,target=/root/.cache/pip \
-    pip install --system playwright \
+    pip install playwright \
     && playwright install-deps
 
 # Optionally install Chromium