Merge pull request #7 from oracle/fix-layer-overwrite

Remove files from lower layer before writing
oracle · Jul 20, 2017 · 2d03f5f · 2d03f5f
2 parents b910e73 + d4226a0
commit 2d03f5f
Showing 1 changed file with 7 additions and 0 deletions.
diff --git a/pack.go b/pack.go
@@ -609,6 +609,13 @@ func extractLayer(layer *Layer, outDir string) error {
 		}
 
 		path := filepath.Join(outDir, clean)
+		info, err := os.Lstat(path)
+		// remove any existing file at the location unless both locations are a dir
+		if err == nil && !(hdr.Typeflag == tar.TypeDir && info.IsDir()) {
+			if err := os.RemoveAll(path); err != nil {
+				logrus.Warnf("Failed to remove %s", path)
+			}
+		}
 		switch hdr.Typeflag {
 		case tar.TypeDir:
 			os.MkdirAll(path, 0755)