Skip to content

Commit ff1fa8b

Browse files
committed
ci: cleanup docker
1 parent f59a791 commit ff1fa8b

File tree

8 files changed

+21
-10
lines changed

8 files changed

+21
-10
lines changed

ci/docker/almalinux/Dockerfile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,9 @@ 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=. pythonnative*.whl
52+
RUN python3 -m pip install \
53+
--find-links=. \
54+
pythonnative*.whl
5355

5456
FROM install_env AS install_devel
5557
WORKDIR /home/samples

ci/docker/alpine/Dockerfile

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@ RUN apk add --no-cache swig
1111

1212
# Install Python
1313
RUN apk add --no-cache \
14-
python3-dev py3-pip py3-wheel
14+
python3-dev py3-pip py3-wheel \
15+
py3-virtualenv
1516

1617
# Add the library src to our build env
1718
FROM env AS devel
@@ -30,7 +31,8 @@ RUN CTEST_OUTPUT_ON_FAILURE=1 cmake --build build --target test -v
3031
# Test install rules
3132
FROM env AS install_env
3233
COPY --from=build /home/project/build/python/dist/*.whl ./
33-
RUN python3 -m pip install --break-system-packages \
34+
RUN python3 -m pip install \
35+
--break-system-packages \
3436
--find-links=. \
3537
pythonnative*.whl
3638

ci/docker/archlinux/Dockerfile

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@ RUN pacman -Syu --noconfirm swig
1111

1212
# Install Python
1313
RUN pacman -Syu --noconfirm \
14-
python python-pip python-wheel python-setuptools
14+
python python-pip python-wheel python-setuptools \
15+
python-virtualenv
1516

1617
# Add the library src to our build env
1718
FROM env AS devel
@@ -30,7 +31,8 @@ RUN CTEST_OUTPUT_ON_FAILURE=1 cmake --build build --target test -v
3031
# Test install rules
3132
FROM env AS install_env
3233
COPY --from=build /home/project/build/python/dist/*.whl ./
33-
RUN python3 -m pip install --break-system-packages \
34+
RUN python3 -m pip install \
35+
--break-system-packages \
3436
--find-links=. \
3537
pythonnative*.whl
3638

ci/docker/debian/Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,8 @@ RUN CTEST_OUTPUT_ON_FAILURE=1 cmake --build build --target test -v
4545
# Test install rules
4646
FROM env AS install_env
4747
COPY --from=build /home/project/build/python/dist/*.whl ./
48-
RUN python3 -m pip install --break-system-packages \
48+
RUN python3 -m pip install \
49+
--break-system-packages \
4950
--find-links=. \
5051
pythonnative*.whl
5152

ci/docker/fedora/Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,8 @@ RUN CTEST_OUTPUT_ON_FAILURE=1 cmake --build build --target test -v
3939
# Test install rules
4040
FROM env AS install_env
4141
COPY --from=build /home/project/build/python/dist/*.whl ./
42-
RUN python3 -m pip install --find-links=. \
42+
RUN python3 -m pip install \
43+
--find-links=. \
4344
pythonnative*.whl
4445

4546
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
pythonnative*.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
@@ -41,7 +41,8 @@ RUN CTEST_OUTPUT_ON_FAILURE=1 cmake --build build --target test -v
4141
# Test install rules
4242
FROM env AS install_env
4343
COPY --from=build /home/project/build/python/dist/*.whl ./
44-
RUN python3 -m pip install --break-system-packages \
44+
RUN python3 -m pip install \
45+
--break-system-packages \
4546
--find-links=. \
4647
pythonnative*.whl
4748

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
pythonnative*.whl
5455

5556
FROM install_env AS install_devel

0 commit comments

Comments
 (0)