summaryrefslogtreecommitdiff
path: root/cmd/podman
diff options
context:
space:
mode:
Diffstat (limited to 'cmd/podman')
-rw-r--r--cmd/podman/create.go15
-rw-r--r--cmd/podman/run.go12
2 files changed, 21 insertions, 6 deletions
diff --git a/cmd/podman/create.go b/cmd/podman/create.go
index ce06ac51b..076e8c56e 100644
--- a/cmd/podman/create.go
+++ b/cmd/podman/create.go
@@ -154,6 +154,12 @@ func createCmd(c *cli.Context) error {
return err
}
+ if c.String("cidfile") != "" {
+ if err := libpod.WriteFile("", c.String("cidfile")); err != nil {
+ return errors.Wrapf(err, "unable to write cidfile %s", c.String("cidfile"))
+ }
+ }
+
runtime, err := getRuntime(c)
if err != nil {
return errors.Wrapf(err, "error creating libpod runtime")
@@ -196,11 +202,12 @@ func createCmd(c *cli.Context) error {
logrus.Debug("new container created ", ctr.ID())
if c.String("cidfile") != "" {
- libpod.WriteFile(ctr.ID(), c.String("cidfile"))
- } else {
- fmt.Printf("%s\n", ctr.ID())
+ err := libpod.WriteFile(ctr.ID(), c.String("cidfile"))
+ if err != nil {
+ logrus.Error(err)
+ }
}
-
+ fmt.Printf("%s\n", ctr.ID())
return nil
}
diff --git a/cmd/podman/run.go b/cmd/podman/run.go
index 07af4a6a2..d9bc00b78 100644
--- a/cmd/podman/run.go
+++ b/cmd/podman/run.go
@@ -29,6 +29,13 @@ func runCmd(c *cli.Context) error {
if err := validateFlags(c, createFlags); err != nil {
return err
}
+
+ if c.String("cidfile") != "" {
+ if err := libpod.WriteFile("", c.String("cidfile")); err != nil {
+ return errors.Wrapf(err, "unable to write cidfile %s", c.String("cidfile"))
+ }
+ }
+
runtime, err := getRuntime(c)
if err != nil {
return errors.Wrapf(err, "error creating libpod runtime")
@@ -84,8 +91,9 @@ func runCmd(c *cli.Context) error {
logrus.Debug("new container created ", ctr.ID())
if c.String("cidfile") != "" {
- libpod.WriteFile(ctr.ID(), c.String("cidfile"))
- return nil
+ if err := libpod.WriteFile(ctr.ID(), c.String("cidfile")); err != nil {
+ logrus.Error(err)
+ }
}
// Create a bool channel to track that the console socket attach