summaryrefslogtreecommitdiff
path: root/pkg/specgenutil/specgen.go
diff options
context:
space:
mode:
authorAditya Rajan <arajan@redhat.com>2021-12-08 17:38:45 +0530
committerAditya Rajan <arajan@redhat.com>2021-12-08 20:26:36 +0530
commitb526a0ccdc289edaaff4ee1ab9ffab60310c4b53 (patch)
treebc1544820c239a7fca1bd46c7cf3d59f0ea78970 /pkg/specgenutil/specgen.go
parent31be3a9f24597a282a51764c15603311e59e4d44 (diff)
downloadpodman-b526a0ccdc289edaaff4ee1ab9ffab60310c4b53.tar.gz
podman-b526a0ccdc289edaaff4ee1ab9ffab60310c4b53.tar.bz2
podman-b526a0ccdc289edaaff4ee1ab9ffab60310c4b53.zip
specgen: honor empty args for entrypoint
Users should be able to override containers entrypoint using `--entrypoint ""` following works fine for podman but not for podman remote. Specgen ignores empty argument for entrypoint so make specgen honor empty arguments. Signed-off-by: Aditya Rajan <arajan@redhat.com>
Diffstat (limited to 'pkg/specgenutil/specgen.go')
-rw-r--r--pkg/specgenutil/specgen.go8
1 files changed, 3 insertions, 5 deletions
diff --git a/pkg/specgenutil/specgen.go b/pkg/specgenutil/specgen.go
index 637a6a8dd..5e4bd2f65 100644
--- a/pkg/specgenutil/specgen.go
+++ b/pkg/specgenutil/specgen.go
@@ -409,11 +409,9 @@ func FillOutSpecGen(s *specgen.SpecGenerator, c *entities.ContainerCreateOptions
s.WorkDir = c.Workdir
if c.Entrypoint != nil {
entrypoint := []string{}
- if ep := *c.Entrypoint; len(ep) > 0 {
- // Check if entrypoint specified is json
- if err := json.Unmarshal([]byte(*c.Entrypoint), &entrypoint); err != nil {
- entrypoint = append(entrypoint, ep)
- }
+ // Check if entrypoint specified is json
+ if err := json.Unmarshal([]byte(*c.Entrypoint), &entrypoint); err != nil {
+ entrypoint = append(entrypoint, *c.Entrypoint)
}
s.Entrypoint = entrypoint
}