toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #23644 from tonistiigi/fix-leave-delete

Browse Source 
Fix removing containers on leaving from pending state
Upstream-commit: f4de3f314e1e965056447d5ea6203ca4b66bb6e0
Component: engine
This commit is contained in:
Arnaud Porterie
2016-06-17 01:40:45 +00:00
committed by GitHub
parent c1713ee511 dae11af952
commit 79ea0079e7
2 changed files with 31 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/engine/daemon/cluster/cluster.go
+5 -4
View File
@@ -389,10 +389,11 @@ func (c *Cluster) Leave(force bool) error {
if err := node.Stop(ctx); err != nil && !strings.Contains(err.Error(), "context canceled") {
return err
}
nodeID := node.NodeID()
for _, id := range c.config.Backend.ListContainersForNode(nodeID) {
if err := c.config.Backend.ContainerRm(id, &apitypes.ContainerRmConfig{ForceRemove: true}); err != nil {
logrus.Errorf("error removing %v: %v", id, err)
if nodeID := node.NodeID(); nodeID != "" {
for _, id := range c.config.Backend.ListContainersForNode(nodeID) {
if err := c.config.Backend.ContainerRm(id, &apitypes.ContainerRmConfig{ForceRemove: true}); err != nil {
logrus.Errorf("error removing %v: %v", id, err)
}
}
}
c.Lock()