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

Merge pull request #78 from dotcloud/77-undeleted_mountpoint-fix

Browse Source 
Fix undeleted mountpoint on destroy
Upstream-commit: 7188dcd96d7c4e48911e92d07a93eecc6f713d58
Component: engine
This commit is contained in:
Guillaume J. Charmes
2013-03-14 10:09:00 -07:00
parent 75751f1a84 8b0719b284
commit d7d110939d
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
components/engine/docker.go
View File

@ -76,10 +76,9 @@ func (docker *Docker) Destroy(container *Container) error {
if err := container.Mountpoint.Umount(); err != nil {
log.Printf("Unable to umount container %v: %v", container.Id, err)
}
if err := container.Mountpoint.Deregister(); err != nil {
log.Printf("Unable to deregiser mountpoint %v: %v", container.Mountpoint.Root, err)
}
}
if err := container.Mountpoint.Deregister(); err != nil {
log.Printf("Unable to deregiser mountpoint %v: %v", container.Mountpoint.Root, err)
}
if err := os.RemoveAll(container.Root); err != nil {
log.Printf("Unable to remove filesystem for %v: %v", container.Id, err)