Merge pull request #16619 from dfr/default-policy

pkg/trust: Take the default policy path from c/common/pkg/config
containers · Nov 25, 2022 · 4135655 · 4135655
2 parents fd142ef + 6502b1f
commit 4135655
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/pkg/trust/policy.go b/pkg/trust/policy.go
@@ -12,6 +12,7 @@ import (
 	"path/filepath"
 	"strings"
 
+	"github.com/containers/common/pkg/config"
 	"github.com/containers/image/v5/types"
 	"github.com/sirupsen/logrus"
 )
@@ -53,7 +54,7 @@ type genericRepoMap map[string]json.RawMessage
 
 // DefaultPolicyPath returns a path to the default policy of the system.
 func DefaultPolicyPath(sys *types.SystemContext) string {
-	systemDefaultPolicyPath := "/etc/containers/policy.json"
+	systemDefaultPolicyPath := config.DefaultSignaturePolicyPath
 	if sys != nil {
 		if sys.SignaturePolicyPath != "" {
 			return sys.SignaturePolicyPath