diff options
| author | Daniil Baturin <daniil@vyos.io> | 2024-04-07 02:02:04 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-04-07 02:02:04 +0200 |
| commit | f124bab88a820bf15e0818cdfdae254cbe041edc (patch) | |
| tree | 9e301d0361dd606ce86845aeb921d199db41bfce /src/conf_mode | |
| parent | c55754fd5fe69a44ea33830d60342b894768af58 (diff) | |
| parent | b30faa43c28b592febd83a7fd3a58247de6b27bc (diff) | |
| download | vyos-1x-f124bab88a820bf15e0818cdfdae254cbe041edc.tar.gz vyos-1x-f124bab88a820bf15e0818cdfdae254cbe041edc.zip | |
Merge pull request #3269 from c-po/container-T6208
container: T6208: rename "cap-add" CLI node to "capability"
Diffstat (limited to 'src/conf_mode')
| -rwxr-xr-x | src/conf_mode/container.py | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/src/conf_mode/container.py b/src/conf_mode/container.py index 910a92a7c..abd2c5f21 100755 --- a/src/conf_mode/container.py +++ b/src/conf_mode/container.py @@ -262,12 +262,11 @@ def generate_run_arguments(name, container_config): restart = container_config['restart'] # Add capability options. Should be in uppercase - cap_add = '' - if 'cap_add' in container_config: - for c in container_config['cap_add']: - c = c.upper() - c = c.replace('-', '_') - cap_add += f' --cap-add={c}' + capabilities = '' + if 'capability' in container_config: + for cap in container_config['capability']: + cap = c.upper().replace('-', '_') + capabilities += f' --cap-add={cap}' # Add a host device to the container /dev/x:/dev/x device = '' @@ -330,7 +329,7 @@ def generate_run_arguments(name, container_config): prop = vol_config['propagation'] volume += f' --volume {svol}:{dvol}:{mode},{prop}' - container_base_cmd = f'--detach --interactive --tty --replace {cap_add} ' \ + container_base_cmd = f'--detach --interactive --tty --replace {capabilities} ' \ f'--memory {memory}m --shm-size {shared_memory}m --memory-swap 0 --restart {restart} ' \ f'--name {name} {hostname} {device} {port} {volume} {env_opt} {label} {uid}' |