mirror of
https://github.com/clearlinux/docker.git
synced 2026-09-04 20:51:44 +00:00
Merge pull request #822 from lopter/master
* Client: Print the container id before the hijack in `docker run` (see also #804)
This commit is contained in:
+3
-3
@@ -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
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user