containers
/
automation-tests
mirror of https://github.com/containers/automation-tests.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #92 from rhatdan/version 

Move SignaturePolicyPath to Engine instead of Containers
This commit is contained in:
Tom Sweeney 2020-03-17 18:04:51 -04:00 committed by GitHub
parent cc73e65485 f935da11c9
commit ff2bc7dc56
3 changed files with 27 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
common/pkg/config/config.go
View File

@ -160,11 +160,6 @@ type ContainersConfig struct {
// ShmSize holds the size of /dev/shm. // ShmSize holds the size of /dev/shm.
ShmSize string `toml:"shm_size"` ShmSize string `toml:"shm_size"`
// SignaturePolicyPath is the path to a signature policy to use for
// validating images. If left empty, the containers/image default signature
// policy will be used.
SignaturePolicyPath string `toml:"_"`
// UTSNS indicates how to create a UTS namespace for the container // UTSNS indicates how to create a UTS namespace for the container
UTSNS string `toml:"utsns"` UTSNS string `toml:"utsns"`
@ -283,6 +278,11 @@ type EngineConfig struct {
// backwards compat with older version of libpod and Podman. // backwards compat with older version of libpod and Podman.
SetOptions SetOptions
// SignaturePolicyPath is the path to a signature policy to use for
// validating images. If left empty, the containers/image default signature
// policy will be used.
SignaturePolicyPath string `toml:"_"`
// SDNotify tells container engine to allow containers to notify the host systemd of // SDNotify tells container engine to allow containers to notify the host systemd of
// readiness using the SD_NOTIFY mechanism. // readiness using the SD_NOTIFY mechanism.
SDNotify bool SDNotify bool

36
common/pkg/config/default.go
View File

@ -123,7 +123,6 @@ func DefaultConfig() (*Config, error) {
return nil, err return nil, err
} }
var signaturePolicyPath string
netns := "bridge" netns := "bridge"
if unshare.IsRootless() { if unshare.IsRootless() {
home, err := unshare.HomeDir() home, err := unshare.HomeDir()
@ -132,7 +131,7 @@ func DefaultConfig() (*Config, error) {
} }
sigPath := filepath.Join(home, DefaultRootlessSignaturePolicyPath) sigPath := filepath.Join(home, DefaultRootlessSignaturePolicyPath)
if _, err := os.Stat(sigPath); err == nil { if _, err := os.Stat(sigPath); err == nil {
signaturePolicyPath = sigPath defaultEngineConfig.SignaturePolicyPath = sigPath
} }
netns = "slirp4netns" netns = "slirp4netns"
} }
@ -154,23 +153,22 @@ func DefaultConfig() (*Config, error) {
Env: []string{ Env: []string{
"PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin", "PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin",
}, },
EnvHost: false, EnvHost: false,
HTTPProxy: false, HTTPProxy: false,
Init: false, Init: false,
InitPath: "", InitPath: "",
IPCNS: "private", IPCNS: "private",
LogDriver: DefaultLogDriver, LogDriver: DefaultLogDriver,
LogSizeMax: DefaultLogSizeMax, LogSizeMax: DefaultLogSizeMax,
NetNS: netns, NetNS: netns,
NoHosts: false, NoHosts: false,
PidsLimit: DefaultPidsLimit, PidsLimit: DefaultPidsLimit,
PidNS: "private", PidNS: "private",
SeccompProfile: SeccompDefaultPath, SeccompProfile: SeccompDefaultPath,
ShmSize: DefaultShmSize, ShmSize: DefaultShmSize,
SignaturePolicyPath: signaturePolicyPath, UTSNS: "private",
UTSNS: "private", UserNS: "private",
UserNS: "private", UserNSSize: DefaultUserNSSize,
UserNSSize: DefaultUserNSSize,
}, },
Network: NetworkConfig{ Network: NetworkConfig{
DefaultNetwork: "podman", DefaultNetwork: "podman",

10
common/pkg/config/libpodConfig.go
View File

@ -302,10 +302,9 @@ func rootlessLibpodConfigPath() (string, error) {
func (c *Config) libpodConfig() *ConfigFromLibpod { func (c *Config) libpodConfig() *ConfigFromLibpod {
return &ConfigFromLibpod{ return &ConfigFromLibpod{
SignaturePolicyPath: c.Containers.SignaturePolicyPath, InitPath: c.Containers.InitPath,
InitPath: c.Containers.InitPath, MaxLogSize: c.Containers.LogSizeMax,
MaxLogSize: c.Containers.LogSizeMax, EnableLabeling: c.Containers.EnableLabeling,
EnableLabeling: c.Containers.EnableLabeling,
SetOptions: c.Engine.SetOptions, SetOptions: c.Engine.SetOptions,
VolumePath: c.Engine.VolumePath, VolumePath: c.Engine.VolumePath,
@ -334,6 +333,7 @@ func (c *Config) libpodConfig() *ConfigFromLibpod {
DetachKeys: c.Engine.DetachKeys, DetachKeys: c.Engine.DetachKeys,
SDNotify: c.Engine.SDNotify, SDNotify: c.Engine.SDNotify,
CgroupCheck: c.Engine.CgroupCheck, CgroupCheck: c.Engine.CgroupCheck,
SignaturePolicyPath: c.Engine.SignaturePolicyPath,
CNIConfigDir: c.Network.NetworkConfigDir, CNIConfigDir: c.Network.NetworkConfigDir,
CNIPluginDir: c.Network.CNIPluginDirs, CNIPluginDir: c.Network.CNIPluginDirs,
@ -343,11 +343,11 @@ func (c *Config) libpodConfig() *ConfigFromLibpod {
func (c *Config) libpodToContainersConfig(libpodConf *ConfigFromLibpod) { func (c *Config) libpodToContainersConfig(libpodConf *ConfigFromLibpod) {
c.Containers.SignaturePolicyPath = libpodConf.SignaturePolicyPath
c.Containers.InitPath = libpodConf.InitPath c.Containers.InitPath = libpodConf.InitPath
c.Containers.LogSizeMax = libpodConf.MaxLogSize c.Containers.LogSizeMax = libpodConf.MaxLogSize
c.Containers.EnableLabeling = libpodConf.EnableLabeling c.Containers.EnableLabeling = libpodConf.EnableLabeling
c.Engine.SignaturePolicyPath = libpodConf.SignaturePolicyPath
c.Engine.SetOptions = libpodConf.SetOptions c.Engine.SetOptions = libpodConf.SetOptions
c.Engine.VolumePath = libpodConf.VolumePath c.Engine.VolumePath = libpodConf.VolumePath
c.Engine.ImageDefaultTransport = libpodConf.ImageDefaultTransport c.Engine.ImageDefaultTransport = libpodConf.ImageDefaultTransport