b044ff0f29
Signed-off-by: John Howard <jhoward@microsoft.com> Move process sorter to new file Signed-off-by: Michael Crosby <crosbymichael@gmail.com> Sort containers by id This will not be the most accurate sorting but atleast the list will be consistent inbetween calls. Signed-off-by: Michael Crosby <crosbymichael@gmail.com> Allow runtime to be configurable via daemon start This allows people to pass an alternate name or location to the runtime binary to start containers. Signed-off-by: Michael Crosby <crosbymichael@gmail.com> Fix state output for containers Return the proper state/status for a container by checking if the pid is still alive. Also fix the cleanup handling in the shim to make sure containers are not left behind. Signed-off-by: Michael Crosby <crosbymichael@gmail.com> Properly wait for container start Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
28 lines
475 B
Go
28 lines
475 B
Go
package supervisor
|
|
|
|
import (
|
|
"sort"
|
|
|
|
"github.com/docker/containerd/runtime"
|
|
)
|
|
|
|
func sortProcesses(p []runtime.Process) {
|
|
sort.Sort(&processSorter{p})
|
|
}
|
|
|
|
type processSorter struct {
|
|
processes []runtime.Process
|
|
}
|
|
|
|
func (s *processSorter) Len() int {
|
|
return len(s.processes)
|
|
}
|
|
|
|
func (s *processSorter) Swap(i, j int) {
|
|
s.processes[i], s.processes[j] = s.processes[j], s.processes[i]
|
|
}
|
|
|
|
func (s *processSorter) Less(i, j int) bool {
|
|
return s.processes[j].ID() == "init"
|
|
}
|