diff --git a/containers-common.spec b/containers-common.spec index 0bd465a..7024f96 100644 --- a/containers-common.spec +++ b/containers-common.spec @@ -12,7 +12,7 @@ Epoch: 2 Name: containers-common Version: 1 -Release: 37%{?dist} +Release: 38%{?dist} Summary: Common configuration and documentation for containers License: ASL 2.0 BuildRequires: /usr/bin/go-md2man @@ -97,7 +97,7 @@ separately. %package -n aardvark-dns Version: 1.0.1 -Release: 37%{?dist} +Release: 38%{?dist} URL: https://github.com/containers/aardvark-dns Summary: Authoritative DNS server for A/AAAA container records License: ASL 2.0 and BSD and MIT @@ -117,7 +117,7 @@ Read more about configuration in `src/backend/mod.rs`. %package -n netavark Version: 1.0.1 -Release: 37%{?dist} +Release: 38%{?dist} URL: https://github.com/containers/netavark Summary: OCI network stack License: ASL 2.0 and BSD and MIT @@ -306,6 +306,10 @@ EOF %{_mandir}/man1/netavark.1* %changelog +* Thu Jun 09 2022 Jindrich Novy - 2:1-38 +- fix unqualified registries in registries.conf generation code +- Related: #2088139 + * Mon May 23 2022 Jindrich Novy - 2:1-37 - update unqualified registries list - Related: #2088139 diff --git a/update.sh b/update.sh index 6a57556..2e83bac 100755 --- a/update.sh +++ b/update.sh @@ -25,14 +25,14 @@ ensure storage.conf driver \"overlay\" ensure storage.conf mountopt \"nodev,metacopy=on\" if pwd | grep rhel-8 > /dev/null then -ensure registries.conf unqualified-search-registries [\"registry.fedoraproject.org\",\ \"registry.access.redhat.com\",\ \"registry.centos.org\",\ \"docker.io\"] +ensure registries.conf unqualified-search-registries [\"registry.access.redhat.com\",\ \"registry.redhat.io\",\ \"docker.io\"] ensure registries.conf short-name-mode \"permissive\" ensure containers.conf runtime \"runc\" ensure containers.conf events_logger \"file\" ensure containers.conf log_driver \"k8s-file\" ensure containers.conf network_backend \"cni\" else -ensure registries.conf unqualified-search-registries [\"registry.fedoraproject.org\",\ \"registry.access.redhat.com\",\ \"registry.centos.org\",\ \"quay.io\",\ \"docker.io\"] +ensure registries.conf unqualified-search-registries [\"registry.access.redhat.com\",\ \"registry.redhat.io\",\ \"docker.io\"] ensure registries.conf short-name-mode \"enforcing\" ensure containers.conf runtime \"crun\" fi