github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Merge pull request #592 from Random-Liu/fix-registry-mirror

Browse Source 
Fix registry mirror.
This commit is contained in:
Lantao Liu 2018-02-02 15:37:29 -08:00 committed by GitHub
commit 2b8800df2b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkg/containerd/resolver/fetcher.go
View File

@ -41,9 +41,13 @@ type dockerFetcher struct {
} }
func (r dockerFetcher) Fetch(ctx context.Context, desc ocispec.Descriptor) (io.ReadCloser, error) { func (r dockerFetcher) Fetch(ctx context.Context, desc ocispec.Descriptor) (io.ReadCloser, error) {
var bases []string
for _, b := range r.base {
bases = append(bases, b.String())
}
ctx = log.WithLogger(ctx, log.G(ctx).WithFields( ctx = log.WithLogger(ctx, log.G(ctx).WithFields(
logrus.Fields{ logrus.Fields{
//"base": r.base.String(), "base": bases,
"digest": desc.Digest, "digest": desc.Digest,
}, },
)) ))
@ -132,11 +136,11 @@ func (r *dockerFetcher) getV2URLPaths(ctx context.Context, desc ocispec.Descript
case images.MediaTypeDockerSchema2Manifest, images.MediaTypeDockerSchema2ManifestList, case images.MediaTypeDockerSchema2Manifest, images.MediaTypeDockerSchema2ManifestList,
images.MediaTypeDockerSchema1Manifest, images.MediaTypeDockerSchema1Manifest,
ocispec.MediaTypeImageManifest, ocispec.MediaTypeImageIndex: ocispec.MediaTypeImageManifest, ocispec.MediaTypeImageIndex:
urls = append(urls, r.url(path.Join("manifests", desc.Digest.String()))) urls = append(urls, r.urls(path.Join("manifests", desc.Digest.String()))...)
} }
// always fallback to attempting to get the object out of the blobs store. // always fallback to attempting to get the object out of the blobs store.
urls = append(urls, r.url(path.Join("blobs", desc.Digest.String()))) urls = append(urls, r.urls(path.Join("blobs", desc.Digest.String()))...)
return urls, nil return urls, nil
} }

6
pkg/containerd/resolver/resolver.go
View File

@ -300,12 +300,6 @@ func (r *containerdResolver) base(refspec reference.Spec) (*dockerBase, error) {
}, nil }, nil
} }
func (r *dockerBase) url(ps ...string) string {
url := r.base[0]
url.Path = path.Join(url.Path, path.Join(ps...))
return url.String()
}
func (r *dockerBase) urls(ps ...string) []string { func (r *dockerBase) urls(ps ...string) []string {
urls := []string{} urls := []string{}
for _, url := range r.base { for _, url := range r.base {