pkg/compose: pull: use native multi-errors

thaJeztah · ndeloof · commit 51499f645b14 · 2025-08-25T11:22:25.000+02:00
Signed-off-by: Sebastiaan van Stijn &lt;github@gone.nl&gt;
diff --git a/pkg/compose/pull.go b/pkg/compose/pull.go
@@ -34,7 +34,6 @@ import (
 	"github.com/docker/docker/api/types/image"
 	"github.com/docker/docker/client"
 	"github.com/docker/docker/pkg/jsonmessage"
-	"github.com/hashicorp/go-multierror"
 	"github.com/opencontainers/go-digest"
 	"golang.org/x/sync/errgroup"
 
@@ -152,7 +151,7 @@ func (s *composeService) pull(ctx context.Context, project *types.Project, opts
 	if opts.IgnoreFailures {
 		return nil
 	}
-	return multierror.Append(nil, pullErrors...).ErrorOrNil()
+	return errors.Join(pullErrors...)
 }
 
 func imageAlreadyPresent(serviceImage string, localImages map[string]api.ImageSummary) bool {

Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,6 @@ import (`
`34`	`34`	`"github.com/docker/docker/api/types/image"`
`35`	`35`	`"github.com/docker/docker/client"`
`36`	`36`	`"github.com/docker/docker/pkg/jsonmessage"`
`37`		`- "github.com/hashicorp/go-multierror"`
`38`	`37`	`"github.com/opencontainers/go-digest"`
`39`	`38`	`"golang.org/x/sync/errgroup"`
`40`	`39`
`@@ -152,7 +151,7 @@ func (s composeService) pull(ctx context.Context, project types.Project, opts`
`152`	`151`	`if opts.IgnoreFailures {`
`153`	`152`	`return nil`
`154`	`153`	`}`
`155`		`- return multierror.Append(nil, pullErrors...).ErrorOrNil()`
	`154`	`+ return errors.Join(pullErrors...)`
`156`	`155`	`}`
`157`	`156`
`158`	`157`	`func imageAlreadyPresent(serviceImage string, localImages map[string]api.ImageSummary) bool {`