From a803148bbac87aec183be38502991bb779196560 Mon Sep 17 00:00:00 2001 From: Jana Radhakrishnan Date: Wed, 16 Sep 2015 14:48:42 -0700 Subject: [PATCH] Vendoring libnetwork To fix an issue with experimental multihost networking. git hash: 00a92f066e628e4c6d50979c070df377575aad18 Signed-off-by: Jana Radhakrishnan --- hack/vendor.sh | 2 +- vendor/src/github.com/docker/libnetwork/Makefile | 2 +- vendor/src/github.com/docker/libnetwork/client/service.go | 4 ++-- vendor/src/github.com/docker/libnetwork/client/types.go | 7 ++++--- vendor/src/github.com/docker/libnetwork/endpoint.go | 2 +- 5 files changed, 9 insertions(+), 8 deletions(-) diff --git a/hack/vendor.sh b/hack/vendor.sh index c152455f70..262fe58bba 100755 --- a/hack/vendor.sh +++ b/hack/vendor.sh @@ -20,7 +20,7 @@ clone git github.com/tchap/go-patricia v2.1.0 clone git golang.org/x/net 3cffabab72adf04f8e3b01c5baf775361837b5fe https://github.com/golang/net.git #get libnetwork packages -clone git github.com/docker/libnetwork 927d2765909ddc3a5dd49b649ae9ef121c0fbef0 +clone git github.com/docker/libnetwork 00a92f066e628e4c6d50979c070df377575aad18 clone git github.com/armon/go-metrics eb0af217e5e9747e41dd5303755356b62d28e3ec clone git github.com/hashicorp/go-msgpack 71c2886f5a673a35f909803f38ece5810165097b clone git github.com/hashicorp/memberlist 9a1e242e454d2443df330bdd51a436d5a9058fc4 diff --git a/vendor/src/github.com/docker/libnetwork/Makefile b/vendor/src/github.com/docker/libnetwork/Makefile index e9d06e5e8f..fa5a4fe1ab 100644 --- a/vendor/src/github.com/docker/libnetwork/Makefile +++ b/vendor/src/github.com/docker/libnetwork/Makefile @@ -31,7 +31,7 @@ build: ${build_image}.created @echo "Done building code" build-local: - @$(shell which godep) go build -tags libnetwork_discovery ./... + @$(shell which godep) go build ./... @$(shell which godep) go build -o ./cmd/dnet/dnet ./cmd/dnet check: ${build_image}.created diff --git a/vendor/src/github.com/docker/libnetwork/client/service.go b/vendor/src/github.com/docker/libnetwork/client/service.go index 36564977fb..6b37db4337 100644 --- a/vendor/src/github.com/docker/libnetwork/client/service.go +++ b/vendor/src/github.com/docker/libnetwork/client/service.go @@ -120,7 +120,7 @@ func lookupSandboxID(cli *NetworkCli, containerID string) (string, error) { return "", err } - var sandboxList []sandboxResource + var sandboxList []SandboxResource err = json.Unmarshal(obj, &sandboxList) if err != nil { return "", err @@ -268,7 +268,7 @@ func getBackendID(cli *NetworkCli, servID string) (string, error) { ) if obj, _, err = readBody(cli.call("GET", "/services/"+servID+"/backend", nil, nil)); err == nil { - var sr sandboxResource + var sr SandboxResource if err := json.NewDecoder(bytes.NewReader(obj)).Decode(&sr); err == nil { bk = sr.ContainerID } else { diff --git a/vendor/src/github.com/docker/libnetwork/client/types.go b/vendor/src/github.com/docker/libnetwork/client/types.go index f215a4efed..1848884509 100644 --- a/vendor/src/github.com/docker/libnetwork/client/types.go +++ b/vendor/src/github.com/docker/libnetwork/client/types.go @@ -21,8 +21,8 @@ type serviceResource struct { Network string `json:"network"` } -// sandboxResource is the body of "get service backend" response message -type sandboxResource struct { +// SandboxResource is the body of "get service backend" response message +type SandboxResource struct { ID string `json:"id"` Key string `json:"key"` ContainerID string `json:"container_id"` @@ -52,7 +52,8 @@ type serviceAttach struct { SandboxID string `json:"sandbox_id"` } -type sandboxCreate struct { +// SandboxCreate is the body of the "post /sandboxes" http request message +type SandboxCreate struct { ContainerID string `json:"container_id"` HostName string `json:"host_name"` DomainName string `json:"domain_name"` diff --git a/vendor/src/github.com/docker/libnetwork/endpoint.go b/vendor/src/github.com/docker/libnetwork/endpoint.go index a8b3acd032..fd5f7b63f5 100644 --- a/vendor/src/github.com/docker/libnetwork/endpoint.go +++ b/vendor/src/github.com/docker/libnetwork/endpoint.go @@ -87,7 +87,7 @@ func (ep *endpoint) UnmarshalJSON(b []byte) (err error) { ep.id = epMap["id"].(string) ib, _ := json.Marshal(epMap["ep_iface"]) - json.Unmarshal(ib, ep.iface) + json.Unmarshal(ib, &ep.iface) tb, _ := json.Marshal(epMap["exposed_ports"]) var tPorts []types.TransportPort