Merge pull request #2414 from lemrouch/2413-fix

selansen · web-flow · commit 3fb133ee8602 · 2019-07-15T16:24:19.000-04:00
Allow network with --config-from to be --internal
diff --git a/controller.go b/controller.go
@@ -801,6 +801,7 @@ func (c *controller) NewNetwork(networkType, name string, id string, options ...
 		if err = t.applyConfigurationTo(network); err != nil {
 			return nil, types.InternalErrorf("Failed to apply configuration: %v", err)
 		}
+		network.generic[netlabel.Internal] = network.internal
 		defer func() {
 			if err == nil {
 				if err := t.getEpCnt().IncEndpointCnt(); err != nil {

Original file line number	Diff line number	Diff line change
`@@ -801,6 +801,7 @@ func (c *controller) NewNetwork(networkType, name string, id string, options ...`
`801`	`801`	`if err = t.applyConfigurationTo(network); err != nil {`
`802`	`802`	`return nil, types.InternalErrorf("Failed to apply configuration: %v", err)`
`803`	`803`	`}`
	`804`	`+ network.generic[netlabel.Internal] = network.internal`
`804`	`805`	`defer func() {`
`805`	`806`	`if err == nil {`
`806`	`807`	`if err := t.getEpCnt().IncEndpointCnt(); err != nil {`