Skip to content

Commit 5037010

Browse files
ecrupperplyr4
andauthored
chore(deps): upgrade docker pkg and fix mock image service (#601)
Co-authored-by: dave vader <48764154+plyr4@users.noreply.github.com>
1 parent 54ad377 commit 5037010

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ go 1.23.1
55
require (
66
github.com/Masterminds/semver/v3 v3.3.0
77
github.com/distribution/reference v0.6.0
8-
github.com/docker/docker v26.1.5+incompatible
8+
github.com/docker/docker v27.3.0+incompatible
99
github.com/docker/go-units v0.5.0
1010
github.com/gin-gonic/gin v1.10.0
1111
github.com/go-vela/sdk-go v0.25.0-rc1

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,8 @@ github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f h1:lO4WD4F/r
6161
github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f/go.mod h1:cuUVRXasLTGF7a8hSLbxyZXjz+1KgoB3wDUb6vlszIc=
6262
github.com/distribution/reference v0.6.0 h1:0IXCQ5g4/QMHHkarYzh5l+u8T3t73zM5QvfrDyIgxBk=
6363
github.com/distribution/reference v0.6.0/go.mod h1:BbU0aIcezP1/5jX/8MP0YiH4SdvB5Y4f/wlDRiLyi3E=
64-
github.com/docker/docker v26.1.5+incompatible h1:NEAxTwEjxV6VbBMBoGG3zPqbiJosIApZjxlbrG9q3/g=
65-
github.com/docker/docker v26.1.5+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
64+
github.com/docker/docker v27.3.0+incompatible h1:BNb1QY6o4JdKpqwi9IB+HUYcRRrVN4aGFUTvDmWYK1A=
65+
github.com/docker/docker v27.3.0+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
6666
github.com/docker/go-connections v0.4.0 h1:El9xVISelRB7BuFusrZozjnkIM5YnzCViNKohAFqRJQ=
6767
github.com/docker/go-connections v0.4.0/go.mod h1:Gbd7IOopHjR8Iph03tsViu4nIes5XhDvyHbTtUxmeec=
6868
github.com/docker/go-units v0.5.0 h1:69rxXcBk27SvSaaxTtLh/8llcHD8vYHT7WSdRZ/jvr4=

mock/docker/image.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ func (i *ImageService) ImageHistory(ctx context.Context, image string) ([]image.
6767
// a mocked call to import a Docker image.
6868
//
6969
// https://pkg.go.dev/github.com/docker/docker/client#Client.ImageImport
70-
func (i *ImageService) ImageImport(ctx context.Context, source types.ImageImportSource, ref string, options image.ImportOptions) (io.ReadCloser, error) {
70+
func (i *ImageService) ImageImport(ctx context.Context, source image.ImportSource, ref string, options image.ImportOptions) (io.ReadCloser, error) {
7171
return nil, nil
7272
}
7373

@@ -143,7 +143,7 @@ func (i *ImageService) ImageList(ctx context.Context, options image.ListOptions)
143143
//
144144
// https://pkg.go.dev/github.com/docker/docker/client#Client.ImageLoad
145145
func (i *ImageService) ImageLoad(ctx context.Context, input io.Reader, quiet bool) (types.ImageLoadResponse, error) {
146-
return types.ImageLoadResponse{}, nil
146+
return image.LoadResponse{}, nil
147147
}
148148

149149
// ImagePull is a helper function to simulate
@@ -239,8 +239,8 @@ func (i *ImageService) ImageTag(ctx context.Context, image, ref string) error {
239239
// a mocked call to prune Docker images.
240240
//
241241
// https://pkg.go.dev/github.com/docker/docker/client#Client.ImagesPrune
242-
func (i *ImageService) ImagesPrune(ctx context.Context, pruneFilter filters.Args) (types.ImagesPruneReport, error) {
243-
return types.ImagesPruneReport{}, nil
242+
func (i *ImageService) ImagesPrune(ctx context.Context, pruneFilter filters.Args) (image.PruneReport, error) {
243+
return image.PruneReport{}, nil
244244
}
245245

246246
// WARNING: DO NOT REMOVE THIS UNDER ANY CIRCUMSTANCES

0 commit comments

Comments
 (0)