Merge pull request #822 from lopter/master

* Client: Print the container id before the hijack in `docker run` (see also #804)
Upstream-commit: 068076f775e88526bbfa19734fc1c34232e961b5
Component: engine
This commit is contained in:
Solomon Hykes
2013-06-05 08:08:30 -07:00
+3 -3
View File
@@ -1228,6 +1228,9 @@ func (cli *DockerCli) CmdRun(args ...string) error {
return err
}
if !config.AttachStdout && !config.AttachStderr {
fmt.Println(out.ID)
}
if connections > 0 {
chErrors := make(chan error, connections)
cli.monitorTtySize(out.ID)
@@ -1262,9 +1265,6 @@ func (cli *DockerCli) CmdRun(args ...string) error {
connections -= 1
}
}
if !config.AttachStdout && !config.AttachStderr {
fmt.Println(out.ID)
}
return nil
}