daemon: remove private func config()
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
This commit is contained in:
parent
1475f567cb
commit
3662f58083
|
@ -1266,10 +1266,6 @@ func (daemon *Daemon) GetImage(refOrID string) (*image.Image, error) {
|
||||||
return daemon.imageStore.Get(imgID)
|
return daemon.imageStore.Get(imgID)
|
||||||
}
|
}
|
||||||
|
|
||||||
func (daemon *Daemon) config() *Config {
|
|
||||||
return daemon.configStore
|
|
||||||
}
|
|
||||||
|
|
||||||
// GraphDriver returns the currently used driver for processing
|
// GraphDriver returns the currently used driver for processing
|
||||||
// container layers.
|
// container layers.
|
||||||
func (daemon *Daemon) GraphDriver() graphdriver.Driver {
|
func (daemon *Daemon) GraphDriver() graphdriver.Driver {
|
||||||
|
|
|
@ -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) {
|
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, fmt.Errorf("Privileged mode is incompatible with user namespace mappings")
|
||||||
}
|
}
|
||||||
return nil, nil
|
return nil, nil
|
||||||
|
|
|
@ -81,12 +81,12 @@ func (daemon *Daemon) SystemInfo() (*types.Info, error) {
|
||||||
InitPath: initPath,
|
InitPath: initPath,
|
||||||
NCPU: runtime.NumCPU(),
|
NCPU: runtime.NumCPU(),
|
||||||
MemTotal: meminfo.MemTotal,
|
MemTotal: meminfo.MemTotal,
|
||||||
DockerRootDir: daemon.config().Root,
|
DockerRootDir: daemon.configStore.Root,
|
||||||
Labels: daemon.config().Labels,
|
Labels: daemon.configStore.Labels,
|
||||||
ExperimentalBuild: utils.ExperimentalBuild(),
|
ExperimentalBuild: utils.ExperimentalBuild(),
|
||||||
ServerVersion: dockerversion.Version,
|
ServerVersion: dockerversion.Version,
|
||||||
ClusterStore: daemon.config().ClusterStore,
|
ClusterStore: daemon.configStore.ClusterStore,
|
||||||
ClusterAdvertise: daemon.config().ClusterAdvertise,
|
ClusterAdvertise: daemon.configStore.ClusterAdvertise,
|
||||||
HTTPProxy: getProxyEnv("http_proxy"),
|
HTTPProxy: getProxyEnv("http_proxy"),
|
||||||
HTTPSProxy: getProxyEnv("https_proxy"),
|
HTTPSProxy: getProxyEnv("https_proxy"),
|
||||||
NoProxy: getProxyEnv("no_proxy"),
|
NoProxy: getProxyEnv("no_proxy"),
|
||||||
|
|
Loading…
Reference in New Issue