From 437948a86bde60e11b18d1f9d11197d9a97d95ae Mon Sep 17 00:00:00 2001 From: Antonio Murdaca Date: Thu, 11 May 2017 11:41:53 +0200 Subject: [PATCH] oci: do not stop containers not running Signed-off-by: Antonio Murdaca --- oci/oci.go | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/oci/oci.go b/oci/oci.go index e318ba3d..33e7d18f 100644 --- a/oci/oci.go +++ b/oci/oci.go @@ -439,6 +439,11 @@ func (r *Runtime) ExecSync(c *Container, command []string, timeout int64) (resp func (r *Runtime) StopContainer(c *Container) error { c.opLock.Lock() defer c.opLock.Unlock() + + if c.state.Status != ContainerStateRunning { + return nil + } + if err := utils.ExecCmdWithStdStreams(os.Stdin, os.Stdout, os.Stderr, r.Path(c), "kill", c.name, "TERM"); err != nil { return err }