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

Shutdown plugins after containers.

Browse Source 
Fixes #26278

Signed-off-by: Anusha Ragunathan <anusha@docker.com>
Upstream-commit: ed6e30767e27537ce342baa17659d983a76c5b7e
Component: engine
This commit is contained in:
Anusha Ragunathan
2016-10-03 15:42:46 -07:00
parent 33a6443775
commit 543881c701
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
components/engine/daemon/daemon.go
View File

@ -726,8 +726,6 @@ func (daemon *Daemon) Shutdown() error {
// Keep mounts and networking running on daemon shutdown if
// we are to keep containers running and restore them.
pluginShutdown()
if daemon.configStore.LiveRestoreEnabled && daemon.containers != nil {
// check if there are any running containers, if none we should do some cleanup
if ls, err := daemon.Containers(&types.ContainerListOptions{}); len(ls) != 0 || err != nil {
@ -753,6 +751,9 @@ func (daemon *Daemon) Shutdown() error {
})
}
// Shutdown plugins after containers. Dont change the order.
pluginShutdown()
// trigger libnetwork Stop only if it's initialized
if daemon.netController != nil {
daemon.netController.Stop()