p4u1/docker-cli
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove HostConfig,SetHostConfig from daemon.container

Browse Source 
Signed-off-by: Antonio Murdaca <runcom@linux.com>
Upstream-commit: f95333010e1c036ac33d75f5271af1f2b03a276e
Component: engine
This commit is contained in:
Antonio Murdaca
2015-07-30 22:25:31 +02:00
parent 52ef2235bf
commit 12be4fa37a
2 changed files with 1 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
components/engine/daemon/container.go
View File

@ -677,14 +677,6 @@ func (container *Container) Exposes(p nat.Port) bool {
return exists
}
func (container *Container) HostConfig() *runconfig.HostConfig {
return container.hostConfig
}
func (container *Container) SetHostConfig(hostConfig *runconfig.HostConfig) {
container.hostConfig = hostConfig
}
func (container *Container) getLogConfig() runconfig.LogConfig {
cfg := container.hostConfig.LogConfig
if cfg.Type != "" || len(cfg.Config) > 0 { // container has log driver configured

2
components/engine/daemon/list.go
View File

@ -154,7 +154,7 @@ func (daemon *Daemon) Containers(config *ContainersConfig) ([]*types.Container,
}
newC.Created = int(container.Created.Unix())
newC.Status = container.State.String()
newC.HostConfig.NetworkMode = string(container.HostConfig().NetworkMode)
newC.HostConfig.NetworkMode = string(container.hostConfig.NetworkMode)
newC.Ports = []types.Port{}
for port, bindings := range container.NetworkSettings.Ports {