pass project.environment to bake

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

Author: ndeloof

cmd/compose/exec.go

@@ -18,7 +18,6 @@ package compose
 
 import (
 	"context"
-	"fmt"
 
 	"github.com/compose-spec/compose-go/v2/types"
 	"github.com/docker/cli/cli"
@@ -110,7 +109,7 @@ func runExec(ctx context.Context, dockerCli command.Cli, backend api.Service, op
 
 	exitCode, err := backend.Exec(ctx, projectName, execOpts)
 	if exitCode != 0 {
-		errMsg := fmt.Sprintf("exit status %d", exitCode)
+		var errMsg string
 		if err != nil && err.Error() != "" {
 			errMsg = err.Error()
 		}

pkg/compose/build_bake.go

@@ -295,7 +295,7 @@ func (s *composeService) doBuildBake(ctx context.Context, project *types.Project
 
 	cmd := exec.CommandContext(ctx, buildx.Path, args...)
 	// Remove DOCKER_CLI_PLUGIN... variable so buildx can detect it run standalone
-	cmd.Env = filter(os.Environ(), manager.ReexecEnvvar)
+	cmd.Env = filter(project.Environment.Values(), manager.ReexecEnvvar)
 
 	// Use docker/cli mechanism to propagate termination signal to child process
 	server, err := socket.NewPluginServer(nil)