From 9bcd91db8df699f8e58cacd8475feabab2aaf232 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pavel=20Mat=C4=9Bja?= Date: Fri, 28 Jun 2019 15:47:00 +0200 Subject: [PATCH] Allow network with --config-from to be --internal MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The --internal netlabel is discarded now. Signed-off-by: Pavel Matěja --- controller.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/controller.go b/controller.go index a182cdc8e9..e78fc559d8 100644 --- a/controller.go +++ b/controller.go @@ -798,9 +798,11 @@ func (c *controller) NewNetwork(networkType, name string, id string, options ... if err != nil { return nil, types.NotFoundErrorf("configuration network %q does not exist", network.configFrom) } + internal := network.internal if err = t.applyConfigurationTo(network); err != nil { return nil, types.InternalErrorf("Failed to apply configuration: %v", err) } + network.generic[netlabel.Internal] = internal defer func() { if err == nil { if err := t.getEpCnt().IncEndpointCnt(); err != nil {