p4u1/docker-cli
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #8413 from tonistiigi/build-content-type

Browse Source 
Fix streaming JSON Content-type for postBuild
Upstream-commit: 166c56cabdd18054a10b8f196c6ba178ad72ba83
Component: engine
This commit is contained in:
Victor Vieux
2014-10-06 09:38:52 -07:00
parent 712eaeae70 46821ac41b
commit 140c209fed
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
components/engine/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") {
job.SetenvBool("json", 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("nocache", r.FormValue("nocache"))
job.Setenv("forcerm", r.FormValue("forcerm"))
job.SetenvBool("lineDelim", version.GreaterThanOrEqualTo("1.15"))
job.SetenvJson("authConfig", authConfig)
job.SetenvJson("configFile", configFile)