Use single image to build packages

This commit is contained in:
Ettore Di Giacinto 2020-12-02 21:18:12 +01:00
parent 43db64c089
commit 6dbf19f085

View File

@ -304,13 +304,13 @@ func (cs *LuetCompiler) buildPackageImage(image, buildertaggedImage, packageImag
fp := p.GetPackage().HashFingerprint(packageImage) fp := p.GetPackage().HashFingerprint(packageImage)
if buildertaggedImage == "" { if buildertaggedImage == "" {
buildertaggedImage = cs.ImageRepository + "-" + fp + "-builder" buildertaggedImage = cs.ImageRepository + ":builder-" + fp
Debug(pkgTag, "Creating intermediary image", buildertaggedImage, "from", image) Debug(pkgTag, "Creating intermediary image", buildertaggedImage, "from", image)
} }
// TODO: Cleanup, not actually hit // TODO: Cleanup, not actually hit
if packageImage == "" { if packageImage == "" {
packageImage = cs.ImageRepository + "-" + fp packageImage = cs.ImageRepository + ":builder-invalid" + fp
} }
p.SetSeedImage(image) // In this case, we ignore the build deps as we suppose that the image has them - otherwise we recompose the tree with a solver, p.SetSeedImage(image) // In this case, we ignore the build deps as we suppose that the image has them - otherwise we recompose the tree with a solver,