registry: ensure docker.io is blocked

Fix BZ#1395401 Signed-off-by: Antonio Murdaca <runcom@redhat.com>
projectatomic · Dec 13, 2016 · fed041a · fed041a
1 parent 8ae67b4
commit fed041a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/distribution/pull.go b/distribution/pull.go
@@ -97,6 +97,7 @@ func Pull(ctx context.Context, ref reference.Named, imagePullConfig *ImagePullCo
  if reference.IsReferenceFullyQualified(ref) {
  return pullFromRegistry(ctx, ref, imagePullConfig)
  }
+ // TODO(runcom): this should be moved before the check above for consistency...
  if len(registry.DefaultRegistries) == 0 {
  return fmt.Errorf("No configured registry to pull from.")
  }

diff --git a/registry/config.go b/registry/config.go
@@ -324,6 +324,9 @@ func newRepositoryInfo(config *serviceConfig, name reference.Named) (*Repository
 // IsIndexBlocked allows to check whether index/registry or endpoint
 // is on a block list.
 func IsIndexBlocked(indexName string) bool {
+ if indexName == DefaultV2Registry.Host || indexName == DefaultV1Registry.Host {
+ indexName = IndexName
+ }
  if _, ok := BlockedRegistries[indexName]; ok {
  return true
  }