summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorsskaje <sskaje@gmail.com>2025-03-11 21:33:46 +0800
committersskaje <sskaje@gmail.com>2025-03-11 22:14:53 +0800
commita8e0f015ea91859163ac9befad8a6e8ac68dec9a (patch)
tree9a951975c3a6f1265d9c973fcb6290adf5dadfd8 /src
parent77b53f1ab2c280f864f56b90dd841d060e2f2b32 (diff)
downloadvyos-1x-a8e0f015ea91859163ac9befad8a6e8ac68dec9a.tar.gz
vyos-1x-a8e0f015ea91859163ac9befad8a6e8ac68dec9a.zip
T7092: Change validators: regex to host-name|address + port + path
Diffstat (limited to 'src')
-rwxr-xr-xsrc/conf_mode/container.py7
1 files changed, 7 insertions, 0 deletions
diff --git a/src/conf_mode/container.py b/src/conf_mode/container.py
index 594de3eb0..8f57be06d 100755
--- a/src/conf_mode/container.py
+++ b/src/conf_mode/container.py
@@ -273,6 +273,13 @@ def verify(container):
if 'registry' in container:
for registry, registry_config in container['registry'].items():
+ if 'mirror' in registry_config:
+ if 'host_name' in registry_config['mirror'] and 'address' in registry_config['mirror']:
+ raise ConfigError(f'Container registry mirror address/host-name are mutually exclusive!')
+
+ if 'path' in registry_config['mirror'] and not registry_config['mirror']['path'].startswith('/'):
+ raise ConfigError('Container registry mirror path must start with "/"!')
+
if 'authentication' not in registry_config:
continue
if not {'username', 'password'} <= set(registry_config['authentication']):