Add jq and curl in docker-compose Dockerfile

Signed-off-by: deepssin <deepssin@redhat.com>

diff --git a/bootstrap b/bootstrap
index 6e6bfd052643c8ab6e12dfa8b807ddc50b047fd4..307d4d391a44ccdd7bae9b13adbf5146abb89d2f 100755 (executable)
--- 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 3be7a8d6ae79c6ac9a7e5a4f9b13ed593120f7e9..bfd3882ab8c6650f0a40e40879ab57502bcd742a 100644 (file)
--- 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 \