diff options
author | Matthew Heon <matthew.heon@gmail.com> | 2017-12-13 09:36:14 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-12-13 09:36:14 -0500 |
commit | e456c07813c5ccc6ccc81ad9a103e46e1b59b50c (patch) | |
tree | 06d6976ab80d77d19393f81344ef092fa9e51a3f /cmd/kpod/run.go | |
parent | cfb4e15e430e63b17420e80c0f6030a12fa1fb4a (diff) | |
parent | 74ee579375654c79fa710f13b7c2ee3810366f82 (diff) | |
download | podman-e456c07813c5ccc6ccc81ad9a103e46e1b59b50c.tar.gz podman-e456c07813c5ccc6ccc81ad9a103e46e1b59b50c.tar.bz2 podman-e456c07813c5ccc6ccc81ad9a103e46e1b59b50c.zip |
Merge pull request #106 from umohnani8/kpod_inspect
Update kpod inspect to use the new container state
Diffstat (limited to 'cmd/kpod/run.go')
-rw-r--r-- | cmd/kpod/run.go | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/cmd/kpod/run.go b/cmd/kpod/run.go index 7e078f66a..6142983ad 100644 --- a/cmd/kpod/run.go +++ b/cmd/kpod/run.go @@ -39,7 +39,7 @@ func runCmd(c *cli.Context) error { return err } - createImage := runtime.NewImage(createConfig.image) + createImage := runtime.NewImage(createConfig.Image) createImage.LocalName, _ = createImage.GetLocalImageName() if createImage.LocalName == "" { // The image wasnt found by the user input'd name or its fqname @@ -89,8 +89,8 @@ func runCmd(c *cli.Context) error { // Gather up the options for NewContainer which consist of With... funcs options = append(options, libpod.WithRootFSFromImage(imageID, imageName, false)) - options = append(options, libpod.WithSELinuxLabels(createConfig.processLabel, createConfig.mountLabel)) - options = append(options, libpod.WithShmDir(createConfig.shmDir)) + options = append(options, libpod.WithSELinuxLabels(createConfig.ProcessLabel, createConfig.MountLabel)) + options = append(options, libpod.WithShmDir(createConfig.ShmDir)) ctr, err := runtime.NewContainer(runtimeSpec, options...) if err != nil { return err @@ -114,7 +114,7 @@ func runCmd(c *cli.Context) error { // to finish before exiting main var wg sync.WaitGroup - if !createConfig.detach { + if !createConfig.Detach { // We increment the wg counter because we need to do the attach wg.Add(1) // Attach to the running container @@ -133,13 +133,13 @@ func runCmd(c *cli.Context) error { if err := ctr.Start(); err != nil { return errors.Wrapf(err, "unable to start container %q", ctr.ID()) } - if createConfig.detach { + if createConfig.Detach { fmt.Printf("%s\n", ctr.ID()) return nil } wg.Wait() - if createConfig.rm { + if createConfig.Rm { return runtime.RemoveContainer(ctr, true) } return ctr.CleanupStorage() |