extern/podman-compose
1
0
Fork 1
mirror of https://github.com/containers/podman-compose.git synced 2025-06-19 19:27:47 +02:00
Code Issues Packages Projects Releases Wiki Activity

clean up redundant default_net variable

Browse Source 
Signed-off-by: legobt <6wbvkn0j@anonaddy.me>
This commit is contained in:
legobt 2024-07-31 00:38:37 +00:00
parent 305f25b4d6
commit ed58ac0879
No known key found for this signature in database
GPG Key ID: C5F28D4B2B8927AB
1 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
podman_compose.py
View File

@ -851,14 +851,12 @@ async def assert_cnt_nets(compose, cnt):
net = cnt.get("network_mode", None) net = cnt.get("network_mode", None)
if net and not net.startswith("bridge"): if net and not net.startswith("bridge"):
return return
nets = compose.networks
default_net = compose.default_net
cnt_nets = cnt.get("networks", None) cnt_nets = cnt.get("networks", None)
if cnt_nets and is_dict(cnt_nets): if cnt_nets and is_dict(cnt_nets):
cnt_nets = list(cnt_nets.keys()) cnt_nets = list(cnt_nets.keys())
cnt_nets = norm_as_list(cnt_nets or default_net) cnt_nets = norm_as_list(cnt_nets or compose.default_net)
for net in cnt_nets: for net in cnt_nets:
net_desc = nets[net] or {} net_desc = compose.networks[net] or {}
is_ext = net_desc.get("external", None) is_ext = net_desc.get("external", None)
ext_desc = is_ext if is_dict(is_ext) else {} ext_desc = is_ext if is_dict(is_ext) else {}
default_net_name = default_network_name_for_project(compose, net, is_ext) default_net_name = default_network_name_for_project(compose, net, is_ext)
@ -907,8 +905,6 @@ def get_net_args(compose, cnt):
sys.exit(1) sys.exit(1)
else: else:
is_bridge = True is_bridge = True
default_net = compose.default_net
nets = compose.networks
cnt_nets = cnt.get("networks", None) cnt_nets = cnt.get("networks", None)
aliases = [service_name] aliases = [service_name]
@ -944,10 +940,10 @@ def get_net_args(compose, cnt):
# sort dict by priority # sort dict by priority
prioritized_cnt_nets.sort(reverse=True) prioritized_cnt_nets.sort(reverse=True)
cnt_nets = [net_key for _, net_key in prioritized_cnt_nets] cnt_nets = [net_key for _, net_key in prioritized_cnt_nets]
cnt_nets = norm_as_list(cnt_nets or default_net) cnt_nets = norm_as_list(cnt_nets or compose.default_net)
net_names = [] net_names = []
for net in cnt_nets: for net in cnt_nets:
net_desc = nets[net] or {} net_desc = compose.networks[net] or {}
is_ext = net_desc.get("external", None) is_ext = net_desc.get("external", None)
ext_desc = is_ext if is_dict(is_ext) else {} ext_desc = is_ext if is_dict(is_ext) else {}
default_net_name = default_network_name_for_project(compose, net, is_ext) default_net_name = default_network_name_for_project(compose, net, is_ext)
@ -983,7 +979,7 @@ def get_net_args(compose, cnt):
) )
for net_, net_config_ in multiple_nets.items(): for net_, net_config_ in multiple_nets.items():
net_desc = nets[net_] or {} net_desc = compose.networks[net_] or {}
is_ext = net_desc.get("external", None) is_ext = net_desc.get("external", None)
ext_desc = is_ext if is_dict(is_ext) else {} ext_desc = is_ext if is_dict(is_ext) else {}
default_net_name = default_network_name_for_project(compose, net_, is_ext) default_net_name = default_network_name_for_project(compose, net_, is_ext)
@ -1919,10 +1915,9 @@ class PodmanCompose:
self.default_net = "default" self.default_net = "default"
else: else:
self.default_net = None self.default_net = None
default_net = self.default_net
allnets = set() allnets = set()
for name, srv in services.items(): for name, srv in services.items():
srv_nets = srv.get("networks", None) or default_net srv_nets = srv.get("networks", None) or self.default_net
srv_nets = list(srv_nets.keys()) if is_dict(srv_nets) else norm_as_list(srv_nets) srv_nets = list(srv_nets.keys()) if is_dict(srv_nets) else norm_as_list(srv_nets)
allnets.update(srv_nets) allnets.update(srv_nets)
given_nets = set(nets.keys()) given_nets = set(nets.keys())