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

fix single snapshot

This commit is contained in:
Tejal Desai 2020-05-03 20:23:07 -07:00
parent db7687dbce
commit 5090baafda
2 changed files with 28 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/commands/workdir.go
View File

@ -74,4 +74,4 @@ func (w *WorkdirCommand) String() string {
func (w *WorkdirCommand) MetadataOnly() bool { func (w *WorkdirCommand) MetadataOnly() bool {
return false return false
} }

48
pkg/executor/build.go
View File

@ -318,6 +318,12 @@ func (s *stageBuilder) build() error {
} }
initSnapshotTaken := false initSnapshotTaken := false
if s.opts.SingleSnapshot {
if err := s.initSnapshotWithTimings(); err != nil {
return err
}
initSnapshotTaken = true
}
cacheGroup := errgroup.Group{} cacheGroup := errgroup.Group{}
for index, command := range s.cmds { for index, command := range s.cmds {
@ -348,15 +354,13 @@ func (s *stageBuilder) build() error {
return false return false
} }
}() }()
if !initSnapshotTaken && !command.ProvidesFilesToSnapshot() { if !initSnapshotTaken && !isCacheCommand && !command.ProvidesFilesToSnapshot() {
// Take initial snapshot if command does not expect to return // Take initial snapshot if command does not expect to return
// a list of files. // a list of files.
t := timing.Start("Initial FS snapshot") if err := s.initSnapshotWithTimings(); err != nil {
if err := s.snapshotter.Init(); err != nil { return err
return err }
} initSnapshotTaken = true
timing.DefaultRun.Stop(t)
initSnapshotTaken = true
} }
if err := command.ExecuteCommand(&s.cf.Config, s.args); err != nil { if err := command.ExecuteCommand(&s.cf.Config, s.args); err != nil {
@ -423,19 +427,12 @@ func (s *stageBuilder) takeSnapshot(files []string) (string, error) {
return snapshot, err return snapshot, err
} }
func (s *stageBuilder) singleSnapshot(index int) bool {
isLastCommand := index == len(s.stage.Commands)-1
// We only snapshot the very end with single snapshot mode on.
if s.opts.SingleSnapshot {
return isLastCommand
}
return false
}
func (s *stageBuilder) shouldTakeSnapshot(index int, files []string, provideFiles bool) bool { func (s *stageBuilder) shouldTakeSnapshot(index int, files []string, provideFiles bool) bool {
if s.singleSnapshot(index){ isLastCommand := index == len(s.stage.Commands)-1
return true
// We only snapshot the very end with single snapshot mode on.
if s.opts.SingleSnapshot {
return isLastCommand
} }
// Always take snapshots if we're using the cache. // Always take snapshots if we're using the cache.
@ -846,3 +843,12 @@ func ResolveCrossStageInstructions(stages []instructions.Stage) map[string]strin
logrus.Debugf("Built stage name to index map: %v", nameToIndex) logrus.Debugf("Built stage name to index map: %v", nameToIndex)
return nameToIndex return nameToIndex
} }
func (s stageBuilder) initSnapshotWithTimings() error {
t := timing.Start("Initial FS snapshot")
if err := s.snapshotter.Init(); err != nil {
return err
}
timing.DefaultRun.Stop(t)
return nil
}