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

Merge pull request #10926 from cpuguy83/10685_check_nil_volume

Browse Source 
Check nil volume on mount init
This commit is contained in:
Jessie Frazelle
2015-02-23 13:55:38 -08:00
parent 83bf0ac96d 7122b6643e
commit ae9001fbdc
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
daemon/volumes.go
+4 -3
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