diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-06-17 15:25:09 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-17 15:25:09 -0400 |
| commit | fd184fa4a1d0bd7797de1fb062c90e1a6d56bd1e (patch) | |
| tree | 08d480ab4e980643fdb158ded79e57b937a4192b /pkg | |
| parent | 5694104c24f36d8575853a48e8ba3cdbf87b8f5c (diff) | |
| parent | 6f1440a3ec16dfbf644acb87012967bc297ec975 (diff) | |
| download | podman-fd184fa4a1d0bd7797de1fb062c90e1a6d56bd1e.tar.gz podman-fd184fa4a1d0bd7797de1fb062c90e1a6d56bd1e.tar.bz2 podman-fd184fa4a1d0bd7797de1fb062c90e1a6d56bd1e.zip | |
Merge pull request #6522 from mheon/unless-stopped
Add support for the unless-stopped restart policy
Diffstat (limited to 'pkg')
| -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)) } |