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

Move Server.ContainerAttach to Daemon.ContainerAttach

Browse Source 
This is part of an effort to break apart the legacy server package. Help wanted!

Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
This commit is contained in:
Solomon Hykes
2014-07-30 11:20:31 +00:00
parent 4949e070fb
commit c2496d97cc
5 changed files with 123 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files
builder/builder.go
+5
View File
@@ -683,6 +683,11 @@ func (b *buildFile) run(c *daemon.Container) error {
var errCh chan error
if b.verbose {
errCh = utils.Go(func() error {
// FIXME: call the 'attach' job so that daemon.Attach can be made private
//
// FIXME (LK4D4): Also, maybe makes sense to call "logs" job, it is like attach
// but without hijacking for stdin. Also, with attach there can be race
// condition because of some output already was printed before it.
return <-b.daemon.Attach(c, nil, nil, b.outStream, b.errStream)
})
}