From 812694c0cc738ef2eea22f9b52ce86522da27aa5 Mon Sep 17 00:00:00 2001 From: Anda Xu Date: Mon, 17 Sep 2018 15:28:26 -0700 Subject: [PATCH] fixed the dockerd won't start bug when 'runtimes' field is defined in both daemon config file and cli flags Signed-off-by: Anda Xu (cherry picked from commit 8392d0930b511402aa7aa71ccfe6c0d4a8159237) Upstream-commit: 66ed41aec82dbcdfbc38027e3d800e429af1cd58 Component: engine --- components/engine/daemon/config/config.go | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/components/engine/daemon/config/config.go b/components/engine/daemon/config/config.go index 451078d8c5..9f215e3068 100644 --- a/components/engine/daemon/config/config.go +++ b/components/engine/daemon/config/config.go @@ -64,6 +64,16 @@ var skipValidateOptions = map[string]bool{ "features": true, } +// skipDuplicates contains configuration keys that +// will be skipped when checking duplicated +// configuration field defined in both daemon +// config file and from dockerd cli flags. +// This allows some configurations to be merged +// during the parsing. +var skipDuplicates = map[string]bool{ + "runtimes": true, +} + // LogConfig represents the default log configuration. // It includes json tags to deserialize configuration from a file // using the same names that the flags in the command line use. @@ -491,13 +501,13 @@ func findConfigurationConflicts(config map[string]interface{}, flags *pflag.Flag duplicatedConflicts := func(f *pflag.Flag) { // search option name in the json configuration payload if the value is a named option if namedOption, ok := f.Value.(opts.NamedOption); ok { - if optsValue, ok := config[namedOption.Name()]; ok { + if optsValue, ok := config[namedOption.Name()]; ok && !skipDuplicates[namedOption.Name()] { conflicts = append(conflicts, printConflict(namedOption.Name(), f.Value.String(), optsValue)) } } else { // search flag name in the json configuration payload for _, name := range []string{f.Name, f.Shorthand} { - if value, ok := config[name]; ok { + if value, ok := config[name]; ok && !skipDuplicates[name] { conflicts = append(conflicts, printConflict(name, f.Value.String(), value)) break }