Skip to content

Commit

Permalink
Bump github.com/docker/docker from 25.0.4+incompatible to 25.0.5+inco…
Browse files Browse the repository at this point in the history
…mpatible (#901)

Bumps [github.com/docker/docker](https://github.com/docker/docker) from 25.0.4+incompatible to 25.0.5+incompatible.
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a href="https://github.com/docker/docker/releases">github.com/docker/docker's releases</a>.</em></p>
<blockquote>
<h2>25.0.5</h2>
<p>For a full list of pull requests and changes in this release, refer to the relevant GitHub milestones:</p>
<ul>
<li><a href="https://github.com/docker/cli/issues?q=is%3Aclosed+milestone%3A25.0.5">docker/cli, 25.0.5 milestone</a></li>
<li><a href="https://github.com/moby/moby/issues?q=is%3Aclosed+milestone%3A25.0.5">moby/moby, 25.0.5 milestone</a></li>
<li>Deprecated and removed features, see <a href="https://github.com/docker/cli/blob/v25.0.5/docs/deprecated.md">Deprecated Features</a>.</li>
<li>Changes to the Engine API, see <a href="https://github.com/moby/moby/blob/v25.0.5/docs/api/version-history.md">API version history</a>.</li>
</ul>
<h3>Security</h3>
<p>This release contains a security fix for <a href="https://github.com/moby/moby/security/advisories/GHSA-mq39-4gv4-mvpx">CVE-2024-29018</a>, a potential data exfiltration from 'internal' networks via authoritative DNS servers.</p>
<h3>Bug fixes and enhancements</h3>
<ul>
<li><a href="https://github.com/moby/moby/security/advisories/GHSA-mq39-4gv4-mvpx">CVE-2024-29018</a>: Do not forward requests to external DNS servers for a container that is only connected to an 'internal' network. Previously, requests were forwarded if the host's DNS server was running on a loopback address, like systemd's 127.0.0.53. <a href="https://redirect.github.com/moby/moby/pull/47589">moby/moby#47589</a></li>
<li>plugin: fix mounting /etc/hosts when running in UserNS. <a href="https://redirect.github.com/moby/moby/pull/47588">moby/moby#47588</a></li>
<li>rootless: fix <code>open /etc/docker/plugins: permission denied</code>. <a href="https://redirect.github.com/moby/moby/pull/47587">moby/moby#47587</a></li>
<li>Fix multiple parallel <code>docker build</code> runs leaking disk space. <a href="https://redirect.github.com/moby/moby/pull/47527">moby/moby#47527</a></li>
</ul>
</blockquote>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a href="https://github.com/moby/moby/commit/e63daec8672d77ac0b2b5c262ef525c7cf17fd20"><code>e63daec</code></a> Merge pull request <a href="https://redirect.github.com/docker/docker/issues/47589">#47589</a> from vvoland/v25.0-47538</li>
<li><a href="https://github.com/moby/moby/commit/817bccb1c65823f29eccf95b812ec9cf26da798c"><code>817bccb</code></a> Merge pull request <a href="https://redirect.github.com/docker/docker/issues/47588">#47588</a> from vvoland/v25.0-47558</li>
<li><a href="https://github.com/moby/moby/commit/2a0601e84e13514d7b94ab6687a33973eb0d80a0"><code>2a0601e</code></a> Merge pull request <a href="https://redirect.github.com/docker/docker/issues/47587">#47587</a> from vvoland/v25.0-47559</li>
<li><a href="https://github.com/moby/moby/commit/9df9ccc06fbcbb5ca9dc995f6075cc18341b3816"><code>9df9ccc</code></a> Merge pull request <a href="https://redirect.github.com/docker/docker/issues/47586">#47586</a> from vvoland/v25.0-47569</li>
<li><a href="https://github.com/moby/moby/commit/a987bc5ad06c54448454b5415dd70465d41c184e"><code>a987bc5</code></a> libnet: Don't forward to upstream resolvers on internal nw</li>
<li><a href="https://github.com/moby/moby/commit/20c205fd3a0081d005958eff690e2b34df1c5e5e"><code>20c205f</code></a> Environment variable to override resolv.conf path.</li>
<li><a href="https://github.com/moby/moby/commit/4be97233cc191bda476d8ecfcd6ee48446ddb3da"><code>4be9723</code></a> daemon: move getUnprivilegedMountFlags to internal package</li>
<li><a href="https://github.com/moby/moby/commit/7ed7e6caf6c1605ba5fcc80c015b4afced7c8bfd"><code>7ed7e6c</code></a> plugin: fix mounting /etc/hosts when running in UserNS</li>
<li><a href="https://github.com/moby/moby/commit/81ad7062f0299c4ebc9ac3f576a2c0c67d8b6ff8"><code>81ad706</code></a> rootless: fix <code>open /etc/docker/plugins: permission denied</code></li>
<li><a href="https://github.com/moby/moby/commit/02d4ee3f9aea7e296ac3f3afb39d4428c38c6251"><code>02d4ee3</code></a> Makefile: generate-files: fix check for empty TMP_OUT</li>
<li>Additional commits viewable in <a href="https://github.com/docker/docker/compare/v25.0.4...v25.0.5">compare view</a></li>
</ul>
</details>
<br />


[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=github.com/docker/docker&package-manager=go_modules&previous-version=25.0.4+incompatible&new-version=25.0.5+incompatible)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)

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-automerge-start)
[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

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 <dependency name> 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/tinkerbell/tink/network/alerts).

</details>
  • Loading branch information
mergify[bot] authored Mar 22, 2024
2 parents 855e177 + 92b93f2 commit 7d0bd88
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ toolchain go1.21.4
require (
github.com/avast/retry-go v3.0.0+incompatible
github.com/distribution/reference v0.5.0
github.com/docker/docker v25.0.4+incompatible
github.com/docker/docker v25.0.5+incompatible
github.com/equinix-labs/otel-init-go v0.0.9
github.com/go-logr/logr v1.4.1
github.com/go-logr/zapr v1.3.0
Expand Down
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -323,8 +323,8 @@ github.com/dgryski/go-lttb v0.0.0-20180810165845-318fcdf10a77/go.mod h1:Va5MyIzk
github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no=
github.com/distribution/reference v0.5.0 h1:/FUIFXtfc/x2gpa5/VGfiGLuOIdYa1t65IKK2OFGvA0=
github.com/distribution/reference v0.5.0/go.mod h1:BbU0aIcezP1/5jX/8MP0YiH4SdvB5Y4f/wlDRiLyi3E=
github.com/docker/docker v25.0.4+incompatible h1:XITZTrq+52tZyZxUOtFIahUf3aH367FLxJzt9vZeAF8=
github.com/docker/docker v25.0.4+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
github.com/docker/docker v25.0.5+incompatible h1:UmQydMduGkrD5nQde1mecF/YnSbTOaPeFIeP5C4W+DE=
github.com/docker/docker v25.0.5+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
github.com/docker/go-connections v0.4.0 h1:El9xVISelRB7BuFusrZozjnkIM5YnzCViNKohAFqRJQ=
github.com/docker/go-connections v0.4.0/go.mod h1:Gbd7IOopHjR8Iph03tsViu4nIes5XhDvyHbTtUxmeec=
github.com/docker/go-units v0.5.0 h1:69rxXcBk27SvSaaxTtLh/8llcHD8vYHT7WSdRZ/jvr4=
Expand Down

0 comments on commit 7d0bd88

Please sign in to comment.