github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-07-21 10:09:07 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1790 from justincormack/docker-17.05

Browse Source 
Update to Docker 17.05
This commit is contained in:
Justin Cormack 2017-05-09 13:57:48 +01:00 committed by GitHub
commit 5c792e791a
6 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/docker.yml
View File

@ -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

4
pkg/docker-ce/Dockerfile
View File

@ -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 \

2
projects/kubernetes/image-cache/Dockerfile
View File

@ -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" ]

2
projects/kubernetes/kube-master.yml
View File

@ -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

2
projects/kubernetes/kube-node.yml
View File

@ -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

2
test/cases/test-docker-bench.yml
View File

@ -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