kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

Make sure the ID is displayed usgin run -d

Browse source
This commit is contained in:
Guillaume J. Charmes 2013-06-27 12:48:25 -07:00
parent cd0f22ef72
commit bd144a64f6
1 changed files with 11 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

12
commands.go
View file

@ -1278,9 +1278,15 @@ func (cli *DockerCli) CmdRun(args ...string) error {
return err return err
} }
var wait chan struct{}
if !config.AttachStdout && !config.AttachStderr { if !config.AttachStdout && !config.AttachStderr {
// Make this asynchrone in order to let the client write to stdin before having to read the ID // Make this asynchrone in order to let the client write to stdin before having to read the ID
go fmt.Fprintf(cli.out, "%s\n", runResult.ID) wait = make(chan struct{})
go func() {
defer close(wait)
fmt.Fprintf(cli.out, "%s\n", runResult.ID)
}()
} }
if config.AttachStdin || config.AttachStdout || config.AttachStderr { if config.AttachStdin || config.AttachStdout || config.AttachStderr {
@ -1309,6 +1315,10 @@ func (cli *DockerCli) CmdRun(args ...string) error {
return err return err
} }
} }
if !config.AttachStdout && !config.AttachStderr {
<-wait
}
return nil return nil
} }