0ct0pu5/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #45243 from thaJeztah/c8d_push_nits

Browse source 
c8d: push: addressing some nits
This commit is contained in:
Sebastiaan van Stijn 2023-03-31 19:28:43 +02:00 • committed by GitHub
commit 126e212fb0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
daemon/containerd/image_push.go
View file

@ -56,10 +56,10 @@ func (i *ImageService) PushImage(ctx context.Context, targetRef reference.Named,
store := i.client.ContentStore()
resolver, tracker := i.newResolverFromAuthConfig(authConfig)
pushProgress := pushProgress{Tracker: tracker}
progress := pushProgress{Tracker: tracker}
jobs := newJobs()
finishProgress := jobs.showProgress(ctx, out, combinedProgress([]progressUpdater{
&pushProgress,
&progress,
pullProgress{ShowExists: false, Store: store},
}))
defer finishProgress()
@ -71,7 +71,7 @@ func (i *ImageService) PushImage(ctx context.Context, targetRef reference.Named,
return err
}
for dgst := range mountableBlobs {
pushProgress.addMountable(dgst)
progress.addMountable(dgst)
}
// Create a store which fakes the local existence of possibly mountable blobs.
@ -201,9 +201,8 @@ func extractDistributionSources(labels map[string]string) []distributionSource {
// Check if this blob has a distributionSource label
// if yes, read it as source
for k, v := range labels {
registry := strings.TrimPrefix(k, labelDistributionSource)
if registry != k {
ref, err := reference.ParseNamed(registry + "/" + v)
if reg := strings.TrimPrefix(k, labelDistributionSource); reg != k {
ref, err := reference.ParseNamed(reg + "/" + v)
if err != nil {
continue
}
@ -242,15 +241,15 @@ func canBeMounted(mediaType string, targetRef reference.Named, isInsecureFunc fu
return false
}
registry := reference.Domain(targetRef)
reg := reference.Domain(targetRef)
// Cross-repo mount doesn't seem to work with insecure registries.
isInsecure := isInsecureFunc(registry)
isInsecure := isInsecureFunc(reg)
if isInsecure {
return false
}
// If the source registry is the same as the one we are pushing to
// then the cross-repo mount will work.
return registry == reference.Domain(source.registryRef)
return reg == reference.Domain(source.registryRef)
}

10
daemon/containerd/progress.go
View file

@ -71,14 +71,16 @@ func (j *jobs) showProgress(ctx context.Context, out progress.Output, updater pr
}
// Add adds a descriptor to be tracked
func (j *jobs) Add(desc ocispec.Descriptor) {
func (j *jobs) Add(desc ...ocispec.Descriptor) {
j.mu.Lock()
defer j.mu.Unlock()
if _, ok := j.descs[desc.Digest]; ok {
return
for _, d := range desc {
if _, ok := j.descs[d.Digest]; ok {
continue
}
j.descs[d.Digest] = d
}
j.descs[desc.Digest] = desc
}
// Remove removes a descriptor