dilim/buildkit
1
0
Fork 0
mirror of https://github.com/moby/buildkit.git synced 2026-08-05 23:30:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

containerimage: fix removeinternalannotations

Browse Source 
It is unsafe to make direct modifications in the
Annotations map of the Remote descriptor. The same
map inside the Descriptor could be used in other
components.

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
This commit is contained in:
Tonis Tiigi
2022-12-12 22:47:07 -08:00
parent ed041ab3f4
commit 19f375e796
2 changed files with 20 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
exporter/containerimage/writer.go
View File

@@ -413,7 +413,7 @@ func (ic *ImageWriter) commitDistributionManifest(ctx context.Context, opts *Ima
}
for _, desc := range remote.Descriptors {
RemoveInternalLayerAnnotations(&desc, opts.OCITypes)
desc.Annotations = RemoveInternalLayerAnnotations(desc.Annotations, opts.OCITypes)
mfst.Layers = append(mfst.Layers, desc)
}
@@ -524,7 +524,7 @@ func (ic *ImageWriter) commitAttestationsManifest(ctx context.Context, opts *Ima
"containerd.io/gc.ref.content.0": configDigest.String(),
}
for i, desc := range layers {
RemoveInternalLayerAnnotations(&desc, opts.OCITypes)
desc.Annotations = RemoveInternalLayerAnnotations(desc.Annotations, opts.OCITypes)
mfst.Layers = append(mfst.Layers, desc)
labels[fmt.Sprintf("containerd.io/gc.ref.content.%d", i+1)] = desc.Digest.String()
}
@@ -782,19 +782,24 @@ func normalizeLayersAndHistory(ctx context.Context, remote *solver.Remote, histo
return remote, history
}
func RemoveInternalLayerAnnotations(desc *ocispecs.Descriptor, oci bool) {
if oci {
// oci supports annotations but don't export internal annotations
delete(desc.Annotations, "containerd.io/uncompressed")
delete(desc.Annotations, "buildkit/createdat")
for k := range desc.Annotations {
if strings.HasPrefix(k, "containerd.io/distribution.source.") {
delete(desc.Annotations, k)
}
}
} else {
desc.Annotations = nil
func RemoveInternalLayerAnnotations(in map[string]string, oci bool) map[string]string {
if len(in) == 0 || !oci {
return nil
}
m := make(map[string]string, len(in))
for k, v := range in {
// oci supports annotations but don't export internal annotations
switch k {
case "containerd.io/uncompressed", "buildkit/createdat":
continue
default:
if strings.HasPrefix(k, "containerd.io/distribution.source.") {
continue
}
m[k] = v
}
}
return m
}
type refMetadata struct {

2
solver/llbsolver/provenance.go
View File

@@ -548,7 +548,7 @@ func (c *cacheRecord) AddResult(dgst digest.Digest, idx int, createdAt time.Time
descs := make([]ocispecs.Descriptor, len(result.Descriptors))
for i, desc := range result.Descriptors {
d := desc
containerimage.RemoveInternalLayerAnnotations(&d, true)
d.Annotations = containerimage.RemoveInternalLayerAnnotations(d.Annotations, true)
descs[i] = d
}
c.ce.layers[e] = append(c.ce.layers[e], descs)