From 7fe8d0aeeb373a0fef92758819d8054fbd744ea5 Mon Sep 17 00:00:00 2001 From: Jessica Frazelle Date: Tue, 18 Nov 2014 10:49:01 -0800 Subject: [PATCH] Fix steam where it should be stream. Docker-DCO-1.1-Signed-off-by: Jessica Frazelle (github: jfrazelle) --- api/client/commands.go | 8 ++++---- api/client/utils.go | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/api/client/commands.go b/api/client/commands.go index 6b9c4d4d8f..63b52ada60 100644 --- a/api/client/commands.go +++ b/api/client/commands.go @@ -916,13 +916,13 @@ func (cli *DockerCli) CmdPort(args ...string) error { 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 { return err } env := engine.Env{} - if err := env.Decode(steam); err != nil { + if err := env.Decode(stream); err != nil { return err } ports := nat.PortMap{} @@ -1856,13 +1856,13 @@ func (cli *DockerCli) CmdLogs(args ...string) error { } 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 { return err } env := engine.Env{} - if err := env.Decode(steam); err != nil { + if err := env.Decode(stream); err != nil { return err } diff --git a/api/client/utils.go b/api/client/utils.go index f094635714..3799ce6735 100644 --- a/api/client/utils.go +++ b/api/client/utils.go @@ -216,7 +216,7 @@ func waitForExit(cli *DockerCli, containerId string) (int, error) { // getExitCode perform an inspect on the container. It returns // the running state and the exit code. 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 we can't connect, then the daemon probably died. if err != ErrConnectionRefused { @@ -226,7 +226,7 @@ func getExitCode(cli *DockerCli, containerId string) (bool, int, error) { } var result engine.Env - if err := result.Decode(steam); err != nil { + if err := result.Decode(stream); err != nil { return false, -1, err }