Merge pull request #418 from jsclayton/fix/retain-cmd

Don’t delete cmd when runtime entrypoint is different

pkg/container/container.go

@@ -153,12 +153,11 @@ func (c Container) runtimeConfig() *dockercontainer.Config {
 		config.Hostname = ""
 	}
 
+	if util.SliceEqual(config.Entrypoint, imageConfig.Entrypoint) {
+		config.Entrypoint = nil
 		if util.SliceEqual(config.Cmd, imageConfig.Cmd) {
 			config.Cmd = nil
 		}
-
-	if util.SliceEqual(config.Entrypoint, imageConfig.Entrypoint) {
-		config.Entrypoint = nil
 	}
 
 	config.Env = util.SliceSubtract(config.Env, imageConfig.Env)