Merge pull request #33273 from cpuguy83/update_libnet_vendor_17.03
[17.03] Update libnetwork vendor
diff --git a/vendor.conf b/vendor.conf
index 4155051..399b6e6 100644
--- a/vendor.conf
+++ b/vendor.conf
@@ -23,7 +23,7 @@
github.com/imdario/mergo 0.2.1
#get libnetwork packages
-github.com/docker/libnetwork ce28404512e8fac9b8103b9072e75cf8d4339302
+github.com/docker/libnetwork 57248dc8d53e7b6cf3124db8f22bf8bbf5d363cb
github.com/docker/go-events 18b43f1bc85d9cdd42c05a6cd2d444c7a200a894
github.com/armon/go-radix e39d623f12e8e41c7b5529e9a9dd67a1e2261f80
github.com/armon/go-metrics eb0af217e5e9747e41dd5303755356b62d28e3ec
diff --git a/vendor/github.com/docker/libnetwork/controller.go b/vendor/github.com/docker/libnetwork/controller.go
index 14b7226..95b46bc 100644
--- a/vendor/github.com/docker/libnetwork/controller.go
+++ b/vendor/github.com/docker/libnetwork/controller.go
@@ -741,7 +741,9 @@
joinCluster(network)
if !c.isDistributedControl() {
+ c.Lock()
arrangeIngressFilterRule()
+ c.Unlock()
}
return network, nil
diff --git a/vendor/github.com/docker/libnetwork/drivers/bridge/setup_ip_tables.go b/vendor/github.com/docker/libnetwork/drivers/bridge/setup_ip_tables.go
index 9df4cdc..35166ab 100644
--- a/vendor/github.com/docker/libnetwork/drivers/bridge/setup_ip_tables.go
+++ b/vendor/github.com/docker/libnetwork/drivers/bridge/setup_ip_tables.go
@@ -114,7 +114,10 @@
n.portMapper.SetIptablesChain(natChain, n.getNetworkBridgeName())
}
- if err := ensureJumpRule("FORWARD", IsolationChain); err != nil {
+ d.Lock()
+ err = ensureJumpRule("FORWARD", IsolationChain)
+ d.Unlock()
+ if err != nil {
return err
}
