Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
| ... | ... |
@@ -204,7 +204,7 @@ func getImagesJSON(eng *engine.Engine, version float64, w http.ResponseWriter, r |
| 204 | 204 |
job.Setenv("filter", r.Form.Get("filter"))
|
| 205 | 205 |
job.Setenv("all", r.Form.Get("all"))
|
| 206 | 206 |
|
| 207 |
- if version > 1.8 {
|
|
| 207 |
+ if version >= 1.7 {
|
|
| 208 | 208 |
job.Stdout.Add(w) |
| 209 | 209 |
} else if outs, err = job.Stdout.AddListTable(); err != nil {
|
| 210 | 210 |
return err |
| ... | ... |
@@ -214,7 +214,7 @@ func getImagesJSON(eng *engine.Engine, version float64, w http.ResponseWriter, r |
| 214 | 214 |
return err |
| 215 | 215 |
} |
| 216 | 216 |
|
| 217 |
- if version < 1.8 && outs != nil { // Convert to legacy format
|
|
| 217 |
+ if version < 1.7 && outs != nil { // Convert to legacy format
|
|
| 218 | 218 |
outsLegacy := engine.NewTable("Created", 0)
|
| 219 | 219 |
for _, out := range outs.Data {
|
| 220 | 220 |
for _, repoTag := range out.GetList("RepoTags") {
|
| ... | ... |
@@ -319,7 +319,7 @@ func getContainersJSON(eng *engine.Engine, version float64, w http.ResponseWrite |
| 319 | 319 |
job.Setenv("before", r.Form.Get("before"))
|
| 320 | 320 |
job.Setenv("limit", r.Form.Get("limit"))
|
| 321 | 321 |
|
| 322 |
- if version > 1.5 {
|
|
| 322 |
+ if version >= 1.5 {
|
|
| 323 | 323 |
job.Stdout.Add(w) |
| 324 | 324 |
} else if outs, err = job.Stdout.AddTable(); err != nil {
|
| 325 | 325 |
return err |