Make exec driver run a blocking command

Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
This commit is contained in:
Michael Crosby
2014-01-17 17:42:22 -08:00
parent 92e6db7beb
commit f846ecdc77
5 changed files with 82 additions and 53 deletions
+3 -3
View File
@@ -192,7 +192,7 @@ func (runtime *Runtime) Register(container *Container) error {
}
container.waitLock = make(chan struct{})
go container.monitor()
go container.monitor(nil)
}
}
return nil
@@ -841,8 +841,8 @@ func (runtime *Runtime) Diff(container *Container) (archive.Archive, error) {
return archive.ExportChanges(cDir, changes)
}
func (runtime *Runtime) Start(c *Container) error {
return runtime.execDriver.Start(c.process)
func (runtime *Runtime) Run(c *Container, startCallback execdriver.StartCallback) (int, error) {
return runtime.execDriver.Run(c.process, startCallback)
}
func (runtime *Runtime) Kill(c *Container, sig int) error {