vbatts/cri-o
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Remove ImageSpec dependency from server

Browse source 
Signed-off-by: Ryan Cole <rcyoalne@gmail.com>
This commit is contained in:
Ryan Cole 2017-07-17 15:42:14 -04:00
parent 3f70873aab
commit f3efb850b7
6 changed files with 14 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

6
server/container_list.go
View file

@ -75,7 +75,9 @@ func (s *Server) ListContainers(ctx context.Context, req *pb.ListContainersReque
created := cState.Created.UnixNano()
rState := pb.ContainerState_CONTAINER_UNKNOWN
cID := ctr.ID()
img := &pb.ImageSpec{
Image: ctr.Image(),
}
c := &pb.Container{
Id: cID,
PodSandboxId: podSandboxID,
@ -83,7 +85,7 @@ func (s *Server) ListContainers(ctx context.Context, req *pb.ListContainersReque
Labels: ctr.Labels(),
Metadata: ctr.Metadata(),
Annotations: ctr.Annotations(),
Image: ctr.Image(),
Image: img,
}
switch cState.Status {