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

Merge pull request #1268 from justincormack/no-wait-ctr

Browse Source 
Do not wait for containerd to be ready, as not using it yet
This commit is contained in:
Justin Cormack 2017-03-09 14:41:05 +00:00 committed by GitHub
commit 83c052f74c
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
base/init/etc/init.d/containers
View File

@ -1,8 +1,8 @@
#!/bin/sh #!/bin/sh
# TODO more robust # TODO more robust
while [ ! -S /run/containerd/containerd.sock ]; do sleep 1; done # while [ ! -S /run/containerd/containerd.sock ]; do sleep 1; done
while ! ctr list 2> /dev/null; do sleep 1; done # while ! ctr list 2> /dev/null; do sleep 1; done
# start system containers # start system containers
# temporarily using runc not containerd # temporarily using runc not containerd

2
moby.yaml
View File

@ -1,5 +1,5 @@
kernel: "mobylinux/kernel:598481c08deafa37dccb33c88ad69fdecda57909" kernel: "mobylinux/kernel:598481c08deafa37dccb33c88ad69fdecda57909"
init: "mobylinux/init:99cd639fa724a706e2d85575cabc4b645b71a727" init: "mobylinux/init:2f1b5c1be1157cb17e5b1e6dee171dccdebb5277"
system: system:
- name: binfmt - name: binfmt
image: "mobylinux/binfmt:a94e0587b702edaa95cc6f303464959d0eb2311c@sha256:432732b90cbe0498f5ca148d75b90bb1eabd8fbfe8c872df8b23906c225091b1" image: "mobylinux/binfmt:a94e0587b702edaa95cc6f303464959d0eb2311c@sha256:432732b90cbe0498f5ca148d75b90bb1eabd8fbfe8c872df8b23906c225091b1"

2
test.yaml
View File

@ -1,5 +1,5 @@
kernel: "mobylinux/kernel:598481c08deafa37dccb33c88ad69fdecda57909" kernel: "mobylinux/kernel:598481c08deafa37dccb33c88ad69fdecda57909"
init: "mobylinux/init:99cd639fa724a706e2d85575cabc4b645b71a727" init: "mobylinux/init:2f1b5c1be1157cb17e5b1e6dee171dccdebb5277"
system: system:
- name: binfmt - name: binfmt
image: "mobylinux/binfmt:a94e0587b702edaa95cc6f303464959d0eb2311c@sha256:432732b90cbe0498f5ca148d75b90bb1eabd8fbfe8c872df8b23906c225091b1" image: "mobylinux/binfmt:a94e0587b702edaa95cc6f303464959d0eb2311c@sha256:432732b90cbe0498f5ca148d75b90bb1eabd8fbfe8c872df8b23906c225091b1"