From 0b5a5bc629180cf5318b77a8ecb4c131abbd057d Mon Sep 17 00:00:00 2001 From: deepssin Date: Thu, 26 Jun 2025 07:12:41 -0400 Subject: [PATCH] Add jq and curl in docker-compose Dockerfile Signed-off-by: deepssin --- bootstrap | 8 ++++---- docs/docker-compose/teuthology/Dockerfile | 2 ++ 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/bootstrap b/bootstrap index 6e6bfd052..307d4d391 100755 --- a/bootstrap +++ b/bootstrap @@ -127,10 +127,10 @@ fi PY_MAJOR=$($VENV/bin/python -c "import sys; print(sys.version_info[0])") PY_MINOR=$($VENV/bin/python -c "import sys; print(sys.version_info[1])") -# Downgrade pip for older python versions -if [ "$PY_MAJOR" -eq 3 ] && [ "$PY_MINOR" -lt 6 ]; then - $VENV/bin/python -m ensurepip - $VENV/bin/pip install pip==20.3.4 --force-reinstall +# Python version check +if [ "$PY_MAJOR" -ne 3 || "$PY_MINOR" -lt 10 ]; then + echo "Python version should be 3.10 or higher, found $PY_MAJOR.$PY_MINOR" + exit 1 fi $VENV/bin/pip install packaging diff --git a/docs/docker-compose/teuthology/Dockerfile b/docs/docker-compose/teuthology/Dockerfile index 3be7a8d6a..bfd3882ab 100644 --- a/docs/docker-compose/teuthology/Dockerfile +++ b/docs/docker-compose/teuthology/Dockerfile @@ -5,6 +5,8 @@ ENV LANG=C.UTF-8 RUN apt-get update && \ apt-get install -y \ git \ + jq \ + curl \ qemu-utils \ python3-dev \ libssl-dev \ -- 2.47.3