Merge pull request #895 from dotcloud/build-fixes

- Builder: fix a bug which caused builds to fail if ADD was the first command
Upstream-commit: 30f604517a5ddc15b3e9f6e9d42f4c7569c1627f
Component: engine

components/engine/buildfile.go

@@ -178,6 +178,8 @@ func (b *buildFile) CmdAdd(args string) error {
 	cmd := b.config.Cmd
 
 	// Create the container and start it
+	b.config.Cmd = []string{"/bin/sh", "-c", fmt.Sprintf("#(nop) ADD %s in %s", orig, dest)}
+	b.config.Image = b.image
 	container, err := b.builder.Create(b.config)
 	if err != nil {
 		return err