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

Expect full image name to GenerateFinalImage

Browse Source 
We will re-use this method also when generating repository metadata
This commit is contained in:
Ettore Di Giacinto
2021-01-18 12:26:22 +01:00
parent a1f4c28973
commit 88b5576611
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/compiler/artifact.go
View File

@@ -248,7 +248,7 @@ COPY * /`
} }
// GenerateFinalImage takes an artifact and builds a Docker image with its content // GenerateFinalImage takes an artifact and builds a Docker image with its content
func (a *PackageArtifact) GenerateFinalImage(imageprefix string, b CompilerBackend, keepPerms bool) (CompilerBackendOptions, error) { func (a *PackageArtifact) GenerateFinalImage(imageName string, b CompilerBackend, keepPerms bool) (CompilerBackendOptions, error) {
builderOpts := CompilerBackendOptions{} builderOpts := CompilerBackendOptions{}
archive, err := LuetCfg.GetSystem().TempDir("archive") archive, err := LuetCfg.GetSystem().TempDir("archive")
if err != nil { if err != nil {
@@ -273,7 +273,7 @@ func (a *PackageArtifact) GenerateFinalImage(imageprefix string, b CompilerBacke
} }
builderOpts = CompilerBackendOptions{ builderOpts = CompilerBackendOptions{
ImageName: imageprefix + a.CompileSpec.Package.GetFingerPrint(), ImageName: imageName,
SourcePath: archive, SourcePath: archive,
DockerFileName: dockerFile, DockerFileName: dockerFile,
Context: uncompressedFiles, Context: uncompressedFiles,

2
pkg/compiler/artifact_test.go
View File

@@ -181,7 +181,7 @@ RUN echo bar > /test2`))
err = artifact.Compress(tmpdir, 1) err = artifact.Compress(tmpdir, 1)
Expect(err).ToNot(HaveOccurred()) Expect(err).ToNot(HaveOccurred())
resultingImage := imageprefix + "foo--1.0" resultingImage := imageprefix + "foo--1.0"
opts, err := artifact.GenerateFinalImage(imageprefix, b, false) opts, err := artifact.GenerateFinalImage(resultingImage, b, false)
Expect(err).ToNot(HaveOccurred()) Expect(err).ToNot(HaveOccurred())
Expect(opts.ImageName).To(Equal(resultingImage)) Expect(opts.ImageName).To(Equal(resultingImage))