summaryrefslogtreecommitdiff
path: root/data/templates/container
diff options
context:
space:
mode:
authorChristian Breunig <christian@breunig.cc>2023-02-09 07:31:40 +0100
committerChristian Breunig <christian@breunig.cc>2023-02-09 07:31:40 +0100
commitf234b602c4b0554456c494451b438d32f3386d69 (patch)
treef6d1cd575a2533ec9e890ed0ad48740a38f9bf88 /data/templates/container
parent10ab68a018dd137ee9a6350c131f65ec6e12e446 (diff)
downloadvyos-1x-f234b602c4b0554456c494451b438d32f3386d69.tar.gz
vyos-1x-f234b602c4b0554456c494451b438d32f3386d69.zip
Revert "container: T4959: Add container registry authentication config for containers"
This reverts commit b17251334c57c2f6875c19ad4e6c6127aa9e1811.
Diffstat (limited to 'data/templates/container')
-rw-r--r--data/templates/container/registries.conf.j27
1 files changed, 1 insertions, 6 deletions
diff --git a/data/templates/container/registries.conf.j2 b/data/templates/container/registries.conf.j2
index 4dffae838..2e86466a1 100644
--- a/data/templates/container/registries.conf.j2
+++ b/data/templates/container/registries.conf.j2
@@ -22,11 +22,6 @@
# 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 %}
-{% set registry_value = ((registry_value + (registry.keys() | list)) | unique | list) %}
+unqualified-search-registries = {{ registry }}
{% endif %}
-unqualified-search-registries = {{ registry_value | tojson }}