From 42fed93a8930df1ba773fb43f81b70187661ceaa Mon Sep 17 00:00:00 2001 From: Santhosh Manohar Date: Thu, 11 Aug 2016 18:44:32 -0700 Subject: [PATCH] Vendoring libnetwork for 1.12.1-rc1 Signed-off-by: Santhosh Manohar (cherry picked from commit b9c9fa2855cd5c7391cd026ef13a7d9d061214ee) Signed-off-by: Tibor Vass --- hack/vendor.sh | 2 +- vendor/src/github.com/docker/libnetwork/sandbox.go | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/hack/vendor.sh b/hack/vendor.sh index cbef2900c5..d18cd4e637 100755 --- a/hack/vendor.sh +++ b/hack/vendor.sh @@ -65,7 +65,7 @@ clone git github.com/RackSec/srslog 259aed10dfa74ea2961eddd1d9847619f6e98837 clone git github.com/imdario/mergo 0.2.1 #get libnetwork packages -clone git github.com/docker/libnetwork f77a0c9f540536c37019cf64d09a9a932dd7b54b +clone git github.com/docker/libnetwork 24f64a6f9e9cade70e3904df291fb321584b1b4e clone git github.com/docker/go-events afb2b9f2c23f33ada1a22b03651775fdc65a5089 clone git github.com/armon/go-radix e39d623f12e8e41c7b5529e9a9dd67a1e2261f80 clone git github.com/armon/go-metrics eb0af217e5e9747e41dd5303755356b62d28e3ec diff --git a/vendor/src/github.com/docker/libnetwork/sandbox.go b/vendor/src/github.com/docker/libnetwork/sandbox.go index ef082f2380..8a659b038c 100644 --- a/vendor/src/github.com/docker/libnetwork/sandbox.go +++ b/vendor/src/github.com/docker/libnetwork/sandbox.go @@ -567,7 +567,10 @@ func (sb *sandbox) ResolveName(name string, ipType int) ([]net.IP, bool) { newList := []*endpoint{} if !sb.controller.isDistributedControl() { newList = append(newList, getDynamicNwEndpoints(epList)...) - newList = append(newList, getIngressNwEndpoint(epList)) + ingressEP := getIngressNwEndpoint(epList) + if ingressEP != nil { + newList = append(newList, ingressEP) + } newList = append(newList, getLocalNwEndpoints(epList)...) epList = newList }