Skip to content

Commit

Permalink
build(deps): bump docker/docker to v28.0.0+incompatible
Browse files Browse the repository at this point in the history
And adjust for breaking API changes.

Signed-off-by: Dan Luhring <dluhring@chainguard.dev>
  • Loading branch information
luhring committed Feb 25, 2025
1 parent c4dd792 commit bc1359d
Show file tree
Hide file tree
Showing 153 changed files with 3,293 additions and 1,780 deletions.
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ require (
github.com/containerd/stargz-snapshotter/estargz v0.16.3
github.com/docker/cli v27.5.0+incompatible
github.com/docker/distribution v2.8.3+incompatible
github.com/docker/docker v27.5.0+incompatible
github.com/docker/docker v28.0.0+incompatible
github.com/google/go-cmp v0.6.0
github.com/klauspost/compress v1.17.11
github.com/mitchellh/go-homedir v1.1.0
Expand Down
4 changes: 2 additions & 2 deletions go.sum

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 3 additions & 2 deletions pkg/v1/daemon/image_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ import (

"github.com/docker/docker/api/types/container"
api "github.com/docker/docker/api/types/image"
"github.com/docker/docker/client"

"github.com/docker/docker/api/types"
"github.com/google/go-containerregistry/pkg/name"
Expand Down Expand Up @@ -88,7 +89,7 @@ func (m *MockClient) NegotiateAPIVersion(_ context.Context) {
m.negotiated = true
}

func (m *MockClient) ImageSave(_ context.Context, _ []string) (io.ReadCloser, error) {
func (m *MockClient) ImageSave(_ context.Context, _ []string, _ ...client.ImageSaveOption) (io.ReadCloser, error) {
if !m.negotiated {
return nil, errors.New("you forgot to call NegotiateAPIVersion before calling ImageSave")
}
Expand All @@ -104,7 +105,7 @@ func (m *MockClient) ImageInspectWithRaw(_ context.Context, _ string) (types.Ima
return m.inspectResp, m.inspectBody, m.inspectErr
}

func (m *MockClient) ImageHistory(_ context.Context, _ string) ([]api.HistoryResponseItem, error) {
func (m *MockClient) ImageHistory(_ context.Context, _ string, _ ...client.ImageHistoryOption) ([]api.HistoryResponseItem, error) {
return []api.HistoryResponseItem{
{
CreatedBy: "bazel build ...",
Expand Down
6 changes: 3 additions & 3 deletions pkg/v1/daemon/options.go
Original file line number Diff line number Diff line change
Expand Up @@ -97,9 +97,9 @@ func WithContext(ctx context.Context) Option {
// package uses.
type Client interface {
NegotiateAPIVersion(ctx context.Context)
ImageSave(context.Context, []string) (io.ReadCloser, error)
ImageLoad(context.Context, io.Reader, bool) (api.LoadResponse, error)
ImageSave(context.Context, []string, ...client.ImageSaveOption) (io.ReadCloser, error)
ImageLoad(context.Context, io.Reader, ...client.ImageLoadOption) (api.LoadResponse, error)
ImageTag(context.Context, string, string) error
ImageInspectWithRaw(context.Context, string) (types.ImageInspect, []byte, error)

Check failure on line 103 in pkg/v1/daemon/options.go

View workflow job for this annotation

GitHub Actions / Lint

SA1019: types.ImageInspect is deprecated: use [image.InspectResponse]. (staticcheck)

Check failure on line 103 in pkg/v1/daemon/options.go

View workflow job for this annotation

GitHub Actions / Presubmit

types.ImageInspect is deprecated: use [image.InspectResponse]. (SA1019)
ImageHistory(context.Context, string) ([]api.HistoryResponseItem, error)
ImageHistory(context.Context, string, ...client.ImageHistoryOption) ([]api.HistoryResponseItem, error)
}
3 changes: 2 additions & 1 deletion pkg/v1/daemon/write.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ import (
"fmt"
"io"

"github.com/docker/docker/client"
"github.com/google/go-containerregistry/pkg/name"
v1 "github.com/google/go-containerregistry/pkg/v1"
"github.com/google/go-containerregistry/pkg/v1/tarball"
Expand Down Expand Up @@ -64,7 +65,7 @@ func Write(tag name.Tag, img v1.Image, options ...Option) (string, error) {
}()

// write the image in docker save format first, then load it
resp, err := o.client.ImageLoad(o.ctx, pr, false)
resp, err := o.client.ImageLoad(o.ctx, pr, client.ImageLoadWithQuiet(false))
if err != nil {
return "", fmt.Errorf("error loading image: %w", err)
}
Expand Down
3 changes: 2 additions & 1 deletion pkg/v1/daemon/write_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ import (
"testing"

api "github.com/docker/docker/api/types/image"
"github.com/docker/docker/client"

"github.com/google/go-containerregistry/pkg/name"
"github.com/google/go-containerregistry/pkg/v1/empty"
Expand All @@ -37,7 +38,7 @@ func (r *errReader) Read(_ []byte) (int, error) {
return 0, r.err
}

func (m *MockClient) ImageLoad(ctx context.Context, r io.Reader, _ bool) (api.LoadResponse, error) {
func (m *MockClient) ImageLoad(ctx context.Context, r io.Reader, _ ...client.ImageLoadOption) (api.LoadResponse, error) {
if !m.negotiated {
return api.LoadResponse{}, errors.New("you forgot to call NegotiateAPIVersion before calling ImageLoad")
}
Expand Down
32 changes: 31 additions & 1 deletion vendor/github.com/docker/docker/AUTHORS

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion vendor/github.com/docker/docker/api/common.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit bc1359d

Please sign in to comment.