Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[20.10 backport] registry: allow "allow-nondistributable-artifacts" for Docker Hub #44313

Merged
merged 1 commit into from Oct 19, 2022
Merged

[20.10 backport] registry: allow "allow-nondistributable-artifacts" for Docker Hub #44313

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 5 additions & 2 deletions registry/service_v2.go
View file
Open in desktop
Expand Up @@ -9,6 +9,9 @@ import (

func (s *DefaultService) lookupV2Endpoints(hostname string) (endpoints []APIEndpoint, err error) {
tlsConfig := tlsconfig.ServerDefault()

ana := allowNondistributableArtifacts(s.config, hostname)

if hostname == DefaultNamespace || hostname == IndexHostname {
for _, mirror := range s.config.Mirrors {
if !strings.HasPrefix(mirror, "http://") && !strings.HasPrefix(mirror, "https://") {
Expand Down Expand Up @@ -36,13 +39,13 @@ func (s *DefaultService) lookupV2Endpoints(hostname string) (endpoints []APIEndp
Official: true,
TrimHostname: true,
TLSConfig: tlsConfig,

AllowNondistributableArtifacts: ana,
})

return endpoints, nil
}

ana := allowNondistributableArtifacts(s.config, hostname)

tlsConfig, err = s.tlsConfig(hostname)
if err != nil {
return nil, err
Expand Down