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

Forced endpoint cleanup

Browse Source 
docker's network disconnect api now supports `Force` option which can be
used to force cleanup an endpoint from any host in the cluster.

Signed-off-by: Madhu Venugopal <madhu@docker.com>
Upstream-commit: b464f1d78cdfa2a4124e083b8f7b0f2353f12de3
Component: engine
This commit is contained in:
Madhu Venugopal
2016-01-12 20:56:36 -08:00
parent b4989a8d3c
commit 2b7ea75ef2
11 changed files with 62 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
components/engine/api/server/router/network/backend.go
View File

@ -16,7 +16,7 @@ type Backend interface {
options map[string]string, internal bool) (libnetwork.Network, error)
ConnectContainerToNetwork(containerName, networkName string, endpointConfig *network.EndpointSettings) error
DisconnectContainerFromNetwork(containerName string,
network libnetwork.Network) error
network libnetwork.Network, force bool) error
NetworkControllerEnabled() bool
DeleteNetwork(name string) error
}

2
components/engine/api/server/router/network/network_routes.go
View File

@ -144,7 +144,7 @@ func (n *networkRouter) postNetworkDisconnect(ctx context.Context, w http.Respon
return err
}
return n.backend.DisconnectContainerFromNetwork(disconnect.Container, nw)
return n.backend.DisconnectContainerFromNetwork(disconnect.Container, nw, disconnect.Force)
}
func (n *networkRouter) deleteNetwork(ctx context.Context, w http.ResponseWriter, r *http.Request, vars map[string]string) error {