From 3662f58083fbef56caf0eb4b2bab7d2a2a2672d5 Mon Sep 17 00:00:00 2001 From: Antonio Murdaca Date: Thu, 3 Dec 2015 11:46:53 +0100 Subject: [PATCH] daemon: remove private func config() Signed-off-by: Antonio Murdaca --- daemon/daemon.go | 4 ---- daemon/daemon_experimental.go | 2 +- daemon/info.go | 8 ++++---- 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/daemon/daemon.go b/daemon/daemon.go index 2081ef5247..24394d0af8 100644 --- a/daemon/daemon.go +++ b/daemon/daemon.go @@ -1266,10 +1266,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 { diff --git a/daemon/daemon_experimental.go b/daemon/daemon_experimental.go index 6952eaa4a9..33d3168f11 100644 --- a/daemon/daemon_experimental.go +++ b/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 diff --git a/daemon/info.go b/daemon/info.go index bad3d68903..60525d170c 100644 --- a/daemon/info.go +++ b/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"),