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

fix commut

This commit is contained in:
Tejal Desai 2020-02-06 15:37:47 -08:00
parent 674f5bda5d
commit 8b69a13641
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/snapshot/snapshot_test.go
View File

@ -322,7 +322,7 @@ func TestSnasphotPreservesFileOrder(t *testing.T) {
filesInTars := [][]string{} filesInTars := [][]string{}
for i := 0; i<= 2; i++ { for i := 0; i <= 2; i++ {
testDir, snapshotter, cleanup, err := setUpTest() testDir, snapshotter, cleanup, err := setUpTest()
testDirWithoutLeadingSlash := strings.TrimLeft(testDir, "/") testDirWithoutLeadingSlash := strings.TrimLeft(testDir, "/")
defer cleanup() defer cleanup()
@ -366,7 +366,7 @@ func TestSnasphotPreservesFileOrder(t *testing.T) {
} }
// Check contents of all snapshots, make sure files appear in consistent order // Check contents of all snapshots, make sure files appear in consistent order
for i := 1; i<len(filesInTars); i++ { for i := 1; i < len(filesInTars); i++ {
testutil.CheckErrorAndDeepEqual(t, false, nil, filesInTars[0], filesInTars[i]) testutil.CheckErrorAndDeepEqual(t, false, nil, filesInTars[0], filesInTars[i])
} }
} }

8
pkg/util/tar_util.go
View File

@ -84,10 +84,10 @@ func (t *Tar) AddFileToTar(p string) error {
hdr.Name = p hdr.Name = p
} }
// rootfs may not have been extracted when using cache, preventing uname/gname from resolving // rootfs may not have been extracted when using cache, preventing uname/gname from resolving
// this makes this layer unnecessarily differ from a cached layer which does contain this information // this makes this layer unnecessarily differ from a cached layer which does contain this information
hdr.Uname = "" hdr.Uname = ""
hdr.Gname = "" hdr.Gname = ""
hardlink, linkDst := t.checkHardlink(p, i) hardlink, linkDst := t.checkHardlink(p, i)
if hardlink { if hardlink {