Merge pull request #6805 from deckhouse/reset-empty-entrypoint

2022-04-14 19:43:06 +08:00
parent eaf286224b 5f3ce9512b
commit e0abf62710
1 changed files with 3 additions and 1 deletions
--- a/pkg/cri/opts/spec.go
+++ b/pkg/cri/opts/spec.go
@@ -63,7 +63,9 @@ func WithProcessArgs(config *runtime.ContainerConfig, image *imagespec.ImageConf
 				args = append([]string{}, image.Cmd...)
 			}
 			if command == nil {
-				command = append([]string{}, image.Entrypoint...)
+				if !(len(image.Entrypoint) == 1 && image.Entrypoint[0] == "") {
+					command = append([]string{}, image.Entrypoint...)
+				}
 			}
 		}
 		if len(command) == 0 && len(args) == 0 {