summaryrefslogtreecommitdiff
path: root/cmd/podman/runlabel.go
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2018-10-26 04:33:12 -0700
committerGitHub <noreply@github.com>2018-10-26 04:33:12 -0700
commit6e1aeb06f86bfed7045be19c8e8b09c1bf5ba55f (patch)
treee05292388acb06c0c30d5031fc540fc629f6f6e5 /cmd/podman/runlabel.go
parenta2dc29746f354382a90956fcc3b47abf8a986fd9 (diff)
parent606a5cec8fa177fe64cff4ccf7cac05900fbe86c (diff)
downloadpodman-6e1aeb06f86bfed7045be19c8e8b09c1bf5ba55f.tar.gz
podman-6e1aeb06f86bfed7045be19c8e8b09c1bf5ba55f.tar.bz2
podman-6e1aeb06f86bfed7045be19c8e8b09c1bf5ba55f.zip
Merge pull request #1637 from vrothberg/runlabel-execute-any-command
runlabel: run any command
Diffstat (limited to 'cmd/podman/runlabel.go')
-rw-r--r--cmd/podman/runlabel.go5
1 files changed, 4 insertions, 1 deletions
diff --git a/cmd/podman/runlabel.go b/cmd/podman/runlabel.go
index aa7411a5f..e1dee1fb2 100644
--- a/cmd/podman/runlabel.go
+++ b/cmd/podman/runlabel.go
@@ -196,7 +196,10 @@ func runlabelCmd(c *cli.Context) error {
runLabel = fmt.Sprintf("%s %s", runLabel, strings.Join(args[2:], " "))
}
- cmd := shared.GenerateCommand(runLabel, imageName, c.String("name"))
+ cmd, err := shared.GenerateCommand(runLabel, imageName, c.String("name"))
+ if err != nil {
+ return errors.Wrapf(err, "unable to generate command")
+ }
env := shared.GenerateRunEnvironment(c.String("name"), imageName, opts)
env = append(env, "PODMAN_RUNLABEL_NESTED=1")