Merge branch 'master' of https://github.com/docker/swarmkit into esc-…

…1003
moby · Mar 4, 2019 · 50465cb · 50465cb
2 parents 3a531f4 + e6e1f60
commit 50465cb
Show file tree

Hide file tree

Showing 399 changed files with 74,382 additions and 18,393 deletions.
diff --git a/.gometalinter.json b/.gometalinter.json
@@ -9,7 +9,6 @@
 		"gofmt",
 		"goimports",
 		"golint",
-		"gosimple",
 		"ineffassign",
 		"deadcode",
 		"unconvert"

diff --git a/agent/exec/dockerapi/container.go b/agent/exec/dockerapi/container.go
@@ -306,7 +306,9 @@ func convertMount(m api.Mount) enginemount.Mount {
 	}
 
 	if m.BindOptions != nil {
-		mount.BindOptions = &enginemount.BindOptions{}
+		mount.BindOptions = &enginemount.BindOptions{
+			NonRecursive: m.BindOptions.NonRecursive,
+		}
 		switch m.BindOptions.Propagation {
 		case api.MountPropagationRPrivate:
 			mount.BindOptions.Propagation = enginemount.PropagationRPrivate