Don’t delete cmd when runtime entrypoint is different

7 years ago · 4f120ef037
parent 9389e8f34f
commit 4f120ef037
1 changed files with 3 additions and 4 deletions
--- a/pkg/container/container.go
+++ b/pkg/container/container.go
@ -143,12 +143,11 @@ func (c Container) runtimeConfig() *dockercontainer.Config {
 		config.User = ""
 	}

-	if util.SliceEqual(config.Cmd, imageConfig.Cmd) {
-		config.Cmd = nil
-	}
-
 	if util.SliceEqual(config.Entrypoint, imageConfig.Entrypoint) {
 		config.Entrypoint = nil
+		if util.SliceEqual(config.Cmd, imageConfig.Cmd) {
+			config.Cmd = nil
+		}
 	}

 	config.Env = util.SliceSubtract(config.Env, imageConfig.Env)