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

fix issue26244

Browse Source 
Signed-off-by: Daniel Zhang <jmzwcn@gmail.com>
Upstream-commit: 434eae7dfd1612d8de292480d4c31c68fceffa68
Component: engine
This commit is contained in:
Daniel Zhang
2016-10-09 12:36:44 +08:00
parent ad119a9fca
commit 5c631e04b7
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/engine/daemon/cluster/executor/container/adapter.go
+7 -3
View File
@@ -133,11 +133,15 @@ func (c *containerAdapter) createNetworks(ctx context.Context) error {
func (c *containerAdapter) removeNetworks(ctx context.Context) error {
for _, nid := range c.container.networks() {
if err := c.backend.DeleteManagedNetwork(nid); err != nil {
if _, ok := err.(*libnetwork.ActiveEndpointsError); ok {
switch err.(type) {
case *libnetwork.ActiveEndpointsError:
continue
case libnetwork.ErrNoSuchNetwork:
continue
default:
log.G(ctx).Errorf("network %s remove failed: %v", nid, err)
return err
}
log.G(ctx).Errorf("network %s remove failed: %v", nid, err)
return err
}
}