From 685236f4e60409c42406c7a1ec4f513bc10ce6bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20Sj=C3=B6gren?= Date: Sat, 21 Dec 2019 21:31:33 +0100 Subject: [PATCH] alpine:3.11 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Thomas Sjögren --- Dockerfile | 2 +- distros/Dockerfile.alpine | 11 +++++------ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/Dockerfile b/Dockerfile index 87f0988..5d5af26 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.10 +FROM alpine:3.11 LABEL \ org.label-schema.name="docker-bench-security" \ diff --git a/distros/Dockerfile.alpine b/distros/Dockerfile.alpine index 2bbaad3..5d5af26 100644 --- a/distros/Dockerfile.alpine +++ b/distros/Dockerfile.alpine @@ -1,4 +1,4 @@ -FROM alpine:3.10 +FROM alpine:3.11 LABEL \ org.label-schema.name="docker-bench-security" \ @@ -7,13 +7,12 @@ LABEL \ # Switch to the HTTPS endpoint for the apk repositories # https://github.com/gliderlabs/docker-alpine/issues/184 -RUN \ - sed -i 's/http\:\/\/dl-cdn.alpinelinux.org/https\:\/\/alpine.global.ssl.fastly.net/g' /etc/apk/repositories && \ +RUN set -eux; \ + sed -i 's!http://dl-cdn.alpinelinux.org/!https://alpine.global.ssl.fastly.net/!g' /etc/apk/repositories && \ apk add --no-cache \ iproute2 \ - docker \ - dumb-init && \ - rm -rf /usr/bin/docker?* + docker-cli \ + dumb-init COPY ./*.sh /usr/local/bin/ COPY ./tests/*.sh /usr/local/bin/tests/