Skip to content

Commit 5b809f3

Browse files
committed
ci: cleanup Dockerfile
1 parent 3e8471a commit 5b809f3

File tree

8 files changed

+20
-10
lines changed

8 files changed

+20
-10
lines changed

ci/docker/alpine/Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,8 @@ RUN CTEST_OUTPUT_ON_FAILURE=1 cmake --build build --target test -v
2828
# Test install rules
2929
FROM env AS install_env
3030
COPY --from=build /home/project/build/python/dist/*.whl ./
31-
RUN python3 -m pip install --break-system-packages \
31+
RUN python3 -m pip install \
32+
--break-system-packages \
3233
--find-links=. \
3334
cmakepybind11*.whl
3435

ci/docker/archlinux/Dockerfile

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@ RUN pacman -Syu --noconfirm git base-devel cmake
88

99
# Install Python
1010
RUN pacman -Syu --noconfirm \
11-
python python-pip python-wheel python-setuptools python-virtualenv
11+
python python-pip python-wheel python-setuptools \
12+
python-virtualenv
1213

1314
# Add the library src to our build env
1415
FROM env AS devel
@@ -27,7 +28,8 @@ RUN CTEST_OUTPUT_ON_FAILURE=1 cmake --build build --target test -v
2728
# Test install rules
2829
FROM env AS install_env
2930
COPY --from=build /home/project/build/python/dist/*.whl ./
30-
RUN python3 -m pip install --break-system-packages \
31+
RUN python3 -m pip install \
32+
--break-system-packages \
3133
--find-links=. \
3234
cmakepybind11*.whl
3335

ci/docker/debian/Dockerfile

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@ RUN apt update -qq \
1313
# Install Python
1414
RUN apt update -qq \
1515
&& apt install -yq \
16-
python3-dev python3-pip python3-venv \
16+
python3-dev python3-pip \
17+
python3-venv python3-virtualenv \
1718
python3-setuptools python3-wheel \
1819
python3-numpy python3-pandas \
1920
&& apt clean \
@@ -38,7 +39,8 @@ RUN CTEST_OUTPUT_ON_FAILURE=1 cmake --build build --target test -v
3839
# Test install rules
3940
FROM env AS install_env
4041
COPY --from=build /home/project/build/python/dist/*.whl ./
41-
RUN python3 -m pip install --break-system-packages \
42+
RUN python3 -m pip install \
43+
--break-system-packages \
4244
--find-links=. \
4345
cmakepybind11*.whl
4446

ci/docker/fedora/Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,8 @@ RUN CTEST_OUTPUT_ON_FAILURE=1 cmake --build build --target test -v
3434
# Test install rules
3535
FROM env AS install_env
3636
COPY --from=build /home/project/build/python/dist/*.whl ./
37-
RUN python3 -m pip install --find-links=. \
37+
RUN python3 -m pip install \
38+
--find-links=. \
3839
cmakepybind11*.whl
3940

4041
FROM install_env AS install_devel

ci/docker/manylinux/Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,8 @@ RUN ./build-manylinux.sh test
3131

3232
FROM env AS install_env
3333
COPY --from=build /home/project/build*/python/dist/*.whl ./
34-
RUN python3 -m pip install --find-links=. \
34+
RUN python3 -m pip install \
35+
--find-links=. \
3536
cmakepybind11*.whl
3637

3738
FROM install_env AS install_devel

ci/docker/opensuse/Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,8 @@ RUN CTEST_OUTPUT_ON_FAILURE=1 cmake --build build --target test -v
3636
# Test install rules
3737
FROM env AS install_env
3838
COPY --from=build /home/project/build/python/dist/*.whl ./
39-
RUN python3 -m pip install --break-system-packages \
39+
RUN python3 -m pip install \
40+
--break-system-packages \
4041
--find-links=. \
4142
cmakepybind11*.whl
4243

ci/docker/rockylinux/Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,8 @@ RUN CTEST_OUTPUT_ON_FAILURE=1 cmake --build build --target test -v
4949
# Test install rules
5050
FROM env AS install_env
5151
COPY --from=build /home/project/build/python/dist/*.whl ./
52-
RUN python3 -m pip install --find-links=. \
52+
RUN python3 -m pip install \
53+
--find-links=. \
5354
cmakepybind11*.whl
5455

5556
FROM install_env AS install_devel

ci/docker/ubuntu/Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@ RUN apt update -q \
1414
# Install Python
1515
RUN apt update -q \
1616
&& apt install -yq \
17-
python3-dev python3-pip python3-venv \
17+
python3-dev python3-pip \
18+
python3-venv python3-virtualenv \
1819
python3-setuptools python3-wheel \
1920
python3-numpy python3-pandas \
2021
&& apt clean \

0 commit comments

Comments
 (0)