diff --git a/hack/dockerfile/install/proxy.installer b/hack/dockerfile/install/proxy.installer index 4a88e20fa8..d075d7b72c 100755 --- a/hack/dockerfile/install/proxy.installer +++ b/hack/dockerfile/install/proxy.installer @@ -3,7 +3,7 @@ # LIBNETWORK_COMMIT is used to build the docker-userland-proxy binary. When # updating the binary version, consider updating github.com/docker/libnetwork # in vendor.conf accordingly -: "${LIBNETWORK_COMMIT:=beab24292cb13d13670985fc860215f9e296bd47}" +: "${LIBNETWORK_COMMIT:=ef149a924dfde2e506ea3cb3f617d7d0fa96b8ee}" install_proxy() { case "$1" in diff --git a/vendor.conf b/vendor.conf index fb5216ea59..8d06fb9f2e 100644 --- a/vendor.conf +++ b/vendor.conf @@ -38,7 +38,7 @@ github.com/gofrs/flock 392e7fae8f1b0bdbd67dad7237d2 # libnetwork # When updating, also update LIBNETWORK_COMMIT in hack/dockerfile/install/proxy.installer accordingly -github.com/docker/libnetwork beab24292cb13d13670985fc860215f9e296bd47 +github.com/docker/libnetwork ef149a924dfde2e506ea3cb3f617d7d0fa96b8ee github.com/docker/go-events 9461782956ad83b30282bf90e31fa6a70c255ba9 github.com/armon/go-radix e39d623f12e8e41c7b5529e9a9dd67a1e2261f80 github.com/armon/go-metrics eb0af217e5e9747e41dd5303755356b62d28e3ec diff --git a/vendor/github.com/docker/libnetwork/drivers/bridge/setup_ip_forwarding.go b/vendor/github.com/docker/libnetwork/drivers/bridge/setup_ip_forwarding.go index 3db12bfd2f..10f61a1868 100644 --- a/vendor/github.com/docker/libnetwork/drivers/bridge/setup_ip_forwarding.go +++ b/vendor/github.com/docker/libnetwork/drivers/bridge/setup_ip_forwarding.go @@ -34,11 +34,11 @@ func setupIPForwarding(enableIPTables bool) error { if err := configureIPForwarding(true); err != nil { return fmt.Errorf("Enabling IP forwarding failed: %v", err) } - } - - // Set the default policy on forward chain to drop only if the - // daemon option iptables is not set to false. - if enableIPTables { + // When enabling ip_forward set the default policy on forward chain to + // drop only if the daemon option iptables is not set to false. + if !enableIPTables { + return nil + } if err := iptables.SetDefaultPolicy(iptables.Filter, "FORWARD", iptables.Drop); err != nil { if err := configureIPForwarding(false); err != nil { logrus.Errorf("Disabling IP forwarding failed, %v", err) diff --git a/vendor/github.com/docker/libnetwork/resolver.go b/vendor/github.com/docker/libnetwork/resolver.go index 7e02a37a5b..e32522a254 100644 --- a/vendor/github.com/docker/libnetwork/resolver.go +++ b/vendor/github.com/docker/libnetwork/resolver.go @@ -484,7 +484,7 @@ func (r *resolver) ServeDNS(w dns.ResponseWriter, query *dns.Msg) { resp, err = co.ReadMsg() // Truncated DNS replies should be sent to the client so that the // client can retry over TCP - if err != nil && !resp.Truncated { + if err != nil && (resp != nil && !resp.Truncated) { r.forwardQueryEnd() logrus.Debugf("[resolver] read from DNS server failed, %s", err) continue