Moving runtime.Create to builder.Create

Upstream-commit: dae2828957b6b962109a9f7ad061e9ddd90b8833
Component: engine

components/engine/builder.go

@@ -277,6 +277,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)
@@ -286,6 +290,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