From d5edd847ab702278f8f97fa422e8de41265ba813 Mon Sep 17 00:00:00 2001
From: Wouter Deconinck <wdconinc@gmail.com>
Date: Tue, 11 Jul 2023 13:38:06 +0000
Subject: [PATCH] feat: use chmod on ADD/COPY
---
containers/dind/Dockerfile | 3 +--
containers/jug/dev.Dockerfile | 5 ++---
2 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/containers/dind/Dockerfile b/containers/dind/Dockerfile
index bfd03f61f..e6a7a97a8 100644
--- a/containers/dind/Dockerfile
+++ b/containers/dind/Dockerfile
@@ -54,8 +54,7 @@ ADD https://get.docker.com/ /tmp/get-docker.sh
RUN bash /tmp/get-docker.sh --version ${DOCKER_VERSION}
# Install the magic wrapper.
-ADD ./wrapdocker /usr/local/bin/wrapdocker
-RUN chmod +x /usr/local/bin/wrapdocker
+ADD --chmod=0755 wrapdocker /usr/local/bin/wrapdocker
# Define additional metadata for our image.
VOLUME /var/lib/docker
diff --git a/containers/jug/dev.Dockerfile b/containers/jug/dev.Dockerfile
index 4b0c8f8ee..3cfd615ae 100644
--- a/containers/jug/dev.Dockerfile
+++ b/containers/jug/dev.Dockerfile
@@ -193,14 +193,13 @@ COPY profile.d/z11_jug_env.sh /etc/profile.d
COPY singularity.d /.singularity.d
## Add minio client into /usr/local/bin
-ADD https://dl.min.io/client/mc/release/linux-amd64/mc /usr/local/bin/mc-amd64
-ADD https://dl.min.io/client/mc/release/linux-arm64/mc /usr/local/bin/mc-arm64
+ADD --chmod=0755 https://dl.min.io/client/mc/release/linux-amd64/mc /usr/local/bin/mc-amd64
+ADD --chmod=0755 https://dl.min.io/client/mc/release/linux-arm64/mc /usr/local/bin/mc-arm64
RUN declare -A target=( \
["linux/amd64"]="amd64" \
["linux/arm64"]="arm64" \
) \
&& mv /usr/local/bin/mc-${target[${TARGETPLATFORM}]} /usr/local/bin/mc \
- && chmod a+x /usr/local/bin/mc \
&& unset target[${TARGETPLATFORM}] \
&& for t in ${target[*]} ; do \
rm /usr/local/bin/mc-${t} ; \
--
GitLab