summaryrefslogtreecommitdiff
path: root/cmd
diff options
context:
space:
mode:
authorGiuseppe Scrivano <gscrivan@redhat.com>2019-03-20 12:45:04 +0100
committerGiuseppe Scrivano <gscrivan@redhat.com>2019-03-20 23:22:22 +0100
commita53c768409db7cf18c20eab73a24bd193493c9ce (patch)
tree5ed2a7da8757e1a34fe9b52dcfd4b17aaccf3e8d /cmd
parentc230f0c693134830b3df60a8dc37770848a6f5e2 (diff)
downloadpodman-a53c768409db7cf18c20eab73a24bd193493c9ce.tar.gz
podman-a53c768409db7cf18c20eab73a24bd193493c9ce.tar.bz2
podman-a53c768409db7cf18c20eab73a24bd193493c9ce.zip
podman: do not split --env on comma
if --env "a=b,c" is used, do not split into a=b and c=. Closes: https://github.com/containers/libpod/issues/2712 Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
Diffstat (limited to 'cmd')
-rw-r--r--cmd/podman/common.go2
-rw-r--r--cmd/podman/exec.go2
-rw-r--r--cmd/podman/shared/create.go2
3 files changed, 3 insertions, 3 deletions
diff --git a/cmd/podman/common.go b/cmd/podman/common.go
index 43dfdb837..8b42ed673 100644
--- a/cmd/podman/common.go
+++ b/cmd/podman/common.go
@@ -264,7 +264,7 @@ func getCreateFlags(c *cliconfig.PodmanCommand) {
"entrypoint", "",
"Overwrite the default ENTRYPOINT of the image",
)
- createFlags.StringSliceP(
+ createFlags.StringArrayP(
"env", "e", []string{},
"Set environment variables in container",
)
diff --git a/cmd/podman/exec.go b/cmd/podman/exec.go
index aa81edf56..a6afbf75a 100644
--- a/cmd/podman/exec.go
+++ b/cmd/podman/exec.go
@@ -41,7 +41,7 @@ func init() {
execCommand.SetUsageTemplate(UsageTemplate())
flags := execCommand.Flags()
flags.SetInterspersed(false)
- flags.StringSliceVarP(&execCommand.Env, "env", "e", []string{}, "Set environment variables")
+ flags.StringArrayVarP(&execCommand.Env, "env", "e", []string{}, "Set environment variables")
flags.BoolVarP(&execCommand.Interfactive, "interactive", "i", false, "Not supported. All exec commands are interactive by default")
flags.BoolVarP(&execCommand.Latest, "latest", "l", false, "Act on the latest container podman is aware of")
flags.BoolVar(&execCommand.Privileged, "privileged", false, "Give the process extended Linux capabilities inside the container. The default is false")
diff --git a/cmd/podman/shared/create.go b/cmd/podman/shared/create.go
index 32a80e9f9..55eb3ce83 100644
--- a/cmd/podman/shared/create.go
+++ b/cmd/podman/shared/create.go
@@ -499,7 +499,7 @@ func ParseCreateOpts(ctx context.Context, c *cliconfig.PodmanCommand, runtime *l
}
}
}
- if err := parse.ReadKVStrings(env, c.StringSlice("env-file"), c.StringSlice("env")); err != nil {
+ if err := parse.ReadKVStrings(env, c.StringSlice("env-file"), c.StringArray("env")); err != nil {
return nil, errors.Wrapf(err, "unable to process environment variables")
}