From d498f264665a3986fb02e91199ea47a7493069c8 Mon Sep 17 00:00:00 2001 From: Brett Smith Date: Fri, 12 Jan 2024 09:31:27 -0500 Subject: [PATCH] 21230: Clean up unnecessary Python packages from package build Dockerfiles * python3-pip: `ensurepip` is standard as of Python 3.4+. * python3-setuptools: We want to install this in our build virtualenv anyway. * python3-virtualenv: python3-venv is sufficient. Arvados-DCO-1.1-Signed-off-by: Brett Smith --- build/package-build-dockerfiles/debian11/Dockerfile | 2 +- build/package-build-dockerfiles/debian12/Dockerfile | 2 +- build/package-build-dockerfiles/ubuntu2004/Dockerfile | 2 +- build/package-build-dockerfiles/ubuntu2204/Dockerfile | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build/package-build-dockerfiles/debian11/Dockerfile b/build/package-build-dockerfiles/debian11/Dockerfile index 1427c64fa5..9e2b3a381f 100644 --- a/build/package-build-dockerfiles/debian11/Dockerfile +++ b/build/package-build-dockerfiles/debian11/Dockerfile @@ -46,7 +46,7 @@ ENV DEBIAN_FRONTEND noninteractive SHELL ["/bin/bash", "-c"] # Install dependencies. -RUN /usr/bin/apt-get update && /usr/bin/apt-get install -q -y python3 python3-setuptools python3-pip libcurl4-gnutls-dev curl git procps libattr1-dev libfuse-dev libgnutls28-dev libpq-dev unzip python3-venv python3-dev libpam-dev equivs +RUN /usr/bin/apt-get update && /usr/bin/apt-get install -q -y python3 libcurl4-gnutls-dev curl git procps libattr1-dev libfuse-dev libgnutls28-dev libpq-dev unzip python3-venv python3-dev libpam-dev equivs # Install RVM ADD generated/mpapis.asc /tmp/ diff --git a/build/package-build-dockerfiles/debian12/Dockerfile b/build/package-build-dockerfiles/debian12/Dockerfile index 859c1a8597..fa1d095e79 100644 --- a/build/package-build-dockerfiles/debian12/Dockerfile +++ b/build/package-build-dockerfiles/debian12/Dockerfile @@ -44,7 +44,7 @@ ENV DEBIAN_FRONTEND noninteractive SHELL ["/bin/bash", "-c"] # Install dependencies. -RUN /usr/bin/apt-get update && /usr/bin/apt-get install -q -y python3 python3-setuptools python3-pip libcurl4-gnutls-dev curl git procps libattr1-dev libfuse-dev libgnutls28-dev libpq-dev unzip python3-venv python3-virtualenv python3-dev libpam-dev equivs +RUN /usr/bin/apt-get update && /usr/bin/apt-get install -q -y python3 libcurl4-gnutls-dev curl git procps libattr1-dev libfuse-dev libgnutls28-dev libpq-dev unzip python3-venv python3-dev libpam-dev equivs # Install RVM ADD generated/mpapis.asc /tmp/ diff --git a/build/package-build-dockerfiles/ubuntu2004/Dockerfile b/build/package-build-dockerfiles/ubuntu2004/Dockerfile index ac23462289..deaac7c0ab 100644 --- a/build/package-build-dockerfiles/ubuntu2004/Dockerfile +++ b/build/package-build-dockerfiles/ubuntu2004/Dockerfile @@ -50,7 +50,7 @@ ENV DEBIAN_FRONTEND noninteractive SHELL ["/bin/bash", "-c"] # Install dependencies. -RUN /usr/bin/apt-get update && /usr/bin/apt-get install -q -y python3 python3-pip libcurl4-gnutls-dev libgnutls28-dev curl git libattr1-dev libfuse-dev libpq-dev unzip tzdata python3-venv python3-dev libpam-dev shared-mime-info equivs +RUN /usr/bin/apt-get update && /usr/bin/apt-get install -q -y python3 libcurl4-gnutls-dev libgnutls28-dev curl git libattr1-dev libfuse-dev libpq-dev unzip tzdata python3-venv python3-dev libpam-dev shared-mime-info equivs # Install RVM ADD generated/mpapis.asc /tmp/ diff --git a/build/package-build-dockerfiles/ubuntu2204/Dockerfile b/build/package-build-dockerfiles/ubuntu2204/Dockerfile index ce96710ead..79664fea6b 100644 --- a/build/package-build-dockerfiles/ubuntu2204/Dockerfile +++ b/build/package-build-dockerfiles/ubuntu2204/Dockerfile @@ -44,7 +44,7 @@ ENV DEBIAN_FRONTEND noninteractive SHELL ["/bin/bash", "-c"] # Install dependencies. -RUN /usr/bin/apt-get update && /usr/bin/apt-get install -q -y python3 python3-pip libcurl4-gnutls-dev libgnutls28-dev curl git libattr1-dev libfuse-dev libpq-dev unzip tzdata python3-venv python3-dev libpam-dev shared-mime-info equivs +RUN /usr/bin/apt-get update && /usr/bin/apt-get install -q -y python3 libcurl4-gnutls-dev libgnutls28-dev curl git libattr1-dev libfuse-dev libpq-dev unzip tzdata python3-venv python3-dev libpam-dev shared-mime-info equivs # Install RVM ADD generated/mpapis.asc /tmp/ -- 2.30.2