tyler.durden/compose
1
0
Fork 0
mirror of https://github.com/docker/compose.git synced 2025-09-23 01:37:53 +02:00
Code Issues Packages Projects Releases Wiki Activity

pkg/compose: pull: use native multi-errors

Browse Source 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
Sebastiaan van Stijn 2025-08-22 16:33:31 +02:00 committed by Nicolas De loof
parent 5165b0f814
commit 51499f645b
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/compose/pull.go
View File

@ -34,7 +34,6 @@ import (
"github.com/docker/docker/api/types/image" "github.com/docker/docker/api/types/image"
"github.com/docker/docker/client" "github.com/docker/docker/client"
"github.com/docker/docker/pkg/jsonmessage" "github.com/docker/docker/pkg/jsonmessage"
"github.com/hashicorp/go-multierror"
"github.com/opencontainers/go-digest" "github.com/opencontainers/go-digest"
"golang.org/x/sync/errgroup" "golang.org/x/sync/errgroup"
@ -152,7 +151,7 @@ func (s *composeService) pull(ctx context.Context, project *types.Project, opts
if opts.IgnoreFailures { if opts.IgnoreFailures {
return nil return nil
} }
return multierror.Append(nil, pullErrors...).ErrorOrNil() return errors.Join(pullErrors...)
} }
func imageAlreadyPresent(serviceImage string, localImages map[string]api.ImageSummary) bool { func imageAlreadyPresent(serviceImage string, localImages map[string]api.ImageSummary) bool {