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

move restoreFilesystem to subroutine

This commit is contained in:
Martin Zihlmann 2025-06-01 20:58:28 +01:00
parent 3728b2ac13
commit e61dbc46b2
No known key found for this signature in database
GPG Key ID: 0F7784F41354DE99
1 changed files with 22 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
pkg/executor/build.go
View File

@ -695,6 +695,23 @@ func CalculateDependencies(stages []config.KanikoStage, opts *config.KanikoOptio
return depGraph, nil
}
func restoreFilesystem(tarball string, opts *config.KanikoOptions) error {
if err := util.DeleteFilesystem(); err != nil {
return err
}
if opts.PreserveContext {
if tarball == "" {
return fmt.Errorf("context snapshot is missing")
}
_, err := util.UnpackLocalTarArchive(tarball, config.RootDir)
if err != nil {
return errors.Wrap(err, "failed to unpack context snapshot")
}
logrus.Info("Context restored")
}
return nil
}
// DoBuild executes building the Dockerfile
func DoBuild(opts *config.KanikoOptions) (v1.Image, error) {
t := timing.Start("Total Build Time")
@ -812,19 +829,10 @@ func DoBuild(opts *config.KanikoOptions) (v1.Image, error) {
}
}
if opts.Cleanup {
if err = util.DeleteFilesystem(); err != nil {
err = restoreFilesystem(tarball, opts)
if err != nil {
return nil, err
}
if opts.PreserveContext {
if tarball == "" {
return nil, fmt.Errorf("context snapshot is missing")
}
_, err := util.UnpackLocalTarArchive(tarball, config.RootDir)
if err != nil {
return nil, errors.Wrap(err, "failed to unpack context snapshot")
}
logrus.Info("Context restored")
}
}
timing.DefaultRun.Stop(t)
return sourceImage, nil
@ -854,18 +862,9 @@ func DoBuild(opts *config.KanikoOptions) (v1.Image, error) {
}
// Delete the filesystem
if err := util.DeleteFilesystem(); err != nil {
return nil, errors.Wrap(err, fmt.Sprintf("deleting file system after stage %d", index))
}
if opts.PreserveContext {
if tarball == "" {
return nil, fmt.Errorf("context snapshot is missing")
}
_, err := util.UnpackLocalTarArchive(tarball, config.RootDir)
if err != nil {
return nil, errors.Wrap(err, "failed to unpack context snapshot")
}
logrus.Info("Context restored")
err = restoreFilesystem(tarball, opts)
if err != nil {
return nil, err
}
}