summaryrefslogtreecommitdiff
path: root/pkg/specgen
diff options
context:
space:
mode:
authorDaniel J Walsh <dwalsh@redhat.com>2020-07-14 13:05:25 -0400
committerDaniel J Walsh <dwalsh@redhat.com>2020-07-14 13:10:03 -0400
commit6535c8b9e82a1cc1f5c8d03215b9de5851b2010c (patch)
treed99a0008d253b9bbb61f899eae6ca0143171a9af /pkg/specgen
parentd83077b16c14b05967fa1f92c7067299367a286f (diff)
downloadpodman-6535c8b9e82a1cc1f5c8d03215b9de5851b2010c.tar.gz
podman-6535c8b9e82a1cc1f5c8d03215b9de5851b2010c.tar.bz2
podman-6535c8b9e82a1cc1f5c8d03215b9de5851b2010c.zip
Fix handling of entrypoint
If a user specifies an entrypoint of "" then we should not use the images entrypoint. Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
Diffstat (limited to 'pkg/specgen')
-rw-r--r--pkg/specgen/generate/oci.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/pkg/specgen/generate/oci.go b/pkg/specgen/generate/oci.go
index 0a485e7cd..ccedc40dc 100644
--- a/pkg/specgen/generate/oci.go
+++ b/pkg/specgen/generate/oci.go
@@ -87,7 +87,7 @@ func makeCommand(ctx context.Context, s *specgen.SpecGenerator, img *image.Image
finalCommand := []string{}
entrypoint := s.Entrypoint
- if len(entrypoint) == 0 && img != nil {
+ if entrypoint == nil && img != nil {
newEntry, err := img.Entrypoint(ctx)
if err != nil {
return nil, err