Signed-off-by: Tibor Vass <tibor@docker.com>
| ... | ... |
@@ -3,7 +3,7 @@ |
| 3 | 3 |
# LIBNETWORK_COMMIT is used to build the docker-userland-proxy binary. When |
| 4 | 4 |
# updating the binary version, consider updating github.com/docker/libnetwork |
| 5 | 5 |
# in vendor.conf accordingly |
| 6 |
-: "${LIBNETWORK_COMMIT:=ef149a924dfde2e506ea3cb3f617d7d0fa96b8ee}"
|
|
| 6 |
+: "${LIBNETWORK_COMMIT:=2e24aed516bd5c836e11378bb457dd612aa868ed}"
|
|
| 7 | 7 |
|
| 8 | 8 |
install_proxy() {
|
| 9 | 9 |
case "$1" in |
| ... | ... |
@@ -40,7 +40,7 @@ github.com/gofrs/flock 392e7fae8f1b0bdbd67dad7237d2 |
| 40 | 40 |
# libnetwork |
| 41 | 41 |
|
| 42 | 42 |
# When updating, also update LIBNETWORK_COMMIT in hack/dockerfile/install/proxy.installer accordingly |
| 43 |
-github.com/docker/libnetwork 1a17fb36132631a95fe6bb055b91e24a516ad81d |
|
| 43 |
+github.com/docker/libnetwork 2e24aed516bd5c836e11378bb457dd612aa868ed |
|
| 44 | 44 |
github.com/docker/go-events e31b211e4f1cd09aa76fe4ac244571fab96ae47f |
| 45 | 45 |
github.com/armon/go-radix e39d623f12e8e41c7b5529e9a9dd67a1e2261f80 |
| 46 | 46 |
github.com/armon/go-metrics eb0af217e5e9747e41dd5303755356b62d28e3ec |
| ... | ... |
@@ -484,7 +484,7 @@ func (r *resolver) ServeDNS(w dns.ResponseWriter, query *dns.Msg) {
|
| 484 | 484 |
resp, err = co.ReadMsg() |
| 485 | 485 |
// Truncated DNS replies should be sent to the client so that the |
| 486 | 486 |
// client can retry over TCP |
| 487 |
- if err != nil && (resp != nil && !resp.Truncated) {
|
|
| 487 |
+ if err != nil && (resp == nil || !resp.Truncated) {
|
|
| 488 | 488 |
r.forwardQueryEnd() |
| 489 | 489 |
logrus.Debugf("[resolver] read from DNS server failed, %s", err)
|
| 490 | 490 |
continue |
| ... | ... |
@@ -58,4 +58,4 @@ go.opencensus.io 9c377598961b706d1542bd2d84d538b5094d596e |
| 58 | 58 |
gotest.tools 1083505acf35a0bd8a696b26837e1fb3187a7a83 # v2.3.0 |
| 59 | 59 |
github.com/google/go-cmp 3af367b6b30c263d47e8895973edcca9a49cf029 # v0.2.0 |
| 60 | 60 |
|
| 61 |
-github.com/moby/ipvs 8f137da6850a975020f4f739c589d293dd3a9d7b # v1.0.0 |
|
| 61 |
+github.com/moby/ipvs 4566ccea0e08d68e9614c3e7a64a23b850c4bb35 # v1.0.1 |