From e0f186967a3adc0e1b4f4bf34c2e819f4694964a Mon Sep 17 00:00:00 2001 From: Konstantin Pavlov Date: Fri, 9 Nov 2018 14:08:44 +0200 Subject: [PATCH] Don't remove the workdir itself Since Docker 18.09, this breaks later stages. --- Dockerfile | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index e7ad0c4..b6fe67b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -21,7 +21,7 @@ ENV TOOLCHAIN_PREFIX=/opt/llvm-mingw COPY build-llvm.sh strip-llvm.sh ./ RUN ./build-llvm.sh $TOOLCHAIN_PREFIX && \ ./strip-llvm.sh $TOOLCHAIN_PREFIX && \ - rm -rf /build + rm -rf /build/* ARG TOOLCHAIN_ARCHS="i686 x86_64 armv7 aarch64" @@ -29,29 +29,29 @@ ARG TOOLCHAIN_ARCHS="i686 x86_64 armv7 aarch64" COPY wrappers/*.sh wrappers/*.c ./wrappers/ COPY install-wrappers.sh ./ RUN ./install-wrappers.sh $TOOLCHAIN_PREFIX && \ - rm -rf /build + rm -rf /build/* # Build MinGW-w64, compiler-rt and mingw-w64's extra libraries COPY build-mingw-w64.sh build-compiler-rt.sh build-mingw-w64-libraries.sh ./ RUN ./build-mingw-w64.sh $TOOLCHAIN_PREFIX && \ ./build-compiler-rt.sh $TOOLCHAIN_PREFIX && \ ./build-mingw-w64-libraries.sh $TOOLCHAIN_PREFIX && \ - rm -rf /build + rm -rf /build/* # Build libunwind/libcxxabi/libcxx COPY build-libcxx.sh merge-archives.sh ./ RUN ./build-libcxx.sh $TOOLCHAIN_PREFIX && \ - rm -rf /build + rm -rf /build/* # Build sanitizers COPY build-compiler-rt.sh ./ RUN ./build-compiler-rt.sh $TOOLCHAIN_PREFIX --build-sanitizers && \ - rm -rf /build + rm -rf /build/* # Build libssp COPY build-libssp.sh libssp-Makefile ./ RUN ./build-libssp.sh $TOOLCHAIN_PREFIX && \ - rm -rf /build + rm -rf /build/* # Cheating: Pull strip and objcopy from the normal binutils package. RUN apt-get update -qq && \