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

Merge pull request #593 from ijc25/delete-response

Browse source 
Return DeleteResponse from ContainerService.Delete
This commit is contained in:
Stephen Day 2017-03-02 10:10:58 -08:00 • committed by GitHub
commit a15aa8e9ab
6 changed files with 54 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

11
linux/runtime.go
View file

@ -92,16 +92,17 @@ func (r *Runtime) Create(ctx context.Context, id string, opts containerd.CreateO
}, nil
}
func (r *Runtime) Delete(ctx context.Context, c containerd.Container) error {
func (r *Runtime) Delete(ctx context.Context, c containerd.Container) (uint32, error) {
lc, ok := c.(*Container)
if !ok {
return fmt.Errorf("container cannot be cast as *linux.Container")
return 0, fmt.Errorf("container cannot be cast as *linux.Container")
}
if _, err := lc.shim.Delete(ctx, &shim.DeleteRequest{}); err != nil {
return err
rsp, err := lc.shim.Delete(ctx, &shim.DeleteRequest{})
if err != nil {
return 0, err
}
lc.shim.Exit(ctx, &shim.ExitRequest{})
return r.deleteBundle(lc.id)
return rsp.ExitStatus, r.deleteBundle(lc.id)
}
func (r *Runtime) Containers() ([]containerd.Container, error) {