fix bug that gen layer tar contains deplicated files

Signed-off-by: frankyang <[email protected]>
moby · Nov 21, 2023 · f1ce51f · f1ce51f
1 parent d5817ce
commit f1ce51f
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/cache/blobs_linux.go b/cache/blobs_linux.go
@@ -45,6 +45,9 @@ func (sr *immutableRef) tryComputeOverlayBlob(ctx context.Context, lower, upper
 	}
 	defer func() {
 		if cw != nil {
+			// after commit succ cw will be set to to nil, if cw isn't nil, error
+			// happened before commit, we should drop the content already written
+			cw.Truncate(0)
 			if cerr := cw.Close(); cerr != nil {
 				bklog.G(ctx).WithError(cerr).Warnf("failed to close writer %q", ref)
 			}