mirror of
https://github.com/containers/podman.git
synced 2025-06-26 12:56:45 +08:00
Ignore entrypoint=[\"\"]
We recieved an issue with an image that was built with entrypoint=[""] This blows up on Podman, but works on Docker. When we setup the OCI Runtime, we should drop entrypoint if it is == [""] https://github.com/containers/podman/issues/9377 Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
This commit is contained in:
@ -105,7 +105,10 @@ func makeCommand(ctx context.Context, s *specgen.SpecGenerator, img *image.Image
|
|||||||
entrypoint = newEntry
|
entrypoint = newEntry
|
||||||
}
|
}
|
||||||
|
|
||||||
finalCommand = append(finalCommand, entrypoint...)
|
// Don't append the entrypoint if it is [""]
|
||||||
|
if len(entrypoint) != 1 || entrypoint[0] != "" {
|
||||||
|
finalCommand = append(finalCommand, entrypoint...)
|
||||||
|
}
|
||||||
|
|
||||||
// Only use image command if the user did not manually set an
|
// Only use image command if the user did not manually set an
|
||||||
// entrypoint.
|
// entrypoint.
|
||||||
|
@ -43,6 +43,18 @@ CMD []
|
|||||||
Expect(session.ExitCode()).To(Equal(125))
|
Expect(session.ExitCode()).To(Equal(125))
|
||||||
})
|
})
|
||||||
|
|
||||||
|
It("podman run entrypoint == [\"\"]", func() {
|
||||||
|
dockerfile := `FROM quay.io/libpod/alpine:latest
|
||||||
|
ENTRYPOINT [""]
|
||||||
|
CMD []
|
||||||
|
`
|
||||||
|
podmanTest.BuildImage(dockerfile, "foobar.com/entrypoint:latest", "false")
|
||||||
|
session := podmanTest.Podman([]string{"run", "foobar.com/entrypoint:latest", "echo", "hello"})
|
||||||
|
session.WaitWithDefaultTimeout()
|
||||||
|
Expect(session.ExitCode()).To(Equal(0))
|
||||||
|
Expect(session.OutputToString()).To(Equal("hello"))
|
||||||
|
})
|
||||||
|
|
||||||
It("podman run entrypoint", func() {
|
It("podman run entrypoint", func() {
|
||||||
dockerfile := `FROM quay.io/libpod/alpine:latest
|
dockerfile := `FROM quay.io/libpod/alpine:latest
|
||||||
ENTRYPOINT ["grep", "Alpine", "/etc/os-release"]
|
ENTRYPOINT ["grep", "Alpine", "/etc/os-release"]
|
||||||
|
Reference in New Issue
Block a user