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

Build step is always required for tagging images

Browse Source
This commit is contained in:
Ettore Di Giacinto
2020-12-07 19:39:56 +01:00
parent ebd18ae22c
commit 9a34296be0
1 changed files with 5 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
pkg/compiler/compiler.go
View File

@@ -346,12 +346,6 @@ func (cs *LuetCompiler) buildPackageImage(image, buildertaggedImage, packageImag
return builderOpts, runnerOpts, errors.Wrap(err, "Could not generate image definition") return builderOpts, runnerOpts, errors.Wrap(err, "Could not generate image definition")
} }
noBuildInstructions := len(p.BuildSteps()) == 0 && len(p.GetPreBuildSteps()) == 0
if len(p.BuildSteps()) == 0 || noBuildInstructions {
packageImage = buildertaggedImage
}
if len(p.GetPreBuildSteps()) == 0 { if len(p.GetPreBuildSteps()) == 0 {
buildertaggedImage = image buildertaggedImage = image
} }
@@ -410,11 +404,11 @@ func (cs *LuetCompiler) buildPackageImage(image, buildertaggedImage, packageImag
} }
} }
if len(p.BuildSteps()) != 0 || len(p.BuildSteps()) == 0 && len(p.GetPreBuildSteps()) == 0 { // Even if we might not have any steps to build, we do that so we can tag the image used in this moment and use that to cache it in a registry, or in the system.
Info(pkgTag, ":whale: Generating 'package' image from", buildertaggedImage, "as", packageImage, "with build steps") // acting as a docker tag.
if err := buildAndPush(runnerOpts); err != nil { Info(pkgTag, ":whale: Generating 'package' image from", buildertaggedImage, "as", packageImage, "with build steps")
return builderOpts, runnerOpts, errors.Wrap(err, "Could not push image: "+image+" "+builderOpts.DockerFileName) if err := buildAndPush(runnerOpts); err != nil {
} return builderOpts, runnerOpts, errors.Wrap(err, "Could not push image: "+image+" "+builderOpts.DockerFileName)
} }
return builderOpts, runnerOpts, nil return builderOpts, runnerOpts, nil