Browse code
do not alter json in docker save
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
Victor Vieux authored on 2014/06/17 09:06:21Showing 4 changed files
| ... | ... |
@@ -855,7 +855,7 @@ func getContainersByName(eng *engine.Engine, version version.Version, w http.Res |
| 855 | 855 |
} |
| 856 | 856 |
var job = eng.Job("container_inspect", vars["name"])
|
| 857 | 857 |
if version.LessThan("1.12") {
|
| 858 |
- job.SetenvBool("dirty", true)
|
|
| 858 |
+ job.SetenvBool("raw", true)
|
|
| 859 | 859 |
} |
| 860 | 860 |
streamJSON(job, w, false) |
| 861 | 861 |
return job.Run() |
| ... | ... |
@@ -867,7 +867,7 @@ func getImagesByName(eng *engine.Engine, version version.Version, w http.Respons |
| 867 | 867 |
} |
| 868 | 868 |
var job = eng.Job("image_inspect", vars["name"])
|
| 869 | 869 |
if version.LessThan("1.12") {
|
| 870 |
- job.SetenvBool("dirty", true)
|
|
| 870 |
+ job.SetenvBool("raw", true)
|
|
| 871 | 871 |
} |
| 872 | 872 |
streamJSON(job, w, false) |
| 873 | 873 |
return job.Run() |
| ... | ... |
@@ -15,7 +15,7 @@ func (daemon *Daemon) ContainerInspect(job *engine.Job) engine.Status {
|
| 15 | 15 |
if container := daemon.Get(name); container != nil {
|
| 16 | 16 |
container.Lock() |
| 17 | 17 |
defer container.Unlock() |
| 18 |
- if job.GetenvBool("dirty") {
|
|
| 18 |
+ if job.GetenvBool("raw") {
|
|
| 19 | 19 |
b, err := json.Marshal(&struct {
|
| 20 | 20 |
*Container |
| 21 | 21 |
HostConfig *runconfig.HostConfig |
| ... | ... |
@@ -135,7 +135,7 @@ func (s *TagStore) CmdLookup(job *engine.Job) engine.Status {
|
| 135 | 135 |
} |
| 136 | 136 |
name := job.Args[0] |
| 137 | 137 |
if image, err := s.LookupImage(name); err == nil && image != nil {
|
| 138 |
- if job.GetenvBool("dirty") {
|
|
| 138 |
+ if job.GetenvBool("raw") {
|
|
| 139 | 139 |
b, err := json.Marshal(image) |
| 140 | 140 |
if err != nil {
|
| 141 | 141 |
return job.Error(err) |
| ... | ... |
@@ -433,6 +433,7 @@ func (srv *Server) exportImage(eng *engine.Engine, name, tempdir string) error {
|
| 433 | 433 |
return err |
| 434 | 434 |
} |
| 435 | 435 |
job := eng.Job("image_inspect", n)
|
| 436 |
+ job.SetenvBool("raw", true)
|
|
| 436 | 437 |
job.Stdout.Add(json) |
| 437 | 438 |
if err := job.Run(); err != nil {
|
| 438 | 439 |
return err |