diff options
| author | Christian Breunig <christian@breunig.cc> | 2025-09-18 16:34:41 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-09-18 16:34:41 +0200 |
| commit | f8ecb5136beba589cb01d241b09b1832a00b0e0d (patch) | |
| tree | 1ac25c0a52747cc0a55e70449c019d95a50d41c5 /src | |
| parent | 3fec74185970d4ad3b176e3126ffcdd5ab07b11d (diff) | |
| parent | 5c5d3a6b839b2a612fefb7d5f0443b80ceb156d0 (diff) | |
| download | vyos-1x-f8ecb5136beba589cb01d241b09b1832a00b0e0d.tar.gz vyos-1x-f8ecb5136beba589cb01d241b09b1832a00b0e0d.zip | |
Merge pull request #4724 from l0crian1/fix-container-branch
container: T7681: fix multiple name servers
Diffstat (limited to 'src')
| -rwxr-xr-x | src/conf_mode/container.py | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/conf_mode/container.py b/src/conf_mode/container.py index 8950f857e..4fe1e432c 100755 --- a/src/conf_mode/container.py +++ b/src/conf_mode/container.py @@ -443,10 +443,14 @@ def generate_run_arguments(name, container_config, host_ident): if 'allow_host_pid' in container_config: host_pid = '--pid host' - name_server = '' + name_server = [] if 'name_server' in container_config: for ns in container_config['name_server']: - name_server += f'--dns {ns}' + name_server.append(f'--dns {ns}') + if name_server: + name_server = ' '.join(name_server) + else: + name_server = '' container_base_cmd = f'--detach --interactive --tty --replace {capabilities} {privileged} --cpus {cpu_quota} {sysctl_opt} ' \ f'--memory {memory}m --shm-size {shared_memory}m --memory-swap 0 --restart {restart} --log-driver={log_driver} ' \ |