do not fail when container could't killed

This commit is contained in:
ubergesundheit 2017-02-07 15:48:38 +01:00
parent 86bd046deb
commit 97d108f415
No known key found for this signature in database
GPG key ID: 5CBA93477A39C06E
2 changed files with 93 additions and 1 deletions

View file

@ -114,7 +114,7 @@ func (client dockerClient) StopContainer(c Container, timeout time.Duration) err
log.Infof("Stopping %s (%s) with %s", c.Name(), c.ID(), signal)
if err := client.api.ContainerKill(bg, c.ID(), signal); err != nil {
return err
fmt.Errorf("Container %s (%s) could not be killed", c.Name(), c.ID())
}
// Wait for container to exit, but proceed anyway after the timeout elapses