If cidfile exists, do not proceed

Both podman run and create have an option to write the container ID to a file. The option is called cidfile. If the cidfile exists, we should not create or run a container but rather output a sensical error message. Resolves: containers#530 Signed-off-by: baude <[email protected]>
baude · Mar 22, 2018 · 900f9f0 · 900f9f0
1 parent 2cc51db
commit 900f9f0
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/cmd/podman/create.go b/cmd/podman/create.go
@@ -159,6 +159,9 @@ func createCmd(c *cli.Context) error {
 	}
 
 	if c.String("cidfile") != "" {
+		if _, err := os.Stat(c.String("cidfile")); err == nil {
+			return errors.Errorf("container id file exists. ensure another container is not using it or delete %s", c.String("cidfile"))
+		}
 		if err := libpod.WriteFile("", c.String("cidfile")); err != nil {
 			return errors.Wrapf(err, "unable to write cidfile %s", c.String("cidfile"))
 		}

diff --git a/cmd/podman/run.go b/cmd/podman/run.go
@@ -37,6 +37,9 @@ func runCmd(c *cli.Context) error {
 	}
 
 	if c.String("cidfile") != "" {
+		if _, err := os.Stat(c.String("cidfile")); err == nil {
+			return errors.Errorf("container id file exists. ensure another container is not using it or delete %s", c.String("cidfile"))
+		}
 		if err := libpod.WriteFile("", c.String("cidfile")); err != nil {
 			return errors.Wrapf(err, "unable to write cidfile %s", c.String("cidfile"))
 		}