opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-05-21 17:16:22 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix handling of entrypoint

Browse Source 
If a user specifies an entrypoint of "" then we should not use the images
entrypoint.

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
This commit is contained in:
Daniel J Walsh
2020-07-14 13:05:25 -04:00
parent d83077b16c
commit 6535c8b9e8
4 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
cmd/podman/common/specgen.go
View File

@ -367,9 +367,10 @@ func FillOutSpecGen(s *specgen.SpecGenerator, c *ContainerCLIOpts, args []string
s.Annotations = annotations s.Annotations = annotations
s.WorkDir = c.Workdir s.WorkDir = c.Workdir
entrypoint := []string{}
userCommand := []string{} userCommand := []string{}
var command []string
if c.Entrypoint != nil { if c.Entrypoint != nil {
entrypoint := []string{}
if ep := *c.Entrypoint; len(ep) > 0 { 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 {
@ -377,17 +378,14 @@ func FillOutSpecGen(s *specgen.SpecGenerator, c *ContainerCLIOpts, args []string
} }
} }
s.Entrypoint = entrypoint s.Entrypoint = entrypoint
// Build the command
// If we have an entry point, it goes first
command = entrypoint
} }
var command []string
// Include the command used to create the container. // Include the command used to create the container.
s.ContainerCreateCommand = os.Args s.ContainerCreateCommand = os.Args
// Build the command
// If we have an entry point, it goes first
if c.Entrypoint != nil {
command = entrypoint
}
if len(inputCommand) > 0 { if len(inputCommand) > 0 {
// User command overrides data CMD // User command overrides data CMD
command = append(command, inputCommand...) command = append(command, inputCommand...)

2
pkg/api/handlers/compat/containers_create.go
View File

@ -81,7 +81,7 @@ func makeCreateConfig(ctx context.Context, containerConfig *config.Config, input
workDir = input.WorkingDir workDir = input.WorkingDir
} }
if len(input.Entrypoint) == 0 { if input.Entrypoint == nil {
entrypointSlice, err := newImage.Entrypoint(ctx) entrypointSlice, err := newImage.Entrypoint(ctx)
if err != nil { if err != nil {
return createconfig.CreateConfig{}, err return createconfig.CreateConfig{}, err

2
pkg/specgen/generate/oci.go
View File

@ -87,7 +87,7 @@ func makeCommand(ctx context.Context, s *specgen.SpecGenerator, img *image.Image
finalCommand := []string{} finalCommand := []string{}
entrypoint := s.Entrypoint entrypoint := s.Entrypoint
if len(entrypoint) == 0 && img != nil { if entrypoint == nil && img != nil {
newEntry, err := img.Entrypoint(ctx) newEntry, err := img.Entrypoint(ctx)
if err != nil { if err != nil {
return nil, err return nil, err

5
test/e2e/run_entrypoint_test.go
View File

@ -101,6 +101,11 @@ ENTRYPOINT ["grep", "Alpine", "/etc/os-release"]
session.WaitWithDefaultTimeout() session.WaitWithDefaultTimeout()
Expect(session.ExitCode()).To(Equal(0)) Expect(session.ExitCode()).To(Equal(0))
Expect(session.LineInOuputStartsWith("Linux")).To(BeTrue()) Expect(session.LineInOuputStartsWith("Linux")).To(BeTrue())
session = podmanTest.Podman([]string{"run", "--entrypoint", "", "foobar.com/entrypoint:latest", "uname"})
session.WaitWithDefaultTimeout()
Expect(session.ExitCode()).To(Equal(0))
Expect(session.LineInOuputStartsWith("Linux")).To(BeTrue())
}) })
It("podman run user entrypoint with command overrides image entrypoint and image cmd", func() { It("podman run user entrypoint with command overrides image entrypoint and image cmd", func() {