Merge pull request #18391 from runcom/remove-daemon-config-func

daemon: remove private func config()

daemon/daemon.go

@@ -1272,10 +1272,6 @@ func (daemon *Daemon) GetImage(refOrID string) (*image.Image, error) {
 	return daemon.imageStore.Get(imgID)
 }
 
-func (daemon *Daemon) config() *Config {
-	return daemon.configStore
-}
-
 // GraphDriver returns the currently used driver for processing
 // container layers.
 func (daemon *Daemon) GraphDriver() graphdriver.Driver {

daemon/daemon_experimental.go

@@ -100,7 +100,7 @@ func setupDaemonRoot(config *Config, rootDir string, rootUID, rootGID int) error
 }
 
 func (daemon *Daemon) verifyExperimentalContainerSettings(hostConfig *runconfig.HostConfig, config *runconfig.Config) ([]string, error) {
-	if hostConfig.Privileged && daemon.config().RemappedRoot != "" {
+	if hostConfig.Privileged && daemon.configStore.RemappedRoot != "" {
 		return nil, fmt.Errorf("Privileged mode is incompatible with user namespace mappings")
 	}
 	return nil, nil

daemon/info.go

@@ -81,12 +81,12 @@ func (daemon *Daemon) SystemInfo() (*types.Info, error) {
 		InitPath:           initPath,
 		NCPU:               runtime.NumCPU(),
 		MemTotal:           meminfo.MemTotal,
-		DockerRootDir:      daemon.config().Root,
-		Labels:             daemon.config().Labels,
+		DockerRootDir:      daemon.configStore.Root,
+		Labels:             daemon.configStore.Labels,
 		ExperimentalBuild:  utils.ExperimentalBuild(),
 		ServerVersion:      dockerversion.Version,
-		ClusterStore:       daemon.config().ClusterStore,
-		ClusterAdvertise:   daemon.config().ClusterAdvertise,
+		ClusterStore:       daemon.configStore.ClusterStore,
+		ClusterAdvertise:   daemon.configStore.ClusterAdvertise,
 		HTTPProxy:          getProxyEnv("http_proxy"),
 		HTTPSProxy:         getProxyEnv("https_proxy"),
 		NoProxy:            getProxyEnv("no_proxy"),