diff --git a/SOURCES/registries.conf b/SOURCES/registries.conf index 6c9cddd..703f453 100644 --- a/SOURCES/registries.conf +++ b/SOURCES/registries.conf @@ -26,13 +26,20 @@ # The following registries are a set of secure defaults provided by Red Hat. # Each of these registries provides container images curated, patched # and maintained by Red Hat and its partners +#[registries.search] +#registries = ['registry.access.redhat.com', 'registry.redhat.io'] + +# To ensure compatibility with docker we've included docker.io in the default search list. However Red Hat +# does not curate, patch or maintain container images from the docker.io registry. [registries.search] -registries = ['registry.access.redhat.com', 'registry.redhat.io'] +registries = ['registry.access.redhat.com', 'registry.redhat.io', 'docker.io'] + # The following registries entry can be used for convenience but includes # container images built by the community. This set of content comes with all # of the risks of any user generated content including security and performance # issues. To use this list first comment out the default list, then uncomment # the following list +#[registries.search] #registries = ['registry.access.redhat.com', 'registry.redhat.io', 'docker.io', 'quay.io'] # Registries that do not use TLS when pulling images or uses self-signed diff --git a/SPECS/skopeo.spec b/SPECS/skopeo.spec index 6a82f80..69fc5ab 100644 --- a/SPECS/skopeo.spec +++ b/SPECS/skopeo.spec @@ -31,7 +31,7 @@ ExcludeArch: ppc64 Epoch: 1 Name: %{repo} Version: 0.1.40 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Inspect container images and repositories on registries License: ASL 2.0 URL: %{git0} @@ -251,6 +251,10 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %{_datadir}/%{name}/test %changelog +* Mon Apr 20 2020 Jindrich Novy - 1:0.1.40-9 +- add docker.io into the default registry list +- Related: #1810053 + * Fri Mar 06 2020 Jindrich Novy - 1:0.1.40-8 - modify registries.conf default configuration to be more secure by default - Resolves: #1810056