Skip to content

Commit 0ba5db9

Browse files
Install python3-pip in ubuntu and AWS container (#410)
* install python3-pip in ubuntu and AWS container * fix aws container, install epel correctly
1 parent f9be723 commit 0ba5db9

File tree

6 files changed

+7
-2
lines changed

6 files changed

+7
-2
lines changed

swift-ci/main/amazon-linux/2/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,7 @@ RUN groupadd -g 998 build-user && \
66
useradd -m -r -u 42 -g build-user build-user
77

88
# The build needs a package from the EPEL repo so that needs to be enabled.
9-
# https://www.tecmint.com/install-epel-repository-on-centos/
10-
RUN yum install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm
9+
RUN amazon-linux-extras install epel -y
1110

1211
# Update and install needed build packages
1312
RUN yum -y group install "development tools"
@@ -30,6 +29,7 @@ RUN yum -y install \
3029
python-devel \
3130
python-pkgconfig \
3231
python-six \
32+
python3-pip \
3333
python3-devel \
3434
python3-psutil \
3535
rsync \

swift-ci/main/ubuntu/18.04/Dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ RUN apt -y update && apt -y install \
2323
python-six \
2424
python-pkg-resources \
2525
python3-six \
26+
python3-pip \
2627
python3-distutils \
2728
python3-pkg-resources \
2829
python3-psutil \

swift-ci/main/ubuntu/20.04/Dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ RUN apt-get -y update && apt-get -y install \
2323
python-six \
2424
python2-dev \
2525
python3-six \
26+
python3-pip \
2627
python3-distutils \
2728
python3-pkg-resources \
2829
python3-psutil \

swift-ci/main/ubuntu/22.04/Dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ RUN apt-get -y update && apt-get -y install \
2626
python-six \
2727
python2-dev \
2828
python3-six \
29+
python3-pip \
2930
python3-distutils \
3031
python3-pkg-resources \
3132
python3-psutil \

swift-ci/main/ubuntu/23.10/Dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ RUN apt-get -y update && apt-get -y install \
2020
ninja-build \
2121
pkg-config \
2222
python3-six \
23+
python3-pip \
2324
python3-distutils \
2425
python3-pkg-resources \
2526
python3-psutil \

swift-ci/main/ubuntu/24.04/Dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ RUN apt-get -y update && apt-get -y install \
2121
ninja-build \
2222
pkg-config \
2323
python3-six \
24+
python3-pip \
2425
python3-pkg-resources \
2526
python3-psutil \
2627
python3-setuptools \

0 commit comments

Comments
 (0)