@@ -851,14 +851,12 @@ async def assert_cnt_nets(compose, cnt):
851
851
net = cnt .get ("network_mode" , None )
852
852
if net and not net .startswith ("bridge" ):
853
853
return
854
- nets = compose .networks
855
- default_net = compose .default_net
856
854
cnt_nets = cnt .get ("networks" , None )
857
855
if cnt_nets and is_dict (cnt_nets ):
858
856
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 )
860
858
for net in cnt_nets :
861
- net_desc = nets [net ] or {}
859
+ net_desc = compose . networks [net ] or {}
862
860
is_ext = net_desc .get ("external" , None )
863
861
ext_desc = is_ext if is_dict (is_ext ) else {}
864
862
default_net_name = default_network_name_for_project (compose , net , is_ext )
@@ -907,8 +905,6 @@ def get_net_args(compose, cnt):
907
905
sys .exit (1 )
908
906
else :
909
907
is_bridge = True
910
- default_net = compose .default_net
911
- nets = compose .networks
912
908
cnt_nets = cnt .get ("networks" , None )
913
909
914
910
aliases = [service_name ]
@@ -944,10 +940,10 @@ def get_net_args(compose, cnt):
944
940
# sort dict by priority
945
941
prioritized_cnt_nets .sort (reverse = True )
946
942
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 )
948
944
net_names = []
949
945
for net in cnt_nets :
950
- net_desc = nets [net ] or {}
946
+ net_desc = compose . networks [net ] or {}
951
947
is_ext = net_desc .get ("external" , None )
952
948
ext_desc = is_ext if is_dict (is_ext ) else {}
953
949
default_net_name = default_network_name_for_project (compose , net , is_ext )
@@ -983,7 +979,7 @@ def get_net_args(compose, cnt):
983
979
)
984
980
985
981
for net_ , net_config_ in multiple_nets .items ():
986
- net_desc = nets [net_ ] or {}
982
+ net_desc = compose . networks [net_ ] or {}
987
983
is_ext = net_desc .get ("external" , None )
988
984
ext_desc = is_ext if is_dict (is_ext ) else {}
989
985
default_net_name = default_network_name_for_project (compose , net_ , is_ext )
@@ -1921,10 +1917,9 @@ def _parse_compose_file(self):
1921
1917
self .default_net = "default"
1922
1918
else :
1923
1919
self .default_net = None
1924
- default_net = self .default_net
1925
1920
allnets = set ()
1926
1921
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
1928
1923
srv_nets = list (srv_nets .keys ()) if is_dict (srv_nets ) else norm_as_list (srv_nets )
1929
1924
allnets .update (srv_nets )
1930
1925
given_nets = set (nets .keys ())
0 commit comments