diff options
author | Matthew Heon <matthew.heon@pm.me> | 2020-06-08 15:15:16 -0400 |
---|---|---|
committer | Matthew Heon <mheon@redhat.com> | 2020-06-17 11:16:12 -0400 |
commit | 6f1440a3ec16dfbf644acb87012967bc297ec975 (patch) | |
tree | c07c364b38d56d44ed1719a08940ea1d8ff9bb6e /pkg/specgen | |
parent | 1acd2adccb357c317add19cea8f0daea328e8315 (diff) | |
download | podman-6f1440a3ec16dfbf644acb87012967bc297ec975.tar.gz podman-6f1440a3ec16dfbf644acb87012967bc297ec975.tar.bz2 podman-6f1440a3ec16dfbf644acb87012967bc297ec975.zip |
Add support for the unless-stopped restart policy
We initially believed that implementing this required support for
restarting containers after reboot, but this is not the case.
The unless-stopped restart policy acts identically to the always
restart policy except in cases related to reboot (which we do not
support yet), but it does not require that support for us to
implement it.
Changes themselves are quite simple, we need a new restart policy
constant, we need to remove existing checks that block creation
of containers when unless-stopped was used, and we need to update
the manpages.
Fixes #6508
Signed-off-by: Matthew Heon <matthew.heon@pm.me>
Diffstat (limited to 'pkg/specgen')
-rw-r--r-- | pkg/specgen/generate/container_create.go | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/pkg/specgen/generate/container_create.go b/pkg/specgen/generate/container_create.go index 869601e93..2f7100e7e 100644 --- a/pkg/specgen/generate/container_create.go +++ b/pkg/specgen/generate/container_create.go @@ -7,7 +7,6 @@ import ( "github.com/containers/common/pkg/config" "github.com/containers/libpod/libpod" - "github.com/containers/libpod/libpod/define" "github.com/containers/libpod/libpod/image" "github.com/containers/libpod/pkg/specgen" "github.com/containers/libpod/pkg/util" @@ -251,9 +250,6 @@ func createContainerOptions(ctx context.Context, rt *libpod.Runtime, s *specgen. // Default used if not overridden on command line if s.RestartPolicy != "" { - if s.RestartPolicy == "unless-stopped" { - return nil, errors.Wrapf(define.ErrInvalidArg, "the unless-stopped restart policy is not supported") - } if s.RestartRetries != nil { options = append(options, libpod.WithRestartRetries(*s.RestartRetries)) } |