From b17251334c57c2f6875c19ad4e6c6127aa9e1811 Mon Sep 17 00:00:00 2001
From: Zen3515 <7106408+Zen3515@users.noreply.github.com>
Date: Mon, 30 Jan 2023 15:58:11 +0700
Subject: container: T4959: Add container registry authentication config for
 containers

---
 data/templates/container/registries.conf.j2 | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'data')

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 }}
-- 
cgit v1.2.3