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

Merge pull request #12541 from flouthoc/remote_blank_entrypoint

Browse Source 
specgen: honor empty args for entrypoint specified as `--entrypoint ""`
This commit is contained in:
OpenShift Merge Robot
2021-12-08 16:50:20 +00:00
committed by GitHub
parent d6079debd8 b526a0ccdc
commit 02eaebda46
2 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/specgenutil/specgen.go
View File

@ -409,11 +409,9 @@ func FillOutSpecGen(s *specgen.SpecGenerator, c *entities.ContainerCreateOptions
s.WorkDir = c.Workdir s.WorkDir = c.Workdir
if c.Entrypoint != nil { if c.Entrypoint != nil {
entrypoint := []string{} entrypoint := []string{}
if ep := *c.Entrypoint; len(ep) > 0 { // Check if entrypoint specified is json
// Check if entrypoint specified is json if err := json.Unmarshal([]byte(*c.Entrypoint), &entrypoint); err != nil {
if err := json.Unmarshal([]byte(*c.Entrypoint), &entrypoint); err != nil { entrypoint = append(entrypoint, *c.Entrypoint)
entrypoint = append(entrypoint, ep)
}
} }
s.Entrypoint = entrypoint s.Entrypoint = entrypoint
} }

1
test/e2e/run_entrypoint_test.go
View File

@ -103,7 +103,6 @@ ENTRYPOINT ["grep", "Alpine", "/etc/os-release"]
}) })
It("podman run user entrypoint overrides image entrypoint and image cmd", func() { It("podman run user entrypoint overrides image entrypoint and image cmd", func() {
SkipIfRemote("#12521: podman-remote not handling passing empty --entrypoint")
dockerfile := `FROM quay.io/libpod/alpine:latest dockerfile := `FROM quay.io/libpod/alpine:latest
CMD ["-i"] CMD ["-i"]
ENTRYPOINT ["grep", "Alpine", "/etc/os-release"] ENTRYPOINT ["grep", "Alpine", "/etc/os-release"]