From 3ad5bd6d88826f0f7fd75a78973faa6bf8ac2f08 Mon Sep 17 00:00:00 2001 From: Alessandro Boch Date: Tue, 5 Apr 2016 17:02:05 -0700 Subject: [PATCH] Bridge driver needs to store the network config internal flag - otherwise after daemon reload, the network is no longer internal Signed-off-by: Alessandro Boch --- libnetwork/drivers/bridge/bridge_store.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libnetwork/drivers/bridge/bridge_store.go b/libnetwork/drivers/bridge/bridge_store.go index 066469adc9..eca72bd30b 100644 --- a/libnetwork/drivers/bridge/bridge_store.go +++ b/libnetwork/drivers/bridge/bridge_store.go @@ -95,6 +95,7 @@ func (ncfg *networkConfiguration) MarshalJSON() ([]byte, error) { nMap["EnableIPMasquerade"] = ncfg.EnableIPMasquerade nMap["EnableICC"] = ncfg.EnableICC nMap["Mtu"] = ncfg.Mtu + nMap["Internal"] = ncfg.Internal nMap["DefaultBridge"] = ncfg.DefaultBridge nMap["DefaultBindingIP"] = ncfg.DefaultBindingIP.String() nMap["DefaultGatewayIPv4"] = ncfg.DefaultGatewayIPv4.String() @@ -143,6 +144,9 @@ func (ncfg *networkConfiguration) UnmarshalJSON(b []byte) error { ncfg.EnableIPMasquerade = nMap["EnableIPMasquerade"].(bool) ncfg.EnableICC = nMap["EnableICC"].(bool) ncfg.Mtu = int(nMap["Mtu"].(float64)) + if v, ok := nMap["Internal"]; ok { + ncfg.Internal = v.(bool) + } return nil }