docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1735 from vieux/update_dockerclient 

update dockerclient
This commit is contained in:
Dongluo Chen 2016-02-02 15:33:38 -08:00
parent eb5bcbdaba f26a50a483
commit 5ab32d0705
3 changed files with 10 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Godeps/Godeps.json generated
View File

@ -167,7 +167,7 @@
}, },
{ {
"ImportPath": "github.com/samalba/dockerclient", "ImportPath": "github.com/samalba/dockerclient",
"Rev": "8328370620b71cb5acadd41f259dca96865a069b" "Rev": "154a327e7f551978278530db4771e2f05376b541"
}, },
{ {
"ImportPath": "github.com/samuel/go-zookeeper/zk", "ImportPath": "github.com/samuel/go-zookeeper/zk",

2
Godeps/_workspace/src/github.com/samalba/dockerclient/types.go generated vendored
View File

@ -236,6 +236,8 @@ type ContainerInfo struct {
Gateway string Gateway string
Bridge string Bridge string
Ports map[string][]PortBinding Ports map[string][]PortBinding
Networks map[string]*EndpointSettings
} }
SysInitPath string SysInitPath string
ResolvConfPath string ResolvConfPath string

23
scheduler/filter/port_test.go
View File

@ -235,24 +235,15 @@ func TestPortFilterRandomAssignment(t *testing.T) {
}, },
}, },
}}, }},
NetworkSettings: struct {
IPAddress string `json:"IpAddress"`
IPPrefixLen int `json:"IpPrefixLen"`
Gateway string
Bridge string
Ports map[string][]dockerclient.PortBinding
}{
Ports: map[string][]dockerclient.PortBinding{
"80/tcp": {
{
HostIp: "127.0.0.1",
HostPort: "1234",
},
},
},
},
}, },
} }
container.Info.NetworkSettings.Ports = map[string][]dockerclient.PortBinding{
"80/tcp": {
{
HostIp: "127.0.0.1",
HostPort: "1234",
},
}}
assert.NoError(t, nodes[0].AddContainer(container)) assert.NoError(t, nodes[0].AddContainer(container))