p4u1/docker-cli
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
change network range to avoid conflict with EC2 DNS
Upstream-commit: 2409df9285f56514de6d675ecd3df678d9b5e5cc
Component: engine
This commit is contained in:
Victor Vieux
2013-08-07 08:43:53 -07:00
parent e2b4fe244d 217ae3229e
commit 6949e430e2
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
components/engine/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
// 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.
"172.16.42.1/16",
"10.0.42.1/16", // Don't even try using the entire /8, that's too intrusive
"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.1.42.1/16",
"10.42.42.1/16",
"172.16.42.1/24",