Merge pull request #484 from changweige/prepare-0.8.2

Pick some stable patches from main branch, prepare v0.8.2
containerd · May 22, 2023 · 92ed522 · 92ed522
2 parents 580487c + b31afe0
commit 92ed522
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/pkg/converter/convert_unix.go b/pkg/converter/convert_unix.go
@@ -140,6 +140,11 @@ func unpackNydusBlob(bootDst, blobDst string, ra content.ReaderAt, unpackBlob bo
 		defer blob.Close()
 
 		if _, err = UnpackEntry(ra, EntryBlob, blob); err != nil {
+			if errors.Is(err, ErrNotFound) {
+				// The nydus layer may contain only bootstrap and no blob
+				// data, which should be ignored.
+				return nil
+			}
 			return errors.Wrap(err, "unpack blob from nydus")
 		}
 	}