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

do not alter json in docker save

Browse source 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
This commit is contained in:
Victor Vieux 2014-06-17 00:06:21 +00:00
parent 8f6162f17b
commit 3e4e8636c1
4 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
api/server/server.go
View file

@ -855,7 +855,7 @@ func getContainersByName(eng *engine.Engine, version version.Version, w http.Res
} }
var job = eng.Job("container_inspect", vars["name"]) var job = eng.Job("container_inspect", vars["name"])
if version.LessThan("1.12") { if version.LessThan("1.12") {
job.SetenvBool("dirty", true) job.SetenvBool("raw", true)
} }
streamJSON(job, w, false) streamJSON(job, w, false)
return job.Run() return job.Run()
@ -867,7 +867,7 @@ func getImagesByName(eng *engine.Engine, version version.Version, w http.Respons
} }
var job = eng.Job("image_inspect", vars["name"]) var job = eng.Job("image_inspect", vars["name"])
if version.LessThan("1.12") { if version.LessThan("1.12") {
job.SetenvBool("dirty", true) job.SetenvBool("raw", true)
} }
streamJSON(job, w, false) streamJSON(job, w, false)
return job.Run() return job.Run()

2
daemon/inspect.go
View file

@ -15,7 +15,7 @@ func (daemon *Daemon) ContainerInspect(job *engine.Job) engine.Status {
if container := daemon.Get(name); container != nil { if container := daemon.Get(name); container != nil {
container.Lock() container.Lock()
defer container.Unlock() defer container.Unlock()
if job.GetenvBool("dirty") { if job.GetenvBool("raw") {
b, err := json.Marshal(&struct { b, err := json.Marshal(&struct {
*Container *Container
HostConfig *runconfig.HostConfig HostConfig *runconfig.HostConfig

2
graph/service.go
View file

@ -135,7 +135,7 @@ func (s *TagStore) CmdLookup(job *engine.Job) engine.Status {
} }
name := job.Args[0] name := job.Args[0]
if image, err := s.LookupImage(name); err == nil && image != nil { if image, err := s.LookupImage(name); err == nil && image != nil {
if job.GetenvBool("dirty") { if job.GetenvBool("raw") {
b, err := json.Marshal(image) b, err := json.Marshal(image)
if err != nil { if err != nil {
return job.Error(err) return job.Error(err)

1
server/server.go
View file

@ -433,6 +433,7 @@ func (srv *Server) exportImage(eng *engine.Engine, name, tempdir string) error {
return err return err
} }
job := eng.Job("image_inspect", n) job := eng.Job("image_inspect", n)
job.SetenvBool("raw", true)
job.Stdout.Add(json) job.Stdout.Add(json)
if err := job.Run(); err != nil { if err := job.Run(); err != nil {
return err return err