From 70c8e82f5aea5f1662e6dd5180b6eb2a3e69d895 Mon Sep 17 00:00:00 2001 From: Daniel J Walsh Date: Fri, 6 Sep 2024 07:39:04 -0400 Subject: [PATCH] Export BuiltinDefaultPolicyPath 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 --- signature/policy_config.go | 2 +- signature/policy_paths_common.go | 4 ++-- signature/policy_paths_freebsd.go | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/signature/policy_config.go b/signature/policy_config.go index 8e7665c4be..0bb737175d 100644 --- a/signature/policy_config.go +++ b/signature/policy_config.go @@ -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") diff --git a/signature/policy_paths_common.go b/signature/policy_paths_common.go index 290fc24599..3d1fd9c1cb 100644 --- a/signature/policy_paths_common.go +++ b/signature/policy_paths_common.go @@ -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" diff --git a/signature/policy_paths_freebsd.go b/signature/policy_paths_freebsd.go index 702b7171fb..0b16c0c7e9 100644 --- a/signature/policy_paths_freebsd.go +++ b/signature/policy_paths_freebsd.go @@ -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"