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 #1229 from dfr/freebsd-config 

pkg/config: Fix DefaultSignaturePath on FreeBSD
This commit is contained in:
OpenShift Merge Robot 2022-11-10 19:39:00 +00:00 committed by GitHub
parent 09d0c236c0 4b906d8159
commit 87d25401b0
5 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
common/pkg/config/config_darwin.go
View File

@ -10,6 +10,10 @@ const (
// DefaultContainersConfig holds the default containers config path // DefaultContainersConfig holds the default containers config path
DefaultContainersConfig = "/usr/share/" + _configPath DefaultContainersConfig = "/usr/share/" + _configPath
// DefaultSignaturePolicyPath is the default value for the
// policy.json file.
DefaultSignaturePolicyPath = "/etc/containers/policy.json"
) )
// podman remote clients on darwin cannot use unshare.isRootless() to determine the configuration file locations. // podman remote clients on darwin cannot use unshare.isRootless() to determine the configuration file locations.

4
common/pkg/config/config_freebsd.go
View File

@ -10,6 +10,10 @@ const (
// DefaultContainersConfig holds the default containers config path // DefaultContainersConfig holds the default containers config path
DefaultContainersConfig = "/usr/local/share/" + _configPath DefaultContainersConfig = "/usr/local/share/" + _configPath
// DefaultSignaturePolicyPath is the default value for the
// policy.json file.
DefaultSignaturePolicyPath = "/usr/local/etc/containers/policy.json"
) )
// podman remote clients on freebsd cannot use unshare.isRootless() to determine the configuration file locations. // podman remote clients on freebsd cannot use unshare.isRootless() to determine the configuration file locations.

4
common/pkg/config/config_linux.go
View File

@ -13,6 +13,10 @@ const (
// DefaultContainersConfig holds the default containers config path // DefaultContainersConfig holds the default containers config path
DefaultContainersConfig = "/usr/share/" + _configPath DefaultContainersConfig = "/usr/share/" + _configPath
// DefaultSignaturePolicyPath is the default value for the
// policy.json file.
DefaultSignaturePolicyPath = "/etc/containers/policy.json"
) )
func selinuxEnabled() bool { func selinuxEnabled() bool {

4
common/pkg/config/config_windows.go
View File

@ -8,6 +8,10 @@ const (
// DefaultContainersConfig holds the default containers config path // DefaultContainersConfig holds the default containers config path
DefaultContainersConfig = "/usr/share/" + _configPath DefaultContainersConfig = "/usr/share/" + _configPath
// DefaultSignaturePolicyPath is the default value for the
// policy.json file.
DefaultSignaturePolicyPath = "/etc/containers/policy.json"
) )
// podman remote clients on windows cannot use unshare.isRootless() to determine the configuration file locations. // podman remote clients on windows cannot use unshare.isRootless() to determine the configuration file locations.

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

@ -149,9 +149,6 @@ const (
DefaultPidsLimit = 2048 DefaultPidsLimit = 2048
// DefaultPullPolicy pulls the image if it does not exist locally. // DefaultPullPolicy pulls the image if it does not exist locally.
DefaultPullPolicy = "missing" DefaultPullPolicy = "missing"
// DefaultSignaturePolicyPath is the default value for the
// policy.json file.
DefaultSignaturePolicyPath = "/etc/containers/policy.json"
// DefaultSubnet is the subnet that will be used for the default // DefaultSubnet is the subnet that will be used for the default
// network. // network.
DefaultSubnet = "10.88.0.0/16" DefaultSubnet = "10.88.0.0/16"