toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Windows: Remove meaningless warnings on docker info

Browse Source 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 615681f5177cef974d516d5814195c768e773dd2
Component: engine
This commit is contained in:
John Howard
2015-07-09 19:05:50 -07:00
parent aae04e2dff
commit c8344b3dc3
21 changed files with 111 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
components/engine/api/client/ps.go
View File

@ -86,15 +86,15 @@ func (cli *DockerCli) CmdPs(args ...string) error {
v.Set("filters", filterJSON)
}
rdr, _, _, err := cli.call("GET", "/containers/json?"+v.Encode(), nil, nil)
serverResp, err := cli.call("GET", "/containers/json?"+v.Encode(), nil, nil)
if err != nil {
return err
}
defer rdr.Close()
defer serverResp.body.Close()
containers := []types.Container{}
if err := json.NewDecoder(rdr).Decode(&containers); err != nil {
if err := json.NewDecoder(serverResp.body).Decode(&containers); err != nil {
return err
}