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

Set builderTagged image afterwards

Browse Source
This commit is contained in:
Ettore Di Giacinto
2020-12-07 18:58:14 +01:00
parent 7f10a19be5
commit ebd18ae22c
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/compiler/compiler.go
View File

@@ -348,14 +348,14 @@ func (cs *LuetCompiler) buildPackageImage(image, buildertaggedImage, packageImag
noBuildInstructions := len(p.BuildSteps()) == 0 && len(p.GetPreBuildSteps()) == 0 noBuildInstructions := len(p.BuildSteps()) == 0 && len(p.GetPreBuildSteps()) == 0
if len(p.GetPreBuildSteps()) == 0 && !noBuildInstructions {
buildertaggedImage = image
}
if len(p.BuildSteps()) == 0 || noBuildInstructions { if len(p.BuildSteps()) == 0 || noBuildInstructions {
packageImage = buildertaggedImage packageImage = buildertaggedImage
} }
if len(p.GetPreBuildSteps()) == 0 {
buildertaggedImage = image
}
// Then we write the step image, which uses the builder one // Then we write the step image, which uses the builder one
if err := p.WriteStepImageDefinition(buildertaggedImage, filepath.Join(buildDir, p.GetPackage().GetFingerPrint()+".dockerfile")); err != nil { if err := p.WriteStepImageDefinition(buildertaggedImage, filepath.Join(buildDir, p.GetPackage().GetFingerPrint()+".dockerfile")); err != nil {
return builderOpts, runnerOpts, errors.Wrap(err, "Could not generate image definition") return builderOpts, runnerOpts, errors.Wrap(err, "Could not generate image definition")