summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel J Walsh <dwalsh@redhat.com>2020-11-13 04:36:23 -0500
committerDaniel J Walsh <dwalsh@redhat.com>2020-11-14 06:25:29 -0500
commitb5e15f18d01219f666cd30623fb3ec73f338d040 (patch)
tree8083e0dff63390dd86054d2e8184fe5a9410d3ab
parent42a5b0fd93c8a19433be814273e9ac80e53d7bbe (diff)
downloadpodman-b5e15f18d01219f666cd30623fb3ec73f338d040.tar.gz
podman-b5e15f18d01219f666cd30623fb3ec73f338d040.tar.bz2
podman-b5e15f18d01219f666cd30623fb3ec73f338d040.zip
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>
-rw-r--r--pkg/api/handlers/compat/images_build.go12
-rw-r--r--pkg/bindings/images/build.go2
2 files changed, 6 insertions, 8 deletions
diff --git a/pkg/api/handlers/compat/images_build.go b/pkg/api/handlers/compat/images_build.go
index d5ccf56fe..a4bb72140 100644
--- a/pkg/api/handlers/compat/images_build.go
+++ b/pkg/api/handlers/compat/images_build.go
@@ -272,15 +272,13 @@ loop:
flush()
case <-runCtx.Done():
if !failed {
- if utils.IsLibpodRequest(r) {
- m.Stream = imageID
- } else {
+ if !utils.IsLibpodRequest(r) {
m.Stream = fmt.Sprintf("Successfully built %12.12s\n", imageID)
+ if err := enc.Encode(m); err != nil {
+ logrus.Warnf("Failed to json encode error %q", err.Error())
+ }
+ flush()
}
- if err := enc.Encode(m); err != nil {
- logrus.Warnf("Failed to json encode error %q", err.Error())
- }
- flush()
}
break loop
}
diff --git a/pkg/bindings/images/build.go b/pkg/bindings/images/build.go
index 60ffea548..815ab4e86 100644
--- a/pkg/bindings/images/build.go
+++ b/pkg/bindings/images/build.go
@@ -187,7 +187,7 @@ func Build(ctx context.Context, containerFiles []string, options entities.BuildO
case s.Stream != "":
stdout.Write([]byte(s.Stream))
if re.Match([]byte(s.Stream)) {
- id = s.Stream
+ id = strings.TrimSuffix(s.Stream, "\n")
}
case s.Error != "":
return nil, errors.New(s.Error)