Skip to content

Commit c20c072

Browse files
justice-adams-applejustice-adams-apple
authored
Install Python deps (#423)
* add dependencies to fedora images * add dependencies to debian images * add dependencies to rhel images * use correct context folder * fix up rawhide
1 parent 1c187af commit c20c072

File tree

12 files changed

+50
-2
lines changed

12 files changed

+50
-2
lines changed

Diff for: ‎ci_test.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ def main():
7070
# Make sure everything is relative
7171
dockerfile = os.path.relpath(os.path.realpath(dockerfile), root_dir)
7272

73-
docker_dir, docker_name = os.path.split(dockerfile)
73+
docker_dir = "."
7474

7575
print("Testing {}".format(dockerfile))
7676
sys.stdout.flush()

Diff for: ‎swift-ci/main/debian/10/Dockerfile

+4
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ RUN apt-get -y update && apt-get -y --no-install-recommends install \
2323
python \
2424
python-six \
2525
python2-dev \
26+
python3-pip \
2627
python3-six \
2728
python3-distutils \
2829
rsync \
@@ -33,6 +34,9 @@ RUN apt-get -y update && apt-get -y --no-install-recommends install \
3334
uuid-dev \
3435
ca-certificates
3536

37+
COPY swift-ci/dependencies/requirements.txt /dependencies/
38+
RUN pip3 install -r /dependencies/requirements.txt
39+
3640
USER build-user
3741

3842
WORKDIR /home/build-user

Diff for: ‎swift-ci/main/debian/11/Dockerfile

+4
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,17 @@ RUN apt-get -y update && apt-get -y install \
2525
python2-dev \
2626
python3-six \
2727
python3-distutils \
28+
python3-pip \
2829
rsync \
2930
swig \
3031
systemtap-sdt-dev \
3132
tzdata \
3233
unzip \
3334
uuid-dev
3435

36+
COPY swift-ci/dependencies/requirements.txt /dependencies/
37+
RUN pip3 install -r /dependencies/requirements.txt
38+
3539
USER build-user
3640

3741
WORKDIR /home/build-user

Diff for: ‎swift-ci/main/debian/12/Dockerfile

+4
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ RUN apt-get -y update && apt-get -y install \
2222
ninja-build \
2323
pkg-config \
2424
python3-distutils \
25+
python3-pip \
2526
python3-pkg-resources \
2627
python3-psutil \
2728
rsync \
@@ -46,6 +47,9 @@ ENV SWIFT_PLATFORM=$SWIFT_PLATFORM \
4647
SWIFT_WEBROOT=$SWIFT_WEBROOT \
4748
SWIFT_PREFIX=$SWIFT_PREFIX
4849

50+
COPY swift-ci/dependencies/requirements.txt /dependencies/
51+
RUN pip3 install -r /dependencies/requirements.txt --break-system-packages
52+
4953
RUN set -e; \
5054
ARCH_NAME="$(dpkg --print-architecture)"; \
5155
url=; \

Diff for: ‎swift-ci/main/debian/9/Dockerfile

+9
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@ RUN groupadd -g 998 build-user && \
55

66
ENV DEBIAN_FRONTEND="noninteractive"
77

8+
RUN sed -i s/deb.debian.org/archive.debian.org/g /etc/apt/sources.list
9+
RUN sed -i s/security.debian.org/archive.debian.org/g /etc/apt/sources.list
10+
RUN sed -i s/stretch-updates/stretch/g /etc/apt/sources.list
811
RUN apt-get update
912

1013
RUN apt-get --no-install-recommends -y install \
@@ -22,6 +25,9 @@ RUN apt-get --no-install-recommends -y install \
2225
ninja-build \
2326
pkg-config \
2427
python \
28+
python3-setuptools \
29+
python3-dev \
30+
python3-pip \
2531
python-six \
2632
rsync \
2733
swig \
@@ -31,6 +37,9 @@ RUN apt-get --no-install-recommends -y install \
3137
ca-certificates \
3238
uuid-dev
3339

40+
COPY swift-ci/dependencies/requirements.txt /dependencies/
41+
RUN pip3 install -r /dependencies/requirements.txt
42+
3443
USER build-user
3544

3645
WORKDIR /home/build-user

Diff for: ‎swift-ci/main/fedora/31/Dockerfile

+4
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,16 @@ RUN dnf -y update && dnf install -y \
2020
python-unversioned-command \
2121
python27 \
2222
python3 \
23+
python3-pip \
2324
python3-devel \
2425
python3-distro \
2526
python3-six \
2627
rsync \
2728
swig
2829

30+
COPY swift-ci/dependencies/requirements.txt /dependencies/
31+
RUN pip3 install -r /dependencies/requirements.txt
32+
2933
USER build-user
3034

3135
WORKDIR /home/build-user

Diff for: ‎swift-ci/main/fedora/32/Dockerfile

+4
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,16 @@ RUN dnf -y update && dnf install -y \
2020
python-unversioned-command \
2121
python27 \
2222
python3 \
23+
python3-pip \
2324
python3-devel \
2425
python3-distro \
2526
python3-six \
2627
rsync \
2728
swig
2829

30+
COPY swift-ci/dependencies/requirements.txt /dependencies/
31+
RUN pip3 install -r /dependencies/requirements.txt
32+
2933
USER build-user
3034

3135
WORKDIR /home/build-user

Diff for: ‎swift-ci/main/fedora/39/Dockerfile

+4
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ RUN yum install -y \
1111
libuuid-devel \
1212
libxml2-devel \
1313
python3 \
14+
python3-pip \
1415
python3-devel \
1516
python3-distro \
1617
python3-setuptools \
@@ -40,6 +41,9 @@ ENV SWIFT_PLATFORM=$SWIFT_PLATFORM \
4041
SWIFT_WEBROOT=$SWIFT_WEBROOT \
4142
SWIFT_PREFIX=$SWIFT_PREFIX
4243

44+
COPY swift-ci/dependencies/requirements.txt /dependencies/
45+
RUN pip3 install -r /dependencies/requirements.txt
46+
4347
RUN set -e; \
4448
ARCH_NAME="$(rpm --eval '%{_arch}')"; \
4549
url=; \

Diff for: ‎swift-ci/main/fedora/40/Dockerfile

+4
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ RUN yum install -y \
1111
libuuid-devel \
1212
libxml2-devel \
1313
python3 \
14+
python3-pip \
1415
python3-devel \
1516
python3-distro \
1617
python3-setuptools \
@@ -26,6 +27,9 @@ RUN yum install -y \
2627
unzip \
2728
diffutils
2829

30+
COPY swift-ci/dependencies/requirements.txt /dependencies/
31+
RUN pip3 install -r /dependencies/requirements.txt
32+
2933
USER build-user
3034

3135
WORKDIR /home/build-user

Diff for: ‎swift-ci/main/fedora/rawhide/Dockerfile

+4-1
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,17 @@ RUN dnf -y update && dnf install -y \
1818
make \
1919
ninja-build \
2020
python-unversioned-command \
21-
python27 \
2221
python3 \
22+
python3-pip \
2323
python3-devel \
2424
python3-distro \
2525
python3-six \
2626
rsync \
2727
swig
2828

29+
COPY swift-ci/dependencies/requirements.txt /dependencies/
30+
RUN pip3 install -r /dependencies/requirements.txt
31+
2932
USER build-user
3033

3134
WORKDIR /home/build-user

Diff for: ‎swift-ci/main/rhel-ubi/8/Dockerfile

+4
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,15 @@ RUN yum install -y \
1515
libxml2-devel \
1616
ncurses-devel \
1717
python3-devel \
18+
python3-pip \
1819
rsync \
1920
sqlite-devel \
2021
unzip \
2122
zip
2223

24+
COPY swift-ci/dependencies/requirements.txt /dependencies/
25+
RUN pip3 install -r /dependencies/requirements.txt
26+
2327
USER build-user
2428

2529
WORKDIR /home/build-user

Diff for: ‎swift-ci/main/rhel-ubi/9/Dockerfile

+4
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ RUN yum install -y \
1515
libxml2-devel \
1616
ncurses-devel \
1717
python3-devel \
18+
python3-pip \
1819
rsync \
1920
sqlite-devel \
2021
unzip \
@@ -34,6 +35,9 @@ ENV SWIFT_PLATFORM=$SWIFT_PLATFORM \
3435
SWIFT_WEBROOT=$SWIFT_WEBROOT \
3536
SWIFT_PREFIX=$SWIFT_PREFIX
3637

38+
COPY swift-ci/dependencies/requirements.txt /dependencies/
39+
RUN pip3 install -r /dependencies/requirements.txt
40+
3741
RUN set -e; \
3842
ARCH_NAME="$(rpm --eval '%{_arch}')"; \
3943
url=; \

0 commit comments

Comments
 (0)