github/containerd
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

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

Browse Source
This commit is contained in:
Fu Wei
2022-04-14 19:43:06 +08:00
committed by GitHub
parent eaf286224b 5f3ce9512b
commit e0abf62710
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/cri/opts/spec.go
View File

@@ -63,7 +63,9 @@ func WithProcessArgs(config *runtime.ContainerConfig, image *imagespec.ImageConf
args = append([]string{}, image.Cmd...) args = append([]string{}, image.Cmd...)
} }
if command == nil { 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 { if len(command) == 0 && len(args) == 0 {