From: Zack Cerza <zack@cerza.org>
Date: Thu, 10 Apr 2025 19:22:31 +0000 (-0600)
Subject: containers: Install pipx
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=bdfca33d307dbd69ed81094c112e99e18fc81404;p=teuthology.git

containers: Install pipx

Signed-off-by: Zack Cerza <zack@cerza.org>
---

diff --git a/containers/teuthology-dev/Dockerfile b/containers/teuthology-dev/Dockerfile
index 074ec3482..fe685cfed 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 \
     jq \
     curl \
@@ -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 \
     (git config -f ./.git/config --unset 'http.https://github.com/.extraheader' || true ) && \
diff --git a/docs/docker-compose/teuthology/Dockerfile b/docs/docker-compose/teuthology/Dockerfile
index bfd3882ab..d03cc0b2d 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
@@ -11,8 +11,7 @@ RUN apt-get update && \
     python3-dev \
     libssl-dev \
     ipmitool \
-    python3-pip \
-    python3-venv \
+    pipx \
     vim \
     locales-all \
     libev-dev \
@@ -24,13 +23,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