Explorar o código

Merge pull request #2259 from resin-os/handle-invalid-default-gateways

bridge: fix error handling for stale default gateways
Christopher Adam Telfer %!s(int64=6) %!d(string=hai) anos
pai
achega
e29452841e
Modificáronse 1 ficheiros con 1 adicións e 1 borrados
  1. 1 1
      libnetwork/drivers/bridge/bridge.go

+ 1 - 1
libnetwork/drivers/bridge/bridge.go

@@ -598,7 +598,7 @@ func (d *driver) checkConflict(config *networkConfiguration) error {
 		nwConfig := nw.config
 		nw.Unlock()
 		if err := nwConfig.Conflicts(config); err != nil {
-			if config.DefaultBridge {
+			if nwConfig.DefaultBridge {
 				// We encountered and identified a stale default network
 				// We must delete it as libnetwork is the source of truth
 				// The default network being created must be the only one