Merge pull request #22820 from thaJeztah/suppress-incorrect-warning

Suppress "IPv4 forwarding" warning for --net=host
This commit is contained in:
Vincent Demeester 2016-05-20 17:17:10 +02:00
Родитель 642b7b1b52 5fb7f9b29e
Коммит 52debcd58a
2 изменённых файлов: 6 добавлений и 1 удалений

Просмотреть файл

@ -488,7 +488,9 @@ func verifyPlatformContainerSettings(daemon *Daemon, hostConfig *containertypes.
if hostConfig.OomScoreAdj < -1000 || hostConfig.OomScoreAdj > 1000 {
return warnings, fmt.Errorf("Invalid value %d, range for oom score adj is [-1000, 1000]", hostConfig.OomScoreAdj)
}
if sysInfo.IPv4ForwardingDisabled {
// ip-forwarding does not affect container with '--net=host'
if sysInfo.IPv4ForwardingDisabled && !hostConfig.NetworkMode.IsHost() {
warnings = append(warnings, "IPv4 forwarding is disabled. Networking will not work.")
logrus.Warnf("IPv4 forwarding is disabled. Networking will not work")
}

Просмотреть файл

@ -37,6 +37,9 @@ or to turn it on manually:
net.ipv4.conf.all.forwarding = 1
```
> **Note**: this setting does not affect containers that use the host
> network stack (`--net=host`).
Many using Docker will want `ip_forward` to be on, to at least make
communication _possible_ between containers and the wider world. May also be
needed for inter-container communication if you are in a multiple bridge setup.