Do not append []string{""} to command to preserve Docker compatibility

zuzzas · zuzzas · commit 0448673af283 · 2022-08-16T18:24:58.000+03:00
Signed-off-by: Andrey Klimentyev <andrey.klimentyev@flant.com> (cherry picked from commit 5f3ce95) Signed-off-by: Andrey Klimentyev <andrey.klimentyev@flant.com>
diff --git 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 {

Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,9 @@ func WithProcessArgs(config runtime.ContainerConfig, image imagespec.ImageConf`
`63`	`63`	`args = append([]string{}, image.Cmd...)`
`64`	`64`	`}`
`65`	`65`	`if command == nil {`
`66`		`- command = append([]string{}, image.Entrypoint...)`
	`66`	`+ if !(len(image.Entrypoint) == 1 && image.Entrypoint[0] == "") {`
	`67`	`+ command = append([]string{}, image.Entrypoint...)`
	`68`	`+ }`
`67`	`69`	`}`
`68`	`70`	`}`
`69`	`71`	`if len(command) == 0 && len(args) == 0 {`