From 8704b908151f90aa4b0969f34f6d2b00e7b4d1ab Mon Sep 17 00:00:00 2001 From: justiceadams Date: Thu, 29 Aug 2024 10:06:18 -0700 Subject: [PATCH 1/2] install python3-pip in ubuntu and AWS container --- swift-ci/main/amazon-linux/2/Dockerfile | 1 + swift-ci/main/ubuntu/18.04/Dockerfile | 1 + swift-ci/main/ubuntu/20.04/Dockerfile | 1 + swift-ci/main/ubuntu/22.04/Dockerfile | 1 + swift-ci/main/ubuntu/23.10/Dockerfile | 1 + swift-ci/main/ubuntu/24.04/Dockerfile | 1 + 6 files changed, 6 insertions(+) diff --git a/swift-ci/main/amazon-linux/2/Dockerfile b/swift-ci/main/amazon-linux/2/Dockerfile index 50af5a97..21fbfc02 100644 --- a/swift-ci/main/amazon-linux/2/Dockerfile +++ b/swift-ci/main/amazon-linux/2/Dockerfile @@ -30,6 +30,7 @@ RUN yum -y install \ python-devel \ python-pkgconfig \ python-six \ + python3-pip \ python3-devel \ python3-psutil \ rsync \ diff --git a/swift-ci/main/ubuntu/18.04/Dockerfile b/swift-ci/main/ubuntu/18.04/Dockerfile index 1229864e..2b530c8f 100644 --- a/swift-ci/main/ubuntu/18.04/Dockerfile +++ b/swift-ci/main/ubuntu/18.04/Dockerfile @@ -23,6 +23,7 @@ RUN apt -y update && apt -y install \ python-six \ python-pkg-resources \ python3-six \ + python3-pip \ python3-distutils \ python3-pkg-resources \ python3-psutil \ diff --git a/swift-ci/main/ubuntu/20.04/Dockerfile b/swift-ci/main/ubuntu/20.04/Dockerfile index 4b9fec3b..0168adcd 100644 --- a/swift-ci/main/ubuntu/20.04/Dockerfile +++ b/swift-ci/main/ubuntu/20.04/Dockerfile @@ -23,6 +23,7 @@ RUN apt-get -y update && apt-get -y install \ python-six \ python2-dev \ python3-six \ + python3-pip \ python3-distutils \ python3-pkg-resources \ python3-psutil \ diff --git a/swift-ci/main/ubuntu/22.04/Dockerfile b/swift-ci/main/ubuntu/22.04/Dockerfile index c624f36f..e3d3e6f5 100644 --- a/swift-ci/main/ubuntu/22.04/Dockerfile +++ b/swift-ci/main/ubuntu/22.04/Dockerfile @@ -26,6 +26,7 @@ RUN apt-get -y update && apt-get -y install \ python-six \ python2-dev \ python3-six \ + python3-pip \ python3-distutils \ python3-pkg-resources \ python3-psutil \ diff --git a/swift-ci/main/ubuntu/23.10/Dockerfile b/swift-ci/main/ubuntu/23.10/Dockerfile index de7cd504..bd9cb667 100644 --- a/swift-ci/main/ubuntu/23.10/Dockerfile +++ b/swift-ci/main/ubuntu/23.10/Dockerfile @@ -20,6 +20,7 @@ RUN apt-get -y update && apt-get -y install \ ninja-build \ pkg-config \ python3-six \ + python3-pip \ python3-distutils \ python3-pkg-resources \ python3-psutil \ diff --git a/swift-ci/main/ubuntu/24.04/Dockerfile b/swift-ci/main/ubuntu/24.04/Dockerfile index b593ef3a..32f27f6c 100644 --- a/swift-ci/main/ubuntu/24.04/Dockerfile +++ b/swift-ci/main/ubuntu/24.04/Dockerfile @@ -21,6 +21,7 @@ RUN apt-get -y update && apt-get -y install \ ninja-build \ pkg-config \ python3-six \ + python3-pip \ python3-pkg-resources \ python3-psutil \ python3-setuptools \ From 85fac57b55b9c1307aea4d73bf9b006bcf9cb656 Mon Sep 17 00:00:00 2001 From: justiceadams Date: Fri, 30 Aug 2024 15:56:09 -0700 Subject: [PATCH 2/2] fix aws container, install epel correctly --- swift-ci/main/amazon-linux/2/Dockerfile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/swift-ci/main/amazon-linux/2/Dockerfile b/swift-ci/main/amazon-linux/2/Dockerfile index 21fbfc02..03074987 100644 --- a/swift-ci/main/amazon-linux/2/Dockerfile +++ b/swift-ci/main/amazon-linux/2/Dockerfile @@ -6,8 +6,7 @@ RUN groupadd -g 998 build-user && \ useradd -m -r -u 42 -g build-user build-user # The build needs a package from the EPEL repo so that needs to be enabled. -# https://www.tecmint.com/install-epel-repository-on-centos/ -RUN yum install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm +RUN amazon-linux-extras install epel -y # Update and install needed build packages RUN yum -y group install "development tools"