From f371bd9fe85e28d28b18fb50bd88e4afff4bee15 Mon Sep 17 00:00:00 2001
From: Kimbro Staken <kstaken@kstaken.com>
Date: Mon, 8 Jul 2013 00:11:45 -0700
Subject: [PATCH] Override Entrypoint picked up from the base image that breaks
 run commands in builder Upstream-commit:
 f64dbdbe3a147f58d04b6c39c6469fdd97427098 Component: engine

---
 components/engine/buildfile.go | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/components/engine/buildfile.go b/components/engine/buildfile.go
index 570a4eb72c..75e31dba70 100644
--- a/components/engine/buildfile.go
+++ b/components/engine/buildfile.go
@@ -279,6 +279,10 @@ func (b *buildFile) run() (string, error) {
 	b.tmpContainers[c.ID] = struct{}{}
 	fmt.Fprintf(b.out, " ---> Running in %s\n", utils.TruncateID(c.ID))
 
+	// override the entry point that may have been picked up from the base image
+	c.Path = b.config.Cmd[0]
+	c.Args = b.config.Cmd[1:]
+
 	//start the container
 	hostConfig := &HostConfig{}
 	if err := c.Start(hostConfig); err != nil {