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

display id on run -s stdin

Browse source
This commit is contained in:
Victor Vieux 2013-05-07 21:36:24 +02:00
parent 32cbd72ebe
commit ac0e27699c
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
commands.go
View file

@ -1132,6 +1132,7 @@ func CmdRun(args ...string) error {
if err != nil { if err != nil {
return err return err
} }
var status int
if config.AttachStdin || config.AttachStdout || config.AttachStderr { if config.AttachStdin || config.AttachStdout || config.AttachStderr {
if err := hijack("POST", "/containers/"+out.Id+"/attach?"+v.Encode(), config.Tty); err != nil { if err := hijack("POST", "/containers/"+out.Id+"/attach?"+v.Encode(), config.Tty); err != nil {
return err return err
@ -1145,12 +1146,17 @@ func CmdRun(args ...string) error {
if err != nil { if err != nil {
return err return err
} }
os.Exit(out.StatusCode) status = out.StatusCode
} }
}
} else { if !config.AttachStdout && !config.AttachStderr {
fmt.Println(out.Id) fmt.Println(out.Id)
} }
if status != 0 {
os.Exit(status)
}
return nil return nil
} }