Merge pull request #869 from tonistiigi/inline-uncompressed

remotecache: allow uncompressed digest in inline export
moby · Mar 14, 2019 · c354108 · c354108
2 parents 0515c76 + d9cdaf8
commit c354108
Showing 1 changed file with 7 additions and 0 deletions.
diff --git a/cache/remotecache/inline/inline.go b/cache/remotecache/inline/inline.go
@@ -41,6 +41,13 @@ func (ce *exporter) ExportForLayers(layers []digest.Digest) ([]byte, error) {
 	for _, k := range layers {
 		if v, ok := descs[k]; ok {
 			descs2[k] = v
+			continue
+		}
+		// fallback for uncompressed digests
+		for _, v := range descs {
+			if uc := v.Descriptor.Annotations["containerd.io/uncompressed"]; uc == string(k) {
+				descs2[v.Descriptor.Digest] = v
+			}
 		}
 	}