Merge pull request #2127 from justincormack/dockerup

Update Docker CE to 17.06.0

blueprints/docker-for-mac.yml

@@ -61,7 +61,7 @@ services:
   # Bind mounts /var/run to allow vsudd to connect to docker.sock, /var/vpnkit
   # for vpnkit coordination and /var/config/docker for the configuration file.
   - name: docker-dfm
-    image: "linuxkit/docker-ce:530912564c0b648aeeab2459c7b82ce40d48fd6a"
+    image: "linuxkit/docker-ce:9e125aa533108731d11f6d7ec17aba6ded0cb4eb"
     capabilities:
      - all
     net: host

examples/docker.yml

@@ -30,7 +30,7 @@ services:
   - name: ntpd
     image: "linuxkit/openntpd:a4c642d52e985922fcd97db52e471db123cc6841"
   - name: docker
-    image: "linuxkit/docker-ce:530912564c0b648aeeab2459c7b82ce40d48fd6a"
+    image: "linuxkit/docker-ce:9e125aa533108731d11f6d7ec17aba6ded0cb4eb"
     capabilities:
      - all
     net: host

pkg/docker-ce/Dockerfile

@@ -31,13 +31,14 @@ RUN set -x \
 	&& echo 'dockremap:165536:65536' >> /etc/subuid \
 	&& echo 'dockremap:165536:65536' >> /etc/subgid
 
-ENV DOCKER_BUCKET get.docker.com
-ENV DOCKER_VERSION 17.05.0-ce
-ENV DOCKER_SHA256 340e0b5a009ba70e1b644136b94d13824db0aeb52e09071410f35a95d94316d9
+# DOCKER_TYPE is stable, edge or test
+ENV DOCKER_TYPE stable
+ENV DOCKER_VERSION 17.06.0-ce
+ENV DOCKER_SHA256 e582486c9db0f4229deba9f8517145f8af6c5fae7a1243e6b07876bd3e706620
 
 # we could avoid installing client here I suppose
 RUN set -x \
-	&& curl -fSL "https://${DOCKER_BUCKET}/builds/Linux/x86_64/docker-${DOCKER_VERSION}.tgz" -o docker.tgz \
+	&& curl -fSL "https://download.docker.com/linux/static/${DOCKER_TYPE}/$(uname -m)/docker-${DOCKER_VERSION}.tgz" -o docker.tgz \
 	&& echo "${DOCKER_SHA256} *docker.tgz" | sha256sum -c - \
 	&& tar -xzvf docker.tgz \
 	&& mv docker/* /usr/bin/ \

projects/compose/compose-dynamic.yml

@@ -27,7 +27,7 @@ services:
   - name: ntpd
     image: "linuxkit/openntpd:a4c642d52e985922fcd97db52e471db123cc6841"
   - name: docker
-    image: "linuxkit/docker-ce:530912564c0b648aeeab2459c7b82ce40d48fd6a"
+    image: "linuxkit/docker-ce:9e125aa533108731d11f6d7ec17aba6ded0cb4eb"
     capabilities:
      - all
     net: host

projects/compose/compose-static.yml

@@ -27,7 +27,7 @@ services:
   - name: ntpd
     image: "linuxkit/openntpd:a4c642d52e985922fcd97db52e471db123cc6841"
   - name: docker
-    image: "linuxkit/docker-ce:530912564c0b648aeeab2459c7b82ce40d48fd6a"
+    image: "linuxkit/docker-ce:9e125aa533108731d11f6d7ec17aba6ded0cb4eb"
     capabilities:
      - all
     net: host

projects/kubernetes/image-cache/Dockerfile

@@ -1,4 +1,4 @@
-FROM linuxkit/docker-ce:530912564c0b648aeeab2459c7b82ce40d48fd6a
+FROM linuxkit/docker-ce:9e125aa533108731d11f6d7ec17aba6ded0cb4eb
 ADD . /images
 ENTRYPOINT [ "/bin/sh", "-c" ]
 CMD [ "for image in /images/*.tar ; do docker image load -i $image && rm -f $image ; done" ]

projects/kubernetes/kube-master.yml

@@ -38,7 +38,7 @@ services:
   - name: sshd
     image: "linuxkit/sshd:f095b62ddca658e99d5751872c933ef3d5d18cec"
   - name: docker
-    image: "linuxkit/docker-ce:530912564c0b648aeeab2459c7b82ce40d48fd6a"
+    image: "linuxkit/docker-ce:9e125aa533108731d11f6d7ec17aba6ded0cb4eb"
     capabilities:
      - all
     net: host

projects/kubernetes/kube-node.yml

@@ -38,7 +38,7 @@ services:
   - name: sshd
     image: "linuxkit/sshd:f095b62ddca658e99d5751872c933ef3d5d18cec"
   - name: docker
-    image: "linuxkit/docker-ce:530912564c0b648aeeab2459c7b82ce40d48fd6a"
+    image: "linuxkit/docker-ce:9e125aa533108731d11f6d7ec17aba6ded0cb4eb"
     capabilities:
      - all
     net: host

test/cases/030_security/000_docker-bench/test-docker-bench.yml

@@ -24,7 +24,7 @@ services:
   - name: dhcpcd
     image: "linuxkit/dhcpcd:6c1ca76dbf808d5c27d10cbf22a8d4399be5c8ae"
   - name: docker
-    image: "linuxkit/docker-ce:530912564c0b648aeeab2459c7b82ce40d48fd6a"
+    image: "linuxkit/docker-ce:9e125aa533108731d11f6d7ec17aba6ded0cb4eb"
     capabilities:
      - all
     net: host