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

change network range to avoid conflict with EC2 DNS

Browse Source 
Upstream-commit: 9f1c9686e0ee47289adeeedd6cf8d5296a058463
Component: engine
This commit is contained in:
Jérôme Petazzoni
2013-08-06 17:24:10 -07:00
parent e6c6ac1cfb
commit 217ae3229e
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",