Skip to content

Commit 80b6170

Browse files
committed
chore: clean up redundant default_net
Signed-off-by: legobt <[email protected]>
1 parent 9d6b48d commit 80b6170

File tree

1 file changed

+6
-11
lines changed

1 file changed

+6
-11
lines changed

podman_compose.py

+6-11
Original file line numberDiff line numberDiff line change
@@ -851,14 +851,12 @@ async def assert_cnt_nets(compose, cnt):
851851
net = cnt.get("network_mode", None)
852852
if net and not net.startswith("bridge"):
853853
return
854-
nets = compose.networks
855-
default_net = compose.default_net
856854
cnt_nets = cnt.get("networks", None)
857855
if cnt_nets and is_dict(cnt_nets):
858856
cnt_nets = list(cnt_nets.keys())
859-
cnt_nets = norm_as_list(cnt_nets or default_net)
857+
cnt_nets = norm_as_list(cnt_nets or compose.default_net)
860858
for net in cnt_nets:
861-
net_desc = nets[net] or {}
859+
net_desc = compose.networks[net] or {}
862860
is_ext = net_desc.get("external", None)
863861
ext_desc = is_ext if is_dict(is_ext) else {}
864862
default_net_name = default_network_name_for_project(compose, net, is_ext)
@@ -907,8 +905,6 @@ def get_net_args(compose, cnt):
907905
sys.exit(1)
908906
else:
909907
is_bridge = True
910-
default_net = compose.default_net
911-
nets = compose.networks
912908
cnt_nets = cnt.get("networks", None)
913909

914910
aliases = [service_name]
@@ -944,10 +940,10 @@ def get_net_args(compose, cnt):
944940
# sort dict by priority
945941
prioritized_cnt_nets.sort(reverse=True)
946942
cnt_nets = [net_key for _, net_key in prioritized_cnt_nets]
947-
cnt_nets = norm_as_list(cnt_nets or default_net)
943+
cnt_nets = norm_as_list(cnt_nets or compose.default_net)
948944
net_names = []
949945
for net in cnt_nets:
950-
net_desc = nets[net] or {}
946+
net_desc = compose.networks[net] or {}
951947
is_ext = net_desc.get("external", None)
952948
ext_desc = is_ext if is_dict(is_ext) else {}
953949
default_net_name = default_network_name_for_project(compose, net, is_ext)
@@ -983,7 +979,7 @@ def get_net_args(compose, cnt):
983979
)
984980

985981
for net_, net_config_ in multiple_nets.items():
986-
net_desc = nets[net_] or {}
982+
net_desc = compose.networks[net_] or {}
987983
is_ext = net_desc.get("external", None)
988984
ext_desc = is_ext if is_dict(is_ext) else {}
989985
default_net_name = default_network_name_for_project(compose, net_, is_ext)
@@ -1921,10 +1917,9 @@ def _parse_compose_file(self):
19211917
self.default_net = "default"
19221918
else:
19231919
self.default_net = None
1924-
default_net = self.default_net
19251920
allnets = set()
19261921
for name, srv in services.items():
1927-
srv_nets = srv.get("networks", None) or default_net
1922+
srv_nets = srv.get("networks", None) or self.default_net
19281923
srv_nets = list(srv_nets.keys()) if is_dict(srv_nets) else norm_as_list(srv_nets)
19291924
allnets.update(srv_nets)
19301925
given_nets = set(nets.keys())

0 commit comments

Comments
 (0)