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

Revert "save snaphots to tmp dir (#1662)" (#1670) 

This reverts commit 754253d375.
This commit is contained in:
Tejal Desai 2021-06-14 12:09:07 -07:00 committed by GitHub
parent 754253d375
commit 094fe52b37
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/config/init.go
View File

@ -22,12 +22,10 @@ import (
var RootDir string var RootDir string
var KanikoDir string var KanikoDir string
var TempDir string
var IgnoreListPath string var IgnoreListPath string
func init() { func init() {
RootDir = constants.RootDir RootDir = constants.RootDir
KanikoDir = constants.KanikoDir KanikoDir = constants.KanikoDir
TempDir = constants.TempDir
IgnoreListPath = constants.IgnoreListPath IgnoreListPath = constants.IgnoreListPath
} }

3
pkg/constants/constants.go
View File

@ -23,9 +23,6 @@ const (
//KanikoDir is the path to the Kaniko directory //KanikoDir is the path to the Kaniko directory
KanikoDir = "/kaniko" KanikoDir = "/kaniko"
// TempDir is the path to the temp directory
TempDir = "/kaniko/tmp"
IgnoreListPath = "/proc/self/mountinfo" IgnoreListPath = "/proc/self/mountinfo"
Author = "kaniko" Author = "kaniko"

4
pkg/snapshot/snapshot.go
View File

@ -61,7 +61,7 @@ func (s *Snapshotter) Key() (string, error) {
// TakeSnapshot takes a snapshot of the specified files, avoiding directories in the ignorelist, and creates // TakeSnapshot takes a snapshot of the specified files, avoiding directories in the ignorelist, and creates
// a tarball of the changed files. Return contents of the tarball, and whether or not any files were changed // a tarball of the changed files. Return contents of the tarball, and whether or not any files were changed
func (s *Snapshotter) TakeSnapshot(files []string, shdCheckDelete bool) (string, error) { func (s *Snapshotter) TakeSnapshot(files []string, shdCheckDelete bool) (string, error) {
f, err := ioutil.TempFile(config.TempDir, "") f, err := ioutil.TempFile(config.KanikoDir, "")
if err != nil { if err != nil {
return "", err return "", err
} }
@ -143,7 +143,7 @@ func (s *Snapshotter) TakeSnapshotFS() (string, error) {
func (s *Snapshotter) getSnashotPathPrefix() string { func (s *Snapshotter) getSnashotPathPrefix() string {
if snapshotPathPrefix == "" { if snapshotPathPrefix == "" {
return config.TempDir return config.KanikoDir
} }
return snapshotPathPrefix return snapshotPathPrefix
} }