Merge pull request #3961 from afbjorklund/tarball-tmp

Use a temp file, when writing the cached image
kubernetes · Mar 26, 2019 · 4ccc7a2 · 4ccc7a2
2 parents a131747 + 3194ec7
commit 4ccc7a2
Showing 1 changed file with 14 additions and 3 deletions.
diff --git a/pkg/minikube/machine/cache_images.go b/pkg/minikube/machine/cache_images.go
@@ -314,10 +314,21 @@ func CacheImage(image, dst string) error {
 	}
 
 	glog.Infoln("OPENING: ", dstPath)
-	f, err := os.Create(dstPath)
+	f, err := ioutil.TempFile(filepath.Dir(dstPath), filepath.Base(dstPath)+".*.tmp")
 	if err != nil {
 		return err
 	}
-	defer f.Close()
-	return tarball.Write(tag, img, nil, f)
+	err = tarball.Write(tag, img, nil, f)
+	if err != nil {
+		return err
+	}
+	err = f.Close()
+	if err != nil {
+		return err
+	}
+	err = os.Rename(f.Name(), dstPath)
+	if err != nil {
+		return err
+	}
+	return nil
 }