diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-11-23 13:44:37 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-23 13:44:37 +0100 |
| commit | dd343418ce5a3fd6c6238d7e2edc132826756051 (patch) | |
| tree | 8f6f33d7e8faed4bf8201d655a54a7277282820f /cmd/podman/common | |
| parent | ac55bd1f673156cbb60b568b65f7bf4918daf152 (diff) | |
| parent | dc8996ec84ffd6f272361edbf7c19e91c52519d9 (diff) | |
| download | podman-dd343418ce5a3fd6c6238d7e2edc132826756051.tar.gz podman-dd343418ce5a3fd6c6238d7e2edc132826756051.tar.bz2 podman-dd343418ce5a3fd6c6238d7e2edc132826756051.zip | |
Merge pull request #8263 from rhatdan/restart
Allow containers to --restart on-failure with --rm
Diffstat (limited to 'cmd/podman/common')
| -rw-r--r-- | cmd/podman/common/createparse.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cmd/podman/common/createparse.go b/cmd/podman/common/createparse.go index 09ee5aa0c..3a69f11b6 100644 --- a/cmd/podman/common/createparse.go +++ b/cmd/podman/common/createparse.go @@ -9,7 +9,7 @@ import ( // by validate must not need any state information on the flag (i.e. changed) func (c *ContainerCLIOpts) validate() error { var () - if c.Rm && c.Restart != "" && c.Restart != "no" { + if c.Rm && (c.Restart != "" && c.Restart != "no" && c.Restart != "on-failure") { return errors.Errorf(`the --rm option conflicts with --restart, when the restartPolicy is not "" and "no"`) } |