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

Inherit pullimages as pushimages while parsing compilespec metadata

Browse Source 
Fixes #200
This commit is contained in:
Ettore Di Giacinto
2021-04-19 17:11:37 +02:00
parent 562fcc2421
commit ef92f23221
1 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
pkg/compiler/compiler.go
View File

@@ -724,12 +724,21 @@ func genImageList(refs []string, hash string) []string {
return res return res
} }
func (cs *LuetCompiler) compile(concurrency int, keepPermissions bool, p *compilerspec.LuetCompilationSpec) (*artifact.PackageArtifact, error) { func (cs *LuetCompiler) inheritSpecBuildOptions(p *compilerspec.LuetCompilationSpec) {
if len(p.BuildOptions.PullImageRepository) != 0 { if len(p.BuildOptions.PullImageRepository) != 0 {
orig := cs.Options.PullImageRepository cs.Options.PullImageRepository = append(cs.Options.PullImageRepository, p.BuildOptions.PullImageRepository...)
cs.Options.PullImageRepository = append(orig, p.BuildOptions.PullImageRepository...)
defer func() { cs.Options.PullImageRepository = orig }()
} }
if len(p.BuildOptions.PushImageRepository) != 0 {
cs.Options.PullImageRepository = append(cs.Options.PullImageRepository, p.BuildOptions.PushImageRepository)
}
}
func (cs *LuetCompiler) compile(concurrency int, keepPermissions bool, p *compilerspec.LuetCompilationSpec) (*artifact.PackageArtifact, error) {
// Inherit build options from compilation specs metadata
orig := cs.Options.PullImageRepository
defer func() { cs.Options.PullImageRepository = orig }()
cs.inheritSpecBuildOptions(p)
Info(":package: Compiling", p.GetPackage().HumanReadableString(), ".... :coffee:") Info(":package: Compiling", p.GetPackage().HumanReadableString(), ".... :coffee:")