New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Forward DNS requests into --internal networks #47821
Merged
Merged
+73
−11
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
robmry
added
status/2-code-review
area/networking
impact/changelog
kind/bugfix
PR's that fix bugs
area/networking/dns
process/cherry-pick/26.0
version/26.0
process/cherry-pick/26.1
labels
May 10, 2024
robmry
commented
May 10, 2024
robmry
force-pushed
the
internal_network_with_dns
branch
2 times, most recently
from
May 10, 2024 15:38
af621b5
to
b27e52b
Compare
cpuguy83
reviewed
May 10, 2024
Source: fname, | ||
Target: "/etc/dnsd.conf", | ||
}), | ||
container.WithCmd("dnsd"), |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
TIL dnsd
in busybox.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Me too!
A recent change to prevent containers only connected to --internal networks from communicating with external DNS servers inadvertently prevented the daemon's internal DNS server from forwarding requests within an internal network to a containerised DNS server. Relax the check, so that only requests that need to be forwarded from the host's network namespace are dropped. External DNS servers remain unreachable from the internal network. Signed-off-by: Rob Murray <rob.murray@docker.com>
robmry
force-pushed
the
internal_network_with_dns
branch
from
May 10, 2024 18:37
b27e52b
to
77a47db
Compare
akerouanton
approved these changes
May 13, 2024
vvoland
approved these changes
May 14, 2024
I went ahead and created a backport to have this attached to the 26.1.3 milestone. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Labels
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
Fixes #47822
#47538 prevents containers only connected to
--internal
networks from communicating with external DNS servers - it also inadvertently prevents the daemon's internal DNS server from forwarding requests within an internal network to a containerised DNS server.- How I did it
Relax the check, so that only requests that need to be forwarded from the host's network namespace are dropped.
External DNS servers remain unreachable from the internal network.
- How to verify it
New integration test.
- Description for the changelog