docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Rebase fix

This commit is contained in:
Guillaume J. Charmes 2013-05-06 17:07:56 -07:00
parent 979db00d9a
commit 3439cd9cea
1 changed files with 0 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
builder.go
View File

@ -277,10 +277,6 @@ func (builder *Builder) Build(dockerfile io.Reader, stdout io.Writer) (*Image, e
fmt.Fprintf(stdout, "===> %s\n", image.ShortId()) fmt.Fprintf(stdout, "===> %s\n", image.ShortId())
break 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 // Create the container and start it
c, err := builder.Create(config) c, err := builder.Create(config)
@ -290,9 +286,6 @@ func (builder *Builder) Build(dockerfile io.Reader, stdout io.Writer) (*Image, e
if err := c.Start(); err != nil { if err := c.Start(); err != nil {
return nil, err return nil, err
} }
if err := c.Start(); err != nil {
return err
}
tmpContainers[c.Id] = struct{}{} tmpContainers[c.Id] = struct{}{}
// Wait for it to finish // Wait for it to finish