diff options
Diffstat (limited to 'data/templates/container')
| -rw-r--r-- | data/templates/container/registries.conf.j2 | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/data/templates/container/registries.conf.j2 b/data/templates/container/registries.conf.j2 index 2e86466a1..4dffae838 100644 --- a/data/templates/container/registries.conf.j2 +++ b/data/templates/container/registries.conf.j2 @@ -22,6 +22,11 @@ # An array of host[:port] registries to try when pulling an unqualified image, in order. # unqualified-search-registries = ["example.com"] +{% set registry_value = [] %} +{% if default_registry is vyos_defined %} +{% set registry_value = default_registry %} +{% endif %} {% if registry is vyos_defined %} -unqualified-search-registries = {{ registry }} +{% set registry_value = ((registry_value + (registry.keys() | list)) | unique | list) %} {% endif %} +unqualified-search-registries = {{ registry_value | tojson }} |