mirror of
https://github.com/moby/moby.git
synced 2022-11-09 12:21:53 -05:00
b241e2008e
Commit483aa6294bintroduced a regression, causing spurious warnings to be shown when starting a daemon for the first time after a fresh install: docker info ... WARNING: IPv4 forwarding is disabled WARNING: bridge-nf-call-iptables is disabled WARNING: bridge-nf-call-ip6tables is disabled The information shown is incorrect, as checking the corresponding options on the system, shows that these options are available: cat /proc/sys/net/ipv4/ip_forward 1 cat /proc/sys/net/bridge/bridge-nf-call-iptables 1 cat /proc/sys/net/bridge/bridge-nf-call-ip6tables 1 The reason this is failing is because the daemon itself reconfigures those options during networking initialization in `configureIPForwarding()`;cf4595265e/libnetwork/drivers/bridge/setup_ip_forwarding.go (L14-L25)Network initialization happens in the `daemon.restore()` function within `daemon.NewDaemon()`:cf4595265e/daemon/daemon.go (L475-L478)However,483aa6294bmoved detection of features earlier in the `daemon.NewDaemon()` function, and collects the system information (`d.RawSysInfo()`) before we enter `daemon.restore()`;cf4595265e/daemon/daemon.go (L1008-L1011)For optimization (collecting the system information comes at a cost), those results are cached on the daemon, and will only be performed once (using a `sync.Once`). This patch: - introduces a `getSysInfo()` utility, which collects system information without caching the results - uses `getSysInfo()` to collect the preliminary information needed at that point in the daemon's lifecycle. - moves printing warnings to the end of `daemon.NewDaemon()`, after all information can be read correctly. Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
18 lines
389 B
Go
18 lines
389 B
Go
//go:build !linux && !freebsd && !windows
|
|
// +build !linux,!freebsd,!windows
|
|
|
|
package daemon // import "github.com/docker/docker/daemon"
|
|
|
|
import (
|
|
"github.com/docker/docker/daemon/config"
|
|
"github.com/docker/docker/pkg/sysinfo"
|
|
)
|
|
|
|
const platformSupported = false
|
|
|
|
func setupResolvConf(config *config.Config) {
|
|
}
|
|
|
|
func getSysInfo(daemon *Daemon) *sysinfo.SysInfo {
|
|
return sysinfo.New()
|
|
}
|