mirror/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2026-02-24 18:46:20 -05:00
Code Issues Packages Projects Releases Wiki Activity

squash

Browse Source 
Signed-off-by: jortkoopmans <jort@jabo-solutions.eu>
This commit is contained in:
jortkoopmans
2020-11-25 18:26:22 +01:00
parent a18365c908
commit 5cfbe0b78e
102 changed files with 1710 additions and 853 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -39,9 +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(
self.anchor_directory, "registry.conf"
)
os.environ["REGISTRIES_CONFIG_PATH"] = os.path.join(self.anchor_directory, "registry.conf")
p = configparser.ConfigParser()
p.read_dict(
{
@@ -53,20 +51,16 @@ class Podman(object):
with open(os.environ["REGISTRIES_CONFIG_PATH"], "w") as w:
p.write(w)
os.environ["CNI_CONFIG_PATH"] = os.path.join(
self.anchor_directory, "cni", "net.d"
)
os.environ["CNI_CONFIG_PATH"] = os.path.join(self.anchor_directory, "cni", "net.d")
os.makedirs(os.environ["CNI_CONFIG_PATH"], exist_ok=True)
self.cmd.append("--cni-config-dir=" + os.environ["CNI_CONFIG_PATH"])
cni_cfg = os.path.join(
os.environ["CNI_CONFIG_PATH"], "87-podman-bridge.conflist"
)
cni_cfg = os.path.join(os.environ["CNI_CONFIG_PATH"], "87-podman-bridge.conflist")
# json decoded and encoded to ensure legal json
buf = json.loads(
"""
{
"cniVersion": "0.3.0",
"name": "podman",
"name": "default",
"plugins": [{
"type": "bridge",
"bridge": "cni0",