diff options
| author | Daniel J Walsh <dwalsh@redhat.com> | 2021-03-08 16:04:20 -0500 |
|---|---|---|
| committer | Daniel J Walsh <dwalsh@redhat.com> | 2021-03-10 06:34:47 -0500 |
| commit | c9ef2607104a0b17e5146b3ee01852edb7d3d688 (patch) | |
| tree | 242c642f1495c16038bf4145d583fa67f0e27d0e /test/apiv2 | |
| parent | 5331096b3882cd5c8e587200560e44ef1eb990a3 (diff) | |
| download | podman-c9ef2607104a0b17e5146b3ee01852edb7d3d688.tar.gz podman-c9ef2607104a0b17e5146b3ee01852edb7d3d688.tar.bz2 podman-c9ef2607104a0b17e5146b3ee01852edb7d3d688.zip | |
Document CONTAINERS_CONF/CONTAINERS_STORAGE_CONF Env variables
Also Switch to using CONTAINERS_REGISTRIES_CONF for registries.conf
overrides.
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
Diffstat (limited to 'test/apiv2')
| -rw-r--r-- | test/apiv2/rest_api/__init__.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/test/apiv2/rest_api/__init__.py b/test/apiv2/rest_api/__init__.py index db0257f03..b7b8a7649 100644 --- a/test/apiv2/rest_api/__init__.py +++ b/test/apiv2/rest_api/__init__.py @@ -27,7 +27,7 @@ class Podman(object): self.cmd.append("--root=" + os.path.join(self.anchor_directory, "crio")) self.cmd.append("--runroot=" + os.path.join(self.anchor_directory, "crio-run")) - os.environ["REGISTRIES_CONFIG_PATH"] = os.path.join(self.anchor_directory, "registry.conf") + os.environ["CONTAINERS_REGISTRIES_CONF"] = os.path.join(self.anchor_directory, "registry.conf") p = configparser.ConfigParser() p.read_dict( { @@ -36,7 +36,7 @@ class Podman(object): "registries.block": {"registries": "[]"}, } ) - with open(os.environ["REGISTRIES_CONFIG_PATH"], "w") as w: + with open(os.environ["CONTAINERS_REGISTRIES_CONF"], "w") as w: p.write(w) os.environ["CNI_CONFIG_PATH"] = os.path.join(self.anchor_directory, "cni", "net.d") |