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

fixup: sanitize metadata images name

Browse Source
This commit is contained in:
Ettore Di Giacinto
2021-11-15 21:10:15 +01:00
parent bb88fe7e9c
commit a2d91a2aee
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
pkg/compiler/compiler.go
View File

@@ -492,7 +492,9 @@ func (cs *LuetCompiler) genArtifact(p *compilerspec.LuetCompilationSpec, builder
} }
cs.Options.Context.Success(pkgTag, " :white_check_mark: done (empty virtual package)") cs.Options.Context.Success(pkgTag, " :white_check_mark: done (empty virtual package)")
if cs.Options.PushFinalImages { if cs.Options.PushFinalImages {
cs.pushFinalArtifact(a, p, keepPermissions) if err := cs.pushFinalArtifact(a, p, keepPermissions); err != nil {
return nil, err
}
} }
return a, nil return a, nil
} }
@@ -526,7 +528,9 @@ func (cs *LuetCompiler) genArtifact(p *compilerspec.LuetCompilationSpec, builder
cs.Options.Context.Success(pkgTag, " :white_check_mark: Done building") cs.Options.Context.Success(pkgTag, " :white_check_mark: Done building")
if cs.Options.PushFinalImages { if cs.Options.PushFinalImages {
cs.pushFinalArtifact(a, p, keepPermissions) if err := cs.pushFinalArtifact(a, p, keepPermissions); err != nil {
return nil, err
}
} }
return a, nil return a, nil
@@ -551,7 +555,7 @@ func (cs *LuetCompiler) pushFinalArtifact(a *artifact.PackageArtifact, p *compil
} }
// Then the image ID // Then the image ID
metadataImageID := fmt.Sprintf("%s:%s", cs.Options.PushFinalImagesRepository, a.CompileSpec.GetPackage().GetMetadataFilePath()) metadataImageID := fmt.Sprintf("%s:%s", cs.Options.PushFinalImagesRepository, helpers.SanitizeImageString(a.CompileSpec.GetPackage().GetMetadataFilePath()))
if !cs.Backend.ImageAvailable(metadataImageID) || cs.Options.PushFinalImagesForce { if !cs.Backend.ImageAvailable(metadataImageID) || cs.Options.PushFinalImagesForce {
cs.Options.Context.Info("Generating metadata image for", a.CompileSpec.Package.HumanReadableString(), metadataImageID) cs.Options.Context.Info("Generating metadata image for", a.CompileSpec.Package.HumanReadableString(), metadataImageID)