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

Merge pull request #1010 from runcom/oci-kill-all

Browse source 
oci: kill all processes in a container not just the main one
This commit is contained in:
Mrunal Patel 2017-10-13 08:54:58 -07:00 committed by GitHub
commit 5b62041194
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
oci/oci.go
View file

@ -554,7 +554,7 @@ func (r *Runtime) StopContainer(c *Container, timeout int64) error {
return nil return nil
} }
if err := utils.ExecCmdWithStdStreams(os.Stdin, os.Stdout, os.Stderr, r.Path(c), "kill", c.id, c.GetStopSignal()); err != nil { if err := utils.ExecCmdWithStdStreams(os.Stdin, os.Stdout, os.Stderr, r.Path(c), "kill", "--all", c.id, c.GetStopSignal()); err != nil {
return fmt.Errorf("failed to stop container %s, %v", c.id, err) return fmt.Errorf("failed to stop container %s, %v", c.id, err)
} }
if timeout == -1 { if timeout == -1 {