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

Move snapshotPathPrefix into a method 

This allows the value to be determined on the fly, which supports consumers that use Kaniko snaphot as a library and may need to change the value of config.KanikoDir
This commit is contained in:
Joe Kutner 2020-07-26 14:28:00 -05:00
parent 0c71a1bb0e
commit 29a02b08ff
No known key found for this signature in database
GPG Key ID: 737562890DC0512A
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkg/snapshot/snapshot.go
View File

@ -33,7 +33,7 @@ import (
) )
// For testing // For testing
var snapshotPathPrefix = config.KanikoDir var snapshotPathPrefix = ""
// Snapshotter holds the root directory from which to take snapshots, and a list of snapshots taken // Snapshotter holds the root directory from which to take snapshots, and a list of snapshots taken
type Snapshotter struct { type Snapshotter struct {
@ -119,7 +119,7 @@ func (s *Snapshotter) TakeSnapshot(files []string, shdCheckDelete bool) (string,
// TakeSnapshotFS takes a snapshot of the filesystem, avoiding directories in the ignorelist, and creates // TakeSnapshotFS takes a snapshot of the filesystem, avoiding directories in the ignorelist, and creates
// a tarball of the changed files. // a tarball of the changed files.
func (s *Snapshotter) TakeSnapshotFS() (string, error) { func (s *Snapshotter) TakeSnapshotFS() (string, error) {
f, err := ioutil.TempFile(snapshotPathPrefix, "") f, err := ioutil.TempFile(s.getSnashotPathPrefix(), "")
if err != nil { if err != nil {
return "", err return "", err
} }
@ -138,6 +138,13 @@ func (s *Snapshotter) TakeSnapshotFS() (string, error) {
return f.Name(), nil return f.Name(), nil
} }
func (s *Snapshotter) getSnashotPathPrefix() string {
if snapshotPathPrefix == "" {
return config.KanikoDir
}
return snapshotPathPrefix
}
func (s *Snapshotter) scanFullFilesystem() ([]string, []string, error) { func (s *Snapshotter) scanFullFilesystem() ([]string, []string, error) {
logrus.Info("Taking snapshot of full filesystem...") logrus.Info("Taking snapshot of full filesystem...")