mirror of
https://github.com/moby/moby.git
synced 2022-11-09 12:21:53 -05:00
Review feedback:
- Match verbiage with other output - Remove dead code and clearer flow Signed-off-by: Richard Scothern <richard.scothern@gmail.com>
This commit is contained in:
parent
f6f7d35248
commit
e817e08481
1 changed files with 5 additions and 7 deletions
|
@ -69,7 +69,7 @@ func (s *TagStore) Pull(image string, tag string, imagePullConfig *ImagePullConf
|
|||
}
|
||||
|
||||
if v2mirrorEndpoint != nil {
|
||||
logrus.Debugf("Attempting pull from v2 mirror: %s", v2mirrorEndpoint.URL)
|
||||
logrus.Debugf("Attempting to pull from v2 mirror: %s", v2mirrorEndpoint.URL)
|
||||
return s.pullFromV2Mirror(v2mirrorEndpoint, v2mirrorRepoInfo, imagePullConfig, tag, sf, logName)
|
||||
}
|
||||
}
|
||||
|
@ -138,12 +138,10 @@ func makeMirrorRepoInfo(repoInfo *registry.RepositoryInfo, mirror string) *regis
|
|||
|
||||
func configureV2Mirror(repoInfo *registry.RepositoryInfo, s *registry.Service) (*registry.Endpoint, *registry.RepositoryInfo, error) {
|
||||
mirrors := repoInfo.Index.Mirrors
|
||||
if len(mirrors) == 0 && !repoInfo.Index.Official {
|
||||
officialIndex, err := s.ResolveIndex(registry.IndexServerName())
|
||||
if err != nil {
|
||||
return nil, nil, err
|
||||
}
|
||||
mirrors = officialIndex.Mirrors
|
||||
|
||||
if len(mirrors) == 0 {
|
||||
// no mirrors configured
|
||||
return nil, nil, nil
|
||||
}
|
||||
|
||||
v1MirrorCount := 0
|
||||
|
|
Loading…
Add table
Reference in a new issue