diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-03-08 07:11:18 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-08 07:11:18 -0800 |
| commit | 8c54126b6f60d216350cda29a5a5ed8b216854fe (patch) | |
| tree | e4fafd1aea96b418d592efad3b7ae390017c21fe | |
| parent | 9e2cd7fea1c03e36c9354c8f67a4f08721fdc503 (diff) | |
| parent | a7606ca5d92eeba25956362d5c8a7b687e2f52cd (diff) | |
| download | podman-8c54126b6f60d216350cda29a5a5ed8b216854fe.tar.gz podman-8c54126b6f60d216350cda29a5a5ed8b216854fe.tar.bz2 podman-8c54126b6f60d216350cda29a5a5ed8b216854fe.zip | |
Merge pull request #2582 from baude/issue2574
label parsing in non-quoted field
| -rw-r--r-- | cmd/podman/common.go | 2 | ||||
| -rw-r--r-- | cmd/podman/create.go | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/cmd/podman/common.go b/cmd/podman/common.go index 1de0c7187..30eaa95d8 100644 --- a/cmd/podman/common.go +++ b/cmd/podman/common.go @@ -321,7 +321,7 @@ func getCreateFlags(c *cliconfig.PodmanCommand) { "kernel-memory", "", "Kernel memory limit (format: `<number>[<unit>]`, where unit = b, k, m or g)", ) - createFlags.StringSliceP( + createFlags.StringArrayP( "label", "l", []string{}, "Set metadata on container (default [])", ) diff --git a/cmd/podman/create.go b/cmd/podman/create.go index 968b5586b..fa8b9f57b 100644 --- a/cmd/podman/create.go +++ b/cmd/podman/create.go @@ -592,7 +592,7 @@ func parseCreateOpts(ctx context.Context, c *cliconfig.PodmanCommand, runtime *l } // LABEL VARIABLES - labels, err := getAllLabels(c.StringSlice("label-file"), c.StringSlice("label")) + labels, err := getAllLabels(c.StringSlice("label-file"), c.StringArray("label")) if err != nil { return nil, errors.Wrapf(err, "unable to process labels") } |