Skip to content

Commit 91ef18b

Browse files
committed
ci cleanup
1 parent 0ffab93 commit 91ef18b

File tree

9 files changed

+15
-11
lines changed

9 files changed

+15
-11
lines changed

ci/docker/almalinux/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ RUN CTEST_OUTPUT_ON_FAILURE=1 cmake --build build --target test -v
2727

2828
# Test install rules
2929
FROM env AS install_env
30-
COPY --from=build /usr/local /usr/local/
30+
COPY --from=build /usr/local/ /usr/local/
3131

3232
FROM install_env AS install_devel
3333
WORKDIR /home/samples

ci/docker/alpine/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ RUN CTEST_OUTPUT_ON_FAILURE=1 cmake --build build --target test -v
2222

2323
# Test install rules
2424
FROM env AS install_env
25-
COPY --from=build /usr/local /usr/local/
25+
COPY --from=build /usr/local/ /usr/local/
2626

2727
FROM install_env AS install_devel
2828
WORKDIR /home/samples

ci/docker/archlinux/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ RUN CTEST_OUTPUT_ON_FAILURE=1 cmake --build build --target test -v
2222

2323
# Test install rules
2424
FROM env AS install_env
25-
COPY --from=build /usr/local /usr/local/
25+
COPY --from=build /usr/local/ /usr/local/
2626

2727
FROM install_env AS install_devel
2828
WORKDIR /home/samples

ci/docker/debian/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ RUN CTEST_OUTPUT_ON_FAILURE=1 cmake --build build --target test -v
2525

2626
# Test install rules
2727
FROM env AS install_env
28-
COPY --from=build /usr/local /usr/local/
28+
COPY --from=build /usr/local/ /usr/local/
2929

3030
FROM install_env AS install_devel
3131
WORKDIR /home/samples

ci/docker/fedora/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ RUN CTEST_OUTPUT_ON_FAILURE=1 cmake --build build --target test -v
2626

2727
# Test install rules
2828
FROM env AS install_env
29-
COPY --from=build /usr/local /usr/local/
29+
COPY --from=build /usr/local/ /usr/local/
3030

3131
FROM install_env AS install_devel
3232
WORKDIR /home/samples

ci/docker/opensuse/Dockerfile

+3-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@ FROM opensuse/tumbleweed AS env
55
# Install system build dependencies
66
ENV PATH=/usr/local/bin:$PATH
77
RUN zypper update -y \
8-
&& zypper install -y git patch gcc gcc-c++ cmake \
8+
&& zypper install -y \
9+
git patch gcc gcc-c++ cmake \
910
&& zypper clean -a
1011
ENV CC=gcc CXX=g++
1112

@@ -25,7 +26,7 @@ RUN CTEST_OUTPUT_ON_FAILURE=1 cmake --build build --target test -v
2526

2627
# Test install rules
2728
FROM env AS install_env
28-
COPY --from=build /usr/local /usr/local/
29+
COPY --from=build /usr/local/ /usr/local/
2930

3031
FROM install_env AS install_devel
3132
WORKDIR /home/samples

ci/docker/rockylinux/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ RUN CTEST_OUTPUT_ON_FAILURE=1 cmake --build build --target test -v
2727

2828
# Test install rules
2929
FROM env AS install_env
30-
COPY --from=build /usr/local /usr/local/
30+
COPY --from=build /usr/local/ /usr/local/
3131

3232
FROM install_env AS install_devel
3333
WORKDIR /home/samples

ci/docker/toolchain/Dockerfile

+5-2
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,11 @@ FROM ubuntu:latest AS env
44
# Install system build dependencies
55
ENV PATH=/usr/local/bin:$PATH
66
RUN apt-get update -qq \
7-
&& DEBIAN_FRONTEND=noninteractive apt-get install -yq git wget libssl-dev build-essential \
8-
ninja-build python3 python3-venv pkgconf libglib2.0-dev \
7+
&& DEBIAN_FRONTEND=noninteractive apt-get install -yq \
8+
git wget libssl-dev \
9+
build-essential ninja-build \
10+
python3 python3-venv \
11+
pkgconf libglib2.0-dev \
912
&& apt-get clean \
1013
&& rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
1114
ENTRYPOINT ["/usr/bin/bash", "-c"]

ci/docker/ubuntu/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ RUN CTEST_OUTPUT_ON_FAILURE=1 cmake --build build --target test -v
2626

2727
# Test install rules
2828
FROM env AS install_env
29-
COPY --from=build /usr/local /usr/local/
29+
COPY --from=build /usr/local/ /usr/local/
3030

3131
FROM install_env AS install_devel
3232
WORKDIR /home/samples

0 commit comments

Comments
 (0)