kairos/luet
1
0
Fork 0
mirror of https://github.com/mudler/luet.git synced 2025-09-01 23:37:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Walk destination only once when computing delta

Browse Source 
Avoid the double pass by constructing the list on the fly
This commit is contained in:
Ettore Di Giacinto
2021-10-26 00:46:45 +02:00
parent 1f0324c452
commit daa9eb98d2
3 changed files with 82 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
pkg/compiler/compiler.go
View File

@@ -311,29 +311,35 @@ func (cs *LuetCompiler) unpackDelta(concurrency int, keepPermissions bool, p *co
cs.Options.Context.Info(pkgTag, ":hammer: Generating delta")
cs.Options.Context.Info(pkgTag, ":hammer: Retrieving reference for", builderOpts.ImageName)
ref, err := cs.Backend.ImageReference(builderOpts.ImageName)
if err != nil {
return nil, err
}
cs.Options.Context.Info(pkgTag, ":hammer: Retrieving reference for", runnerOpts.ImageName)
ref2, err := cs.Backend.ImageReference(runnerOpts.ImageName)
if err != nil {
return nil, err
}
diff, err := image.Delta(ref, ref2)
cs.Options.Context.Info(pkgTag, ":hammer: Generating filters for extraction")
filter, err := image.ExtractDeltaAdditionsFiles(cs.Options.Context, ref, p.GetIncludes(), p.GetExcludes())
if err != nil {
return nil, err
return nil, errors.Wrap(err, "failed generating filter for extraction")
}
// TODO: includes/excludes might need to get "/" stripped from prefix
cs.Options.Context.Info(pkgTag, ":hammer: Extracting artifact from image", runnerOpts.ImageName)
a, err := artifact.ImageToArtifact(
cs.Options.Context,
ref2,
cs.Options.CompressionType,
p.Rel(fmt.Sprintf("%s%s", p.GetPackage().GetFingerPrint(), ".package.tar")),
keepPermissions,
image.ExtractDeltaFiles(cs.Options.Context, diff, p.GetIncludes(), p.GetExcludes()),
filter,
)
if err != nil {
return nil, err