From f234b602c4b0554456c494451b438d32f3386d69 Mon Sep 17 00:00:00 2001 From: Christian Breunig Date: Thu, 9 Feb 2023 07:31:40 +0100 Subject: Revert "container: T4959: Add container registry authentication config for containers" This reverts commit b17251334c57c2f6875c19ad4e6c6127aa9e1811. --- data/templates/container/registries.conf.j2 | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'data/templates/container') 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 }} -- cgit v1.2.3