From 1f44fd8624d1de3f7e1e55880352faef2e141fb1 Mon Sep 17 00:00:00 2001 From: Victor Vieux Date: Thu, 31 Oct 2013 17:58:15 -0700 Subject: [PATCH] Fix logs with tty --- commands.go | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/commands.go b/commands.go index 87aa12b65c..f7895557df 100644 --- a/commands.go +++ b/commands.go @@ -1347,8 +1347,18 @@ func (cli *DockerCli) CmdLogs(args ...string) error { return nil } name := cmd.Arg(0) + body, _, err := cli.call("GET", "/containers/"+name+"/json", nil) + if err != nil { + return err + } - if err := cli.hijack("POST", "/containers/"+name+"/attach?logs=1&stdout=1&stderr=1", false, nil, cli.out, cli.err, nil); err != nil { + container := &Container{} + err = json.Unmarshal(body, container) + if err != nil { + return err + } + + if err := cli.hijack("POST", "/containers/"+name+"/attach?logs=1&stdout=1&stderr=1", container.Config.Tty, nil, cli.out, cli.err, nil); err != nil { return err } return nil