0f6eeecac0
The daemon has made a habit of mutating the DefaultRuntime and Runtimes values in the Config struct to merge defaults. This would be fine if it was a part of the regular configuration loading and merging process, as is done with other config options. The trouble is it does so in surprising places, such as in functions with 'verify' or 'validate' in their name. It has been necessary in order to validate that the user has not defined a custom runtime named "runc" which would shadow the built-in runtime of the same name. Other daemon code depends on the runtime named "runc" always being defined in the config, but merging it with the user config at the same time as the other defaults are merged would trip the validation. The root of the issue is that the daemon has used the same config values for both validating the daemon runtime configuration as supplied by the user and for keeping track of which runtimes have been set up by the daemon. Now that a completely separate value is used for the latter purpose, surprising contortions are no longer required to make the validation work as intended. Consolidate the validation of the runtimes config and merging of the built-in runtimes into the daemon.setupRuntimes() function. Set the result of merging the built-in runtimes config and default default runtime on the returned runtimes struct, without back-propagating it onto the config.Config argument. Signed-off-by: Cory Snider <csnider@mirantis.com>
54 lines
1.4 KiB
Go
54 lines
1.4 KiB
Go
//go:build linux || freebsd
|
|
|
|
package daemon // import "github.com/docker/docker/daemon"
|
|
|
|
import (
|
|
"bytes"
|
|
"strconv"
|
|
|
|
"github.com/docker/docker/daemon/config"
|
|
)
|
|
|
|
// reloadPlatform updates configuration with platform specific options
|
|
// and updates the passed attributes
|
|
func (daemon *Daemon) reloadPlatform(txn *reloadTxn, newCfg *configStore, conf *config.Config, attributes map[string]string) error {
|
|
if conf.DefaultRuntime != "" {
|
|
newCfg.DefaultRuntime = conf.DefaultRuntime
|
|
}
|
|
if conf.IsValueSet("runtimes") {
|
|
newCfg.Config.Runtimes = conf.Runtimes
|
|
}
|
|
var err error
|
|
newCfg.Runtimes, err = setupRuntimes(&newCfg.Config)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
if conf.IsValueSet("default-shm-size") {
|
|
newCfg.ShmSize = conf.ShmSize
|
|
}
|
|
|
|
if conf.CgroupNamespaceMode != "" {
|
|
newCfg.CgroupNamespaceMode = conf.CgroupNamespaceMode
|
|
}
|
|
|
|
if conf.IpcMode != "" {
|
|
newCfg.IpcMode = conf.IpcMode
|
|
}
|
|
|
|
// Update attributes
|
|
var runtimeList bytes.Buffer
|
|
for name, rt := range newCfg.Config.Runtimes {
|
|
if runtimeList.Len() > 0 {
|
|
runtimeList.WriteRune(' ')
|
|
}
|
|
runtimeList.WriteString(name + ":" + rt.Path)
|
|
}
|
|
|
|
attributes["runtimes"] = runtimeList.String()
|
|
attributes["default-runtime"] = newCfg.DefaultRuntime
|
|
attributes["default-shm-size"] = strconv.FormatInt(int64(newCfg.ShmSize), 10)
|
|
attributes["default-ipc-mode"] = newCfg.IpcMode
|
|
attributes["default-cgroupns-mode"] = newCfg.CgroupNamespaceMode
|
|
return nil
|
|
}
|