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

Fix network disconnect does not save the config to disk

Browse Source 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: c0bde4e92c1da26e206bfbcb8308bd9a5f037659
Component: engine
This commit is contained in:
Lei Jitang
2015-12-25 02:09:37 -05:00
parent 91a83f8dd4
commit 89492a4249
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
components/engine/daemon/container_operations_unix.go
View File

@ -711,15 +711,17 @@ func (daemon *Daemon) DisconnectFromNetwork(container *container.Container, n li
return runconfig.ErrConflictHostNetwork
}
return disconnectFromNetwork(container, n)
}
func disconnectFromNetwork(container *container.Container, n libnetwork.Network) error {
if err := disconnectFromNetwork(container, n); err != nil {
return err
}
if err := container.ToDiskLocking(); err != nil {
return fmt.Errorf("Error saving container to disk: %v", err)
}
return nil
}
func disconnectFromNetwork(container *container.Container, n libnetwork.Network) error {
var (
ep libnetwork.Endpoint
sbox libnetwork.Sandbox