From 4e7e23819bb19414ba82431be6c9e5721978410d Mon Sep 17 00:00:00 2001 From: Dong Chen Date: Mon, 4 Jan 2016 11:26:53 -0800 Subject: [PATCH] Godep dockerclient update. Signed-off-by: Dong Chen --- Godeps/Godeps.json | 2 +- .../_workspace/src/github.com/samalba/dockerclient/README.md | 2 +- .../src/github.com/samalba/dockerclient/dockerclient.go | 3 +++ 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json index 24437c65ab..97d4d9536a 100644 --- a/Godeps/Godeps.json +++ b/Godeps/Godeps.json @@ -136,7 +136,7 @@ }, { "ImportPath": "github.com/samalba/dockerclient", - "Rev": "0cba4a962c5a4dfcc4a83b8e64a946837a6ed913" + "Rev": "f661dd4754aa5c52da85d04b5871ee0e11f4b59c" }, { "ImportPath": "github.com/samuel/go-zookeeper/zk", diff --git a/Godeps/_workspace/src/github.com/samalba/dockerclient/README.md b/Godeps/_workspace/src/github.com/samalba/dockerclient/README.md index 5a5027b8b7..6cad9bd318 100644 --- a/Godeps/_workspace/src/github.com/samalba/dockerclient/README.md +++ b/Godeps/_workspace/src/github.com/samalba/dockerclient/README.md @@ -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) } diff --git a/Godeps/_workspace/src/github.com/samalba/dockerclient/dockerclient.go b/Godeps/_workspace/src/github.com/samalba/dockerclient/dockerclient.go index 0df89c8b59..b52d52bf44 100644 --- a/Godeps/_workspace/src/github.com/samalba/dockerclient/dockerclient.go +++ b/Godeps/_workspace/src/github.com/samalba/dockerclient/dockerclient.go @@ -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) }