beenull/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix 2 potential panics with mounts in swarm

Browse source 
Signed-off-by: Victor Vieux <vieux@docker.com>
This commit is contained in:
Victor Vieux 2016-06-14 09:25:39 -07:00
parent c913dd5f57
commit ffeb9fcb2a
2 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
api/client/service/opts.go
View file

@ -154,6 +154,9 @@ func (m *MountOpt) Set(value string) error {
Labels: make(map[string]string), Labels: make(map[string]string),
} }
} }
if mount.VolumeOptions.DriverConfig == nil {
mount.VolumeOptions.DriverConfig = &swarm.Driver{}
}
return mount.VolumeOptions return mount.VolumeOptions
} }

2
daemon/cluster/executor/container/adapter.go
View file

@ -192,7 +192,7 @@ func (c *containerAdapter) createVolumes(ctx context.Context, backend executorpk
continue continue
} }
if mount.VolumeOptions != nil { if mount.VolumeOptions == nil {
continue continue
} }