From 736941c2f516486ad057e730a48ce776c049d95d Mon Sep 17 00:00:00 2001
From: "Guillaume J. Charmes" <guillaume@dotcloud.com>
Date: Thu, 30 May 2013 12:21:57 -0700
Subject: [PATCH] Fix issue with CMD instruction within docker build
 Upstream-commit: 6d2e3d2ec0dedc6c1429e87800e9f3d7e4ada095 Component: engine

---
 components/engine/buildfile.go | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/components/engine/buildfile.go b/components/engine/buildfile.go
index cf8f3e8e56..3081367719 100644
--- a/components/engine/buildfile.go
+++ b/components/engine/buildfile.go
@@ -143,7 +143,11 @@ func (b *buildFile) CmdCmd(args string) error {
 		utils.Debugf("Error unmarshalling: %s, using /bin/sh -c", err)
 		cmd = []string{"/bin/sh", "-c", args}
 	}
-	return b.commit("", cmd, fmt.Sprintf("CMD %v", cmd))
+	if err := b.commit("", cmd, fmt.Sprintf("CMD %v", cmd)); err != nil {
+		return err
+	}
+	b.config.Cmd = cmd
+	return nil
 }
 
 func (b *buildFile) CmdExpose(args string) error {
@@ -216,7 +220,11 @@ func (b *buildFile) CmdAdd(args string) error {
 			return err
 		}
 	}
-	return b.commit(cid, cmd, fmt.Sprintf("ADD %s in %s", orig, dest))
+	if err := b.commit(cid, cmd, fmt.Sprintf("ADD %s in %s", orig, dest)); err != nil {
+		return err
+	}
+	b.config.Cmd = cmd
+	return nil
 }
 
 func (b *buildFile) run() (string, error) {