Merge pull request #215 from HuKeping/runtime_status

Bugfix: ctr container list can not get the proper status of container
This commit is contained in:
Michael Crosby 2016-04-26 13:43:47 -07:00
commit c44f03a1bf
5 changed files with 41 additions and 5 deletions

View file

@ -9,16 +9,20 @@ type GetContainersTask struct {
}
func (s *Supervisor) getContainers(t *GetContainersTask) error {
if t.ID != "" {
ci := s.containers[t.ID]
if ci == nil {
ci, ok := s.containers[t.ID]
if !ok {
return ErrContainerNotFound
}
t.Containers = append(t.Containers, ci.container)
return nil
}
for _, i := range s.containers {
t.Containers = append(t.Containers, i.container)
for _, ci := range s.containers {
t.Containers = append(t.Containers, ci.container)
}
return nil
}