Merge pull request containerd#3801 from containerd/dependabot/go_modu…

…les/github.com/compose-spec/compose-go/v2-2.4.7

build(deps): bump github.com/compose-spec/compose-go/v2 from 2.4.6 to 2.4.7

go.mod

@@ -11,7 +11,7 @@ require (
 	github.com/Masterminds/semver/v3 v3.3.1
 	github.com/Microsoft/go-winio v0.6.2
 	github.com/Microsoft/hcsshim v0.12.9
-	github.com/compose-spec/compose-go/v2 v2.4.6
+	github.com/compose-spec/compose-go/v2 v2.4.7
 	github.com/containerd/accelerated-container-image v1.2.3
 	github.com/containerd/cgroups/v3 v3.0.5
 	github.com/containerd/console v1.0.4

go.sum

@@ -23,8 +23,8 @@ github.com/cilium/ebpf v0.16.0 h1:+BiEnHL6Z7lXnlGUsXQPPAE7+kenAd4ES8MQ5min0Ok=
 github.com/cilium/ebpf v0.16.0/go.mod h1:L7u2Blt2jMM/vLAVgjxluxtBKlz3/GWjB0dMOEngfwE=
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
 github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
-github.com/compose-spec/compose-go/v2 v2.4.6 h1:QiqXQ2L/f0OCbAl41bPpeiGAWVRIQ+GEDrYxO+dRPhQ=
-github.com/compose-spec/compose-go/v2 v2.4.6/go.mod h1:lFN0DrMxIncJGYAXTfWuajfwj5haBJqrBkarHcnjJKc=
+github.com/compose-spec/compose-go/v2 v2.4.7 h1:WNpz5bIbKG+G+w9pfu72B1ZXr+Og9jez8TMEo8ecXPk=
+github.com/compose-spec/compose-go/v2 v2.4.7/go.mod h1:lFN0DrMxIncJGYAXTfWuajfwj5haBJqrBkarHcnjJKc=
 github.com/containerd/accelerated-container-image v1.2.3 h1:tAIoP7Z7b2xGhb7QCM5Fa+2xqWfPqRmyi5lodbsGGRA=
 github.com/containerd/accelerated-container-image v1.2.3/go.mod h1:EvKVWor6ZQNUyYp0MZm5hw4k21ropuz7EegM+m/Jb/Q=
 github.com/containerd/cgroups/v3 v3.0.5 h1:44na7Ud+VwyE7LIoJ8JTNQOa549a8543BmzaJHo6Bzo=

pkg/composer/pipetagger/pipetagger.go

@@ -19,6 +19,7 @@ package pipetagger
 import (
 	"bufio"
 	"fmt"
+	"github.com/containerd/log"
 	"hash/fnv"
 	"io"
 	"strings"
@@ -94,9 +95,15 @@ type PipeTagger struct {
 }
 
 func (x *PipeTagger) Run() error {
-	scanner := bufio.NewScanner(x.r)
-	for scanner.Scan() {
-		line := scanner.Text()
+	r := bufio.NewReader(x.r)
+
+	var err error
+
+	for err == nil {
+		var s string
+		s, err = r.ReadString('\n')
+		line := strings.TrimSuffix(s, "\n")
+
 		if x.width < 0 {
 			fmt.Fprintln(x.w, line)
 		} else {
@@ -106,6 +113,10 @@ func (x *PipeTagger) Run() error {
 				line,
 			)
 		}
+
+		if err != nil && err != io.EOF {
+			log.L.WithError(err).Error("failed to read log")
+		}
 	}
-	return scanner.Err()
+	return err
 }