From c8653a9ead94c5bf7e1061597e5708d2734d153a Mon Sep 17 00:00:00 2001 From: ecrupper Date: Fri, 20 Sep 2024 10:38:04 -0500 Subject: [PATCH] chore(deps): upgrade docker pkg and fix mock image service --- go.mod | 2 +- go.sum | 4 ++-- mock/docker/image.go | 8 ++++---- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/go.mod b/go.mod index 8c137f08..1f1001be 100644 --- a/go.mod +++ b/go.mod @@ -5,7 +5,7 @@ go 1.23.1 require ( github.com/Masterminds/semver/v3 v3.3.0 github.com/distribution/reference v0.6.0 - github.com/docker/docker v26.1.5+incompatible + github.com/docker/docker v27.3.0+incompatible github.com/docker/go-units v0.5.0 github.com/gin-gonic/gin v1.10.0 github.com/go-vela/sdk-go v0.24.0 diff --git a/go.sum b/go.sum index 63bd9dbf..aec47b59 100644 --- a/go.sum +++ b/go.sum @@ -61,8 +61,8 @@ github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f h1:lO4WD4F/r github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f/go.mod h1:cuUVRXasLTGF7a8hSLbxyZXjz+1KgoB3wDUb6vlszIc= github.com/distribution/reference v0.6.0 h1:0IXCQ5g4/QMHHkarYzh5l+u8T3t73zM5QvfrDyIgxBk= github.com/distribution/reference v0.6.0/go.mod h1:BbU0aIcezP1/5jX/8MP0YiH4SdvB5Y4f/wlDRiLyi3E= -github.com/docker/docker v26.1.5+incompatible h1:NEAxTwEjxV6VbBMBoGG3zPqbiJosIApZjxlbrG9q3/g= -github.com/docker/docker v26.1.5+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= +github.com/docker/docker v27.3.0+incompatible h1:BNb1QY6o4JdKpqwi9IB+HUYcRRrVN4aGFUTvDmWYK1A= +github.com/docker/docker v27.3.0+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= github.com/docker/go-connections v0.4.0 h1:El9xVISelRB7BuFusrZozjnkIM5YnzCViNKohAFqRJQ= github.com/docker/go-connections v0.4.0/go.mod h1:Gbd7IOopHjR8Iph03tsViu4nIes5XhDvyHbTtUxmeec= github.com/docker/go-units v0.5.0 h1:69rxXcBk27SvSaaxTtLh/8llcHD8vYHT7WSdRZ/jvr4= diff --git a/mock/docker/image.go b/mock/docker/image.go index 91c4a26d..2c6ece10 100644 --- a/mock/docker/image.go +++ b/mock/docker/image.go @@ -67,7 +67,7 @@ func (i *ImageService) ImageHistory(ctx context.Context, image string) ([]image. // a mocked call to import a Docker image. // // https://pkg.go.dev/github.com/docker/docker/client#Client.ImageImport -func (i *ImageService) ImageImport(ctx context.Context, source types.ImageImportSource, ref string, options image.ImportOptions) (io.ReadCloser, error) { +func (i *ImageService) ImageImport(ctx context.Context, source image.ImportSource, ref string, options image.ImportOptions) (io.ReadCloser, error) { return nil, nil } @@ -143,7 +143,7 @@ func (i *ImageService) ImageList(ctx context.Context, options image.ListOptions) // // https://pkg.go.dev/github.com/docker/docker/client#Client.ImageLoad func (i *ImageService) ImageLoad(ctx context.Context, input io.Reader, quiet bool) (types.ImageLoadResponse, error) { - return types.ImageLoadResponse{}, nil + return image.LoadResponse{}, nil } // ImagePull is a helper function to simulate @@ -239,8 +239,8 @@ func (i *ImageService) ImageTag(ctx context.Context, image, ref string) error { // a mocked call to prune Docker images. // // https://pkg.go.dev/github.com/docker/docker/client#Client.ImagesPrune -func (i *ImageService) ImagesPrune(ctx context.Context, pruneFilter filters.Args) (types.ImagesPruneReport, error) { - return types.ImagesPruneReport{}, nil +func (i *ImageService) ImagesPrune(ctx context.Context, pruneFilter filters.Args) (image.PruneReport, error) { + return image.PruneReport{}, nil } // WARNING: DO NOT REMOVE THIS UNDER ANY CIRCUMSTANCES