Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #272 from ellerbrock/alpine-upgrade
feat(dockerfile): update alpine and cleanup the dockerfile
- Loading branch information
Showing
2 changed files
with
22 additions
and
23 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,27 +1,25 @@ | ||
| FROM alpine:3.6 | ||
| FROM alpine:3.7 | ||
|
|
||
| LABEL org.label-schema.name="docker-bench-security" \ | ||
| org.label-schema.url="https://dockerbench.com" \ | ||
| org.label-schema.vcs-url="https://github.com/docker/docker-bench-security.git" | ||
|
|
||
| # Switch to the HTTPS endpoint for the apk repositories as per 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 | ||
| LABEL \ | ||
| org.label-schema.name="docker-bench-security" \ | ||
| org.label-schema.url="https://dockerbench.com" \ | ||
| org.label-schema.vcs-url="https://github.com/docker/docker-bench-security.git" | ||
|
|
||
| # Switch to the HTTPS endpoint for the apk repositories | ||
| # https://github.com/gliderlabs/docker-alpine/issues/184 | ||
| RUN \ | ||
| apk upgrade --no-cache && \ | ||
| sed -i 's/http\:\/\/dl-cdn.alpinelinux.org/https\:\/\/alpine.global.ssl.fastly.net/g' /etc/apk/repositories && \ | ||
| apk add --no-cache \ | ||
| docker \ | ||
| dumb-init && \ | ||
| rm -rf /usr/bin/docker-* /usr/bin/dockerd && \ | ||
| mkdir /usr/local/bin/tests | ||
| rm -rf /usr/bin/docker?* | ||
|
|
||
| COPY ./*.sh /usr/local/bin/ | ||
|
|
||
| COPY ./tests/*.sh /usr/local/bin/tests/ | ||
|
|
||
| WORKDIR /usr/local/bin | ||
|
|
||
| HEALTHCHECK CMD exit 0 | ||
|
|
||
| WORKDIR /usr/local/bin | ||
|
|
||
| ENTRYPOINT [ "/usr/bin/dumb-init", "docker-bench-security.sh" ] | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,24 +1,25 @@ | ||
| FROM alpine:3.6 | ||
| FROM alpine:3.7 | ||
|
|
||
| LABEL org.label-schema.name="docker-bench-security" \ | ||
| org.label-schema.url="https://dockerbench.com" \ | ||
| org.label-schema.vcs-url="https://github.com/docker/docker-bench-security.git" | ||
| LABEL \ | ||
| org.label-schema.name="docker-bench-security" \ | ||
| org.label-schema.url="https://dockerbench.com" \ | ||
| org.label-schema.vcs-url="https://github.com/docker/docker-bench-security.git" | ||
|
|
||
| # Switch to the HTTPS endpoint for the apk repositories | ||
| # https://github.com/gliderlabs/docker-alpine/issues/184 | ||
| RUN \ | ||
| apk upgrade --no-cache && \ | ||
| sed -i 's/http\:\/\/dl-cdn.alpinelinux.org/https\:\/\/alpine.global.ssl.fastly.net/g' /etc/apk/repositories && \ | ||
| apk add --no-cache \ | ||
| docker \ | ||
| dumb-init && \ | ||
| rm -rf /usr/bin/docker-* /usr/bin/dockerd && \ | ||
| mkdir /usr/local/bin/tests | ||
| rm -rf /usr/bin/docker?* | ||
|
|
||
| COPY ./*.sh /usr/local/bin/ | ||
|
|
||
| COPY ./tests/*.sh /usr/local/bin/tests/ | ||
|
|
||
| WORKDIR /usr/local/bin | ||
|
|
||
| HEALTHCHECK CMD exit 0 | ||
|
|
||
| WORKDIR /usr/local/bin | ||
|
|
||
| ENTRYPOINT [ "/usr/bin/dumb-init", "docker-bench-security.sh" ] | ||
|
|