zefie/llvm-mingw
1
0 Fork 0
Code Activity

Consistently use "COPY .. ./" in Dockerfiles

Browse Source 
This avoids potential issues and confusion with cases where a plain "." as
target doesn't work.
This commit is contained in:
Martin Storsjö committed 2018-10-16 20:25:39 +03:00
1 parent e9d8d57ec6
commit 5390b58835
2 files changed
+6 -6
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Dockerfile
+1 -1
View File
@@ -27,7 +27,7 @@ ARG TOOLCHAIN_ARCHS="i686 x86_64 armv7 aarch64"
# Install the usual $TUPLE-clang binaries # Install the usual $TUPLE-clang binaries
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
Dockerfile.dev
+5 -5
View File
@@ -18,7 +18,7 @@ ARG CORES=4
ENV TOOLCHAIN_PREFIX=/opt/llvm-mingw ENV TOOLCHAIN_PREFIX=/opt/llvm-mingw
# Build LLVM # Build LLVM
COPY build-llvm.sh . COPY build-llvm.sh ./
RUN ./build-llvm.sh $TOOLCHAIN_PREFIX RUN ./build-llvm.sh $TOOLCHAIN_PREFIX
# Strip the LLVM install output immediately. (This doesn't reduce the # Strip the LLVM install output immediately. (This doesn't reduce the
@@ -26,14 +26,14 @@ RUN ./build-llvm.sh $TOOLCHAIN_PREFIX
# but reduces build times if tweaking the contents of strip-llvm.sh.) # but reduces build times if tweaking the contents of strip-llvm.sh.)
# Most of the size of the docker image comes from the build directory that # Most of the size of the docker image comes from the build directory that
# we keep in any case. # we keep in any case.
COPY strip-llvm.sh . COPY strip-llvm.sh ./
RUN ./strip-llvm.sh $TOOLCHAIN_PREFIX RUN ./strip-llvm.sh $TOOLCHAIN_PREFIX
ARG TOOLCHAIN_ARCHS="i686 x86_64 armv7 aarch64" ARG TOOLCHAIN_ARCHS="i686 x86_64 armv7 aarch64"
# Install the usual $TUPLE-clang binaries # Install the usual $TUPLE-clang binaries
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
# Build MinGW-w64 # Build MinGW-w64
@@ -41,11 +41,11 @@ COPY build-mingw-w64.sh build-mingw-w64-widl.sh ./
RUN ./build-mingw-w64.sh $TOOLCHAIN_PREFIX RUN ./build-mingw-w64.sh $TOOLCHAIN_PREFIX
# Build compiler-rt # Build compiler-rt
COPY build-compiler-rt.sh . COPY build-compiler-rt.sh ./
RUN ./build-compiler-rt.sh $TOOLCHAIN_PREFIX RUN ./build-compiler-rt.sh $TOOLCHAIN_PREFIX
# Build mingw-w64's extra libraries # Build mingw-w64's extra libraries
COPY build-mingw-w64-libraries.sh . COPY build-mingw-w64-libraries.sh ./
RUN ./build-mingw-w64-libraries.sh $TOOLCHAIN_PREFIX RUN ./build-mingw-w64-libraries.sh $TOOLCHAIN_PREFIX
# Build C test applications # Build C test applications