summaryrefslogtreecommitdiff
path: root/test/python/docker
diff options
context:
space:
mode:
authorDaniel J Walsh <dwalsh@redhat.com>2021-03-08 16:04:20 -0500
committerDaniel J Walsh <dwalsh@redhat.com>2021-03-10 06:34:47 -0500
commitc9ef2607104a0b17e5146b3ee01852edb7d3d688 (patch)
tree242c642f1495c16038bf4145d583fa67f0e27d0e /test/python/docker
parent5331096b3882cd5c8e587200560e44ef1eb990a3 (diff)
downloadpodman-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/python/docker')
-rw-r--r--test/python/docker/__init__.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/test/python/docker/__init__.py b/test/python/docker/__init__.py
index da5630eac..59b7987f4 100644
--- a/test/python/docker/__init__.py
+++ b/test/python/docker/__init__.py
@@ -39,7 +39,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(
+ os.environ["CONTAINERS_REGISTRIES_CONF"] = os.path.join(
self.anchor_directory, "registry.conf"
)
p = configparser.ConfigParser()
@@ -50,7 +50,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(