to address #30295
Signed-off-by: Madhu Venugopal <madhu@docker.com>
| ... | ... |
@@ -23,7 +23,7 @@ github.com/RackSec/srslog 456df3a81436d29ba874f3590eeeee25d666f8a5 |
| 23 | 23 |
github.com/imdario/mergo 0.2.1 |
| 24 | 24 |
|
| 25 | 25 |
#get libnetwork packages |
| 26 |
-github.com/docker/libnetwork ba79e3e43b8773892df745cd9a83b5eefd5b9b90 |
|
| 26 |
+github.com/docker/libnetwork 2c8b6838deee7ab8263b4206980f6623db7279c2 |
|
| 27 | 27 |
github.com/docker/go-events 18b43f1bc85d9cdd42c05a6cd2d444c7a200a894 |
| 28 | 28 |
github.com/armon/go-radix e39d623f12e8e41c7b5529e9a9dd67a1e2261f80 |
| 29 | 29 |
github.com/armon/go-metrics eb0af217e5e9747e41dd5303755356b62d28e3ec |
| ... | ... |
@@ -178,7 +178,14 @@ func GetNameservers(resolvConf []byte, kind int) []string {
|
| 178 | 178 |
func GetNameserversAsCIDR(resolvConf []byte) []string {
|
| 179 | 179 |
nameservers := []string{}
|
| 180 | 180 |
for _, nameserver := range GetNameservers(resolvConf, types.IP) {
|
| 181 |
- nameservers = append(nameservers, nameserver+"/32") |
|
| 181 |
+ var address string |
|
| 182 |
+ // If IPv6, strip zone if present |
|
| 183 |
+ if strings.Contains(nameserver, ":") {
|
|
| 184 |
+ address = strings.Split(nameserver, "%")[0] + "/128" |
|
| 185 |
+ } else {
|
|
| 186 |
+ address = nameserver + "/32" |
|
| 187 |
+ } |
|
| 188 |
+ nameservers = append(nameservers, address) |
|
| 182 | 189 |
} |
| 183 | 190 |
return nameservers |
| 184 | 191 |
} |