clearlinux/docker
2
0
Fork 0
mirror of https://github.com/clearlinux/docker.git synced 2026-09-28 09:00:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix unmount when host volume is removed

Browse Source 
Fixes #5244
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
This commit is contained in:
Michael Crosby
2014-04-14 12:43:01 +00:00
parent 24c4c3e0e9
commit 39103e72a3
2 changed files with 34 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/server.go
+7 -4
View File
@@ -1867,13 +1867,16 @@ func (srv *Server) ContainerDestroy(job *engine.Job) engine.Status {
for _, bind := range container.HostConfig().Binds {
source := strings.Split(bind, ":")[0]
// TODO: refactor all volume stuff, all of it
// this is very important that we eval the link
// or comparing the keys to container.Volumes will not work
// it is very important that we eval the link or comparing the keys to container.Volumes will not work
//
// eval symlink can fail, ref #5244 if we receive an is not exist error we can ignore it
p, err := filepath.EvalSymlinks(source)
if err != nil {
if err != nil && !os.IsNotExist(err) {
return job.Error(err)
}
source = p
if p != "" {
source = p
}
binds[source] = struct{}{}
}