Merge pull request #257 from jwilder/jw-deps-update

Update go-dockerclient

Author: jwilder

.travis.yml

@@ -1,6 +1,6 @@
 language: go
 go:
-- 1.4
+- 1.9
 install:
 - make get-deps
 script:

GLOCKFILE

@@ -1,2 +1,6 @@
 github.com/BurntSushi/toml 056c9bc7be7190eaa7715723883caffa5f8fa3e4
-github.com/fsouza/go-dockerclient e0d22d30691bcc996eca51f729a4777b8c7dc2a8
+github.com/docker/docker f2afa26235941fd79f40eb1e572e19e4ac2b9bbe
+github.com/docker/go-units 0dadbb0345b35ec7ef35e228dabb8de89a65bf52
+github.com/fsouza/go-dockerclient d2a6d0596004cc01062a2a068540b817f911e6dc
+github.com/gorilla/mux d391bea3118c9fc17a88d62c9189bb791255e0ef
+golang.org/x/net a04bdaca5b32abe1c069418fb7088ae607de5bd0

context.go

@@ -27,13 +27,13 @@ func (c *Context) Docker() Docker {
 	return dockerInfo
 }
 
-func SetServerInfo(d *docker.Env) {
+func SetServerInfo(d *docker.DockerInfo) {
 	mu.Lock()
 	defer mu.Unlock()
 	dockerInfo = Docker{
-		Name:               d.Get("Name"),
-		NumContainers:      d.GetInt("Containers"),
-		NumImages:          d.GetInt("Images"),
+		Name:               d.Name,
+		NumContainers:      d.Containers,
+		NumImages:          d.Images,
 		Version:            dockerEnv.Get("Version"),
 		ApiVersion:         dockerEnv.Get("ApiVersion"),
 		GoVersion:          dockerEnv.Get("GoVersion"),