Merge pull request #186 from konstruktoid/1126

CVE-2016-9962

Author: konstruktoid

Dockerfile

@@ -4,20 +4,24 @@ 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"
 
-ENV VERSION 1.10.0
+ENV VERSION 1.12.6
+ENV SHA256 cadc6025c841e034506703a06cf54204e51d0cadfae4bae62628ac648d82efdd
 
 WORKDIR /usr/bin
 
 RUN apk update && \
     apk upgrade && \
-    apk --update add curl && \
-    curl -sS https://get.docker.com/builds/Linux/x86_64/docker-$VERSION > docker-$VERSION && \
-    curl -sS https://get.docker.com/builds/Linux/x86_64/docker-$VERSION.sha256 > docker-$VERSION.sha256 && \
-    sha256sum -c docker-$VERSION.sha256 && \
-    ln -s docker-$VERSION docker && \
-    chmod u+x docker-$VERSION && \
-    apk del curl && \
-    rm -rf /var/cache/apk/*
+    apk --update add coreutils wget ca-certificates && \
+    wget https://get.docker.com/builds/Linux/x86_64/docker-$VERSION.tgz && \
+    wget https://get.docker.com/builds/Linux/x86_64/docker-$VERSION.tgz.sha256 && \
+    sha256sum -c docker-$VERSION.tgz.sha256 && \
+    echo "$SHA256 docker-$VERSION.tgz" | sha256sum -c - && \
+    tar -xzvf docker-$VERSION.tgz -C /tmp && \
+    mv /tmp/docker/docker . && \
+    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
 

distros/Dockerfile.alpine

@@ -4,20 +4,24 @@ 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"
 
-ENV VERSION 1.10.0
+ENV VERSION 1.12.6
+ENV SHA256 cadc6025c841e034506703a06cf54204e51d0cadfae4bae62628ac648d82efdd
 
 WORKDIR /usr/bin
 
 RUN apk update && \
     apk upgrade && \
-    apk --update add curl && \
-    curl -sS https://get.docker.com/builds/Linux/x86_64/docker-$VERSION > docker-$VERSION && \
-    curl -sS https://get.docker.com/builds/Linux/x86_64/docker-$VERSION.sha256 > docker-$VERSION.sha256 && \
-    sha256sum -c docker-$VERSION.sha256 && \
-    ln -s docker-$VERSION docker && \
-    chmod u+x docker-$VERSION && \
-    apk del curl && \
-    rm -rf /var/cache/apk/*
+    apk --update add coreutils wget ca-certificates && \
+    wget https://get.docker.com/builds/Linux/x86_64/docker-$VERSION.tgz && \
+    wget https://get.docker.com/builds/Linux/x86_64/docker-$VERSION.tgz.sha256 && \
+    sha256sum -c docker-$VERSION.tgz.sha256 && \
+    echo "$SHA256 docker-$VERSION.tgz" | sha256sum -c - && \
+    tar -xzvf docker-$VERSION.tgz -C /tmp && \
+    mv /tmp/docker/docker . && \
+    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