opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-05-31 07:27:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

Update podman to use containers.conf

Browse Source 
Add more default options parsing

Switch to using --time as opposed to --timeout to better match Docker.

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
This commit is contained in:
Daniel J Walsh
2020-04-16 21:54:31 -04:00
parent 5928e8fe80
commit e62d081770
39 changed files with 68 additions and 1496 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/specgen/pod_validate.go
View File

@ -1,14 +1,16 @@
package specgen
import (
"github.com/containers/libpod/libpod/define"
"github.com/containers/libpod/pkg/rootless"
"github.com/containers/libpod/pkg/util"
"github.com/pkg/errors"
)
var (
// ErrInvalidPodSpecConfig describes an error given when the podspecgenerator is invalid
ErrInvalidPodSpecConfig error = errors.New("invalid pod spec")
// containerConfig has the default configurations defined in containers.conf
containerConfig = util.DefaultContainerConfig()
)
func exclusivePodOptions(opt1, opt2 string) error {
@ -96,10 +98,10 @@ func (p *PodSpecGenerator) Validate() error {
}
}
if len(p.InfraImage) < 1 {
p.InfraImage = define.DefaultInfraImage
p.InfraImage = containerConfig.Engine.InfraImage
}
if len(p.InfraCommand) < 1 {
p.InfraCommand = []string{define.DefaultInfraCommand}
p.InfraCommand = []string{containerConfig.Engine.InfraCommand}
}
return nil
}