Merge pull request #33273 from cpuguy83/update_libnet_vendor_17.03
[17.03] Update libnetwork vendor
This commit is contained in:
commit
69e798217c
3 changed files with 7 additions and 2 deletions
|
@ -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
|
||||
|
|
2
vendor/github.com/docker/libnetwork/controller.go
generated
vendored
2
vendor/github.com/docker/libnetwork/controller.go
generated
vendored
|
@ -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
|
||||
|
|
5
vendor/github.com/docker/libnetwork/drivers/bridge/setup_ip_tables.go
generated
vendored
5
vendor/github.com/docker/libnetwork/drivers/bridge/setup_ip_tables.go
generated
vendored
|
@ -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
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue