Don't remove the workdir itself
Since Docker 18.09, this breaks later stages.
This commit is contained in:
1 parent
9367988be7
commit
e0f186967a
1 file changed
+6
-6
+6
-6
@@ -21,7 +21,7 @@ ENV TOOLCHAIN_PREFIX=/opt/llvm-mingw
|
|||||||
COPY build-llvm.sh strip-llvm.sh ./
|
COPY build-llvm.sh strip-llvm.sh ./
|
||||||
RUN ./build-llvm.sh $TOOLCHAIN_PREFIX && \
|
RUN ./build-llvm.sh $TOOLCHAIN_PREFIX && \
|
||||||
./strip-llvm.sh $TOOLCHAIN_PREFIX && \
|
./strip-llvm.sh $TOOLCHAIN_PREFIX && \
|
||||||
rm -rf /build
|
rm -rf /build/*
|
||||||
|
|
||||||
ARG TOOLCHAIN_ARCHS="i686 x86_64 armv7 aarch64"
|
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 wrappers/*.sh wrappers/*.c ./wrappers/
|
||||||
COPY install-wrappers.sh ./
|
COPY install-wrappers.sh ./
|
||||||
RUN ./install-wrappers.sh $TOOLCHAIN_PREFIX && \
|
RUN ./install-wrappers.sh $TOOLCHAIN_PREFIX && \
|
||||||
rm -rf /build
|
rm -rf /build/*
|
||||||
|
|
||||||
# Build MinGW-w64, compiler-rt and mingw-w64's extra libraries
|
# 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 ./
|
COPY build-mingw-w64.sh build-compiler-rt.sh build-mingw-w64-libraries.sh ./
|
||||||
RUN ./build-mingw-w64.sh $TOOLCHAIN_PREFIX && \
|
RUN ./build-mingw-w64.sh $TOOLCHAIN_PREFIX && \
|
||||||
./build-compiler-rt.sh $TOOLCHAIN_PREFIX && \
|
./build-compiler-rt.sh $TOOLCHAIN_PREFIX && \
|
||||||
./build-mingw-w64-libraries.sh $TOOLCHAIN_PREFIX && \
|
./build-mingw-w64-libraries.sh $TOOLCHAIN_PREFIX && \
|
||||||
rm -rf /build
|
rm -rf /build/*
|
||||||
|
|
||||||
# Build libunwind/libcxxabi/libcxx
|
# Build libunwind/libcxxabi/libcxx
|
||||||
COPY build-libcxx.sh merge-archives.sh ./
|
COPY build-libcxx.sh merge-archives.sh ./
|
||||||
RUN ./build-libcxx.sh $TOOLCHAIN_PREFIX && \
|
RUN ./build-libcxx.sh $TOOLCHAIN_PREFIX && \
|
||||||
rm -rf /build
|
rm -rf /build/*
|
||||||
|
|
||||||
# Build sanitizers
|
# Build sanitizers
|
||||||
COPY build-compiler-rt.sh ./
|
COPY build-compiler-rt.sh ./
|
||||||
RUN ./build-compiler-rt.sh $TOOLCHAIN_PREFIX --build-sanitizers && \
|
RUN ./build-compiler-rt.sh $TOOLCHAIN_PREFIX --build-sanitizers && \
|
||||||
rm -rf /build
|
rm -rf /build/*
|
||||||
|
|
||||||
# Build libssp
|
# Build libssp
|
||||||
COPY build-libssp.sh libssp-Makefile ./
|
COPY build-libssp.sh libssp-Makefile ./
|
||||||
RUN ./build-libssp.sh $TOOLCHAIN_PREFIX && \
|
RUN ./build-libssp.sh $TOOLCHAIN_PREFIX && \
|
||||||
rm -rf /build
|
rm -rf /build/*
|
||||||
|
|
||||||
# Cheating: Pull strip and objcopy from the normal binutils package.
|
# Cheating: Pull strip and objcopy from the normal binutils package.
|
||||||
RUN apt-get update -qq && \
|
RUN apt-get update -qq && \
|
||||||
|
|||||||
Reference in new issue
Block a user