mirror of
https://github.com/moby/moby.git
synced 2026-01-11 18:51:37 +00:00
Merge pull request #51102 from thaJeztah/move_more_imagebackendopts
daemon/server: move GetImageOpts, ImageInspectOpts to imagebackend
This commit is contained in:
@@ -75,5 +75,5 @@ type VolumeBackend interface {
|
||||
type ImageBackend interface {
|
||||
PullImage(ctx context.Context, ref reference.Named, options imagebackend.PullOptions) error
|
||||
GetRepositories(context.Context, reference.Named, *registry.AuthConfig) ([]distribution.Repository, error)
|
||||
GetImage(ctx context.Context, refOrID string, options backend.GetImageOpts) (*image.Image, error)
|
||||
GetImage(ctx context.Context, refOrID string, options imagebackend.GetImageOpts) (*image.Image, error)
|
||||
}
|
||||
|
||||
@@ -77,7 +77,7 @@ func (c *containerAdapter) pullImage(ctx context.Context) error {
|
||||
named, err := reference.ParseNormalizedNamed(spec.Image)
|
||||
if err == nil {
|
||||
if _, ok := named.(reference.Canonical); ok {
|
||||
_, err := c.imageBackend.GetImage(ctx, spec.Image, backend.GetImageOpts{})
|
||||
_, err := c.imageBackend.GetImage(ctx, spec.Image, imagebackend.GetImageOpts{})
|
||||
if errors.Is(err, context.Canceled) || errors.Is(err, context.DeadlineExceeded) {
|
||||
return err
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user