Merge pull request #8333 from rhatdan/buildah

Podman-remote build is getting ID twice
containers · Nov 14, 2020 · 4eb9c28 · 4eb9c28
2 parents 64a7d49 + b5e15f1
commit 4eb9c28
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 8 deletions.
diff --git 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
@@ -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)