From ae2cdac2f6b4920892fea506747f60992aeed553 Mon Sep 17 00:00:00 2001
From: Zack Cerza <zack@cerza.org>
Date: Thu, 10 Apr 2025 13:22:31 -0600
Subject: [PATCH] containers: Install pipx

Signed-off-by: Zack Cerza <zack@cerza.org>
---
 containers/teuthology-dev/Dockerfile      | 7 +++----
 docs/docker-compose/teuthology/Dockerfile | 9 ++++-----
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/containers/teuthology-dev/Dockerfile b/containers/teuthology-dev/Dockerfile
index 97e0677efe..637f25017d 100644
--- a/containers/teuthology-dev/Dockerfile
+++ b/containers/teuthology-dev/Dockerfile
@@ -8,8 +8,7 @@ RUN apt-get update && \
     python3-dev \
     libssl-dev \
     ipmitool \
-    python3-pip \
-    python3-venv \
+    pipx \
     vim \
     libev-dev \
     libvirt-dev \
@@ -20,13 +19,13 @@ RUN apt-get update && \
     apt-get clean all && \
     locale-gen $LC_ALL
 WORKDIR /teuthology
-COPY requirements.txt requirements.yml ansible.cfg bootstrap /teuthology/
+COPY pyproject.toml requirements.txt requirements.yml uv.lock ansible.cfg bootstrap /teuthology/
 RUN \
     cd /teuthology && \
     mkdir ../archive_dir && \
     mkdir log && \
     chmod +x /teuthology/bootstrap && \
-    PIP_INSTALL_FLAGS="-r requirements.txt" ./bootstrap
+    ./bootstrap
 COPY . /teuthology
 RUN \
     git config -f ./.git/config --unset 'http.https://github.com/.extraheader' && \
diff --git a/docs/docker-compose/teuthology/Dockerfile b/docs/docker-compose/teuthology/Dockerfile
index 3be7a8d6ae..f977bf72ff 100644
--- a/docs/docker-compose/teuthology/Dockerfile
+++ b/docs/docker-compose/teuthology/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:22.04
+FROM ubuntu:24.04
 ARG SSH_PRIVKEY_FILE=id_ed25519
 ENV DEBIAN_FRONTEND=noninteractive
 ENV LANG=C.UTF-8
@@ -9,8 +9,7 @@ RUN apt-get update && \
     python3-dev \
     libssl-dev \
     ipmitool \
-    python3-pip \
-    python3-venv \
+    pipx \
     vim \
     locales-all \
     libev-dev \
@@ -22,13 +21,13 @@ RUN apt-get update && \
     apt-get clean all && \
     locale-gen $LC_ALL
 WORKDIR /teuthology
-COPY requirements.txt requirements.yml ansible.cfg bootstrap /teuthology/
+COPY pyproject.toml requirements.txt requirements.yml uv.lock ansible.cfg bootstrap /teuthology/
 RUN \
     cd /teuthology && \
     mkdir ../archive_dir && \
     mkdir log && \
     chmod +x /teuthology/bootstrap && \
-    PIP_INSTALL_FLAGS="-r requirements.txt" ./bootstrap
+    ./bootstrap
 COPY . /teuthology
 RUN \
     ./bootstrap
-- 
2.39.5