From 69f29483f1c7fed4e4fcdd5f9dace73b058de347 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Thu, 28 Jan 2021 14:39:00 -0500 Subject: [PATCH] containers-common-4:1-6 - short-name-mode="enforcing" in registries.conf Signed-off-by: Lokesh Mandvekar --- containers-common.spec | 5 ++++- registries.conf | 2 ++ update.sh | 2 ++ 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/containers-common.spec b/containers-common.spec index 6a7752f..ff4302e 100644 --- a/containers-common.spec +++ b/containers-common.spec @@ -15,7 +15,7 @@ Epoch: 4 Name: containers-common Version: 1 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Common configuration and documentation for containers License: ASL 2.0 BuildArch: noarch @@ -114,6 +114,9 @@ ln -s %{_sysconfdir}/yum.repos.d/redhat.repo %{buildroot}%{_datadir}/rhel/secret %{_datadir}/rhel/secrets/* %changelog +* Thu Jan 28 2021 Lokesh Mandvekar - 4:1-6 +- short-name-mode="enforcing" in registries.conf + * Thu Jan 28 2021 Lokesh Mandvekar - 4:1-5 - number sources in order diff --git a/registries.conf b/registries.conf index 11d1a29..e63d4a3 100644 --- a/registries.conf +++ b/registries.conf @@ -68,3 +68,5 @@ unqualified-search-registries = ["registry.fedoraproject.org", "registry.access. # # 2. example-mirror-1.local/mirrors/foo/image:latest # # 3. internal-registry-for-example.net/bar/image:latest # # in order, and use the first one that exists. + +short-name-mode="enforcing" diff --git a/update.sh b/update.sh index 51c583b..68d283f 100644 --- a/update.sh +++ b/update.sh @@ -16,3 +16,5 @@ echo "Changing registries.conf..." sed -i 's/^#.*unqualified-search-registries.*=.*/unqualified-search-registries = ["registry.fedoraproject.org", "registry.access.redhat.com", "registry.centos.org", "docker.io"]/g' \ registries.conf +echo '' >> registries.conf +echo 'short-name-mode="enforcing"' >> registries.conf