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

Simplify get_net_args_from_network_mode()

Browse Source 
This commit takes into account that network_mode won't have networks
attribute set, accordingly get_net_args_from_network_mode() can
calculate complete net_args easily.

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:24 +02:00 committed by Povilas Kanapickas
parent 2891be01d7
commit de2c33d7ae
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
podman_compose.py
View File

@ -887,7 +887,6 @@ def get_net_args_from_network_mode(compose, cnt):
f"networks and network_mode must not be present in the same service [{service_name}]" f"networks and network_mode must not be present in the same service [{service_name}]"
) )
is_bridge = False
if net == "none": if net == "none":
net_args.append("--network=none") net_args.append("--network=none")
elif net == "host": elif net == "host":
@ -908,12 +907,20 @@ def get_net_args_from_network_mode(compose, cnt):
other_cnt = net.split(":", 1)[1].strip() other_cnt = net.split(":", 1)[1].strip()
net_args.append(f"--network=container:{other_cnt}") net_args.append(f"--network=container:{other_cnt}")
elif net.startswith("bridge"): elif net.startswith("bridge"):
is_bridge = True aliases_on_container = [service_name]
if cnt.get("_aliases"):
aliases_on_container.extend(cnt.get("_aliases"))
net_args.append("--network=bridge")
mac_address = cnt.get("mac_address")
if mac_address:
net_args.append(f"--mac-address={mac_address}")
for alias in aliases_on_container:
net_args.extend([f"--network-alias={alias}"])
else: else:
log.fatal("unknown network_mode [%s]", net) log.fatal("unknown network_mode [%s]", net)
sys.exit(1) sys.exit(1)
return net_args, is_bridge return net_args
def get_net_args(compose, cnt): def get_net_args(compose, cnt):
@ -922,7 +929,7 @@ def get_net_args(compose, cnt):
mac_address = cnt.get("mac_address") mac_address = cnt.get("mac_address")
net = cnt.get("network_mode") net = cnt.get("network_mode")
if net: if net:
net_args, is_bridge = get_net_args_from_network_mode(compose, cnt) return get_net_args_from_network_mode(compose, cnt)
else: else:
is_bridge = True is_bridge = True
cnt_nets = cnt.get("networks") cnt_nets = cnt.get("networks")