Fix wrong Content-Type returned by /images/search API
/images/search was replying with Content-Type text/plain instead of application/json. Fix #14846 Signed-off-by: Antonio Murdaca <runcom@linux.com>
This commit is contained in:
parent
757c4f0d5c
commit
1a5d6a94c9
|
@ -818,7 +818,7 @@ func (s *Server) getImagesSearch(version version.Version, w http.ResponseWriter,
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
return json.NewEncoder(w).Encode(query.Results)
|
return writeJSON(w, http.StatusOK, query.Results)
|
||||||
}
|
}
|
||||||
|
|
||||||
func (s *Server) postImagesPush(version version.Version, w http.ResponseWriter, r *http.Request, vars map[string]string) error {
|
func (s *Server) postImagesPush(version version.Version, w http.ResponseWriter, r *http.Request, vars map[string]string) error {
|
||||||
|
|
|
@ -120,3 +120,14 @@ func (s *DockerSuite) TestApiImagesHistory(c *check.C) {
|
||||||
c.Assert(len(historydata), check.Not(check.Equals), 0)
|
c.Assert(len(historydata), check.Not(check.Equals), 0)
|
||||||
c.Assert(historydata[0].Tags[0], check.Equals, "test-api-images-history:latest")
|
c.Assert(historydata[0].Tags[0], check.Equals, "test-api-images-history:latest")
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// #14846
|
||||||
|
func (s *DockerSuite) TestApiImagesSearchJSONContentType(c *check.C) {
|
||||||
|
testRequires(c, Network)
|
||||||
|
|
||||||
|
res, b, err := sockRequestRaw("GET", "/images/search?term=test", nil, "application/json")
|
||||||
|
b.Close()
|
||||||
|
c.Assert(err, check.IsNil)
|
||||||
|
c.Assert(res.StatusCode, check.Equals, http.StatusOK)
|
||||||
|
c.Assert(res.Header.Get("Content-Type"), check.Equals, "application/json")
|
||||||
|
}
|
||||||
|
|
Loading…
Reference in New Issue