mirror of
https://github.com/docker/compose.git
synced 2025-09-22 17:27:50 +02:00
pkg/compose: pull: use native multi-errors
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
parent
5165b0f814
commit
51499f645b
@ -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 {
|
||||
|
Loading…
x
Reference in New Issue
Block a user