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

Fix streaming JSON Content-type for postBuild

Browse source 
See #8101

lineDelim is used by streamJSON() so it needs to be set
before its called.

Signed-off-by: Tõnis Tiigi <tonistiigi@gmail.com> (github: tonistiigi)
This commit is contained in:
Tonis Tiigi 2014-10-06 18:47:04 +03:00
parent 44264f48e4
commit 30d6ff99fc
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
api/server/server.go
View file

@ -993,6 +993,9 @@ func postBuild(eng *engine.Engine, version version.Version, w http.ResponseWrite
} }
} }
// This needs to be set before calls to streamJSON
job.SetenvBool("lineDelim", version.GreaterThanOrEqualTo("1.15"))
if version.GreaterThanOrEqualTo("1.8") { if version.GreaterThanOrEqualTo("1.8") {
job.SetenvBool("json", true) job.SetenvBool("json", true)
streamJSON(job, w, true) streamJSON(job, w, true)
@ -1013,7 +1016,6 @@ func postBuild(eng *engine.Engine, version version.Version, w http.ResponseWrite
job.Setenv("q", r.FormValue("q")) job.Setenv("q", r.FormValue("q"))
job.Setenv("nocache", r.FormValue("nocache")) job.Setenv("nocache", r.FormValue("nocache"))
job.Setenv("forcerm", r.FormValue("forcerm")) job.Setenv("forcerm", r.FormValue("forcerm"))
job.SetenvBool("lineDelim", version.GreaterThanOrEqualTo("1.15"))
job.SetenvJson("authConfig", authConfig) job.SetenvJson("authConfig", authConfig)
job.SetenvJson("configFile", configFile) job.SetenvJson("configFile", configFile)