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

Drop join from compilation specs

Browse Source 
Adapt also hash and integration tests
This commit is contained in:
Ettore Di Giacinto
2021-10-09 18:31:48 +02:00
parent 5a63bbd0d2
commit 097e310d3a
10 changed files with 41 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
pkg/compiler/compiler.go
View File

@@ -784,12 +784,7 @@ func (cs *LuetCompiler) resolveFinalImages(concurrency int, keepPermissions bool
joinTag := ">:loop: final images<"
var fromPackages pkg.DefaultPackages
if len(p.Join) > 0 {
fromPackages = p.Join
Warning(joinTag, `
Attention! the 'join' keyword is going to be deprecated in Luet >=0.18.x.
Use 'requires_final_images: true' instead in the build.yaml file`)
} else if p.RequiresFinalImages {
if p.RequiresFinalImages {
Info(joinTag, "Generating a parent image from final packages")
fromPackages = p.Package.GetRequires()
} else {
@@ -833,7 +828,7 @@ func (cs *LuetCompiler) resolveFinalImages(concurrency int, keepPermissions bool
for _, c := range fromPackages {
current++
if c != nil && c.Name != "" && c.Version != "" {
joinTag2 := fmt.Sprintf("%s %d/%d ⤑ :hammer: build %s", joinTag, current, len(p.Join), c.HumanReadableString())
joinTag2 := fmt.Sprintf("%s %d/%d ⤑ :hammer: build %s", joinTag, current, len(p.Package.GetRequires()), c.HumanReadableString())
Info(joinTag2, "compilation starts")
spec, err := cs.FromPackage(c)