Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com> (github: estesp)
| ... | ... |
@@ -1993,7 +1993,7 @@ func (cli *DockerCli) pullImage(image string) error {
|
| 1993 | 1993 |
registryAuthHeader := []string{
|
| 1994 | 1994 |
base64.URLEncoding.EncodeToString(buf), |
| 1995 | 1995 |
} |
| 1996 |
- if err = cli.stream("POST", "/images/create?"+v.Encode(), nil, cli.err, map[string][]string{"X-Registry-Auth": registryAuthHeader}); err != nil {
|
|
| 1996 |
+ if err = cli.stream("POST", "/images/create?"+v.Encode(), nil, cli.out, map[string][]string{"X-Registry-Auth": registryAuthHeader}); err != nil {
|
|
| 1997 | 1997 |
return err |
| 1998 | 1998 |
} |
| 1999 | 1999 |
return nil |
| ... | ... |
@@ -143,7 +143,9 @@ func DisplayJSONMessagesStream(in io.Reader, out io.Writer, terminalFd uintptr, |
| 143 | 143 |
if !ok {
|
| 144 | 144 |
line = len(ids) |
| 145 | 145 |
ids[jm.ID] = line |
| 146 |
- fmt.Fprintf(out, "\n") |
|
| 146 |
+ if isTerminal {
|
|
| 147 |
+ fmt.Fprintf(out, "\n") |
|
| 148 |
+ } |
|
| 147 | 149 |
diff = 0 |
| 148 | 150 |
} else {
|
| 149 | 151 |
diff = len(ids) - line |