kairos/luet
1
0
Fork 0
mirror of https://github.com/mudler/luet.git synced 2025-08-15 22:13:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't always generate artifact

Browse Source 
Distinguish rather if we should generate artifact of the deps of a
package or not, and ensure that we just force artifact generation for
targets when computing the join image.

Fixes #217
This commit is contained in:
Ettore Di Giacinto 2021-05-25 13:27:50 +02:00
parent 838899aa83
commit 92ea69a2b9
1 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
pkg/compiler/compiler.go
View File

@ -91,7 +91,7 @@ func (cs *LuetCompiler) compilerWorker(i int, wg *sync.WaitGroup, cspecs chan *c
defer wg.Done() defer wg.Done()
for s := range cspecs { for s := range cspecs {
ar, err := cs.compile(concurrency, keepPermissions, nil, s) ar, err := cs.compile(concurrency, keepPermissions, nil, nil, s)
if err != nil { if err != nil {
errors <- err errors <- err
} }
@ -723,7 +723,7 @@ func (cs *LuetCompiler) ComputeMinimumCompilableSet(p ...*compilerspec.LuetCompi
// Compile is a non-parallel version of CompileParallel. It builds the compilation specs and generates // Compile is a non-parallel version of CompileParallel. It builds the compilation specs and generates
// an artifact // an artifact
func (cs *LuetCompiler) Compile(keepPermissions bool, p *compilerspec.LuetCompilationSpec) (*artifact.PackageArtifact, error) { func (cs *LuetCompiler) Compile(keepPermissions bool, p *compilerspec.LuetCompilationSpec) (*artifact.PackageArtifact, error) {
return cs.compile(cs.Options.Concurrency, keepPermissions, nil, p) return cs.compile(cs.Options.Concurrency, keepPermissions, nil, nil, p)
} }
func genImageList(refs []string, hash string) []string { func genImageList(refs []string, hash string) []string {
@ -826,9 +826,11 @@ func (cs *LuetCompiler) resolveJoinImages(concurrency int, keepPermissions bool,
return errors.Wrap(err, "while generating images to join from") return errors.Wrap(err, "while generating images to join from")
} }
wantsArtifact := true wantsArtifact := true
genDepsArtifact := !cs.Options.PackageTargetOnly
spec.SetOutputPath(p.GetOutputPath()) spec.SetOutputPath(p.GetOutputPath())
artifact, err := cs.compile(concurrency, keepPermissions, &wantsArtifact, spec) artifact, err := cs.compile(concurrency, keepPermissions, &wantsArtifact, &genDepsArtifact, spec)
if err != nil { if err != nil {
return errors.Wrap(err, "failed building join image") return errors.Wrap(err, "failed building join image")
} }
@ -897,7 +899,7 @@ func (cs *LuetCompiler) resolveMultiStageImages(concurrency int, keepPermissions
// If we specify --only-target package, we don't want any artifact, otherwise we do // If we specify --only-target package, we don't want any artifact, otherwise we do
genArtifact := !cs.Options.PackageTargetOnly genArtifact := !cs.Options.PackageTargetOnly
spec.SetOutputPath(p.GetOutputPath()) spec.SetOutputPath(p.GetOutputPath())
artifact, err := cs.compile(concurrency, keepPermissions, &genArtifact, spec) artifact, err := cs.compile(concurrency, keepPermissions, &genArtifact, &genArtifact, spec)
if err != nil { if err != nil {
return errors.Wrap(err, "failed building multi-stage image") return errors.Wrap(err, "failed building multi-stage image")
} }
@ -916,7 +918,7 @@ func (cs *LuetCompiler) resolveMultiStageImages(concurrency int, keepPermissions
return nil return nil
} }
func (cs *LuetCompiler) compile(concurrency int, keepPermissions bool, generateArtifact *bool, p *compilerspec.LuetCompilationSpec) (*artifact.PackageArtifact, error) { func (cs *LuetCompiler) compile(concurrency int, keepPermissions bool, generateFinalArtifact *bool, generateDependenciesFinalArtifact *bool, p *compilerspec.LuetCompilationSpec) (*artifact.PackageArtifact, error) {
Info(":package: Compiling", p.GetPackage().HumanReadableString(), ".... :coffee:") Info(":package: Compiling", p.GetPackage().HumanReadableString(), ".... :coffee:")
//Before multistage : join - same as multistage, but keep artifacts, join them, create a new one and generate a final image. //Before multistage : join - same as multistage, but keep artifacts, join them, create a new one and generate a final image.
@ -966,8 +968,8 @@ func (cs *LuetCompiler) compile(concurrency int, keepPermissions bool, generateA
// Treat last case (easier) first. The image is provided and we just compute a plain dockerfile with the images listed as above // Treat last case (easier) first. The image is provided and we just compute a plain dockerfile with the images listed as above
if p.GetImage() != "" { if p.GetImage() != "" {
localGenerateArtifact := true localGenerateArtifact := true
if generateArtifact != nil { if generateFinalArtifact != nil {
localGenerateArtifact = *generateArtifact localGenerateArtifact = *generateFinalArtifact
} }
a, err := cs.compileWithImage(p.GetImage(), packageHashTree.BuilderImageHash, targetAssertion.Hash.PackageHash, concurrency, keepPermissions, cs.Options.KeepImg, p, localGenerateArtifact) a, err := cs.compileWithImage(p.GetImage(), packageHashTree.BuilderImageHash, targetAssertion.Hash.PackageHash, concurrency, keepPermissions, cs.Options.KeepImg, p, localGenerateArtifact)
@ -990,8 +992,8 @@ func (cs *LuetCompiler) compile(concurrency int, keepPermissions bool, generateA
currentN := 0 currentN := 0
packageDeps := !cs.Options.PackageTargetOnly packageDeps := !cs.Options.PackageTargetOnly
if generateArtifact != nil { if generateDependenciesFinalArtifact != nil {
packageDeps = *generateArtifact packageDeps = *generateDependenciesFinalArtifact
} }
buildDeps := !cs.Options.NoDeps buildDeps := !cs.Options.NoDeps
@ -1086,8 +1088,8 @@ func (cs *LuetCompiler) compile(concurrency int, keepPermissions bool, generateA
if buildTarget { if buildTarget {
localGenerateArtifact := true localGenerateArtifact := true
if generateArtifact != nil { if generateFinalArtifact != nil {
localGenerateArtifact = *generateArtifact localGenerateArtifact = *generateFinalArtifact
} }
resolvedSourceImage := cs.resolveExistingImageHash(packageHashTree.SourceHash, p) resolvedSourceImage := cs.resolveExistingImageHash(packageHashTree.SourceHash, p)
Info(":rocket: All dependencies are satisfied, building package requested by the user", p.GetPackage().HumanReadableString()) Info(":rocket: All dependencies are satisfied, building package requested by the user", p.GetPackage().HumanReadableString())