extern/podman-compose
1
0
Fork 1
mirror of https://github.com/containers/podman-compose.git synced 2025-04-23 08:59:21 +02:00
Code Issues Packages Projects Releases Wiki Activity

Simplify network handling in get_net_args_from_networks()

Browse Source 
Note that multiple_nets is now guaranteed to be not empty in processing
stage.

Modified-by: Povilas Kanapickas <povilas@radix.lt>
Signed-off-by: Songmin Li <lisongmin@protonmail.com>
This commit is contained in:
Songmin Li 2024-12-18 19:59:32 +02:00 committed by Povilas Kanapickas
parent fb0bbd6fe1
commit aa8c6fd598
1 changed files with 26 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
podman_compose.py
View File

@ -951,6 +951,18 @@ def get_net_args_from_networks(compose, cnt):
# always sets a network-alias to the container name, is currently doesn't make sense to # always sets a network-alias to the container name, is currently doesn't make sense to
# implement this. # implement this.
multiple_nets = cnt.get("networks", {}) multiple_nets = cnt.get("networks", {})
if not multiple_nets:
if not compose.default_net:
# The bridge mode in podman is using the `podman` network.
# It seems weird, but we should keep this behavior to avoid
# breaking changes.
net_args.append("--network=bridge")
if mac_address:
net_args.append(f"--mac-address={mac_address}")
net_args.extend([f"--network-alias={alias}" for alias in aliases_on_container])
return net_args
multiple_nets = {compose.default_net: {}}
# networks can be specified as a dict with config per network or as a plain list without # networks can be specified as a dict with config per network or as a plain list without
# config. Support both cases by converting the plain list to a dict with empty config. # config. Support both cases by converting the plain list to a dict with empty config.
@ -971,7 +983,7 @@ def get_net_args_from_networks(compose, cnt):
"is not supported" "is not supported"
) )
if multiple_nets and len(multiple_nets) > 1: if len(multiple_nets) > 1:
for net_, net_config_ in multiple_nets.items(): for net_, net_config_ in multiple_nets.items():
net_desc = compose.networks[net_] or {} net_desc = compose.networks[net_] or {}
is_ext = net_desc.get("external") is_ext = net_desc.get("external")
@ -1006,24 +1018,20 @@ def get_net_args_from_networks(compose, cnt):
else: else:
net_args.append(f"--network={net_name}") net_args.append(f"--network={net_name}")
else: else:
if multiple_nets or compose.default_net: net = list(multiple_nets.keys())[0]
net = list(multiple_nets.keys())[0] if multiple_nets else compose.default_net net_config = list(multiple_nets.values())[0]
net_desc = compose.networks[net] or {} net_desc = compose.networks[net] or {}
is_ext = net_desc.get("external") is_ext = net_desc.get("external")
ext_desc = is_ext if isinstance(is_ext, str) else {} ext_desc = is_ext if isinstance(is_ext, str) 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)
net_name = ext_desc.get("name") or net_desc.get("name") or default_net_name net_name = ext_desc.get("name") or net_desc.get("name") or default_net_name
net_args.append(f"--network={net_name}") net_args.append(f"--network={net_name}")
else:
net_args.append("--network=bridge")
ipv4 = None
ipv6 = None
if multiple_nets:
net_config = list(multiple_nets.values())[0]
ipv4 = net_config.get("ipv4_address") ipv4 = net_config.get("ipv4_address")
ipv6 = net_config.get("ipv6_address") ipv6 = net_config.get("ipv6_address")
aliases_on_net = norm_as_list(net_config.get("aliases")) aliases_on_net = norm_as_list(net_config.get("aliases"))
if ipv4: if ipv4:
net_args.append(f"--ip={ipv4}") net_args.append(f"--ip={ipv4}")
if ipv6: if ipv6: