GitList

Browse code

Merge pull request #23523 from vieux/fix_mounts_swarm

fix 2 potential panics with mounts in swarm

Brian Goff authored on 2016/06/15 03:44:19
Showing 2 changed files

api/client/service/opts.go index f54c81b..00ede4d 100644
daemon/cluster/executor/container/adapter.go index c9751ca..ffe1ce6 100644

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

daemon/cluster/executor/container/adapter.go

History View file @ 87f31e3

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

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

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