From 7c2ee209e8501c309139d13aedbfd8645df2df03 Mon Sep 17 00:00:00 2001 From: Justin Cormack Date: Thu, 9 Mar 2017 14:37:28 +0000 Subject: [PATCH] Do not wait for containerd to be ready, as not using it yet Signed-off-by: Justin Cormack --- base/init/etc/init.d/containers | 4 ++-- moby.yaml | 2 +- test.yaml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/base/init/etc/init.d/containers b/base/init/etc/init.d/containers index 65c827020..3cab6c479 100755 --- a/base/init/etc/init.d/containers +++ b/base/init/etc/init.d/containers @@ -1,8 +1,8 @@ #!/bin/sh # TODO more robust -while [ ! -S /run/containerd/containerd.sock ]; do sleep 1; done -while ! ctr list 2> /dev/null; do sleep 1; done +# while [ ! -S /run/containerd/containerd.sock ]; do sleep 1; done +# while ! ctr list 2> /dev/null; do sleep 1; done # start system containers # temporarily using runc not containerd diff --git a/moby.yaml b/moby.yaml index db3014363..751930448 100644 --- a/moby.yaml +++ b/moby.yaml @@ -1,5 +1,5 @@ kernel: "mobylinux/kernel:598481c08deafa37dccb33c88ad69fdecda57909" -init: "mobylinux/init:99cd639fa724a706e2d85575cabc4b645b71a727" +init: "mobylinux/init:2f1b5c1be1157cb17e5b1e6dee171dccdebb5277" system: - name: binfmt image: "mobylinux/binfmt:a94e0587b702edaa95cc6f303464959d0eb2311c@sha256:432732b90cbe0498f5ca148d75b90bb1eabd8fbfe8c872df8b23906c225091b1" diff --git a/test.yaml b/test.yaml index a192d841d..7912eaec4 100644 --- a/test.yaml +++ b/test.yaml @@ -1,5 +1,5 @@ kernel: "mobylinux/kernel:598481c08deafa37dccb33c88ad69fdecda57909" -init: "mobylinux/init:99cd639fa724a706e2d85575cabc4b645b71a727" +init: "mobylinux/init:2f1b5c1be1157cb17e5b1e6dee171dccdebb5277" system: - name: binfmt image: "mobylinux/binfmt:a94e0587b702edaa95cc6f303464959d0eb2311c@sha256:432732b90cbe0498f5ca148d75b90bb1eabd8fbfe8c872df8b23906c225091b1"