ci: fix provenance for binaries and generate sbom #12479
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: CrazyMax <[email protected]>
crazy-max
force-pushed
the
ci-fix-binary-provenance
branch
from
e2753a8 to
5abeeb0
Compare
glours
approved these changes
Jan 20, 2025
tmeijn
pushed a commit
to tmeijn/dotfiles
that referenced
this pull request
Feb 13, 2025
This MR contains the following updates: | Package | Update | Change | |---|---|---| | [docker/compose](https://github.com/docker/compose) | minor | `v2.32.4` -> `v2.33.0` | MR created with the help of [el-capitano/tools/renovate-bot](https://gitlab.com/el-capitano/tools/renovate-bot). **Proposed changes to behavior should be submitted there as MRs.** --- ### Release Notes <details> <summary>docker/compose (docker/compose)</summary> ### [`v2.33.0`](https://github.com/docker/compose/releases/tag/v2.33.0) [Compare Source](docker/compose@v2.32.4...v2.33.0) #### What's Changed > \[!IMPORTANT] > This release introduce support for [Bake](https://docs.docker.com/build/bake/) to manage builds as an alternative to the internal buildkit client. This new feature can be enabled by setting `COMPOSE_BAKE=1` variable. Bake will become the default builder in a future release. ##### ✨ Improvements - let user know bake is now supported by [@​ndeloof](https://github.com/ndeloof) in docker/compose#12524 - support additional_context reference to another service by [@​ndeloof](https://github.com/ndeloof) in docker/compose#12485 - add support for BUILDKIT_PROGRESS by [@​ndeloof](https://github.com/ndeloof) in docker/compose#12458 - add --with-env flag to publish command by [@​glours](https://github.com/glours) in docker/compose#12482 - Update ls --quiet help description by [@​maxproske](https://github.com/maxproske) in docker/compose#12541 - Publish warn display env vars by [@​glours](https://github.com/glours) in docker/compose#12486 ##### 🐛 Fixes - Fix bake support by [@​ndeloof](https://github.com/ndeloof) in docker/compose#12507 - Update link in stats --help output by [@​maxproske](https://github.com/maxproske) in docker/compose#12523 - Properly handle "builtin" seccomp profile by [@​r-bk](https://github.com/r-bk) in docker/compose#12478 - manage `watch` applied to mulitple services by [@​ndeloof](https://github.com/ndeloof) in docker/compose#12469 ##### 🔧 Internal - use main branch for docs upstream validation workflow by [@​crazy-max](https://github.com/crazy-max) in docker/compose#12487 - fix provenance for binaries and generate sbom by [@​crazy-max](https://github.com/crazy-max) in docker/compose#12479 - add codeowners file by [@​glours](https://github.com/glours) in docker/compose#12480 - remove exit code per error type used by legacy metrics system by [@​ndeloof](https://github.com/ndeloof) in docker/compose#12502 - Dockerfile: update golangci-lint to v1.63.4 by [@​thaJeztah](https://github.com/thaJeztah) in docker/compose#12546 - Full test coverage for compatibility cmd by [@​maxproske](https://github.com/maxproske) in docker/compose#12528 - don't send raw os.Args to opentelemetry but a pseudo command line by [@​ndeloof](https://github.com/ndeloof) in docker/compose#12530 - add docker engine v28.x to the test-matrix by [@​thaJeztah](https://github.com/thaJeztah) in docker/compose#12539 - enable copyloopvar linter by [@​thaJeztah](https://github.com/thaJeztah) in docker/compose#12542 - go.mod: remove toolchain directive by [@​thaJeztah](https://github.com/thaJeztah) in docker/compose#12551 ##### ⚙️ Dependencies - bump buildx v0.20.1 by [@​ndeloof](https://github.com/ndeloof) in docker/compose#12488 - bump docker to v27.5.1 by [@​ndeloof](https://github.com/ndeloof) in docker/compose#12491 - bump compose-go v2.4.8 by [@​ndeloof](https://github.com/ndeloof) in docker/compose#12543 - bump golang.org/x/sys from 0.28.0 to 0.30.0 by [@​dependabot](https://github.com/dependabot) in docker/compose#12529 - bump github.com/moby/term v0.5.2 by [@​thaJeztah](https://github.com/thaJeztah) in docker/compose#12540 - bump github.com/otiai10/copy from 1.14.0 to 1.14.1 by [@​dependabot](https://github.com/dependabot) in docker/compose#12493 - bump github.com/jonboulle/clockwork from 0.4.0 to 0.5.0 by [@​dependabot](https://github.com/dependabot) in docker/compose#12430 - bump github.com/spf13/pflag from 1.0.5 to 1.0.6 by [@​dependabot](https://github.com/dependabot) in docker/compose#12548 - bump golang.org/x/sync from 0.10.0 to 0.11.0 by [@​dependabot](https://github.com/dependabot) in docker/compose#12547 - bump gotest.tools/v3 from 3.5.1 to 3.5.2 by [@​dependabot](https://github.com/dependabot) in docker/compose#12549 #### New Contributors - [@​r-bk](https://github.com/r-bk) made their first contribution in docker/compose#12478 - [@​maxproske](https://github.com/maxproske) made their first contribution in docker/compose#12523 **Full Changelog**: docker/compose@v2.32.4...v2.33.0 </details> --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever MR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this MR and you won't be reminded about this update again. --- - [ ] <!-- rebase-check -->If you want to rebase/retry this MR, check this box --- This MR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate). <!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzOS4xNjYuMSIsInVwZGF0ZWRJblZlciI6IjM5LjE2Ni4xIiwidGFyZ2V0QnJhbmNoIjoibWFpbiIsImxhYmVscyI6WyJSZW5vdmF0ZSBCb3QiXX0=-->
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What I did
Generated provenance for binaries that are pushed to GitHub Releases is overriden by the last binary when merged in release job: https://github.com/docker/compose/releases/tag/v2.32.4
There should be a provenance for each binary similar to buildx: https://github.com/docker/buildx/releases/tag/v0.19.3
SBOM generation is also not enabled, I think this is an oversight in the workflow because we have it enabled in the Dockerfile:
compose/Dockerfile
Lines 181 to 182 in 489fe9c
Result: https://github.com/docker/compose/actions/runs/12843628138/job/35815820312#step:6:5