Merge pull request #1577 from dongluochen/clientUpdate

Godep dockerclient update.
This commit is contained in:
Victor Vieux 2016-01-04 11:51:21 -08:00
commit 31534f6519
3 changed files with 5 additions and 2 deletions

2
Godeps/Godeps.json generated
View File

@ -136,7 +136,7 @@
},
{
"ImportPath": "github.com/samalba/dockerclient",
"Rev": "0cba4a962c5a4dfcc4a83b8e64a946837a6ed913"
"Rev": "f661dd4754aa5c52da85d04b5871ee0e11f4b59c"
},
{
"ImportPath": "github.com/samuel/go-zookeeper/zk",

View File

@ -63,7 +63,7 @@ func main() {
Cmd: []string{"bash"},
AttachStdin: true,
Tty: true}
containerId, err := docker.CreateContainer(containerConfig, "foobar")
containerId, err := docker.CreateContainer(containerConfig, "foobar", nil)
if err != nil {
log.Fatal(err)
}

View File

@ -513,6 +513,9 @@ func (client *DockerClient) StartMonitorEvents(cb Callback, ec chan error, args
}
func (client *DockerClient) StopAllMonitorEvents() {
if client.eventStopChan == nil {
return
}
close(client.eventStopChan)
}