mirror of
https://github.com/SAP/jenkins-library.git
synced 2025-03-03 15:02:35 +02:00
cnbBuild: temporary remove experimental createBOM feature (#4147)
Co-authored-by: Pavel Busko <pavel.busko@sap.com> Co-authored-by: Sumit Kulhadia <sumit.kulhadia@sap.com>
This commit is contained in:
parent
b7468e81aa
commit
74a3133f35
@ -7,7 +7,6 @@ import (
|
||||
"os"
|
||||
"path"
|
||||
"path/filepath"
|
||||
"strings"
|
||||
|
||||
"github.com/SAP/jenkins-library/pkg/buildsettings"
|
||||
"github.com/SAP/jenkins-library/pkg/certutils"
|
||||
@ -625,15 +624,15 @@ func runCnbBuild(config *cnbBuildOptions, cnbTelemetry *cnbBuildTelemetry, utils
|
||||
commonPipelineEnvironment.container.imageDigest = digest
|
||||
commonPipelineEnvironment.container.imageDigests = append(commonPipelineEnvironment.container.imageDigests, digest)
|
||||
|
||||
if config.CreateBOM {
|
||||
bomFilename := fmt.Sprintf("bom-%s-%s.xml", targetImage.ContainerImageName, strings.TrimLeft(digest, "sha256:"))
|
||||
imageName := fmt.Sprintf("%s:%s", containerImage, targetImage.ContainerImageTag)
|
||||
err = cnbutils.MergeSBOMFiles("/layers/sbom/launch/**/sbom.syft.json", bomFilename, imageName, dockerConfigFile, utils)
|
||||
if err != nil {
|
||||
log.SetErrorCategory(log.ErrorBuild)
|
||||
return errors.Wrap(err, "failed to create SBoM file")
|
||||
}
|
||||
}
|
||||
// if config.CreateBOM {
|
||||
// bomFilename := fmt.Sprintf("bom-%s-%s.xml", targetImage.ContainerImageName, strings.TrimLeft(digest, "sha256:"))
|
||||
// imageName := fmt.Sprintf("%s:%s", containerImage, targetImage.ContainerImageTag)
|
||||
// err = cnbutils.MergeSBOMFiles("/layers/sbom/launch/**/sbom.syft.json", bomFilename, imageName, dockerConfigFile, utils)
|
||||
// if err != nil {
|
||||
// log.SetErrorCategory(log.ErrorBuild)
|
||||
// return errors.Wrap(err, "failed to create SBoM file")
|
||||
// }
|
||||
// }
|
||||
|
||||
if len(config.PreserveFiles) > 0 {
|
||||
if pathType != pathEnumArchive {
|
||||
|
Loading…
x
Reference in New Issue
Block a user