Merge pull request #7298 from deckhouse/docker-compat-1.6

containerd · Aug 16, 2022 · 1be2cb3 · 1be2cb3
2 parents 9ff7280 + 0448673
commit 1be2cb3
Showing 1 changed file with 3 additions and 1 deletion.
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 {