[25.0] remove erroneous platform from image config OCI descriptor in docker save output. moby/moby#47695
[25.0 backport] Fix a nil dereference when getting image history for images having layers without the Created value set. moby/moby#47759
[25.0 backport] apparmor: Allow confined runc to kill containers. moby/moby#47830
[25.0 backport] Fix an issue where rapidly promoting a Swarm node after another node was demoted could cause the promoted node to fail its promotion. moby/moby#47869
[25.0 backport] don't depend on containerd platform.Parse to return a typed error. moby/moby#47890
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 merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually
- `@dependabot show ignore conditions` will show all of the ignore conditions of the specified dependency
- `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
You can disable automated security fix PRs for this repo from the [Security Alerts page](https://github.com/metrico/otel-collector/network/alerts).
Bumps github.com/docker/docker from 25.0.5+incompatible to 25.0.6+incompatible.
Release notes
Sourced from github.com/docker/docker's releases.
Commits
b08a51f
Merge pull request #48231 from austinvazquez/backport-vendor-otel-v0.46.1-to-...d151b0f
vendor: OTEL v0.46.1 / v1.21.0c6ba9a5
Merge pull request #48225 from austinvazquez/backport-workflow-artifact-reten...4673a3c
Merge pull request #48227 from austinvazquez/backport-backport-branch-check-t...30f8908
github/ci: Check if backport is opened against the expected branch7454d6a
ci: update workflow artifacts retention65cc597
Merge commit from forkb722836
Merge pull request #48199 from austinvazquez/update-containerd-binary-to-1.7.20e8ecb9c
update containerd binary to v1.7.20e6cae1f
update containerd binary to v1.7.19Dependabot 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 merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show