docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9216 from jfrazelle/typo-steam 

Fix steam where it should be stream.
This commit is contained in:
Michael Crosby 2014-11-18 15:29:33 -08:00
parent 9854b0aa40 7fe8d0aeeb
commit ca4be114e9
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
api/client/commands.go
View File

@ -916,13 +916,13 @@ func (cli *DockerCli) CmdPort(args ...string) error {
return nil return nil
} }
steam, _, err := cli.call("GET", "/containers/"+cmd.Arg(0)+"/json", nil, false) stream, _, err := cli.call("GET", "/containers/"+cmd.Arg(0)+"/json", nil, false)
if err != nil { if err != nil {
return err return err
} }
env := engine.Env{} env := engine.Env{}
if err := env.Decode(steam); err != nil { if err := env.Decode(stream); err != nil {
return err return err
} }
ports := nat.PortMap{} ports := nat.PortMap{}
@ -1856,13 +1856,13 @@ func (cli *DockerCli) CmdLogs(args ...string) error {
} }
name := cmd.Arg(0) name := cmd.Arg(0)
steam, _, err := cli.call("GET", "/containers/"+name+"/json", nil, false) stream, _, err := cli.call("GET", "/containers/"+name+"/json", nil, false)
if err != nil { if err != nil {
return err return err
} }
env := engine.Env{} env := engine.Env{}
if err := env.Decode(steam); err != nil { if err := env.Decode(stream); err != nil {
return err return err
} }

4
api/client/utils.go
View File

@ -216,7 +216,7 @@ func waitForExit(cli *DockerCli, containerId string) (int, error) {
// getExitCode perform an inspect on the container. It returns // getExitCode perform an inspect on the container. It returns
// the running state and the exit code. // the running state and the exit code.
func getExitCode(cli *DockerCli, containerId string) (bool, int, error) { func getExitCode(cli *DockerCli, containerId string) (bool, int, error) {
steam, _, err := cli.call("GET", "/containers/"+containerId+"/json", nil, false) stream, _, err := cli.call("GET", "/containers/"+containerId+"/json", nil, false)
if err != nil { if err != nil {
// If we can't connect, then the daemon probably died. // If we can't connect, then the daemon probably died.
if err != ErrConnectionRefused { if err != ErrConnectionRefused {
@ -226,7 +226,7 @@ func getExitCode(cli *DockerCli, containerId string) (bool, int, error) {
} }
var result engine.Env var result engine.Env
if err := result.Decode(steam); err != nil { if err := result.Decode(stream); err != nil {
return false, -1, err return false, -1, err
} }