Skip to content

Move arch check from SBOM generation to this script #73

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
tianon merged 1 commit into from
Sep 4, 2024
Merged

Move arch check from SBOM generation to this script #73

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
22 changes: 14 additions & 8 deletions doi.jq
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,14 +155,20 @@ def _sbom_subset:
# input: "build" object (with "buildId" top level key)
# output: boolean
def build_should_sbom:
.source.arches[.build.arch].tags
| map(split(":")[0])
| unique
| _sbom_subset as $subset
| any(.[];
. as $i
| $subset
| index($i)
# see "bashbrew remote arches docker/scout-sbom-indexer:1" (we need the SBOM scanner to be runnable on the host architecture)
# bashbrew remote arches --json docker/scout-sbom-indexer:1 | jq '.arches | keys_unsorted' -c
(
.build.arch as $arch | ["amd64","arm32v5","arm32v7","arm64v8","i386","ppc64le","riscv64","s390x"] | index($arch)
) and (
.source.arches[.build.arch].tags
| map(split(":")[0])
| unique
| _sbom_subset as $subset
| any(.[];
. as $i
| $subset
| index($i)
)
)
;

Expand Down
7 changes: 1 addition & 6 deletions meta.jq
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,12 +143,7 @@ def build_command:
"docker buildx build --progress=plain",
"--provenance=mode=max",
if build_should_sbom then
# see "bashbrew remote arches docker/scout-sbom-indexer:1" (we need the SBOM scanner to be runnable on the host architecture)
# bashbrew remote arches --json docker/scout-sbom-indexer:1 | jq '.arches | keys_unsorted' -c
if .build.arch as $arch | ["amd64","arm32v5","arm32v7","arm64v8","i386","ppc64le","riscv64","s390x"] | index($arch) then
# TODO this needs to be based on the *host* architecture, not the *target* architecture (amd64 vs i386)
"--sbom=generator=\"$BASHBREW_BUILDKIT_SBOM_GENERATOR\""
else empty end
"--sbom=generator=\"$BASHBREW_BUILDKIT_SBOM_GENERATOR\""
else empty end,
"--output " + (
[
Expand Down