containerd
diff --git a/‎api/next.pb.txt‎
Lines changed: 28 additions & 0 deletions b/‎api/next.pb.txt‎
Lines changed: 28 additions & 0 deletions
diff --git a/‎api/types/descriptor.pb.go‎
Lines changed: 175 additions & 14 deletions b/‎api/types/descriptor.pb.go‎
Lines changed: 175 additions & 14 deletions
diff --git a/‎api/types/descriptor.proto‎
Lines changed: 1 addition & 0 deletions b/‎api/types/descriptor.proto‎
Lines changed: 1 addition & 0 deletions
diff --git a/‎diff.go‎
Lines changed: 8 additions & 6 deletions b/‎diff.go‎
Lines changed: 8 additions & 6 deletions
diff --git a/‎image_store.go‎
Lines changed: 8 additions & 6 deletions b/‎image_store.go‎
Lines changed: 8 additions & 6 deletions
@@ -1764,6 +1764,34 @@ file {
       type: TYPE_INT64
       json_name: "size"
     }
+    field {
+      name: "annotations"
+      number: 5
+      label: LABEL_REPEATED
+      type: TYPE_MESSAGE
+      type_name: ".containerd.types.Descriptor.AnnotationsEntry"
+      json_name: "annotations"
+    }
+    nested_type {
+      name: "AnnotationsEntry"
+      field {
+        name: "key"
+        number: 1
+        label: LABEL_OPTIONAL
+        type: TYPE_STRING
+        json_name: "key"
+      }
+      field {
+        name: "value"
+        number: 2
+        label: LABEL_OPTIONAL
+        type: TYPE_STRING
+        json_name: "value"
+      }
+      options {
+        map_entry: true
+      }
+    }
   }
   options {
     go_package: "github.com/containerd/containerd/api/types;types"
 
@@ -15,4 +15,5 @@ message Descriptor {
 	string media_type = 1;
 	string digest = 2 [(gogoproto.customtype) = "github.com/opencontainers/go-digest.Digest", (gogoproto.nullable) = false];
 	int64 size = 3;
+	map<string, string> annotations = 5;
 }
@@ -80,17 +80,19 @@ func (r *diffRemote) Compare(ctx context.Context, a, b []mount.Mount, opts ...di
 
 func toDescriptor(d *types.Descriptor) ocispec.Descriptor {
 	return ocispec.Descriptor{
-		MediaType: d.MediaType,
-		Digest:    d.Digest,
-		Size:      d.Size_,
+		MediaType:   d.MediaType,
+		Digest:      d.Digest,
+		Size:        d.Size_,
+		Annotations: d.Annotations,
 	}
 }
 
 func fromDescriptor(d ocispec.Descriptor) *types.Descriptor {
 	return &types.Descriptor{
-		MediaType: d.MediaType,
-		Digest:    d.Digest,
-		Size_:     d.Size,
+		MediaType:   d.MediaType,
+		Digest:      d.Digest,
+		Size_:       d.Size,
+		Annotations: d.Annotations,
 	}
 }
 
 
@@ -137,16 +137,18 @@ func imagesFromProto(imagespb []imagesapi.Image) []images.Image {
 
 func descFromProto(desc *types.Descriptor) ocispec.Descriptor {
 	return ocispec.Descriptor{
-		MediaType: desc.MediaType,
-		Size:      desc.Size_,
-		Digest:    desc.Digest,
+		MediaType:   desc.MediaType,
+		Size:        desc.Size_,
+		Digest:      desc.Digest,
+		Annotations: desc.Annotations,
 	}
 }
 
 func descToProto(desc *ocispec.Descriptor) types.Descriptor {
 	return types.Descriptor{
-		MediaType: desc.MediaType,
-		Size_:     desc.Size,
-		Digest:    desc.Digest,
+		MediaType:   desc.MediaType,
+		Size_:       desc.Size,
+		Digest:      desc.Digest,
+		Annotations: desc.Annotations,
 	}
 }
Original file line number	Diff line number	Diff line change
`@@ -15,4 +15,5 @@ message Descriptor {`
`15`	`15`	`string media_type = 1;`
`16`	`16`	`string digest = 2 [(gogoproto.customtype) = "github.com/opencontainers/go-digest.Digest", (gogoproto.nullable) = false];`
`17`	`17`	`int64 size = 3;`
	`18`	`+ map<string, string> annotations = 5;`
`18`	`19`	`}`
Original file line number	Diff line number	Diff line change
`@@ -80,17 +80,19 @@ func (r *diffRemote) Compare(ctx context.Context, a, b []mount.Mount, opts ...di`
`80`	`80`
`81`	`81`	`func toDescriptor(d *types.Descriptor) ocispec.Descriptor {`
`82`	`82`	`return ocispec.Descriptor{`
`83`		`- MediaType: d.MediaType,`
`84`		`- Digest: d.Digest,`
`85`		`- Size: d.Size_,`
	`83`	`+ MediaType: d.MediaType,`
	`84`	`+ Digest: d.Digest,`
	`85`	`+ Size: d.Size_,`
	`86`	`+ Annotations: d.Annotations,`
`86`	`87`	`}`
`87`	`88`	`}`
`88`	`89`
`89`	`90`	`func fromDescriptor(d ocispec.Descriptor) *types.Descriptor {`
`90`	`91`	`return &types.Descriptor{`
`91`		`- MediaType: d.MediaType,`
`92`		`- Digest: d.Digest,`
`93`		`- Size_: d.Size,`
	`92`	`+ MediaType: d.MediaType,`
	`93`	`+ Digest: d.Digest,`
	`94`	`+ Size_: d.Size,`
	`95`	`+ Annotations: d.Annotations,`
`94`	`96`	`}`
`95`	`97`	`}`
`96`	`98`
Original file line number	Diff line number	Diff line change
`@@ -137,16 +137,18 @@ func imagesFromProto(imagespb []imagesapi.Image) []images.Image {`
`137`	`137`
`138`	`138`	`func descFromProto(desc *types.Descriptor) ocispec.Descriptor {`
`139`	`139`	`return ocispec.Descriptor{`
`140`		`- MediaType: desc.MediaType,`
`141`		`- Size: desc.Size_,`
`142`		`- Digest: desc.Digest,`
	`140`	`+ MediaType: desc.MediaType,`
	`141`	`+ Size: desc.Size_,`
	`142`	`+ Digest: desc.Digest,`
	`143`	`+ Annotations: desc.Annotations,`
`143`	`144`	`}`
`144`	`145`	`}`
`145`	`146`
`146`	`147`	`func descToProto(desc *ocispec.Descriptor) types.Descriptor {`
`147`	`148`	`return types.Descriptor{`
`148`		`- MediaType: desc.MediaType,`
`149`		`- Size_: desc.Size,`
`150`		`- Digest: desc.Digest,`
	`149`	`+ MediaType: desc.MediaType,`
	`150`	`+ Size_: desc.Size,`
	`151`	`+ Digest: desc.Digest,`
	`152`	`+ Annotations: desc.Annotations,`
`151`	`153`	`}`
`152`	`154`	`}`