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

Move network alias processing to common location

Browse Source 
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:29 +02:00 committed by Povilas Kanapickas
parent 16196a1f6d
commit 590c371db2
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
podman_compose.py
View File

@ -977,7 +977,6 @@ def get_net_args_from_networks(compose, cnt):
# cnt_nets is {net_key: net_value, ...} # cnt_nets is {net_key: net_value, ...}
for net_key, net_value in cnt_nets.items(): for net_key, net_value in cnt_nets.items():
net_value = net_value or {} net_value = net_value or {}
aliases.extend(norm_as_list(net_value.get("aliases")))
net_priority = net_value.get("priority", 0) net_priority = net_value.get("priority", 0)
prioritized_cnt_nets.append(( prioritized_cnt_nets.append((
@ -1010,6 +1009,7 @@ def get_net_args_from_networks(compose, cnt):
ipv6 = net_config_.get("ipv6_address") ipv6 = net_config_.get("ipv6_address")
# custom extension; not supported by docker-compose v3 # custom extension; not supported by docker-compose v3
mac = net_config_.get("x-podman.mac_address") mac = net_config_.get("x-podman.mac_address")
aliases.extend(norm_as_list(net_config_.get("aliases")))
# if a mac_address was specified on the container level, apply it to the first network # if a mac_address was specified on the container level, apply it to the first network
# This works for Python > 3.6, because dict insert ordering is preserved, so we are # This works for Python > 3.6, because dict insert ordering is preserved, so we are
@ -1042,6 +1042,7 @@ def get_net_args_from_networks(compose, cnt):
net_config = list(multiple_nets.values())[0] 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.extend(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: