diff options
| author | Daniel J Walsh <dwalsh@redhat.com> | 2017-11-05 06:43:20 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-05 06:43:20 -0500 |
| commit | b06190e0da66f45cbe6a44d79065fabcd00ea19c (patch) | |
| tree | e50aa13cd31b63d797cabe4b9157599bf2f36898 /cmd/kpod/create.go | |
| parent | 098389dc3e7bbba7c266ad24c909f3a5422e2908 (diff) | |
| parent | 0026075d59b5e6e90786ed21825ac43d4f59fa5a (diff) | |
| download | podman-b06190e0da66f45cbe6a44d79065fabcd00ea19c.tar.gz podman-b06190e0da66f45cbe6a44d79065fabcd00ea19c.tar.bz2 podman-b06190e0da66f45cbe6a44d79065fabcd00ea19c.zip | |
Merge pull request #8 from baude/clicontext
Clicontext
Diffstat (limited to 'cmd/kpod/create.go')
| -rw-r--r-- | cmd/kpod/create.go | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/cmd/kpod/create.go b/cmd/kpod/create.go index 9d4d08b08..caee0c7f0 100644 --- a/cmd/kpod/create.go +++ b/cmd/kpod/create.go @@ -170,7 +170,7 @@ func createCmd(c *cli.Context) error { if err != nil { return err } - options, err := createConfig.GetContainerCreateOptions(c) + options, err := createConfig.GetContainerCreateOptions() if err != nil { return errors.Wrapf(err, "unable to parse new container options") } @@ -252,13 +252,12 @@ func parseCreateOpts(c *cli.Context, runtime *libpod.Runtime) (*createConfig, er } // LABEL VARIABLES - labels, err := getAllLabels(c) + labels, err := getAllLabels(c.StringSlice("label-file"), c.StringSlice("labels")) if err != nil { return &createConfig{}, errors.Wrapf(err, "unable to process labels") } // ENVIRONMENT VARIABLES - // TODO where should env variables be verified to be x=y format - env, err := getAllEnvironmentVariables(c) + env, err := getAllEnvironmentVariables(c.StringSlice("env-file"), c.StringSlice("env")) if err != nil { return &createConfig{}, errors.Wrapf(err, "unable to process environment variables") } |