summaryrefslogtreecommitdiff
path: root/src/conf_mode/container.py
diff options
context:
space:
mode:
authorChristian Breunig <christian@breunig.cc>2024-04-07 07:15:09 +0200
committerGitHub <noreply@github.com>2024-04-07 07:15:09 +0200
commitc5cda0934df4c6ec3e5b368a907bbda04ffa359f (patch)
treede4d96c0d5a1444de522045c0cef258dc8b7ceb1 /src/conf_mode/container.py
parent7dc280fc9de5dcd2a44820a64f7c5220e6811bd4 (diff)
parent597ee21fc3319fd685ee988d67838d058203fcf8 (diff)
downloadvyos-1x-c5cda0934df4c6ec3e5b368a907bbda04ffa359f.tar.gz
vyos-1x-c5cda0934df4c6ec3e5b368a907bbda04ffa359f.zip
Merge pull request #3271 from vyos/mergify/bp/sagitta/pr-3269
container: T6208: rename "cap-add" CLI node to "capability" (backport #3269)
Diffstat (limited to 'src/conf_mode/container.py')
-rwxr-xr-xsrc/conf_mode/container.py13
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}'