From 9afc81f7186dfc5016cbf25cd27083a40826091f Mon Sep 17 00:00:00 2001 From: Alexander Taepper Date: Wed, 18 Dec 2024 14:57:14 +0100 Subject: [PATCH] fix: do not install system-wide python packages with pip --- Dockerfile_dependencies | 4 +--- Dockerfile_linter_dependencies | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/Dockerfile_dependencies b/Dockerfile_dependencies index 33a6b4338..0c1687d11 100644 --- a/Dockerfile_dependencies +++ b/Dockerfile_dependencies @@ -4,9 +4,7 @@ ARG TARGETPLATFORM RUN apt update && apt dist-upgrade -y \ && apt install -y \ - cmake python3-pip - -RUN pip install conan==2.8.1 + cmake apt python3-conan WORKDIR /src COPY conanfile.py conanprofile.docker conanprofile.docker_arm ./ diff --git a/Dockerfile_linter_dependencies b/Dockerfile_linter_dependencies index 794eef4d9..f6df1dab4 100644 --- a/Dockerfile_linter_dependencies +++ b/Dockerfile_linter_dependencies @@ -6,15 +6,13 @@ WORKDIR /src RUN apt update \ && apt install -y \ - cmake python3-pip software-properties-common wget gnupg lsb-release \ + cmake python3-conan software-properties-common wget gnupg lsb-release \ && wget -qO- https://apt.llvm.org/llvm-snapshot.gpg.key | tee /etc/apt/trusted.gpg.d/apt.llvm.org.asc \ && add-apt-repository 'deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy main' \ && apt install -y clang-tidy-15 \ && apt install -y jq \ && apt install -y curl -RUN pip install conan==2.8.1 - COPY conanfile.py conanprofile.docker conanprofile.docker_arm ./ RUN if [ "$TARGETPLATFORM" = "linux/arm64" ]; then \ mv conanprofile.docker_arm conanprofile; \