0ct0pu5/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #47048 from thaJeztah/fix_version_output

Browse source 
daemon/config: setPlatformDefaults: use debug for missing userland-proxy
This commit is contained in:
Sebastiaan van Stijn 2024-01-10 17:15:08 +01:00 • committed by GitHub
commit 0fb6ba4ccc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
cmd/dockerd/docker.go
View file

@ -19,6 +19,7 @@ import (
var honorXDG bool
func newDaemonCommand() (*cobra.Command, error) {
// FIXME(thaJeztah): config.New also looks up default binary-path, but this code is also executed when running "--version".
cfg, err := config.New()
if err != nil {
return nil, err

10
daemon/config/config_linux.go
View file

@ -251,13 +251,17 @@ func setPlatformDefaults(cfg *Config) error {
var err error
cfg.BridgeConfig.UserlandProxyPath, err = exec.LookPath(userlandProxyBinary)
if err != nil {
// Log a warning, but don't error here. This allows running a daemon
// with userland-proxy disabled (which does not require the binary
// Log, but don't error here. This allows running a daemon with
// userland-proxy disabled (which does not require the binary
// to be present).
//
// An error is still produced by [Config.ValidatePlatformConfig] if
// userland-proxy is enabled in the configuration.
log.G(context.TODO()).WithError(err).Warn("failed to lookup default userland-proxy binary")
//
// We log this at "debug" level, as this code is also executed
// when running "--version", and we don't want to print logs in
// that case..
log.G(context.TODO()).WithError(err).Debug("failed to lookup default userland-proxy binary")
}
cfg.Root = "/var/lib/docker"
cfg.ExecRoot = "/var/run/docker"