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

dmcgowan · web-flow · commit cde03a0a2b20 · 2019-08-26T13:08:19.000-07:00
Handle layers with the same digest in unpacker.
diff --git 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
 		}

Original file line number	Diff line number	Diff line change
`@@ -113,6 +113,12 @@ func (u *unpacker) unpack(ctx context.Context, config ocispec.Descriptor, layers`
`113`	`113`	`if states[i].layer.Blob.Digest != layer.Digest {`
`114`	`114`	`continue`
`115`	`115`	`}`
	`116`	`+ // Different layers may have the same digest. When that`
	`117`	`+ // happens, we should continue marking the next layer`
	`118`	`+ // as downloaded.`
	`119`	`+ if states[i].downloaded {`
	`120`	`+ continue`
	`121`	`+ }`
`116`	`122`	`states[i].downloaded = true`
`117`	`123`	`break`
`118`	`124`	`}`