summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorPiotr Maksymiuk <piotr.maksymiuk@movishell.pl>2024-02-01 22:59:54 +0100
committerMergify <37929162+mergify[bot]@users.noreply.github.com>2024-02-02 09:05:55 +0000
commitf95738c0dd6263bad7973e664eb826b2507c6b1e (patch)
treeaf290eb914c24f4fb6e6a0ee09ee8ae53134dfa6 /src
parentcb702bbe61436286c2ac9400ee4e09c4b5ac397c (diff)
downloadvyos-1x-f95738c0dd6263bad7973e664eb826b2507c6b1e.tar.gz
vyos-1x-f95738c0dd6263bad7973e664eb826b2507c6b1e.zip
container: T5955: allow setting uid/gid
(cherry picked from commit 52e9707a43290f5f826766e2c42c5f0db3c9adec)
Diffstat (limited to 'src')
-rwxr-xr-xsrc/conf_mode/container.py14
1 files changed, 13 insertions, 1 deletions
diff --git a/src/conf_mode/container.py b/src/conf_mode/container.py
index 59d11c5a3..321d00abf 100755
--- a/src/conf_mode/container.py
+++ b/src/conf_mode/container.py
@@ -214,6 +214,10 @@ def verify(container):
if {'allow_host_networks', 'network'} <= set(container_config):
raise ConfigError(f'"allow-host-networks" and "network" for "{name}" cannot be both configured at the same time!')
+ # gid cannot be set without uid
+ if 'gid' in container_config and 'uid' not in container_config:
+ raise ConfigError(f'Cannot set "gid" without "uid" for container')
+
# Add new network
if 'network' in container:
for network, network_config in container['network'].items():
@@ -308,6 +312,14 @@ def generate_run_arguments(name, container_config):
# If listen_addresses is empty, just include the standard publish command
port += f' --publish {sport}:{dport}/{protocol}'
+ # Set uid and gid
+ uid = ''
+ if 'uid' in container_config:
+ uid = container_config['uid']
+ if 'gid' in container_config:
+ uid += ':' + container_config['gid']
+ uid = f'--user {uid}'
+
# Bind volume
volume = ''
if 'volume' in container_config:
@@ -320,7 +332,7 @@ def generate_run_arguments(name, container_config):
container_base_cmd = f'--detach --interactive --tty --replace {cap_add} ' \
f'--memory {memory}m --shm-size {shared_memory}m --memory-swap 0 --restart {restart} ' \
- f'--name {name} {hostname} {device} {port} {volume} {env_opt} {label}'
+ f'--name {name} {hostname} {device} {port} {volume} {env_opt} {label} {uid}'
entrypoint = ''
if 'entrypoint' in container_config: