diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-12-08 20:02:19 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-12-08 20:02:19 +0000 |
| commit | b8fde5c5b2a94beac20cd37cab0b59ea0124249c (patch) | |
| tree | ff3699646ba675a3ccf11b46b827e71ca06627ce /pkg | |
| parent | 2d7c4beffc38f72a49ae2e9d360d8ecc46ea76c5 (diff) | |
| parent | d46a82d218303c68aab0388b51d9ec1938b45b53 (diff) | |
| download | podman-b8fde5c5b2a94beac20cd37cab0b59ea0124249c.tar.gz podman-b8fde5c5b2a94beac20cd37cab0b59ea0124249c.tar.bz2 podman-b8fde5c5b2a94beac20cd37cab0b59ea0124249c.zip | |
Merge pull request #12549 from mheon/bump_344
Bump to v3.4.4
Diffstat (limited to 'pkg')
| -rw-r--r-- | pkg/specgenutil/specgen.go | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/pkg/specgenutil/specgen.go b/pkg/specgenutil/specgen.go index eba173a81..4db25bef3 100644 --- a/pkg/specgenutil/specgen.go +++ b/pkg/specgenutil/specgen.go @@ -397,11 +397,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 } |