Merge pull request #13471 from ibuildthecloud/no-nil

Preinitialize MountPoints to avoid assigning to a nil map
Upstream-commit: 0fccc40307c239e421dde825fc9f7adfadeaff61
Component: engine
This commit is contained in:
Brian Goff
2015-05-26 12:26:49 -04:00

View File

@ -161,6 +161,7 @@ func (daemon *Daemon) load(id string) (*Container, error) {
CommonContainer: CommonContainer{
State: NewState(),
root: daemon.containerRoot(id),
MountPoints: make(map[string]*mountPoint),
execCommands: newExecStore(),
},
}