docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #12609 from runcom/remove-not-needed-readHostConfig 

Remove not needed call to container.readHostConfig()
This commit is contained in:
Alexander Morozov 2015-04-21 13:45:48 -07:00
parent b807ac1115 a3c4801c92
commit 783dbcade3
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
daemon/container.go
View File

@ -178,11 +178,13 @@ func (container *Container) readHostConfig() error {
return nil return nil
} }
data, err := ioutil.ReadFile(pth) f, err := os.Open(pth)
if err != nil { if err != nil {
return err return err
} }
return json.Unmarshal(data, container.hostConfig) defer f.Close()
return json.NewDecoder(f).Decode(&container.hostConfig)
} }
func (container *Container) WriteHostConfig() error { func (container *Container) WriteHostConfig() error {

2
daemon/daemon.go
View File

@ -194,8 +194,6 @@ func (daemon *Daemon) load(id string) (*Container, error) {
return container, fmt.Errorf("Container %s is stored at %s", container.ID, id) return container, fmt.Errorf("Container %s is stored at %s", container.ID, id)
} }
container.readHostConfig()
return container, nil return container, nil
} }