Skip to content

SBOM attestations generation #2983

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tonistiigi merged 8 commits into from
Oct 13, 2022
Merged

SBOM attestations generation #2983

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
149c25a
result: fix possible nil map assignment in AddAttestation
jedevc Oct 13, 2022
24ca1a3
attestations: add frontend opt parsing utilities
jedevc Aug 30, 2022
19fb12b
attestations: add attestation bundles
jedevc Oct 13, 2022
1d11321
sbom: add sbom scanning to dockerfile frontend
jedevc Oct 13, 2022
1e19042
solver: add post-processing callbacks to run after solve
jedevc Oct 13, 2022
6519283
solver: add post-processor to convert Ref to Refs map
jedevc Oct 13, 2022
aacbedb
sbom: add post-processor to perform sbom fallback
jedevc Oct 13, 2022
3d45d9e
tests: add new tests to test SBOM functionality
jedevc Oct 13, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 5 additions & 6 deletions client/build.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import (
"context"

"github.com/moby/buildkit/client/buildid"
"github.com/moby/buildkit/frontend/attestations"
gateway "github.com/moby/buildkit/frontend/gateway/client"
"github.com/moby/buildkit/frontend/gateway/grpcclient"
gatewayapi "github.com/moby/buildkit/frontend/gateway/pb"
Expand All @@ -20,17 +21,15 @@ func (c *Client) Build(ctx context.Context, opt SolveOpt, product string, buildF
}
}()

if opt.Frontend != "" {
return nil, errors.New("invalid SolveOpt, Build interface cannot use Frontend")
}
feOpts := opt.FrontendAttrs

opt.Frontend = ""
opt.FrontendAttrs = attestations.Filter(opt.FrontendAttrs)

if product == "" {
product = apicaps.ExportedProduct
}

feOpts := opt.FrontendAttrs
opt.FrontendAttrs = nil

workers, err := c.ListWorkers(ctx)
if err != nil {
return nil, errors.Wrap(err, "listing workers for Build")
Expand Down
Loading