containers
/
podman
mirror of https://github.com/containers/podman.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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: #530

Signed-off-by: baude <bbaude@redhat.com>

Closes: #531
Approved by: rhatdan
This commit is contained in:
baude 2018-03-22 13:44:32 -05:00 committed by Atomic Bot
parent d364d41e1b
commit c55e371365
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cmd/podman/create.go
View File

@ -159,6 +159,9 @@ func createCmd(c *cli.Context) error {
} }
if c.String("cidfile") != "" { 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 { if err := libpod.WriteFile("", c.String("cidfile")); err != nil {
return errors.Wrapf(err, "unable to write cidfile %s", c.String("cidfile")) return errors.Wrapf(err, "unable to write cidfile %s", c.String("cidfile"))
} }

3
cmd/podman/run.go
View File

@ -37,6 +37,9 @@ func runCmd(c *cli.Context) error {
} }
if c.String("cidfile") != "" { 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 { if err := libpod.WriteFile("", c.String("cidfile")); err != nil {
return errors.Wrapf(err, "unable to write cidfile %s", c.String("cidfile")) return errors.Wrapf(err, "unable to write cidfile %s", c.String("cidfile"))
} }