Merge pull request #19676 from cpuguy83/19672_fix_force_rm
Fix removing mountpoints on container rm fail
This commit is contained in:
commit
d4ccd948e9
|
@ -43,15 +43,14 @@ func (daemon *Daemon) ContainerRm(name string, config *types.ContainerRmConfig)
|
|||
return daemon.rmLink(container, name)
|
||||
}
|
||||
|
||||
if err := daemon.cleanupContainer(container, config.ForceRemove); err != nil {
|
||||
return err
|
||||
err = daemon.cleanupContainer(container, config.ForceRemove)
|
||||
if err == nil || config.ForceRemove {
|
||||
if e := daemon.removeMountPoints(container, config.RemoveVolume); e != nil {
|
||||
logrus.Error(e)
|
||||
}
|
||||
}
|
||||
|
||||
if err := daemon.removeMountPoints(container, config.RemoveVolume); err != nil {
|
||||
logrus.Error(err)
|
||||
}
|
||||
|
||||
return nil
|
||||
return err
|
||||
}
|
||||
|
||||
func (daemon *Daemon) rmLink(container *container.Container, name string) error {
|
||||
|
|
Loading…
Reference in New Issue