docker/cli
1
0
Fork 0
mirror of https://github.com/docker/cli.git synced 2026-01-16 20:22:36 +03:00
Code Activity

Moving runtime.Create to builder.Create

Browse Source 
Upstream-commit: 602786cd60746cd2baf7bb14fb6acb60f9554f50
Component: engine
This commit is contained in:
Guillaume J. Charmes
2013-04-24 15:14:10 -07:00
parent 4d47ca713e
commit d43649a37e
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
components/engine/builder.go
View File

@@ -274,6 +274,10 @@ func (builder *Builder) Build(dockerfile io.Reader, stdout io.Writer) (*Image, e
fmt.Fprintf(stdout, "===> %s\n", image.ShortId())
break
}
config, err := ParseRun([]string{image.Id, "/bin/sh", "-c", tmp[1]}, nil, builder.runtime.capabilities)
if err != nil {
return err
}
// Create the container and start it
c, err := builder.Create(config)
@@ -283,6 +287,9 @@ func (builder *Builder) Build(dockerfile io.Reader, stdout io.Writer) (*Image, e
if err := c.Start(); err != nil {
return nil, err
}
if err := c.Start(); err != nil {
return err
}
tmpContainers[c.Id] = struct{}{}
// Wait for it to finish