From 9e14a48f2e4eef065c41a6e3305104a65fa69cc0 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Dec 17 2020 17:31:20 +0000
Subject: import skopeo-0.1.41-4.module+el8.3.0+8377+eff33c85


---

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 d3fbe5b..9c49af2 100644
--- a/SPECS/skopeo.spec
+++ b/SPECS/skopeo.spec
@@ -31,7 +31,7 @@ ExcludeArch: ppc64
 Epoch: 1
 Name: %{repo}
 Version: 0.1.41
-Release: 3%{?dist}
+Release: 4%{?dist}
 Summary: Inspect container images and repositories on registries
 License: ASL 2.0
 URL: %{git0}
@@ -252,6 +252,10 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath}
 %{_datadir}/%{name}/test
 
 %changelog
+* Thu Oct 08 2020 Jindrich Novy <jnovy@redhat.com> - 1:0.1.41-4
+- add docker.io into the default registry list
+- Resolves: #1886443
+
 * Thu Jul 16 2020 Eduardo Santiago <santiago@redhat.com> - 1:0.1.41-3
 - patch broken gating tests: improper 'jq' usage, and use 'registry:2.6'
   (instead of :2) to work around broken image pushed by docker