diff --git a/daemon/mgr/container.go b/daemon/mgr/container.go index 5269e453c..5f7bd81cc 100644 --- a/daemon/mgr/container.go +++ b/daemon/mgr/container.go @@ -281,7 +281,7 @@ func (mgr *ContainerManager) Restore(ctx context.Context) error { } // recover the running or paused container. - if !(c.IsRunning() || c.IsPaused()) { + if !c.IsRunningOrPaused() { continue } diff --git a/daemon/mgr/network.go b/daemon/mgr/network.go index 2e79c30ea..0525ee7dd 100644 --- a/daemon/mgr/network.go +++ b/daemon/mgr/network.go @@ -85,7 +85,7 @@ func NewNetworkManager(cfg *config.Config, store *meta.Store, ctrMgr ContainerMg &ContainerListOption{ All: true, FilterFunc: func(c *Container) bool { - return (c.IsRunning() || c.IsPaused()) && !isContainer(c.HostConfig.NetworkMode) + return c.IsRunningOrPaused() && !isContainer(c.HostConfig.NetworkMode) }}) if err != nil { logrus.Errorf("failed to new network manager: cannot get container list")