diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-06-12 14:36:42 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-12 14:36:42 -0400 |
| commit | c955c95b54b2f45f560e5f57f1f8513c06fc75f7 (patch) | |
| tree | e694f2e9c2bc043eb32e52f27abf555fbad45d4c /pkg | |
| parent | d1cb5d14e94534d5065e20178b6bd435097920e9 (diff) | |
| parent | ded2f004f04c174dbd2a143ade8f2d5daf6f42da (diff) | |
| download | podman-c955c95b54b2f45f560e5f57f1f8513c06fc75f7.tar.gz podman-c955c95b54b2f45f560e5f57f1f8513c06fc75f7.tar.bz2 podman-c955c95b54b2f45f560e5f57f1f8513c06fc75f7.zip | |
Merge pull request #10661 from mwhahaha/issue-10660
Fall back to string for dockerfile parameter
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 { |