From 653faf7c6784a77485db3ede5764bb3ee873685a Mon Sep 17 00:00:00 2001 From: Aaron Weitekamp Date: Fri, 23 Sep 2016 08:17:00 -0400 Subject: [PATCH] add TRUST_POLICY env var Closes: #659 Approved by: rhatdan --- Atomic/trust.py | 2 +- docs/atomic-trust.1.md | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/Atomic/trust.py b/Atomic/trust.py index 759589a..ec30d0e 100644 --- a/Atomic/trust.py +++ b/Atomic/trust.py @@ -75,7 +75,7 @@ class Trust(Atomic): :param policy_filename: override policy filename """ super(Trust, self).__init__() - self.policy_filename = policy_filename + self.policy_filename = os.environ.get('TRUST_POLICY', policy_filename) self.atomic_config = util.get_atomic_config() def add(self, registry=None, pubkeys=None, sigstore=None, sigstoretype=None, keytype=None, trust_type=None): diff --git a/docs/atomic-trust.1.md b/docs/atomic-trust.1.md index b7ee44a..c5250df 100644 --- a/docs/atomic-trust.1.md +++ b/docs/atomic-trust.1.md @@ -39,6 +39,10 @@ Trust may be updated using the command **atomic trust add** for an existing trus The default trust policy is managed by the default command. Options are **accept** or **reject**. +The default **/etc/containers/policy.json** file may be overriden using +environment variable **TRUST_POLICY**. This is typically only useful for +testing. + # OPTIONS **-h** **--help** Print usage statement.