docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix removing mountpoints on container rm fail 

Ensure that the the container's mountpoints are cleaned up if the
container is force removed.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
This commit is contained in:
Brian Goff 2016-01-25 15:44:59 -05:00
parent 15cc67b73d
commit 0eed34755e
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
daemon/delete.go
View File

@ -43,17 +43,16 @@ func (daemon *Daemon) ContainerRm(name string, config *types.ContainerRmConfig)
return daemon.rmLink(container, name) return daemon.rmLink(container, name)
} }
if err := daemon.cleanupContainer(container, config.ForceRemove); err != nil { err = daemon.cleanupContainer(container, config.ForceRemove)
if err == nil || config.ForceRemove {
if e := daemon.removeMountPoints(container, config.RemoveVolume); e != nil {
logrus.Error(e)
}
}
return err return err
} }
if err := daemon.removeMountPoints(container, config.RemoveVolume); err != nil {
logrus.Error(err)
}
return nil
}
func (daemon *Daemon) rmLink(container *container.Container, name string) error { func (daemon *Daemon) rmLink(container *container.Container, name string) error {
if name[0] != '/' { if name[0] != '/' {
name = "/" + name name = "/" + name