investigate issues #13243

Signed-off-by: Nicolas De Loof <[email protected]>

Author: ndeloof

go.mod

@@ -24,6 +24,7 @@ require (
 	github.com/fsnotify/fsevents v0.2.0
 	github.com/go-viper/mapstructure/v2 v2.4.0
 	github.com/google/go-cmp v0.7.0
+	github.com/google/uuid v1.6.0
 	github.com/hashicorp/go-version v1.7.0
 	github.com/jonboulle/clockwork v0.5.0
 	github.com/mattn/go-shellwords v1.0.12
@@ -108,7 +109,6 @@ require (
 	github.com/google/gnostic-models v0.6.8 // indirect
 	github.com/google/gofuzz v1.2.0 // indirect
 	github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
-	github.com/google/uuid v1.6.0 // indirect
 	github.com/gorilla/mux v1.8.1 // indirect
 	github.com/gorilla/websocket v1.5.0 // indirect
 	github.com/grpc-ecosystem/grpc-gateway/v2 v2.26.1 // indirect

pkg/compose/build_bake.go

@@ -25,7 +25,6 @@ import (
 	"errors"
 	"fmt"
 	"io"
-	"math/rand"
 	"os"
 	"os/exec"
 	"path/filepath"
@@ -41,6 +40,7 @@ import (
 	"github.com/docker/compose/v2/pkg/progress"
 	"github.com/docker/docker/api/types/versions"
 	"github.com/docker/docker/builder/remotecontext/urlutil"
+	"github.com/google/uuid"
 	"github.com/moby/buildkit/client"
 	gitutil "github.com/moby/buildkit/frontend/dockerfile/dfgitutil"
 	"github.com/moby/buildkit/util/progress/progressui"
@@ -293,10 +293,15 @@ func (s *composeService) doBuildBake(ctx context.Context, project *types.Project
 	for {
 		// we don't use os.CreateTemp here as we need a temporary file name, but don't want it actually created
 		// as bake relies on atomicwriter and this creates conflict during rename
-		metadataFile = filepath.Join(os.TempDir(), fmt.Sprintf("compose-build-metadataFile-%d.json", rand.Int31()))
-		if _, err = os.Stat(metadataFile); os.IsNotExist(err) {
-			break
+		metadataFile = filepath.Join(os.TempDir(), fmt.Sprintf("compose-build-metadataFile-%s.json", uuid.New().String()))
+		if _, err = os.Stat(metadataFile); err != nil {
+			if os.IsNotExist(err) {
+				break
+			} else {
+				return nil, fmt.Errorf("failed to check metadata file %s already exists: %w", metadataFile, err)
+			}
 		}
+		logrus.Debugf("metadata file already exists: %s", metadataFile)
 	}
 	defer func() {
 		_ = os.Remove(metadataFile)
@@ -369,9 +374,13 @@ func (s *composeService) doBuildBake(ctx context.Context, project *types.Project
 	for {
 		line, readErr := reader.ReadString('\n')
 		if readErr != nil {
-			if readErr == io.EOF {
+			switch {
+			case errors.Is(err, io.EOF):
 				break
-			} else {
+			case errors.Is(err, os.ErrClosed):
+				logrus.Debugf("bake stopped")
+				break
+			default:
 				return nil, fmt.Errorf("failed to execute bake: %w", readErr)
 			}
 		}