summaryrefslogtreecommitdiff
path: root/cmd/podman
diff options
context:
space:
mode:
authorbaude <bbaude@redhat.com>2018-04-03 09:12:39 -0500
committerAtomic Bot <atomic-devel@projectatomic.io>2018-04-03 15:19:30 +0000
commit6fab1c1b780b5fde6d59d1ee7ac491b3df8e32bd (patch)
tree5953c6fdb12013d9c3946b8387314c0cab3df473 /cmd/podman
parent750f000e7cfe79ade7b7e881d1d870341e08ea3f (diff)
downloadpodman-6fab1c1b780b5fde6d59d1ee7ac491b3df8e32bd.tar.gz
podman-6fab1c1b780b5fde6d59d1ee7ac491b3df8e32bd.tar.bz2
podman-6fab1c1b780b5fde6d59d1ee7ac491b3df8e32bd.zip
--entrypoint= should delete existing entrypoint
Resolves: #572 Signed-off-by: baude <bbaude@redhat.com> Closes: #585 Approved by: mheon
Diffstat (limited to 'cmd/podman')
-rw-r--r--cmd/podman/create.go5
1 files changed, 4 insertions, 1 deletions
diff --git a/cmd/podman/create.go b/cmd/podman/create.go
index 520664c8e..fe6d30c9e 100644
--- a/cmd/podman/create.go
+++ b/cmd/podman/create.go
@@ -547,7 +547,10 @@ func parseCreateOpts(c *cli.Context, runtime *libpod.Runtime, imageName string,
if len(entrypoint) == 0 {
entrypoint = data.ContainerConfig.Entrypoint
}
-
+ // if entrypoint=, we need to clear the entrypoint
+ if len(entrypoint) == 1 && c.IsSet("entrypoint") && strings.Join(c.StringSlice("entrypoint"), "") == "" {
+ entrypoint = []string{}
+ }
// Build the command
// If we have an entry point, it goes first
if len(entrypoint) > 0 {