diff options
| author | Brian Goff <cpuguy83@gmail.com> | 2017-05-18 13:08:10 -0400 |
|---|---|---|
| committer | Brian Goff <cpuguy83@gmail.com> | 2017-05-18 13:08:10 -0400 |
| commit | 9ef54c654ba61fd10b4c3322ccd31ccd45dc9b38 (patch) | |
| tree | 479c7a37e20d540382b2a758f1179bcb4cfe8657 | |
| parent | 8b9c66e80dc67e7536810fda28ff0c9abbfc14ad (diff) | |
| download | docker-9ef54c654ba61fd10b4c3322ccd31ccd45dc9b38.tar.gz | |
Update libnetwork vendor
Pulls in docker/libnetwork#1750
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
| -rw-r--r-- | vendor.conf | 2 | ||||
| -rw-r--r-- | vendor/github.com/docker/libnetwork/controller.go | 2 | ||||
| -rw-r--r-- | vendor/github.com/docker/libnetwork/drivers/bridge/setup_ip_tables.go | 5 |
3 files changed, 7 insertions, 2 deletions
diff --git a/vendor.conf b/vendor.conf index 4155051a05..399b6e6703 100644 --- a/vendor.conf +++ b/vendor.conf @@ -23,7 +23,7 @@ github.com/RackSec/srslog 456df3a81436d29ba874f3590eeeee25d666f8a5 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 14b722606d..95b46bcdd0 100644 --- a/vendor/github.com/docker/libnetwork/controller.go +++ b/vendor/github.com/docker/libnetwork/controller.go @@ -741,7 +741,9 @@ func (c *controller) NewNetwork(networkType, name string, id string, options ... 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 9df4cdc6c6..35166ab151 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 @@ func (n *bridgeNetwork) setupIPTables(config *networkConfiguration, i *bridgeInt 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 } |