opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-23 02:18:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6817 from maybe-sybr/maybe/entrypoint-nil-means-inherit

Browse Source 
fix: Don't override entrypoint if it's `nil`
This commit is contained in:
OpenShift Merge Robot
2020-06-30 10:22:21 -04:00
committed by GitHub
parent b163ec35d0 aa69e68ef7
commit 1dab8d1e46
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
pkg/spec/createconfig.go
View File

@ -287,10 +287,11 @@ func (c *CreateConfig) getContainerCreateOptions(runtime *libpod.Runtime, pod *l
options = append(options, libpod.WithCommand(c.UserCommand))
}
// Add entrypoint unconditionally
// If it's empty it's because it was explicitly set to "" or the image
// does not have one
options = append(options, libpod.WithEntrypoint(c.Entrypoint))
// Add entrypoint if it was set
// If it's empty it's because it was explicitly set to ""
if c.Entrypoint != nil {
options = append(options, libpod.WithEntrypoint(c.Entrypoint))
}
// TODO: MNT, USER, CGROUP
options = append(options, libpod.WithStopSignal(c.StopSignal))