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

Don't replace buildertaggedImage if there aren't build steps

Browse Source
This commit is contained in:
Ettore Di Giacinto
2020-12-07 18:39:15 +01:00
parent 338f310d67
commit 6bf7368993
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/compiler/compiler.go
View File

@@ -346,11 +346,13 @@ func (cs *LuetCompiler) buildPackageImage(image, buildertaggedImage, packageImag
return builderOpts, runnerOpts, errors.Wrap(err, "Could not generate image definition")
}
if 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 || len(p.BuildSteps()) == 0 && len(p.GetPreBuildSteps()) == 0 {
if len(p.BuildSteps()) == 0 || noBuildInstructions {
packageImage = buildertaggedImage
}