From a98c71af6415269411d8947d571a5a86ed3c4a40 Mon Sep 17 00:00:00 2001 From: Alami-Amine Date: Wed, 25 Sep 2024 00:43:17 +0200 Subject: [PATCH] [connectedhomeip] Making python3.10 as default --- projects/connectedhomeip/Dockerfile | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/projects/connectedhomeip/Dockerfile b/projects/connectedhomeip/Dockerfile index 9ed583459d34..68c9a8092b72 100644 --- a/projects/connectedhomeip/Dockerfile +++ b/projects/connectedhomeip/Dockerfile @@ -20,19 +20,25 @@ FROM gcr.io/oss-fuzz-base/base-builder # See connectedhomeip/docs/guides/BUILDING.md#prerequisites RUN apt-get update && \ apt-get install -y pkg-config libssl-dev libdbus-1-dev libglib2.0-dev \ - libavahi-client-dev ninja-build python3-venv python3-dev python3-pip \ - unzip libgirepository1.0-dev libcairo2-dev libreadline-dev + libavahi-client-dev ninja-build \ + unzip libgirepository1.0-dev libcairo2-dev libreadline-dev + +# Installing Python3.10 and using it instead of the default Python taken from the base-builder image +RUN apt-get update && \ + apt-get install -y software-properties-common && \ + add-apt-repository ppa:deadsnakes/ppa && \ + apt-get update && \ + apt-get install -y pkg-config python3.10 python3.10-dev python3.10-venv && \ + ln --force -s /usr/bin/python3.10 /usr/bin/python3 # Ensure python that was just installed gets precedence over # the one already installed in /usr/local/bin ENV PATH="/usr/bin/:${PATH}" -# This fixes setuptools bug related to version 71 -# https://github.com/pypa/setuptools/issues/4483 -RUN pip install -U packaging +RUN python3 -m ensurepip --upgrade # PEP-517 needed for cryptography. Update pip -RUN pip3 install --upgrade pip setuptools wheel +RUN python3 -m pip install --upgrade pip setuptools wheel # Install Rust for building `cryptography` python package when bootstraping pigweed RUN curl https://sh.rustup.rs -sSf | sh -s -- -y