Merge pull request #29497 from yongtang/29486-docker-build-tmp-file

Clean up tmp files for interrupted `docker build`

builder/tarsum.go

@@ -104,7 +104,8 @@ func MakeTarSumContext(tarStream io.Reader) (ModifiableContext, error) {
 		return nil, err
 	}
 
-	if err := chrootarchive.Untar(sum, root, nil); err != nil {
+	err = chrootarchive.Untar(sum, root, nil)
+	if err != nil {
 		return nil, err
 	}