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

Update yaml files to new Docker CE

Browse Source 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
This commit is contained in:
Justin Cormack 2017-05-09 11:12:39 +01:00
parent 9e879dc56a
commit 9ca3ba489a
5 changed files with 5 additions and 5 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 - CAP_SETGID
net: host net: host
- name: docker - name: docker
image: "linuxkit/docker-ce:957306b51f2bc03087833eee2625d60514a5079c" image: "linuxkit/docker-ce:050e734489f2d19b42ec818a4242a318ea446bc3"
capabilities: capabilities:
- all - all
net: host net: host

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

@ -1,4 +1,4 @@
FROM linuxkit/docker-ce:741bf21513328f674e0cdcaa55492b0b75974e08 FROM linuxkit/docker-ce:050e734489f2d19b42ec818a4242a318ea446bc3
ADD . /images ADD . /images
ENTRYPOINT [ "/bin/sh", "-c" ] ENTRYPOINT [ "/bin/sh", "-c" ]
CMD [ "for image in /images/*.tar ; do docker image load -i $image && rm -f $image ; done" ] 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: binds:
- /root/.ssh:/root/.ssh - /root/.ssh:/root/.ssh
- name: docker - name: docker
image: "linuxkit/docker-ce:741bf21513328f674e0cdcaa55492b0b75974e08" image: "linuxkit/docker-ce:050e734489f2d19b42ec818a4242a318ea446bc3"
capabilities: capabilities:
- all - all
net: host net: host

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

@ -74,7 +74,7 @@ services:
binds: binds:
- /root/.ssh:/root/.ssh - /root/.ssh:/root/.ssh
- name: docker - name: docker
image: "linuxkit/docker-ce:741bf21513328f674e0cdcaa55492b0b75974e08" image: "linuxkit/docker-ce:050e734489f2d19b42ec818a4242a318ea446bc3"
capabilities: capabilities:
- all - all
net: host net: host

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

@ -57,7 +57,7 @@ services:
net: host net: host
oomScoreAdj: -800 oomScoreAdj: -800
- name: docker - name: docker
image: "linuxkit/docker-ce:957306b51f2bc03087833eee2625d60514a5079c" image: "linuxkit/docker-ce:050e734489f2d19b42ec818a4242a318ea446bc3"
capabilities: capabilities:
- all - all
net: host net: host