Merge pull request #79 from v2tec/DoNotCallRemoveOnAutoRemove

Do not initiate a RemoveContainer for containers which have AutoRemov…
pull/61/merge
Fabrizio Steiner 8 years ago committed by GitHub
commit fec369fd01

@ -101,11 +101,15 @@ func (client dockerClient) StopContainer(c Container, timeout time.Duration) err
// Wait for container to exit, but proceed anyway after the timeout elapses
client.waitForStop(c, timeout)
if c.containerInfo.HostConfig.AutoRemove {
log.Debugf("AutoRemove container %s, skipping ContainerRemove call.", c.ID())
} else {
log.Debugf("Removing container %s", c.ID())
if err := client.api.ContainerRemove(bg, c.ID(), types.ContainerRemoveOptions{Force: true, RemoveVolumes: false}); err != nil {
return err
}
}
// Wait for container to be removed. In this case an error is a good thing
if err := client.waitForStop(c, timeout); err == nil {

Loading…
Cancel
Save