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

Merge pull request #10926 from cpuguy83/10685_check_nil_volume

Browse Source 
Check nil volume on mount init
Upstream-commit: ae9001fbdc251a455a7e59475b2a40b54d2fbd96
Component: engine
This commit is contained in:
Jessie Frazelle
2015-02-23 13:55:38 -08:00
parent 1c2ec47a40 c3fb546053
commit 56f9de6d23
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
components/engine/daemon/volumes.go
View File

@ -89,9 +89,10 @@ func (m *Mount) initialize() error {
// Make sure we remove these old volumes we don't actually want now.
// Ignore any errors here since this is just cleanup, maybe someone volumes-from'd this volume
v := m.container.daemon.volumes.Get(hostPath)
v.RemoveContainer(m.container.ID)
m.container.daemon.volumes.Delete(v.Path)
if v := m.container.daemon.volumes.Get(hostPath); v != nil {
v.RemoveContainer(m.container.ID)
m.container.daemon.volumes.Delete(v.Path)
}
}
// This is the full path to container fs + mntToPath