vbatts/containerd
1
0
Fork 0
Code Pull requests Releases Activity

Add ContainerService.Info to get info about a single container

Browse source 
For clients which only want to know about one container this is simpler than
searching the result of execution.List.

Signed-off-by: Ian Campbell <ian.campbell@docker.com>
This commit is contained in:
Ian Campbell 2017-02-24 17:39:59 +00:00
parent 660783cb00
commit cc253b0f18
5 changed files with 291 additions and 57 deletions
Download patch file Download diff file Expand all files Collapse all files

53
services/execution/service.go
View file

@ -131,31 +131,48 @@ func (s *Service) Delete(ctx context.Context, r *api.DeleteRequest) (*google_pro
return empty, nil
}
func containerFromContainerd(ctx context.Context, c containerd.Container) (*container.Container, error) {
state, err := c.State(ctx)
if err != nil {
return nil, err
}
var status container.Status
switch state.Status() {
case containerd.CreatedStatus:
status = container.Status_CREATED
case containerd.RunningStatus:
status = container.Status_RUNNING
case containerd.StoppedStatus:
status = container.Status_STOPPED
case containerd.PausedStatus:
status = container.Status_PAUSED
}
return &container.Container{
ID: c.Info().ID,
Pid: state.Pid(),
Status: status,
}, nil
}
func (s *Service) Info(ctx context.Context, r *api.InfoRequest) (*container.Container, error) {
c, err := s.getContainer(r.ID)
if err != nil {
return nil, err
}
return containerFromContainerd(ctx, c)
}
func (s *Service) List(ctx context.Context, r *api.ListRequest) (*api.ListResponse, error) {
resp := &api.ListResponse{}
s.mu.Lock()
defer s.mu.Unlock()
for _, c := range s.containers {
state, err := c.State(ctx)
for _, cd := range s.containers {
c, err := containerFromContainerd(ctx, cd)
if err != nil {
return nil, err
}
var status container.Status
switch state.Status() {
case containerd.CreatedStatus:
status = container.Status_CREATED
case containerd.RunningStatus:
status = container.Status_RUNNING
case containerd.StoppedStatus:
status = container.Status_STOPPED
case containerd.PausedStatus:
status = container.Status_PAUSED
}
resp.Containers = append(resp.Containers, &container.Container{
ID: c.Info().ID,
Pid: state.Pid(),
Status: status,
})
resp.Containers = append(resp.Containers, c)
}
return resp, nil
}