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

Merge pull request #22856 from thaJeztah/dont-warn-when-net-none

Browse Source 
Suppress "IPv4 forwarding" warning for --net=none
Upstream-commit: 3ab9049be31c2c205cb9bce793e3bd640072e6e7
Component: engine
This commit is contained in:
Alexander Morozov
2016-05-23 11:11:21 -07:00
parent f3d8bc8e20 3bef31b24e
commit 0fe147094e
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
components/engine/daemon/daemon_unix.go
View File

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