diff --git a/examples/docker.yml b/examples/docker.yml index fac0ea561..2a3152921 100644 --- a/examples/docker.yml +++ b/examples/docker.yml @@ -66,7 +66,7 @@ services: - CAP_SETGID net: host - name: docker - image: "linuxkit/docker-ce:957306b51f2bc03087833eee2625d60514a5079c" + image: "linuxkit/docker-ce:050e734489f2d19b42ec818a4242a318ea446bc3" capabilities: - all net: host diff --git a/pkg/docker-ce/Dockerfile b/pkg/docker-ce/Dockerfile index 8e3ccb415..2fd504094 100644 --- a/pkg/docker-ce/Dockerfile +++ b/pkg/docker-ce/Dockerfile @@ -28,8 +28,8 @@ RUN set -x \ && echo 'dockremap:165536:65536' >> /etc/subgid ENV DOCKER_BUCKET get.docker.com -ENV DOCKER_VERSION 17.04.0-ce -ENV DOCKER_SHA256 c52cff62c4368a978b52e3d03819054d87bcd00d15514934ce2e0e09b99dd100 +ENV DOCKER_VERSION 17.05.0-ce +ENV DOCKER_SHA256 340e0b5a009ba70e1b644136b94d13824db0aeb52e09071410f35a95d94316d9 # we could avoid installing client here I suppose RUN set -x \ diff --git a/projects/kubernetes/image-cache/Dockerfile b/projects/kubernetes/image-cache/Dockerfile index 44210f632..78b28a530 100644 --- a/projects/kubernetes/image-cache/Dockerfile +++ b/projects/kubernetes/image-cache/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/docker-ce:741bf21513328f674e0cdcaa55492b0b75974e08 +FROM linuxkit/docker-ce:050e734489f2d19b42ec818a4242a318ea446bc3 ADD . /images ENTRYPOINT [ "/bin/sh", "-c" ] CMD [ "for image in /images/*.tar ; do docker image load -i $image && rm -f $image ; done" ] diff --git a/projects/kubernetes/kube-master.yml b/projects/kubernetes/kube-master.yml index 2bf7f8ff1..99a23c876 100644 --- a/projects/kubernetes/kube-master.yml +++ b/projects/kubernetes/kube-master.yml @@ -74,7 +74,7 @@ services: binds: - /root/.ssh:/root/.ssh - name: docker - image: "linuxkit/docker-ce:741bf21513328f674e0cdcaa55492b0b75974e08" + image: "linuxkit/docker-ce:050e734489f2d19b42ec818a4242a318ea446bc3" capabilities: - all net: host diff --git a/projects/kubernetes/kube-node.yml b/projects/kubernetes/kube-node.yml index 0f1a6303d..6867b8cdb 100644 --- a/projects/kubernetes/kube-node.yml +++ b/projects/kubernetes/kube-node.yml @@ -74,7 +74,7 @@ services: binds: - /root/.ssh:/root/.ssh - name: docker - image: "linuxkit/docker-ce:741bf21513328f674e0cdcaa55492b0b75974e08" + image: "linuxkit/docker-ce:050e734489f2d19b42ec818a4242a318ea446bc3" capabilities: - all net: host diff --git a/test/cases/test-docker-bench.yml b/test/cases/test-docker-bench.yml index 37846cfc0..5d3aa214e 100644 --- a/test/cases/test-docker-bench.yml +++ b/test/cases/test-docker-bench.yml @@ -57,7 +57,7 @@ services: net: host oomScoreAdj: -800 - name: docker - image: "linuxkit/docker-ce:957306b51f2bc03087833eee2625d60514a5079c" + image: "linuxkit/docker-ce:050e734489f2d19b42ec818a4242a318ea446bc3" capabilities: - all net: host