opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-26 04:46:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6522 from mheon/unless-stopped

Browse Source 
Add support for the unless-stopped restart policy
This commit is contained in:
OpenShift Merge Robot
2020-06-17 15:25:09 -04:00
committed by GitHub
parent 5694104c24 6f1440a3ec
commit fd184fa4a1
6 changed files with 24 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/specgen/generate/container_create.go
View File

@ -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))
}