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

Merge pull request #17545 from LK4D4/writehs_encode 

Use json.Encoder for container.writeHostConfig
This commit is contained in:
Brian Goff 2015-10-30 21:11:15 -04:00
parent cccb6bce7d cf1a6c08fa
commit f87082f08e
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
daemon/container.go
View File

@ -5,7 +5,6 @@ import (
"errors" "errors"
"fmt" "fmt"
"io" "io"
"io/ioutil"
"os" "os"
"path/filepath" "path/filepath"
"strings" "strings"
@ -163,17 +162,18 @@ func (container *Container) readHostConfig() error {
} }
func (container *Container) writeHostConfig() error { func (container *Container) writeHostConfig() error {
data, err := json.Marshal(container.hostConfig)
if err != nil {
return err
}
pth, err := container.hostConfigPath() pth, err := container.hostConfigPath()
if err != nil { if err != nil {
return err return err
} }
return ioutil.WriteFile(pth, data, 0666) f, err := os.Create(pth)
if err != nil {
return err
}
defer f.Close()
return json.NewEncoder(f).Encode(&container.hostConfig)
} }
func (container *Container) logEvent(action string) { func (container *Container) logEvent(action string) {