clearlinux/docker
2
0
Fork 0
mirror of https://github.com/clearlinux/docker.git synced 2026-10-03 23:38:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Factor out the native driver config options

Browse Source 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
This commit is contained in:
Michael Crosby
2014-03-21 08:10:07 +00:00
parent be5538d8a8
commit 7c726669cb
8 changed files with 207 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files
runtime/execdriver/native/driver.go
+8 -4
View File
@@ -59,7 +59,7 @@ func init() {
type driver struct {
root string
initPath string
activeContainers map[string]*execdriver.Command
activeContainers map[string]*exec.Cmd
}
func NewDriver(root, initPath string) (*driver, error) {
@@ -72,16 +72,20 @@ func NewDriver(root, initPath string) (*driver, error) {
return &driver{
root: root,
initPath: initPath,
activeContainers: make(map[string]*execdriver.Command),
activeContainers: make(map[string]*exec.Cmd),
}, nil
}
func (d *driver) Run(c *execdriver.Command, pipes *execdriver.Pipes, startCallback execdriver.StartCallback) (int, error) {
d.activeContainers[c.ID] = c
// take the Command and populate the libcontainer.Container from it
container, err := d.createContainer(c)
if err != nil {
return -1, err
}
d.activeContainers[c.ID] = &c.Cmd
var (
term nsinit.Terminal
container = d.createContainer(c)
factory = &dockerCommandFactory{c: c, driver: d}
stateWriter = &dockerStateWriter{
callback: startCallback,