aboutsummaryrefslogtreecommitdiff
path: root/pkg/spec
diff options
context:
space:
mode:
authormaybe-sybr <58414429+maybe-sybr@users.noreply.github.com>2020-06-30 11:18:29 +1000
committermaybe-sybr <58414429+maybe-sybr@users.noreply.github.com>2020-06-30 11:25:13 +1000
commitaa69e68ef7d11faff29e7eaf4d91d4eb97e419e9 (patch)
treee9769f8ceb2d95157ed5122949aa3d988b6fab94 /pkg/spec
parentb163ec35d0d42423c274019cb41013d558d6f822 (diff)
downloadpodman-aa69e68ef7d11faff29e7eaf4d91d4eb97e419e9.tar.gz
podman-aa69e68ef7d11faff29e7eaf4d91d4eb97e419e9.tar.bz2
podman-aa69e68ef7d11faff29e7eaf4d91d4eb97e419e9.zip
fix: Don't override entrypoint if it's `nil`
This change ensures that we only override a container's entrypoint if it is set to something other than `nil`. Signed-off-by: Matt Brindley <58414429+maybe-sybr@users.noreply.github.com>
Diffstat (limited to 'pkg/spec')
-rw-r--r--pkg/spec/createconfig.go9
1 files changed, 5 insertions, 4 deletions
diff --git a/pkg/spec/createconfig.go b/pkg/spec/createconfig.go
index e19c582b5..a04afa00f 100644
--- a/pkg/spec/createconfig.go
+++ b/pkg/spec/createconfig.go
@@ -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))