jenkins/sap-jenkins-library
1
0
Fork 0
mirror of https://github.com/SAP/jenkins-library.git synced 2025-03-03 15:02:35 +02:00
Code Issues Releases Activity

cnbBuild: temporary remove experimental createBOM feature (#4147)

Browse Source 
Co-authored-by: Pavel Busko <pavel.busko@sap.com>

Co-authored-by: Sumit Kulhadia <sumit.kulhadia@sap.com>
This commit is contained in:
Pavel Busko 2022-12-07 09:50:37 +01:00 committed by GitHub
parent b7468e81aa
commit 74a3133f35
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
cmd/cnbBuild.go
View File

@ -7,7 +7,6 @@ import (
"os" "os"
"path" "path"
"path/filepath" "path/filepath"
"strings"
"github.com/SAP/jenkins-library/pkg/buildsettings" "github.com/SAP/jenkins-library/pkg/buildsettings"
"github.com/SAP/jenkins-library/pkg/certutils" "github.com/SAP/jenkins-library/pkg/certutils"
@ -625,15 +624,15 @@ func runCnbBuild(config *cnbBuildOptions, cnbTelemetry *cnbBuildTelemetry, utils
commonPipelineEnvironment.container.imageDigest = digest commonPipelineEnvironment.container.imageDigest = digest
commonPipelineEnvironment.container.imageDigests = append(commonPipelineEnvironment.container.imageDigests, digest) commonPipelineEnvironment.container.imageDigests = append(commonPipelineEnvironment.container.imageDigests, digest)
if config.CreateBOM { // if config.CreateBOM {
bomFilename := fmt.Sprintf("bom-%s-%s.xml", targetImage.ContainerImageName, strings.TrimLeft(digest, "sha256:")) // bomFilename := fmt.Sprintf("bom-%s-%s.xml", targetImage.ContainerImageName, strings.TrimLeft(digest, "sha256:"))
imageName := fmt.Sprintf("%s:%s", containerImage, targetImage.ContainerImageTag) // imageName := fmt.Sprintf("%s:%s", containerImage, targetImage.ContainerImageTag)
err = cnbutils.MergeSBOMFiles("/layers/sbom/launch/**/sbom.syft.json", bomFilename, imageName, dockerConfigFile, utils) // err = cnbutils.MergeSBOMFiles("/layers/sbom/launch/**/sbom.syft.json", bomFilename, imageName, dockerConfigFile, utils)
if err != nil { // if err != nil {
log.SetErrorCategory(log.ErrorBuild) // log.SetErrorCategory(log.ErrorBuild)
return errors.Wrap(err, "failed to create SBoM file") // return errors.Wrap(err, "failed to create SBoM file")
} // }
} // }
if len(config.PreserveFiles) > 0 { if len(config.PreserveFiles) > 0 {
if pathType != pathEnumArchive { if pathType != pathEnumArchive {