Skip to content

Commit

Permalink
Export BuiltinDefaultPolicyPath
Browse files Browse the repository at this point in the history
This field is duplicated in containers/common/pkg/config and is
being vendored into bindings, just because it is not exported
from containers/image.

Signed-off-by: Daniel J Walsh <[email protected]>
  • Loading branch information
rhatdan committed Sep 6, 2024
1 parent 3ad7998 commit 70c8e82
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion signature/policy_config.go
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ import (
// systemDefaultPolicyPath is the policy path used for DefaultPolicy().
// You can override this at build time with
// -ldflags '-X github.com/containers/image/v5/signature.systemDefaultPolicyPath=$your_path'
var systemDefaultPolicyPath = builtinDefaultPolicyPath
var systemDefaultPolicyPath = BuiltinDefaultPolicyPath

// userPolicyFile is the path to the per user policy path.
var userPolicyFile = filepath.FromSlash(".config/containers/policy.json")
Expand Down
4 changes: 2 additions & 2 deletions signature/policy_paths_common.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@

package signature

// builtinDefaultPolicyPath is the policy path used for DefaultPolicy().
// BuiltinDefaultPolicyPath is the policy path used for DefaultPolicy().
// DO NOT change this, instead see systemDefaultPolicyPath above.
const builtinDefaultPolicyPath = "/etc/containers/policy.json"
const BuiltinDefaultPolicyPath = "/etc/containers/policy.json"
4 changes: 2 additions & 2 deletions signature/policy_paths_freebsd.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@

package signature

// builtinDefaultPolicyPath is the policy path used for DefaultPolicy().
// BuiltinDefaultPolicyPath is the policy path used for DefaultPolicy().
// DO NOT change this, instead see systemDefaultPolicyPath above.
const builtinDefaultPolicyPath = "/usr/local/etc/containers/policy.json"
const BuiltinDefaultPolicyPath = "/usr/local/etc/containers/policy.json"

0 comments on commit 70c8e82

Please sign in to comment.