public_git/kaniko
1
0
Fork 0
mirror of https://github.com/GoogleContainerTools/kaniko synced 2026-10-20 22:53:26 +02:00
Code Issues Releases Wiki Activity

Fixing lint issues. Adding tests for COPY command. Fixing issue with copying files out of snapshots

Browse Source
This commit is contained in:
Don McCasland
2019-09-16 10:48:31 -07:00
parent e003bae87d
commit 1bb5a41d7d
21 changed files with 104 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/util/fs_util.go
+6 -3
View File
@@ -32,7 +32,7 @@ import (
"github.com/GoogleContainerTools/kaniko/pkg/constants"
"github.com/docker/docker/builder/dockerignore"
"github.com/docker/docker/pkg/fileutils"
"github.com/google/go-containerregistry/pkg/v1"
v1 "github.com/google/go-containerregistry/pkg/v1"
"github.com/pkg/errors"
"github.com/sirupsen/logrus"
)
@@ -188,9 +188,12 @@ func extractFile(dest string, hdr *tar.Header, tr io.Reader) error {
switch hdr.Typeflag {
case tar.TypeReg:
logrus.Debugf("creating file %s", path)
// It's possible a file is in the tar before its directory.
if _, err := os.Stat(dir); os.IsNotExist(err) {
// It's possible a file is in the tar before its directory,
// or a file was copied over a directory prior to now
fi, err := os.Stat(dir)
if os.IsNotExist(err) || !fi.IsDir() {
logrus.Debugf("base %s for file %s does not exist. Creating.", base, path)
os.RemoveAll(dir)
if err := os.MkdirAll(dir, 0755); err != nil {
return err
}
pkg/util/image_util.go
+1 -1
View File
@@ -28,7 +28,7 @@ import (
"github.com/GoogleContainerTools/kaniko/pkg/creds"
"github.com/google/go-containerregistry/pkg/name"
"github.com/google/go-containerregistry/pkg/v1"
v1 "github.com/google/go-containerregistry/pkg/v1"
"github.com/google/go-containerregistry/pkg/v1/empty"
"github.com/google/go-containerregistry/pkg/v1/remote"
"github.com/google/go-containerregistry/pkg/v1/tarball"