Merge pull request #186 from konstruktoid/1126

CVE-2016-9962
This commit is contained in:
Thomas Sjögren 2017-01-11 15:49:06 +01:00 committed by GitHub
commit 7878276f04
2 changed files with 26 additions and 18 deletions

View file

@ -4,20 +4,24 @@ LABEL org.label-schema.name="docker-bench-security" \
org.label-schema.url="https://dockerbench.com" \ org.label-schema.url="https://dockerbench.com" \
org.label-schema.vcs-url="https://github.com/docker/docker-bench-security.git" org.label-schema.vcs-url="https://github.com/docker/docker-bench-security.git"
ENV VERSION 1.10.0 ENV VERSION 1.12.6
ENV SHA256 cadc6025c841e034506703a06cf54204e51d0cadfae4bae62628ac648d82efdd
WORKDIR /usr/bin WORKDIR /usr/bin
RUN apk update && \ RUN apk update && \
apk upgrade && \ apk upgrade && \
apk --update add curl && \ apk --update add coreutils wget ca-certificates && \
curl -sS https://get.docker.com/builds/Linux/x86_64/docker-$VERSION > docker-$VERSION && \ wget https://get.docker.com/builds/Linux/x86_64/docker-$VERSION.tgz && \
curl -sS https://get.docker.com/builds/Linux/x86_64/docker-$VERSION.sha256 > docker-$VERSION.sha256 && \ wget https://get.docker.com/builds/Linux/x86_64/docker-$VERSION.tgz.sha256 && \
sha256sum -c docker-$VERSION.sha256 && \ sha256sum -c docker-$VERSION.tgz.sha256 && \
ln -s docker-$VERSION docker && \ echo "$SHA256 docker-$VERSION.tgz" | sha256sum -c - && \
chmod u+x docker-$VERSION && \ tar -xzvf docker-$VERSION.tgz -C /tmp && \
apk del curl && \ mv /tmp/docker/docker . && \
rm -rf /var/cache/apk/* chmod u+x docker* && \
rm -rf /tmp/docker* && \
apk del wget ca-certificates && \
rm -rf /var/cache/apk/* docker-$VERSION.tgz docker-$VERSION.tgz.sha256
RUN mkdir /docker-bench-security RUN mkdir /docker-bench-security

View file

@ -4,20 +4,24 @@ LABEL org.label-schema.name="docker-bench-security" \
org.label-schema.url="https://dockerbench.com" \ org.label-schema.url="https://dockerbench.com" \
org.label-schema.vcs-url="https://github.com/docker/docker-bench-security.git" org.label-schema.vcs-url="https://github.com/docker/docker-bench-security.git"
ENV VERSION 1.10.0 ENV VERSION 1.12.6
ENV SHA256 cadc6025c841e034506703a06cf54204e51d0cadfae4bae62628ac648d82efdd
WORKDIR /usr/bin WORKDIR /usr/bin
RUN apk update && \ RUN apk update && \
apk upgrade && \ apk upgrade && \
apk --update add curl && \ apk --update add coreutils wget ca-certificates && \
curl -sS https://get.docker.com/builds/Linux/x86_64/docker-$VERSION > docker-$VERSION && \ wget https://get.docker.com/builds/Linux/x86_64/docker-$VERSION.tgz && \
curl -sS https://get.docker.com/builds/Linux/x86_64/docker-$VERSION.sha256 > docker-$VERSION.sha256 && \ wget https://get.docker.com/builds/Linux/x86_64/docker-$VERSION.tgz.sha256 && \
sha256sum -c docker-$VERSION.sha256 && \ sha256sum -c docker-$VERSION.tgz.sha256 && \
ln -s docker-$VERSION docker && \ echo "$SHA256 docker-$VERSION.tgz" | sha256sum -c - && \
chmod u+x docker-$VERSION && \ tar -xzvf docker-$VERSION.tgz -C /tmp && \
apk del curl && \ mv /tmp/docker/docker . && \
rm -rf /var/cache/apk/* chmod u+x docker* && \
rm -rf /tmp/docker* && \
apk del wget ca-certificates && \
rm -rf /var/cache/apk/* docker-$VERSION.tgz docker-$VERSION.tgz.sha256
RUN mkdir /docker-bench-security RUN mkdir /docker-bench-security