kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

Merge pull request #5087 from vbatts/vbatts-save_permissions

Browse source 
docker save: fix filemode permissions
This commit is contained in:
Guillaume J. Charmes 2014-04-10 08:00:37 -07:00
commit 4a88e111d0
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
server/server.go
View file

@ -340,7 +340,7 @@ func (srv *Server) ImageExport(job *engine.Job) engine.Status {
rootRepoMap[name] = rootRepo rootRepoMap[name] = rootRepo
rootRepoJson, _ := json.Marshal(rootRepoMap) rootRepoJson, _ := json.Marshal(rootRepoMap)
if err := ioutil.WriteFile(path.Join(tempdir, "repositories"), rootRepoJson, os.ModeAppend); err != nil { if err := ioutil.WriteFile(path.Join(tempdir, "repositories"), rootRepoJson, os.FileMode(0644)); err != nil {
return job.Error(err) return job.Error(err)
} }
} else { } else {
@ -369,7 +369,7 @@ func (srv *Server) exportImage(img *image.Image, tempdir string) error {
for i := img; i != nil; { for i := img; i != nil; {
// temporary directory // temporary directory
tmpImageDir := path.Join(tempdir, i.ID) tmpImageDir := path.Join(tempdir, i.ID)
if err := os.Mkdir(tmpImageDir, os.ModeDir); err != nil { if err := os.Mkdir(tmpImageDir, os.FileMode(0755)); err != nil {
if os.IsExist(err) { if os.IsExist(err) {
return nil return nil
} }
@ -379,7 +379,7 @@ func (srv *Server) exportImage(img *image.Image, tempdir string) error {
var version = "1.0" var version = "1.0"
var versionBuf = []byte(version) var versionBuf = []byte(version)
if err := ioutil.WriteFile(path.Join(tmpImageDir, "VERSION"), versionBuf, os.ModeAppend); err != nil { if err := ioutil.WriteFile(path.Join(tmpImageDir, "VERSION"), versionBuf, os.FileMode(0644)); err != nil {
return err return err
} }
@ -388,7 +388,7 @@ func (srv *Server) exportImage(img *image.Image, tempdir string) error {
if err != nil { if err != nil {
return err return err
} }
if err := ioutil.WriteFile(path.Join(tmpImageDir, "json"), b, os.ModeAppend); err != nil { if err := ioutil.WriteFile(path.Join(tmpImageDir, "json"), b, os.FileMode(0644)); err != nil {
return err return err
} }