Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions swift-ci/main/amazon-linux/2/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -30,6 +29,7 @@ RUN yum -y install \
python-devel \
python-pkgconfig \
python-six \
python3-pip \
python3-devel \
python3-psutil \
rsync \
Expand Down
1 change: 1 addition & 0 deletions swift-ci/main/ubuntu/18.04/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
1 change: 1 addition & 0 deletions swift-ci/main/ubuntu/20.04/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
1 change: 1 addition & 0 deletions swift-ci/main/ubuntu/22.04/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
1 change: 1 addition & 0 deletions swift-ci/main/ubuntu/23.10/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
1 change: 1 addition & 0 deletions swift-ci/main/ubuntu/24.04/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down