From c4cf659e324379dba29c78d6e838dfebe6b59e2f Mon Sep 17 00:00:00 2001 From: Peter Dave Hello Date: Wed, 19 May 2021 13:31:19 +0800 Subject: [PATCH] docker: reduce additional image layer for the not executable gosu binary (#6557) This will help reduce the image size and image layers. --- Dockerfile | 4 ++-- docker/Dockerfile.aarch64 | 4 ++-- docker/Dockerfile.rpi | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index 4196fca80..51908346d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -10,8 +10,8 @@ COPY . . RUN make build TAGS="cert pam" FROM alpine:3.11 -ADD https://github.com/tianon/gosu/releases/download/1.11/gosu-amd64 /usr/sbin/gosu -RUN chmod +x /usr/sbin/gosu \ +RUN wget https://github.com/tianon/gosu/releases/download/1.11/gosu-amd64 -O /usr/sbin/gosu \ + && chmod +x /usr/sbin/gosu \ && echo http://dl-2.alpinelinux.org/alpine/edge/community/ >> /etc/apk/repositories \ && apk --no-cache --no-progress add \ bash \ diff --git a/docker/Dockerfile.aarch64 b/docker/Dockerfile.aarch64 index f06372997..d69916899 100644 --- a/docker/Dockerfile.aarch64 +++ b/docker/Dockerfile.aarch64 @@ -10,8 +10,8 @@ COPY . . RUN make build TAGS="cert pam" FROM arm64v8/alpine:3.11 -ADD https://github.com/tianon/gosu/releases/download/1.11/gosu-arm64 /usr/sbin/gosu -RUN chmod +x /usr/sbin/gosu \ +RUN wget https://github.com/tianon/gosu/releases/download/1.11/gosu-arm64 -O /usr/sbin/gosu \ + && chmod +x /usr/sbin/gosu \ && echo http://dl-2.alpinelinux.org/alpine/edge/community/ >> /etc/apk/repositories \ && apk --no-cache --no-progress add \ bash \ diff --git a/docker/Dockerfile.rpi b/docker/Dockerfile.rpi index 41560145a..8e0b41f43 100644 --- a/docker/Dockerfile.rpi +++ b/docker/Dockerfile.rpi @@ -10,8 +10,8 @@ COPY . . RUN make build TAGS="cert pam" FROM arm32v7/alpine:3.12 -ADD https://github.com/tianon/gosu/releases/download/1.12/gosu-armhf /usr/sbin/gosu -RUN chmod +x /usr/sbin/gosu \ +RUN wget https://github.com/tianon/gosu/releases/download/1.12/gosu-armhf -O /usr/sbin/gosu \ + && chmod +x /usr/sbin/gosu \ && echo http://dl-2.alpinelinux.org/alpine/edge/community/ >> /etc/apk/repositories \ && apk --no-cache --no-progress add \ bash \