kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

Merge pull request #1434 from jpetazzo/fix-ec2-dns-conflict

Browse source 
change network range to avoid conflict with EC2 DNS
This commit is contained in:
Victor Vieux 2013-08-07 08:43:53 -07:00
commit 2409df9285
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
network.go
View file

@ -131,8 +131,8 @@ func CreateBridgeIface(ifaceName string) error {
// In theory this shouldn't matter - in practice there's bound to be a few scripts relying // In theory this shouldn't matter - in practice there's bound to be a few scripts relying
// on the internal addressing or other stupid things like that. // on the internal addressing or other stupid things like that.
// The shouldn't, but hey, let's not break them unless we really have to. // The shouldn't, but hey, let's not break them unless we really have to.
"172.16.42.1/16", "172.17.42.1/16", // Don't use 172.16.0.0/16, it conflicts with EC2 DNS 172.16.0.23
"10.0.42.1/16", // Don't even try using the entire /8, that's too intrusive "10.0.42.1/16", // Don't even try using the entire /8, that's too intrusive
"10.1.42.1/16", "10.1.42.1/16",
"10.42.42.1/16", "10.42.42.1/16",
"172.16.42.1/24", "172.16.42.1/24",