Merge pull request #1777 from nalind/no-config-for-extant-netns

crosbymichael · web-flow · commit 9f0eca2a94a5 · 2018-04-12T10:55:02.000-04:00
Only configure networking when creating a net ns
diff --git a/libcontainer/specconv/spec_linux.go b/libcontainer/specconv/spec_linux.go
@@ -216,7 +216,7 @@ func CreateLibcontainerConfig(opts *CreateOpts) (*configs.Config, error) {
 			}
 			config.Namespaces.Add(t, ns.Path)
 		}
-		if config.Namespaces.Contains(configs.NEWNET) {
+		if config.Namespaces.Contains(configs.NEWNET) && config.Namespaces.PathOf(configs.NEWNET) == "" {
 			config.Networks = []*configs.Network{
 				{
 					Type: "loopback",

Original file line number	Diff line number	Diff line change
`@@ -216,7 +216,7 @@ func CreateLibcontainerConfig(opts CreateOpts) (configs.Config, error) {`
`216`	`216`	`}`
`217`	`217`	`config.Namespaces.Add(t, ns.Path)`
`218`	`218`	`}`
`219`		`- if config.Namespaces.Contains(configs.NEWNET) {`
	`219`	`+ if config.Namespaces.Contains(configs.NEWNET) && config.Namespaces.PathOf(configs.NEWNET) == "" {`
`220`	`220`	`config.Networks = []*configs.Network{`
`221`	`221`	`{`
`222`	`222`	`Type: "loopback",`