Skip to content

T7982: simplifies run arguments into one #4826

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: current
Choose a base branch
from
Open

T7982: simplifies run arguments into one #4826

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
64 changes: 37 additions & 27 deletions src/conf_mode/container.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -505,40 +505,50 @@ def generate_run_arguments(name, container_config, host_ident):
if 'arguments' in container_config:
command_arguments = container_config['arguments'].strip()

net = ''
if 'allow_host_networks' in container_config:
return f'{container_base_cmd} {healthcheck} --net host {entrypoint} {image} {command} {command_arguments}'.strip()

ip_param = ''
addr_info = ''
networks = ",".join(container_config['network'])
for network in container_config['network']:
network_name = network
if 'address' not in container_config['network'][network]:
continue
for address in container_config['network'][network]['address']:
if is_ipv6(address):
ip_param += f' --ip6 {address}'
else:
ip_param += f' --ip {address}'
net = '--net host'
else:
ip_param = ''
addr_info = ''
networks = ",".join(container_config['network'])
for network in container_config['network']:
network_name = network
if 'address' not in container_config['network'][network]:
continue
for address in container_config['network'][network]['address']:
if is_ipv6(address):
ip_param += f' --ip6 {address}'
else:
ip_param += f' --ip {address}'

addr_info = ''.join(container_config['network'][network]['address'])
addr_info = ''.join(container_config['network'][network]['address'])

get_mac = dict_search(f'network.{network_name}.mac', container_config)
if get_mac == 'auto' or get_mac is None:
mac_add = gen_mac(name, addr_info, host_ident)
else:
mac_add = get_mac
get_mac = dict_search(f'network.{network_name}.mac', container_config)
if get_mac == 'auto' or get_mac is None:
mac_add = gen_mac(name, addr_info, host_ident)
else:
mac_add = get_mac

mac_address = f'--mac-address {mac_add}'

mac_address = f'--mac-address {mac_add}'
# Replace mac-auto with the generated mac address
if get_mac == 'auto':
mac_config_path = [
'container',
'name',
name,
'network',
network_name,
'mac',
]

# Replace mac-auto with the generated mac address
if get_mac == 'auto':
mac_config_path = ['container', 'name', name, 'network', network_name, 'mac']
delete_cli_node(mac_config_path)
add_cli_node(mac_config_path, value=mac_add)

delete_cli_node(mac_config_path)
add_cli_node(mac_config_path, value=mac_add)
net = f'--net {networks} {ip_param} {mac_address}'

return f'{container_base_cmd} {healthcheck} --net {networks} {ip_param} {mac_address} {entrypoint} {image} {command} {command_arguments}'.strip()
return f'{container_base_cmd} {healthcheck} {net} {entrypoint} {image} {command} {command_arguments}'.strip()


def generate(container):
Expand Down
Loading