Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use pax tar format #1809

Merged
merged 2 commits into from
Dec 23, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions pkg/util/tar_util.go
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,8 @@ func (t *Tar) AddFileToTar(p string) error {
// this makes this layer unnecessarily differ from a cached layer which does contain this information
hdr.Uname = ""
hdr.Gname = ""
// use PAX format to preserve accurate mtime (match Docker behavior)
hdr.Format = tar.FormatPAX

hardlink, linkDst := t.checkHardlink(p, i)
if hardlink {
Expand Down
36 changes: 36 additions & 0 deletions pkg/util/tar_util_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,15 @@ limitations under the License.
package util

import (
"archive/tar"
"bytes"
"compress/gzip"
"io"
"io/ioutil"
"os"
"path/filepath"
"testing"
"time"

"github.com/GoogleContainerTools/kaniko/testutil"
)
Expand Down Expand Up @@ -57,6 +60,39 @@ func Test_IsLocalTarArchive(t *testing.T) {
}
}

func Test_AddFileToTar(t *testing.T) {
testDir, err := ioutil.TempDir("", "")
if err != nil {
t.Fatalf("err setting up temp dir: %v", err)
}
defer os.RemoveAll(testDir)

path := filepath.Join(testDir, regularFiles[0])
if err := ioutil.WriteFile(path, []byte("hello"), os.ModePerm); err != nil {
t.Fatal(err)
}
// use a pre-determined time with non-zero microseconds to avoid flakiness
mtime := time.UnixMicro(1635533172891395)
if err := os.Chtimes(path, mtime, mtime); err != nil {
t.Fatal(err)
}

buf := new(bytes.Buffer)
tarw := NewTar(buf)
if err := tarw.AddFileToTar(path); err != nil {
t.Fatal(err)
}
tarw.Close()

// Check that the mtime is correct (#1808)
tarReader := tar.NewReader(buf)
hdr, err := tarReader.Next()
if err != nil {
t.Fatal(err)
}
testutil.CheckDeepEqual(t, mtime, hdr.ModTime)
}

func setUpFilesAndTars(testDir string) error {
regularFilesAndContents := map[string]string{
regularFiles[0]: "",
Expand Down