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

Tag and push an image when virtual is supplied, to have a track of it in the image graph tree

Browse Source
This commit is contained in:
Ettore Di Giacinto
2020-12-07 17:59:30 +01:00
parent 3fd1bdbfc8
commit 338f310d67
1 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/compiler/compiler.go
View File

@@ -350,14 +350,10 @@ func (cs *LuetCompiler) buildPackageImage(image, buildertaggedImage, packageImag
buildertaggedImage = image buildertaggedImage = image
} }
if len(p.BuildSteps()) == 0 { if len(p.BuildSteps()) == 0 || len(p.BuildSteps()) == 0 && len(p.GetPreBuildSteps()) == 0 {
packageImage = buildertaggedImage packageImage = buildertaggedImage
} }
if len(p.BuildSteps()) == 0 && len(p.GetPreBuildSteps()) == 0 {
packageImage = 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")
@@ -412,7 +408,7 @@ func (cs *LuetCompiler) buildPackageImage(image, buildertaggedImage, packageImag
} }
} }
if len(p.BuildSteps()) != 0 { if len(p.BuildSteps()) != 0 || len(p.BuildSteps()) == 0 && len(p.GetPreBuildSteps()) == 0 {
Info(pkgTag, ":whale: Generating 'package' image from", buildertaggedImage, "as", packageImage, "with build steps") Info(pkgTag, ":whale: Generating 'package' image from", buildertaggedImage, "as", packageImage, "with build steps")
if err := buildAndPush(runnerOpts); err != nil { if err := buildAndPush(runnerOpts); err != nil {
return builderOpts, runnerOpts, errors.Wrap(err, "Could not push image: "+image+" "+builderOpts.DockerFileName) return builderOpts, runnerOpts, errors.Wrap(err, "Could not push image: "+image+" "+builderOpts.DockerFileName)