opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-05-23 10:07:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

Document CONTAINERS_CONF/CONTAINERS_STORAGE_CONF Env variables

Browse Source 
Also Switch to using CONTAINERS_REGISTRIES_CONF for registries.conf
overrides.

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
This commit is contained in:
Daniel J Walsh
2021-03-08 16:04:20 -05:00
parent 5331096b38
commit c9ef260710
9 changed files with 29 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
test/python/docker/__init__.py
View File

@ -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(