kairos/luet
1
0
Fork 0
mirror of https://github.com/mudler/luet.git synced 2025-07-04 19:16:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Do not compute diff when package is unpacked

Browse Source
This commit is contained in:
Ettore Di Giacinto 2019-11-17 15:45:55 +01:00
parent d0b128000d
commit a39f596e8f
No known key found for this signature in database
GPG Key ID: 1ADA699B145A2D1C
1 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
pkg/compiler/compiler.go
View File

@ -227,9 +227,15 @@ func (cs *LuetCompiler) compileWithImage(image, buildertaggedImage, packageImage
} }
} }
diffs, err := cs.Backend.Changes(p.Rel(p.GetPackage().GetFingerPrint()+"-builder.image.tar"), p.Rel(p.GetPackage().GetFingerPrint()+".image.tar")) var diffs []ArtifactLayer
if err != nil { var artifact Artifact
return nil, errors.Wrap(err, "Could not generate changes from layers")
if !p.ImageUnpack() {
// we have to get diffs only if spec is not unpacked
diffs, err = cs.Backend.Changes(p.Rel(p.GetPackage().GetFingerPrint()+"-builder.image.tar"), p.Rel(p.GetPackage().GetFingerPrint()+".image.tar"))
if err != nil {
return nil, errors.Wrap(err, "Could not generate changes from layers")
}
} }
if !keepImg { if !keepImg {
@ -253,21 +259,23 @@ func (cs *LuetCompiler) compileWithImage(image, buildertaggedImage, packageImage
if err != nil { if err != nil {
return nil, errors.Wrap(err, "Could not extract rootfs") return nil, errors.Wrap(err, "Could not extract rootfs")
} }
if p.ImageUnpack() { if p.ImageUnpack() {
err = helpers.Tar(rootfs, p.Rel(p.GetPackage().GetFingerPrint()+".package.tar")) err = helpers.Tar(rootfs, p.Rel(p.GetPackage().GetFingerPrint()+".package.tar"))
if err != nil { if err != nil {
return nil, errors.Wrap(err, "Error met while creating package archive") return nil, errors.Wrap(err, "Error met while creating package archive")
} }
artifact := NewPackageArtifact(p.Rel(p.GetPackage().GetFingerPrint() + ".package.tar")) artifact = NewPackageArtifact(p.Rel(p.GetPackage().GetFingerPrint() + ".package.tar"))
artifact.SetCompileSpec(p)
} else {
artifact, err = ExtractArtifactFromDelta(rootfs, p.Rel(p.GetPackage().GetFingerPrint()+".package.tar"), diffs, concurrency, keepPermissions, p.GetIncludes())
if err != nil {
return nil, errors.Wrap(err, "Could not generate deltas")
}
artifact.SetCompileSpec(p) artifact.SetCompileSpec(p)
return artifact, nil
} }
artifact, err := ExtractArtifactFromDelta(rootfs, p.Rel(p.GetPackage().GetFingerPrint()+".package.tar"), diffs, concurrency, keepPermissions, p.GetIncludes())
if err != nil {
return nil, errors.Wrap(err, "Could not generate deltas")
}
artifact.SetCompileSpec(p)
return artifact, nil return artifact, nil
} }