From 30db2c07d3a26fec70a4722b928bdb1ef336e6d3 Mon Sep 17 00:00:00 2001
From: xanonid <xanonid@gmail.com>
Date: Fri, 9 Aug 2019 17:30:45 +0200
Subject: [PATCH] Also remove leading / from paths to file which are marked as
 deleted

---
 pkg/util/tar_util.go | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkg/util/tar_util.go b/pkg/util/tar_util.go
index f358f48ad..213ef68e3 100644
--- a/pkg/util/tar_util.go
+++ b/pkg/util/tar_util.go
@@ -112,7 +112,8 @@ func (t *Tar) Whiteout(p string) error {
 	name := ".wh." + filepath.Base(p)
 
 	th := &tar.Header{
-		Name: filepath.Join(dir, name),
+		// Docker uses no leading / in the tarball
+		Name: strings.TrimLeft(filepath.Join(dir, name), "/"),
 		Size: 0,
 	}
 	if err := t.w.WriteHeader(th); err != nil {