From 3439cd9cea8056cce62d46dd5cf59d6d5b50ef84 Mon Sep 17 00:00:00 2001
From: "Guillaume J. Charmes" <guillaume.charmes@dotcloud.com>
Date: Mon, 6 May 2013 17:07:56 -0700
Subject: [PATCH] Rebase fix

---
 builder.go | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/builder.go b/builder.go
index f22d4864e6..61ea03311c 100644
--- a/builder.go
+++ b/builder.go
@@ -277,10 +277,6 @@ 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)
@@ -290,9 +286,6 @@ 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