Skip to content

Commit 4dfebb1

Browse files
committed
Fix find invocation to properly delete all found files
1 parent 236917d commit 4dfebb1

8 files changed

Lines changed: 26 additions & 26 deletions

File tree

images/base-linux32/Dockerfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ RUN --mount=src=ct-ng-config,dst=/.config \
1313

1414
# Prepare "cross" environment to heavily favour static builds
1515
RUN \
16-
find /opt/ct-ng -type l \
16+
find /opt/ct-ng \( -type l \
1717
-and -name '*.so' \
1818
-and -not -ipath '*plugin*' \
1919
-and -not -name 'libdl.*' \
@@ -22,15 +22,15 @@ RUN \
2222
-and -not -name 'libmvec.*' \
2323
-and -not -name 'librt.*' \
2424
-and -not -name 'libpthread.*' \
25-
-delete && \
26-
find /opt/ct-ng \
25+
\) -delete && \
26+
find /opt/ct-ng \( \
2727
-name 'libdl.a' \
2828
-or -name 'libc.a' \
2929
-or -name 'libm.a' \
3030
-or -name 'libmvec.a' \
3131
-or -name 'librt.a' \
3232
-or -name 'libpthread.a' \
33-
-delete && \
33+
\) -delete && \
3434
mkdir /opt/ffbuild
3535

3636
ENV FFBUILD_TOOLCHAIN=i686-ffbuild-linux-gnu \

images/base-linux64/Dockerfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ RUN --mount=src=ct-ng-config,dst=/.config \
1313

1414
# Prepare "cross" environment to heavily favour static builds
1515
RUN \
16-
find /opt/ct-ng -type l \
16+
find /opt/ct-ng \( -type l \
1717
-and -name '*.so' \
1818
-and -not -ipath '*plugin*' \
1919
-and -not -name 'libdl.*' \
@@ -22,15 +22,15 @@ RUN \
2222
-and -not -name 'libmvec.*' \
2323
-and -not -name 'librt.*' \
2424
-and -not -name 'libpthread.*' \
25-
-delete && \
26-
find /opt/ct-ng \
25+
\) -delete && \
26+
find /opt/ct-ng \( \
2727
-name 'libdl.a' \
2828
-or -name 'libc.a' \
2929
-or -name 'libm.a' \
3030
-or -name 'libmvec.a' \
3131
-or -name 'librt.a' \
3232
-or -name 'libpthread.a' \
33-
-delete && \
33+
\) -delete && \
3434
mkdir /opt/ffbuild
3535

3636
ENV FFBUILD_TOOLCHAIN=x86_64-ffbuild-linux-gnu \

images/base-linuxarm64/Dockerfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ RUN --mount=src=ct-ng-config,dst=/.config \
1313

1414
# Prepare cross environment to heavily favour static builds
1515
RUN \
16-
find /opt/ct-ng -type l \
16+
find /opt/ct-ng \( -type l \
1717
-and -name '*.so' \
1818
-and -not -ipath '*plugin*' \
1919
-and -not -name 'libdl.*' \
@@ -22,15 +22,15 @@ RUN \
2222
-and -not -name 'libmvec.*' \
2323
-and -not -name 'librt.*' \
2424
-and -not -name 'libpthread.*' \
25-
-delete && \
26-
find /opt/ct-ng \
25+
\) -delete && \
26+
find /opt/ct-ng \( \
2727
-name 'libdl.a' \
2828
-or -name 'libc.a' \
2929
-or -name 'libm.a' \
3030
-or -name 'libmvec.a' \
3131
-or -name 'librt.a' \
3232
-or -name 'libpthread.a' \
33-
-delete && \
33+
\) -delete && \
3434
mkdir /opt/ffbuild
3535

3636
ENV FFBUILD_TOOLCHAIN=aarch64-ffbuild-linux-gnu \

images/base-linuxmips64/Dockerfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ RUN --mount=src=ct-ng-config,dst=/.config \
1313

1414
# Prepare cross environment to heavily favour static builds
1515
RUN \
16-
find /opt/ct-ng -type l \
16+
find /opt/ct-ng \( -type l \
1717
-and -name '*.so' \
1818
-and -not -ipath '*plugin*' \
1919
-and -not -name 'libdl.*' \
@@ -22,15 +22,15 @@ RUN \
2222
-and -not -name 'libmvec.*' \
2323
-and -not -name 'librt.*' \
2424
-and -not -name 'libpthread.*' \
25-
-delete && \
26-
find /opt/ct-ng \
25+
\) -delete && \
26+
find /opt/ct-ng \( \
2727
-name 'libdl.a' \
2828
-or -name 'libc.a' \
2929
-or -name 'libm.a' \
3030
-or -name 'libmvec.a' \
3131
-or -name 'librt.a' \
3232
-or -name 'libpthread.a' \
33-
-delete && \
33+
\) -delete && \
3434
mkdir /opt/ffbuild
3535

3636
ENV FFBUILD_TOOLCHAIN=mips64-ffbuild-linux-gnu \

images/base-linuxppc64/Dockerfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ RUN --mount=src=ct-ng-config,dst=/.config \
1313

1414
# Prepare cross environment to heavily favour static builds
1515
RUN \
16-
find /opt/ct-ng -type l \
16+
find /opt/ct-ng \( -type l \
1717
-and -name '*.so' \
1818
-and -not -ipath '*plugin*' \
1919
-and -not -name 'libdl.*' \
@@ -22,15 +22,15 @@ RUN \
2222
-and -not -name 'libmvec.*' \
2323
-and -not -name 'librt.*' \
2424
-and -not -name 'libpthread.*' \
25-
-delete && \
26-
find /opt/ct-ng \
25+
\) -delete && \
26+
find /opt/ct-ng \( \
2727
-name 'libdl.a' \
2828
-or -name 'libc.a' \
2929
-or -name 'libm.a' \
3030
-or -name 'libmvec.a' \
3131
-or -name 'librt.a' \
3232
-or -name 'libpthread.a' \
33-
-delete && \
33+
\) -delete && \
3434
mkdir /opt/ffbuild
3535

3636
ENV FFBUILD_TOOLCHAIN=powerpc64-ffbuild-linux-gnu \

images/base-win32/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ RUN --mount=src=ct-ng-config,dst=/.config \
1313

1414
# Prepare "cross" environment to heavily favour static builds
1515
RUN \
16-
find /opt/ct-ng \
16+
find /opt/ct-ng \( \
1717
-name "*.dll" \
1818
-or -name "*.dll.a" \
19-
-delete && \
19+
\) -delete && \
2020
mkdir /opt/ffbuild
2121

2222
RUN \

images/base-win64/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ RUN --mount=src=ct-ng-config,dst=/.config \
1313

1414
# Prepare "cross" environment to heavily favour static builds
1515
RUN \
16-
find /opt/ct-ng \
16+
find /opt/ct-ng \( \
1717
-name "*.dll" \
1818
-or -name "*.dll.a" \
19-
-delete && \
19+
\) -delete && \
2020
mkdir /opt/ffbuild
2121

2222
RUN \

images/base-winarm64/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ RUN \
1313

1414
# Prepare "cross" environment to heavily favour static builds
1515
RUN \
16-
find /opt/llvm-mingw \
16+
find /opt/llvm-mingw \( \
1717
-name "*.dll" \
1818
-or -name "*.dll.a" \
19-
-delete && \
19+
\) -delete && \
2020
mkdir /opt/ffbuild
2121

2222
ENV FFBUILD_TOOLCHAIN=aarch64-w64-mingw32 \

0 commit comments

Comments
 (0)