diff options
| author | Alex Schultz <aschultz@redhat.com> | 2021-06-11 11:13:19 -0600 |
|---|---|---|
| committer | Alex Schultz <aschultz@redhat.com> | 2021-06-11 13:50:29 -0600 |
| commit | ded2f004f04c174dbd2a143ade8f2d5daf6f42da (patch) | |
| tree | 248a45373b649572ce9e79c66d8cba3425eb2d46 /pkg | |
| parent | a634b2cd5977c60f1907733efe07b61ba36271fb (diff) | |
| download | podman-ded2f004f04c174dbd2a143ade8f2d5daf6f42da.tar.gz podman-ded2f004f04c174dbd2a143ade8f2d5daf6f42da.tar.bz2 podman-ded2f004f04c174dbd2a143ade8f2d5daf6f42da.zip | |
Fall back to string for dockerfile parameter
a9cb824981db3fee6b8445b29e513c89e9b9b00b changed the expectations of the
dockerfile parameter to be json data however it's a string. In order to
support both, let's attempt json and fall back to a string if the json
parsing fails.
Closes #10660
Signed-off-by: Alex Schultz <aschultz@redhat.com>
Diffstat (limited to 'pkg')
| -rw-r--r-- | pkg/api/handlers/compat/images_build.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkg/api/handlers/compat/images_build.go b/pkg/api/handlers/compat/images_build.go index 50423fb96..9c4dd8638 100644 --- a/pkg/api/handlers/compat/images_build.go +++ b/pkg/api/handlers/compat/images_build.go @@ -144,8 +144,8 @@ func BuildImage(w http.ResponseWriter, r *http.Request) { if _, found := r.URL.Query()["dockerfile"]; found { var m = []string{} if err := json.Unmarshal([]byte(query.Dockerfile), &m); err != nil { - utils.BadRequest(w, "dockerfile", query.Dockerfile, err) - return + // it's not json, assume just a string + m = append(m, query.Dockerfile) } containerFiles = m } else { |