Skip to content

[9.3] (backport #20596) build(deps): bump the docker group in /packaging/docker with 2 updates#20601

Merged
mergify[bot] merged 2 commits into9.3from
mergify/bp/9.3/pr-20596
Mar 9, 2026
Merged

[9.3] (backport #20596) build(deps): bump the docker group in /packaging/docker with 2 updates#20601
mergify[bot] merged 2 commits into9.3from
mergify/bp/9.3/pr-20596

Conversation

@mergify
Copy link
Copy Markdown
Contributor

@mergify mergify Bot commented Mar 9, 2026

Bumps the docker group in /packaging/docker with 2 updates: chainguard/static and wolfi/chainguard-base-fips.

Updates chainguard/static from b24ac98 to d6a97eb

Commits

Updates wolfi/chainguard-base-fips from 7864be1 to 9377886

Commits

Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting @dependabot rebase.


Dependabot commands and options

You can trigger Dependabot actions by commenting on this PR:

  • @dependabot rebase will rebase this PR
  • @dependabot recreate will recreate this PR, overwriting any edits that have been made to it
  • @dependabot show <dependency name> ignore conditions will show all of the ignore conditions of the specified dependency
  • @dependabot ignore <dependency name> major version will close this group update PR and stop Dependabot creating any more for the specific dependency's major version (unless you unignore this specific dependency's major version or upgrade to it yourself)
  • @dependabot ignore <dependency name> minor version will close this group update PR and stop Dependabot creating any more for the specific dependency's minor version (unless you unignore this specific dependency's minor version or upgrade to it yourself)
  • @dependabot ignore <dependency name> will close this group update PR and stop Dependabot creating any more for the specific dependency (unless you unignore this specific dependency or upgrade to it yourself)
  • @dependabot unignore <dependency name> will remove all of the ignore conditions of the specified dependency
  • @dependabot unignore <dependency name> <ignore condition> will remove the ignore condition of the specified dependency and ignore conditions

This is an automatic backport of pull request #20596 done by [Mergify](https://mergify.com).

#20596)

Bumps the docker group in /packaging/docker with 2 updates: [chainguard/static](https://github.com/chainguard-images/images) and [wolfi/chainguard-base-fips](https://github.com/chainguard-images/images-private).

Updates `chainguard/static` from `b24ac98` to `d6a97eb`
- [Commits](https://github.com/chainguard-images/images/commits)

Updates `wolfi/chainguard-base-fips` from `7864be1` to `9377886`
- [Commits](https://github.com/chainguard-images/images-private/commits)

---
updated-dependencies:
- dependency-name: chainguard/static
  dependency-version: latest
  dependency-type: direct:production
  dependency-group: docker
- dependency-name: wolfi/chainguard-base-fips
  dependency-version: latest
  dependency-type: direct:production
  dependency-group: docker
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
(cherry picked from commit 93f4df9)

# Conflicts:
#	packaging/docker/Dockerfile
#	packaging/docker/Dockerfile.fips
#	packaging/docker/Dockerfile.wolfi
@mergify mergify Bot requested a review from a team as a code owner March 9, 2026 19:34
@mergify mergify Bot added backport conflicts There is a conflict in the backported pull request labels Mar 9, 2026
@mergify
Copy link
Copy Markdown
Contributor Author

mergify Bot commented Mar 9, 2026

Cherry-pick of 93f4df9 has failed:

On branch mergify/bp/9.3/pr-20596
Your branch is up to date with 'origin/9.3'.

You are currently cherry-picking commit 93f4df96.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   packaging/docker/Dockerfile
	both modified:   packaging/docker/Dockerfile.fips
	both modified:   packaging/docker/Dockerfile.wolfi

no changes added to commit (use "git add" and/or "git commit -a")

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@github-actions
Copy link
Copy Markdown
Contributor

github-actions Bot commented Mar 9, 2026

🤖 GitHub comments

Just comment with:

  • run docs-build : Re-trigger the docs validation. (use unformatted text in the comment!)

Comment thread packaging/docker/Dockerfile Outdated
Comment thread packaging/docker/Dockerfile.fips Outdated
Comment thread packaging/docker/Dockerfile.wolfi Outdated
@carsonip carsonip enabled auto-merge (squash) March 9, 2026 19:50
@mergify mergify Bot added the queued label Mar 9, 2026
mergify Bot added a commit that referenced this pull request Mar 9, 2026
@mergify
Copy link
Copy Markdown
Contributor Author

mergify Bot commented Mar 9, 2026

Merge Queue Status

This pull request spent 9 minutes 49 seconds in the queue, including 9 minutes 33 seconds running CI.

Required conditions to merge

@mergify mergify Bot merged commit 75a2429 into 9.3 Mar 9, 2026
19 of 23 checks passed
@mergify mergify Bot deleted the mergify/bp/9.3/pr-20596 branch March 9, 2026 20:03
@mergify mergify Bot removed the queued label Mar 9, 2026
@elasticmachine
Copy link
Copy Markdown
Collaborator

💚 Build Succeeded

History

This was referenced Mar 11, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport conflicts There is a conflict in the backported pull request

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants