Skip to content
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.

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

sbom: fix minor inconsistencies in sbom protocol #3290

Merged
merged 2 commits into from
Nov 23, 2022

Conversation

jedevc
Copy link
Member

@jedevc jedevc commented Nov 18, 2022

⚠️ Requires updates in buildkit-syft-scanner

Since we construct the args for the image based on the Entrypoint + Cmd, we shouldn't error out early if no Cmd is set, but only if neither Entrypoint or Cmd are set.

Additionally, we should avoid setting BUILDKIT_SCAN_SOURCE_EXTRAS if no extras have been specified.

jedevc and others added 2 commits November 23, 2022 14:38
This irons a few issues discovered in porting the default sbom scanner
to go.

Since we construct the args for the image based on the Entrypoint + Cmd,
we shouldn't error out early if no Cmd is set, but only if neither
Entrypoint or Cmd are set.

We should also respect the environment variables set in the config, and
include those, passing them to the ExecOp as well as the custom-set
variables.

We should avoid setting BUILDKIT_SCAN_SOURCE_EXTRAS if no extras have
been specified, to simplify the scanning protocol.

Signed-off-by: Justin Chadwell <me@jedevc.com>
Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
@crazy-max crazy-max merged commit a03858c into moby:master Nov 23, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants