diff options
| author | Aditya R <arajan@redhat.com> | 2022-02-07 13:38:16 +0530 |
|---|---|---|
| committer | Matthew Heon <matthew.heon@pm.me> | 2022-02-10 13:58:12 -0500 |
| commit | 7e37c608f7ac04ffbb6e11b5b774acfd7afb6d95 (patch) | |
| tree | 49d617fa7696266b0df9df52fd46f12ba82dc175 | |
| parent | 9aee36b768fbbf58dd8550380e6cb67e33af3a22 (diff) | |
| download | podman-7e37c608f7ac04ffbb6e11b5b774acfd7afb6d95.tar.gz podman-7e37c608f7ac04ffbb6e11b5b774acfd7afb6d95.tar.bz2 podman-7e37c608f7ac04ffbb6e11b5b774acfd7afb6d95.zip | |
compat: endpoint /build must set header content type as application/json in reponse
Lot of clients are expecting proper `Content-type: application/json`
configured in response headers of `/build` compat api. Following commit
fixes that.
Fixes issues where code is setting header field after writing header
which is wrong. We must set `content-type` before we write and flush
http header.
Signed-off-by: Aditya R <arajan@redhat.com>
| -rw-r--r-- | pkg/api/handlers/compat/images_build.go | 2 | ||||
| -rw-r--r-- | test/apiv2/10-images.at | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/pkg/api/handlers/compat/images_build.go b/pkg/api/handlers/compat/images_build.go index cc9667202..0ebf74f98 100644 --- a/pkg/api/handlers/compat/images_build.go +++ b/pkg/api/handlers/compat/images_build.go @@ -605,8 +605,8 @@ func BuildImage(w http.ResponseWriter, r *http.Request) { } // Send headers and prime client for stream to come - w.WriteHeader(http.StatusOK) w.Header().Set("Content-Type", "application/json") + w.WriteHeader(http.StatusOK) flush() body := w.(io.Writer) diff --git a/test/apiv2/10-images.at b/test/apiv2/10-images.at index 673858a3c..9526183e3 100644 --- a/test/apiv2/10-images.at +++ b/test/apiv2/10-images.at @@ -190,6 +190,11 @@ t POST "libpod/build?dockerfile=containerfile" $CONTAINERFILE_TAR application/js t POST "build?dockerfile=containerfile" $CONTAINERFILE_TAR application/json 200 \ .stream~"STEP 1/1: FROM $IMAGE" +# Build api response header must contain Content-type: application/json +t POST "build?dockerfile=containerfile" $CONTAINERFILE_TAR application/json 200 +response_headers=$(cat "$WORKDIR/curl.headers.out") +like "$response_headers" ".*application/json.*" "header does not contains application/json" + # PR #12091: output from compat API must now include {"aux":{"ID":"sha..."}} t POST "build?dockerfile=containerfile" $CONTAINERFILE_TAR 200 \ '.aux|select(has("ID")).ID~^sha256:[0-9a-f]\{64\}$' |