containers
/
automation-tests
mirror of https://github.com/containers/automation-tests.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Podman-remote build is getting ID twice 

This PR eliminates the second sending of the image id to the
podman-remote client.

Fixes: https://github.com/containers/podman/issues/8332

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
This commit is contained in:
Daniel J Walsh 2020-11-13 04:36:23 -05:00
parent 42a5b0fd93
commit b5e15f18d0
No known key found for this signature in database
GPG Key ID: A2DF901DABE2C028
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -272,16 +272,14 @@ loop:
flush() flush()
case <-runCtx.Done(): case <-runCtx.Done():
if !failed { if !failed {
if utils.IsLibpodRequest(r) { if !utils.IsLibpodRequest(r) {
m.Stream = imageID
} else {
m.Stream = fmt.Sprintf("Successfully built %12.12s\n", imageID) m.Stream = fmt.Sprintf("Successfully built %12.12s\n", imageID)
}
if err := enc.Encode(m); err != nil { if err := enc.Encode(m); err != nil {
logrus.Warnf("Failed to json encode error %q", err.Error()) logrus.Warnf("Failed to json encode error %q", err.Error())
} }
flush() flush()
} }
}
break loop break loop
} }
} }

2
pkg/bindings/images/build.go
View File

@ -187,7 +187,7 @@ func Build(ctx context.Context, containerFiles []string, options entities.BuildO
case s.Stream != "": case s.Stream != "":
stdout.Write([]byte(s.Stream)) stdout.Write([]byte(s.Stream))
if re.Match([]byte(s.Stream)) { if re.Match([]byte(s.Stream)) {
id = s.Stream id = strings.TrimSuffix(s.Stream, "\n")
} }
case s.Error != "": case s.Error != "":
return nil, errors.New(s.Error) return nil, errors.New(s.Error)