diff --git a/Linux/BaseBuilder/Dockerfile b/Linux/BaseBuilder/Dockerfile index 39ceb4b..d30443f 100644 --- a/Linux/BaseBuilder/Dockerfile +++ b/Linux/BaseBuilder/Dockerfile @@ -13,7 +13,7 @@ RUN echo '#!/bin/bash\n$@' > /usr/bin/sudo \ && chmod +x /usr/bin/sudo # Install base dependencies in one layer -RUN apt-get update && apt-get install -y --no-install-recommends \ +RUN apt-get update && apt-get install -y \ unzip \ curl \ wget \ @@ -21,8 +21,4 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ software-properties-common \ gnupg \ python3 \ - python3-pip \ && rm -rf /var/lib/apt/lists/* - -# Optional: Upgrade pip for Python3 -RUN python3 -m pip install --no-cache-dir --upgrade pip diff --git a/Linux/CPPBuilder/Dockerfile b/Linux/CPPBuilder/Dockerfile index 5e05eed..7bf72ce 100644 --- a/Linux/CPPBuilder/Dockerfile +++ b/Linux/CPPBuilder/Dockerfile @@ -23,7 +23,7 @@ RUN apt-get update && apt-get install -y \ wget \ lsb-release \ software-properties-common \ - python3-pip \ + pipx \ && rm -rf /var/lib/apt/lists/* \ \ # Install LLVM 18 @@ -47,8 +47,7 @@ RUN apt-get update && apt-get install -y \ && ccache --zero-stats # Install pipx and Conan -RUN python3 -m pip install --no-cache-dir pipx \ - && pipx ensurepath \ +RUN pipx ensurepath \ && pipx install conan # Build and install mold