clearlinux/docker
2
0
Fork 0
mirror of https://github.com/clearlinux/docker.git synced 2026-09-06 13:41:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10573 from LK4D4/return_attach_to_builder

Browse Source 
Change verbose builder out back to attach
This commit is contained in:
Michael Crosby
2015-02-06 14:37:09 -08:00
parent e4a49ae188 1095d5e5e4
commit e345fe53ba
3 changed files with 10 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
builder/internals.go
+7 -10
View File
@@ -545,21 +545,18 @@ func (b *Builder) create() (*daemon.Container, error) {
}
func (b *Builder) run(c *daemon.Container) error {
var errCh chan error
if b.Verbose {
errCh = b.Daemon.Attach(&c.StreamConfig, c.Config.OpenStdin, c.Config.StdinOnce, c.Config.Tty, nil, b.OutStream, b.ErrStream)
}
//start the container
if err := c.Start(); err != nil {
return err
}
if b.Verbose {
logsJob := b.Engine.Job("logs", c.ID)
logsJob.Setenv("follow", "1")
logsJob.Setenv("stdout", "1")
logsJob.Setenv("stderr", "1")
logsJob.Stdout.Add(b.OutStream)
logsJob.Stderr.Set(b.ErrStream)
if err := logsJob.Run(); err != nil {
return err
}
if err := <-errCh; err != nil {
return err
}
// Wait for it to finish