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

Set Entrypoint from image only if not already set

Browse Source 
Signed-off-by: Matthew Heon <mheon@redhat.com>

Closes: #827
Approved by: rhatdan
This commit is contained in:
Matthew Heon
2018-05-24 10:19:32 -04:00
committed by Atomic Bot
parent 915364034f
commit b09fca74af
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libpod/container_internal.go
View File

@ -242,8 +242,10 @@ func (c *Container) setupStorage(ctx context.Context) error {
} }
// Set the default Entrypoint and Command // Set the default Entrypoint and Command
if c.config.Entrypoint == nil {
c.config.Entrypoint = containerInfo.Config.Config.Entrypoint c.config.Entrypoint = containerInfo.Config.Config.Entrypoint
if len(c.config.Command) == 0 { }
if c.config.Command == nil {
c.config.Command = containerInfo.Config.Config.Cmd c.config.Command = containerInfo.Config.Config.Cmd
} }