public_git
/
kaniko
mirror of https://github.com/GoogleContainerTools/kaniko
1
0
Fork 0
Code Issues Releases Wiki Activity

Do not use leading slashes for paths in layer tarballs to be more compatible with docker

This commit is contained in:
xanonid 2019-07-29 20:07:31 +02:00
parent 56eeaf41e6
commit c75749b840
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkg/util/tar_util.go
View File

@ -25,6 +25,7 @@ import (
"io/ioutil" "io/ioutil"
"os" "os"
"path/filepath" "path/filepath"
"strings"
"syscall" "syscall"
"github.com/docker/docker/pkg/archive" "github.com/docker/docker/pkg/archive"
@ -74,7 +75,14 @@ func (t *Tar) AddFileToTar(p string) error {
if err != nil { if err != nil {
return err return err
} }
hdr.Name = p
if p != "/" {
// Docker uses no leading / in the tarball
hdr.Name = strings.TrimLeft(p, "/")
} else {
// allow entry for / to preserve permission changes etc. (currently ignored anyway by Docker runtime)
hdr.Name = p
}
hardlink, linkDst := t.checkHardlink(p, i) hardlink, linkDst := t.checkHardlink(p, i)
if hardlink { if hardlink {