Skip to content

Commit 098045d

Browse files
luhringluhring
authored
build(deps): bump docker/docker to v28.0.0+incompatible (#2071)
* build(deps): bump docker/docker to v28.0.0+incompatible And adjust for breaking API changes. Signed-off-by: Dan Luhring <[email protected]> * fix use of deprecated types from presubmit failures Signed-off-by: Dan Luhring <[email protected]> --------- Signed-off-by: Dan Luhring <[email protected]>
1 parent c4dd792 commit 098045d

File tree

154 files changed

+3302
-1790
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

154 files changed

+3302
-1790
lines changed

‎go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ require (
66
github.com/containerd/stargz-snapshotter/estargz v0.16.3
77
github.com/docker/cli v27.5.0+incompatible
88
github.com/docker/distribution v2.8.3+incompatible
9-
github.com/docker/docker v27.5.0+incompatible
9+
github.com/docker/docker v28.0.0+incompatible
1010
github.com/google/go-cmp v0.6.0
1111
github.com/klauspost/compress v1.17.11
1212
github.com/mitchellh/go-homedir v1.1.0

‎go.sum

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎pkg/v1/daemon/image.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ import (
2121
"sync"
2222
"time"
2323

24-
api "github.com/docker/docker/api/types"
2524
"github.com/docker/docker/api/types/container"
25+
api "github.com/docker/docker/api/types/image"
2626

2727
"github.com/google/go-containerregistry/pkg/name"
2828
v1 "github.com/google/go-containerregistry/pkg/v1"
@@ -266,7 +266,7 @@ func (i *image) diffIDs(rootFS api.RootFS) ([]v1.Hash, error) {
266266
return diffIDs, nil
267267
}
268268

269-
func (i *image) computeConfigFile(inspect api.ImageInspect) (*v1.ConfigFile, error) {
269+
func (i *image) computeConfigFile(inspect api.InspectResponse) (*v1.ConfigFile, error) {
270270
diffIDs, err := i.diffIDs(inspect.RootFS)
271271
if err != nil {
272272
return nil, err

‎pkg/v1/daemon/image_test.go

+9-8
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,9 @@ import (
2525

2626
"github.com/docker/docker/api/types/container"
2727
api "github.com/docker/docker/api/types/image"
28+
"github.com/docker/docker/api/types/storage"
29+
"github.com/docker/docker/client"
2830

29-
"github.com/docker/docker/api/types"
3031
"github.com/google/go-containerregistry/pkg/name"
3132
"github.com/google/go-containerregistry/pkg/v1/compare"
3233
"github.com/google/go-containerregistry/pkg/v1/tarball"
@@ -35,7 +36,7 @@ import (
3536

3637
var imagePath = "../tarball/testdata/test_image_1.tar"
3738

38-
var inspectResp = types.ImageInspect{
39+
var inspectResp = api.InspectResponse{
3940
ID: "sha256:6e0b05049ed9c17d02e1a55e80d6599dbfcce7f4f4b022e3c673e685789c470e",
4041
RepoTags: []string{
4142
"bazel/v1/tarball:test_image_1",
@@ -48,15 +49,15 @@ var inspectResp = types.ImageInspect{
4849
Size: 8,
4950
VirtualSize: 8,
5051
Config: &container.Config{},
51-
GraphDriver: types.GraphDriverData{
52+
GraphDriver: storage.DriverData{
5253
Data: map[string]string{
5354
"MergedDir": "/var/lib/docker/overlay2/988ecd005d048fd47b241dd57687231859563ba65a1dfd01ae1771ebfc4cb7c5/merged",
5455
"UpperDir": "/var/lib/docker/overlay2/988ecd005d048fd47b241dd57687231859563ba65a1dfd01ae1771ebfc4cb7c5/diff",
5556
"WorkDir": "/var/lib/docker/overlay2/988ecd005d048fd47b241dd57687231859563ba65a1dfd01ae1771ebfc4cb7c5/work",
5657
},
5758
Name: "overlay2",
5859
},
59-
RootFS: types.RootFS{
60+
RootFS: api.RootFS{
6061
Type: "layers",
6162
Layers: []string{
6263
"sha256:8897395fd26dc44ad0e2a834335b33198cb41ac4d98dfddf58eced3853fa7b17",
@@ -78,7 +79,7 @@ type MockClient struct {
7879
saveBody io.ReadCloser
7980

8081
inspectErr error
81-
inspectResp types.ImageInspect
82+
inspectResp api.InspectResponse
8283
inspectBody []byte
8384

8485
tagErr error
@@ -88,7 +89,7 @@ func (m *MockClient) NegotiateAPIVersion(_ context.Context) {
8889
m.negotiated = true
8990
}
9091

91-
func (m *MockClient) ImageSave(_ context.Context, _ []string) (io.ReadCloser, error) {
92+
func (m *MockClient) ImageSave(_ context.Context, _ []string, _ ...client.ImageSaveOption) (io.ReadCloser, error) {
9293
if !m.negotiated {
9394
return nil, errors.New("you forgot to call NegotiateAPIVersion before calling ImageSave")
9495
}
@@ -100,11 +101,11 @@ func (m *MockClient) ImageSave(_ context.Context, _ []string) (io.ReadCloser, er
100101
return m.saveBody, m.saveErr
101102
}
102103

103-
func (m *MockClient) ImageInspectWithRaw(_ context.Context, _ string) (types.ImageInspect, []byte, error) {
104+
func (m *MockClient) ImageInspectWithRaw(_ context.Context, _ string) (api.InspectResponse, []byte, error) {
104105
return m.inspectResp, m.inspectBody, m.inspectErr
105106
}
106107

107-
func (m *MockClient) ImageHistory(_ context.Context, _ string) ([]api.HistoryResponseItem, error) {
108+
func (m *MockClient) ImageHistory(_ context.Context, _ string, _ ...client.ImageHistoryOption) ([]api.HistoryResponseItem, error) {
108109
return []api.HistoryResponseItem{
109110
{
110111
CreatedBy: "bazel build ...",

‎pkg/v1/daemon/options.go

+4-5
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ import (
1818
"context"
1919
"io"
2020

21-
"github.com/docker/docker/api/types"
2221
api "github.com/docker/docker/api/types/image"
2322
"github.com/docker/docker/client"
2423
)
@@ -97,9 +96,9 @@ func WithContext(ctx context.Context) Option {
9796
// package uses.
9897
type Client interface {
9998
NegotiateAPIVersion(ctx context.Context)
100-
ImageSave(context.Context, []string) (io.ReadCloser, error)
101-
ImageLoad(context.Context, io.Reader, bool) (api.LoadResponse, error)
99+
ImageSave(context.Context, []string, ...client.ImageSaveOption) (io.ReadCloser, error)
100+
ImageLoad(context.Context, io.Reader, ...client.ImageLoadOption) (api.LoadResponse, error)
102101
ImageTag(context.Context, string, string) error
103-
ImageInspectWithRaw(context.Context, string) (types.ImageInspect, []byte, error)
104-
ImageHistory(context.Context, string) ([]api.HistoryResponseItem, error)
102+
ImageInspectWithRaw(context.Context, string) (api.InspectResponse, []byte, error)
103+
ImageHistory(context.Context, string, ...client.ImageHistoryOption) ([]api.HistoryResponseItem, error)
105104
}

‎pkg/v1/daemon/write.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ import (
1818
"fmt"
1919
"io"
2020

21+
"github.com/docker/docker/client"
2122
"github.com/google/go-containerregistry/pkg/name"
2223
v1 "github.com/google/go-containerregistry/pkg/v1"
2324
"github.com/google/go-containerregistry/pkg/v1/tarball"
@@ -64,7 +65,7 @@ func Write(tag name.Tag, img v1.Image, options ...Option) (string, error) {
6465
}()
6566

6667
// write the image in docker save format first, then load it
67-
resp, err := o.client.ImageLoad(o.ctx, pr, false)
68+
resp, err := o.client.ImageLoad(o.ctx, pr, client.ImageLoadWithQuiet(false))
6869
if err != nil {
6970
return "", fmt.Errorf("error loading image: %w", err)
7071
}

‎pkg/v1/daemon/write_test.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ import (
2323
"testing"
2424

2525
api "github.com/docker/docker/api/types/image"
26+
"github.com/docker/docker/client"
2627

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

40-
func (m *MockClient) ImageLoad(ctx context.Context, r io.Reader, _ bool) (api.LoadResponse, error) {
41+
func (m *MockClient) ImageLoad(ctx context.Context, r io.Reader, _ ...client.ImageLoadOption) (api.LoadResponse, error) {
4142
if !m.negotiated {
4243
return api.LoadResponse{}, errors.New("you forgot to call NegotiateAPIVersion before calling ImageLoad")
4344
}

‎vendor/github.com/docker/docker/AUTHORS

+31-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)