From ab1da59a487c93c302bc99c7d3579e28a2e282b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Storsj=C3=B6?= Date: Fri, 14 Sep 2018 09:38:44 +0200 Subject: [PATCH] Use a single COPY command in dockerfiles for both *.sh and *.c for wrappers --- Dockerfile | 3 +-- Dockerfile.dev | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 673e336..e9823d8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -26,8 +26,7 @@ RUN ./build-llvm.sh $TOOLCHAIN_PREFIX && \ ENV TOOLCHAIN_ARCHS="i686 x86_64 armv7 aarch64" # Install the usual $TUPLE-clang binaries -COPY wrappers/*.sh ./wrappers/ -COPY wrappers/*.c ./wrappers/ +COPY wrappers/*.sh wrappers/*.c ./wrappers/ COPY install-wrappers.sh . RUN ./install-wrappers.sh $TOOLCHAIN_PREFIX && \ rm -rf /build diff --git a/Dockerfile.dev b/Dockerfile.dev index b9172e9..6c2f599 100644 --- a/Dockerfile.dev +++ b/Dockerfile.dev @@ -32,8 +32,7 @@ RUN ./strip-llvm.sh $TOOLCHAIN_PREFIX ENV TOOLCHAIN_ARCHS="i686 x86_64 armv7 aarch64" # Install the usual $TUPLE-clang binaries -COPY wrappers/*.sh ./wrappers/ -COPY wrappers/*.c ./wrappers/ +COPY wrappers/*.sh wrappers/*.c ./wrappers/ COPY install-wrappers.sh . RUN ./install-wrappers.sh $TOOLCHAIN_PREFIX