Skip to content

Some additions to SBOM creation epic#5167

Open
supersven wants to merge 5 commits intodevelopfrom
sventennie/sbomnix
Open

Some additions to SBOM creation epic#5167
supersven wants to merge 5 commits intodevelopfrom
sventennie/sbomnix

Conversation

@supersven
Copy link
Copy Markdown
Contributor

@supersven supersven commented Apr 1, 2026

Use sbomnix to create SBOMs for Nix-generated docker images and flake devShells. (It's much better than tom-bombadil regarding speed and completeness.)

Also, adjust the Helm template-ing after inlining other charts into wire-server.

The result of the whole workflow can be seen here: https://deptrack.wire.link/projects/1ac04e80-0376-413c-a26b-5ac0dd857338/collectionprojects

Ticket: https://wearezeta.atlassian.net/browse/WPB-20616

Checklist

  • Add a new entry in an appropriate subdirectory of changelog.d
  • Read and follow the PR guidelines

sbomnix creates much better SBOMs than tom-bombadil. Also, we can adhere
to our new rule to have one SBOM file per thing.
@supersven supersven requested a review from Copilot April 1, 2026 16:47
@zebot zebot added the ok-to-test Approved for running tests in CI, overrides not-ok-to-test if both labels exist label Apr 1, 2026
Copy link
Copy Markdown
Contributor

Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

This PR extends the repository’s SBOM tooling to cover additional Nix-based build artifacts, aligning SBOM generation/upload workflows with the ongoing SBOM creation epic.

Changes:

  • Extend make sboms to include SBOM generation for Nix-built Docker images and Nix devShells.
  • Add new hack/bin scripts to generate CycloneDX SBOMs via sbomnix, and update upload logic to include the new SBOM categories.
  • Add sbomnix as a Nix flake input and include it in the SBOM devShell toolchain.

Reviewed changes

Copilot reviewed 2 out of 7 changed files in this pull request and generated no comments.

Show a summary per file
File Description
Makefile Adds new sboms-nix-* targets and includes them in the aggregate sboms target.
hack/bin/upload-all-sboms.sh Makes SBOM uploads conditional on directory presence and adds upload handling for Nix Docker image + devShell SBOMs.
hack/bin/create-nix-docker-image-sboms.sh New script to generate runtime/buildtime SBOMs for Nix-built Docker images using sbomnix.
hack/bin/create-nix-devshell-sbom.sh New script to generate runtime/buildtime SBOMs for Nix devShells using sbomnix.
hack/bin/create-helm-sboms.sh Updates Helm templating to pass minimal values for specific charts to satisfy required checks.
flake.nix Adds sbomnix input and exposes it in the SBOM devShell packages.
flake.lock Locks sbomnix and its transitive inputs.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

@supersven supersven force-pushed the sventennie/sbomnix branch from e7fd8c0 to cbe84d6 Compare April 2, 2026 09:28
@supersven supersven marked this pull request as ready for review April 2, 2026 13:38
@supersven supersven requested review from a team as code owners April 2, 2026 13:38
@supersven supersven force-pushed the sventennie/sbomnix branch from cbe84d6 to ecc5d25 Compare April 2, 2026 16:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

ok-to-test Approved for running tests in CI, overrides not-ok-to-test if both labels exist

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants