Skip to content

Update go-dockerclient #257

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 16, 2017
Merged

Update go-dockerclient #257

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fd0f057
Update go-dockerclient
jwilder Oct 15, 2017
16c9b54
Update go version
jwilder Oct 16, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
language: go
go:
- 1.4
- 1.9
install:
- make get-deps
script:
Expand Down
6 changes: 5 additions & 1 deletion GLOCKFILE
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
8 changes: 4 additions & 4 deletions context.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"),
Expand Down