Merge pull request #413 from konstruktoid/alpineupdate

alpine:3.11
This commit is contained in:
Thomas Sjögren 2019-12-21 20:32:28 +00:00 committed by GitHub
commit 9696a8bd6a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 7 deletions

View file

@ -1,4 +1,4 @@
FROM alpine:3.10 FROM alpine:3.11
LABEL \ LABEL \
org.label-schema.name="docker-bench-security" \ org.label-schema.name="docker-bench-security" \

View file

@ -1,4 +1,4 @@
FROM alpine:3.10 FROM alpine:3.11
LABEL \ LABEL \
org.label-schema.name="docker-bench-security" \ org.label-schema.name="docker-bench-security" \
@ -7,13 +7,12 @@ LABEL \
# Switch to the HTTPS endpoint for the apk repositories # Switch to the HTTPS endpoint for the apk repositories
# https://github.com/gliderlabs/docker-alpine/issues/184 # https://github.com/gliderlabs/docker-alpine/issues/184
RUN \ RUN set -eux; \
sed -i 's/http\:\/\/dl-cdn.alpinelinux.org/https\:\/\/alpine.global.ssl.fastly.net/g' /etc/apk/repositories && \ sed -i 's!http://dl-cdn.alpinelinux.org/!https://alpine.global.ssl.fastly.net/!g' /etc/apk/repositories && \
apk add --no-cache \ apk add --no-cache \
iproute2 \ iproute2 \
docker \ docker-cli \
dumb-init && \ dumb-init
rm -rf /usr/bin/docker?*
COPY ./*.sh /usr/local/bin/ COPY ./*.sh /usr/local/bin/
COPY ./tests/*.sh /usr/local/bin/tests/ COPY ./tests/*.sh /usr/local/bin/tests/