Merge pull request #3583 from Random-Liu/handle-duplicated-layer

Handle layers with the same digest in unpacker.
2019-08-26 13:08:19 -07:00 · 2019-08-26 13:08:19 -07:00 · cde03a0a2b
commit cde03a0a2b
parent df84e546b5 56bcc77679
1 changed files with 6 additions and 0 deletions
--- a/unpacker.go
+++ b/unpacker.go
@ -113,6 +113,12 @@ func (u *unpacker) unpack(ctx context.Context, config ocispec.Descriptor, layers
 			if states[i].layer.Blob.Digest != layer.Digest {
 				continue
 			}
+			// Different layers may have the same digest. When that
+			// happens, we should continue marking the next layer
+			// as downloaded.
+			if states[i].downloaded {
+				continue
+			}
 			states[i].downloaded = true
 			break
 		}