opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-23 10:38:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #12405 from flouthoc/compat-build-error

Browse Source 
compat: Add compatiblity with `Docker/Moby` API for scenarios where build fails.
This commit is contained in:
OpenShift Merge Robot
2021-11-29 22:38:19 +01:00
committed by GitHub
parent 6052914222 84e81252f2
commit 2b0b4327c4
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
pkg/api/handlers/compat/images_build.go
View File

@ -24,6 +24,7 @@ import (
"github.com/containers/podman/v3/pkg/auth" "github.com/containers/podman/v3/pkg/auth"
"github.com/containers/podman/v3/pkg/channel" "github.com/containers/podman/v3/pkg/channel"
"github.com/containers/storage/pkg/archive" "github.com/containers/storage/pkg/archive"
"github.com/docker/docker/pkg/jsonmessage"
"github.com/gorilla/schema" "github.com/gorilla/schema"
"github.com/opencontainers/runtime-spec/specs-go" "github.com/opencontainers/runtime-spec/specs-go"
"github.com/pkg/errors" "github.com/pkg/errors"
@ -547,7 +548,9 @@ func BuildImage(w http.ResponseWriter, r *http.Request) {
for { for {
m := struct { m := struct {
Stream string `json:"stream,omitempty"` Stream string `json:"stream,omitempty"`
Error string `json:"error,omitempty"` Error *jsonmessage.JSONError `json:"errorDetail,omitempty"`
// NOTE: `error` is being deprecated check https://github.com/moby/moby/blob/master/pkg/jsonmessage/jsonmessage.go#L148
ErrorMessage string `json:"error,omitempty"` // deprecate this slowly
}{} }{}
select { select {
@ -570,7 +573,10 @@ func BuildImage(w http.ResponseWriter, r *http.Request) {
} }
flush() flush()
case e := <-stderr.Chan(): case e := <-stderr.Chan():
m.Error = string(e) m.ErrorMessage = string(e)
m.Error = &jsonmessage.JSONError{
Message: m.ErrorMessage,
}
if err := enc.Encode(m); err != nil { if err := enc.Encode(m); err != nil {
logrus.Warnf("Failed to json encode error %v", err) logrus.Warnf("Failed to json encode error %v", err)
} }