From 0a6d42e2085b9cd1d057779a5b0a80cd49292c37 Mon Sep 17 00:00:00 2001 From: Vincent Batts Date: Tue, 8 Apr 2014 12:39:25 -0400 Subject: [PATCH] docker save: fix filemode permissions currently the files created are not readable. This makes the files and directories permissions more sane. Docker-DCO-1.1-Signed-off-by: Vincent Batts (github: vbatts) --- server/server.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/server/server.go b/server/server.go index 9cabf17889..ba84408f7e 100644 --- a/server/server.go +++ b/server/server.go @@ -340,7 +340,7 @@ func (srv *Server) ImageExport(job *engine.Job) engine.Status { rootRepoMap[name] = rootRepo 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) } } else { @@ -369,7 +369,7 @@ func (srv *Server) exportImage(img *image.Image, tempdir string) error { for i := img; i != nil; { // temporary directory 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) { return nil } @@ -379,7 +379,7 @@ func (srv *Server) exportImage(img *image.Image, tempdir string) error { var version = "1.0" 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 } @@ -388,7 +388,7 @@ func (srv *Server) exportImage(img *image.Image, tempdir string) error { if err != nil { 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 }