[26.1 backport] Do not forward DNS requests to self. #47833
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
If a container is configured with the internal DNS resolver's own address as an external server, try the next ext server rather than recursing (return SERVFAIL if there are no other servers). Signed-off-by: Rob Murray <rob.murray@docker.com> (cherry picked from commit 8750614) Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com>
vvoland
added
status/2-code-review
area/networking
kind/bugfix
robmry
approved these changes
May 14, 2024
renovate bot
added a commit
to earthly/dind
that referenced
this pull request
May 27, 2024
[](https://renovatebot.com) This PR contains the following updates: | Package | Update | Change | |---|---|---| | [docker/docker](https://togithub.com/docker/docker) | patch | `26.1.2` -> `26.1.3` | --- ### Release Notes <details> <summary>docker/docker (docker/docker)</summary> ### [`v26.1.3`](https://togithub.com/moby/moby/releases/tag/v26.1.3) [Compare Source](https://togithub.com/docker/docker/compare/v26.1.2...v26.1.3) #### 26.1.3 For a full list of pull requests and changes in this release, refer to the relevant GitHub milestones: - [docker/cli, 26.1.3 milestone](https://togithub.com/docker/cli/issues?q=is%3Aclosed+milestone%3A26.1.3) - [moby/moby, 26.1.3 milestone](https://togithub.com/moby/moby/issues?q=is%3Aclosed+milestone%3A26.1.3) - Deprecated and removed features, see [Deprecated Features](https://togithub.com/docker/cli/blob/v26.1.3/docs/deprecated.md). - Changes to the Engine API, see [API version history](https://togithub.com/moby/moby/blob/v26.1.3/docs/api/version-history.md). ##### Bug fixes and enhancements - Fix a regression that prevented the use of DNS servers within a `--internal` network. [moby/moby#47832](https://togithub.com/moby/moby/pull/47832) - When the internal DNS server's own address is supplied as an external server address, ignore it to avoid unproductive recursion. [moby/moby#47833](https://togithub.com/moby/moby/pull/47833) ##### Packaging updates - Allow runc to kill containers when confined to the runc profile in AppArmor version 4.0.0 and later. [moby/moby#47829](https://togithub.com/moby/moby/pull/47829) </details> --- ### Configuration 📅 **Schedule**: Branch creation - "after 6am on monday" (UTC), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Enabled. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://developer.mend.io/github/earthly/dind). <!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNy4zNzcuOCIsInVwZGF0ZWRJblZlciI6IjM3LjM3Ny44IiwidGFyZ2V0QnJhbmNoIjoibWFpbiIsImxhYmVscyI6WyJyZW5vdmF0ZSJdfQ==--> Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
](https://renovatebot.com){kind=link}
renovate bot
added a commit
to earthly/dind
that referenced
this pull request
May 27, 2024
[](https://renovatebot.com) This PR contains the following updates: | Package | Update | Change | |---|---|---| | [docker/docker](https://togithub.com/docker/docker) | patch | `26.1.2` -> `26.1.3` | --- ### Release Notes <details> <summary>docker/docker (docker/docker)</summary> ### [`v26.1.3`](https://togithub.com/moby/moby/releases/tag/v26.1.3) [Compare Source](https://togithub.com/docker/docker/compare/v26.1.2...v26.1.3) #### 26.1.3 For a full list of pull requests and changes in this release, refer to the relevant GitHub milestones: - [docker/cli, 26.1.3 milestone](https://togithub.com/docker/cli/issues?q=is%3Aclosed+milestone%3A26.1.3) - [moby/moby, 26.1.3 milestone](https://togithub.com/moby/moby/issues?q=is%3Aclosed+milestone%3A26.1.3) - Deprecated and removed features, see [Deprecated Features](https://togithub.com/docker/cli/blob/v26.1.3/docs/deprecated.md). - Changes to the Engine API, see [API version history](https://togithub.com/moby/moby/blob/v26.1.3/docs/api/version-history.md). ##### Bug fixes and enhancements - Fix a regression that prevented the use of DNS servers within a `--internal` network. [moby/moby#47832](https://togithub.com/moby/moby/pull/47832) - When the internal DNS server's own address is supplied as an external server address, ignore it to avoid unproductive recursion. [moby/moby#47833](https://togithub.com/moby/moby/pull/47833) ##### Packaging updates - Allow runc to kill containers when confined to the runc profile in AppArmor version 4.0.0 and later. [moby/moby#47829](https://togithub.com/moby/moby/pull/47829) </details> --- ### Configuration 📅 **Schedule**: Branch creation - "after 6am on monday" (UTC), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Enabled. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://developer.mend.io/github/earthly/dind). <!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNy4zNzcuOCIsInVwZGF0ZWRJblZlciI6IjM3LjM3Ny44IiwidGFyZ2V0QnJhbmNoIjoibWFpbiIsImxhYmVscyI6WyJyZW5vdmF0ZSJdfQ==--> Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
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
Make it safe to supply the internal DNS server's own address as an external DNS server.
Fix #47716
- How I did it
The internal resolver removes its own address from the list of ext-servers it's given, and logs a message.
- How to verify it
New integration test.
- Description for the changelog