Merge pull request #7091 from arizvisa/GH-6920

Proper fix to #6920 which ensures that entrypoint and arguments get passed to docker, not the image.

builder/docker/config.go

@@ -73,7 +73,7 @@ func NewConfig(raws ...interface{}) (*Config, []string, error) {
 
 	// Defaults
 	if len(c.RunCommand) == 0 {
-		c.RunCommand = []string{"-d", "-i", "-t", "{{.Image}}", "--entrypoint=/bin/sh"}
+		c.RunCommand = []string{"-d", "-i", "-t", "--entrypoint=/bin/sh", "--", "{{.Image}}"}
 	}
 
 	// Default Pull if it wasn't set