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 <dluhring@chainguard.dev> * fix use of deprecated types from presubmit failures Signed-off-by: Dan Luhring <dluhring@chainguard.dev> --------- Signed-off-by: Dan Luhring <dluhring@chainguard.dev>
google · Feb 25, 2025 · 098045d · 098045d
1 parent c4dd792
commit 098045d
Show file tree

Hide file tree

Showing 154 changed files with 3,302 additions and 1,790 deletions.
diff --git a/go.mod b/go.mod
@@ -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

diff --git a/go.sum b/go.sum
diff --git a/pkg/v1/daemon/image.go b/pkg/v1/daemon/image.go
@@ -21,8 +21,8 @@ import (
 	"sync"
 	"time"
 
-	api "github.com/docker/docker/api/types"
 	"github.com/docker/docker/api/types/container"
+	api "github.com/docker/docker/api/types/image"
 
 	"github.com/google/go-containerregistry/pkg/name"
 	v1 "github.com/google/go-containerregistry/pkg/v1"
@@ -266,7 +266,7 @@ func (i *image) diffIDs(rootFS api.RootFS) ([]v1.Hash, error) {
 	return diffIDs, nil
 }
 
-func (i *image) computeConfigFile(inspect api.ImageInspect) (*v1.ConfigFile, error) {
+func (i *image) computeConfigFile(inspect api.InspectResponse) (*v1.ConfigFile, error) {
 	diffIDs, err := i.diffIDs(inspect.RootFS)
 	if err != nil {
 		return nil, err

diff --git a/pkg/v1/daemon/image_test.go b/pkg/v1/daemon/image_test.go
@@ -25,8 +25,9 @@ import (
 
 	"github.com/docker/docker/api/types/container"
 	api "github.com/docker/docker/api/types/image"
+	"github.com/docker/docker/api/types/storage"
+	"github.com/docker/docker/client"
 
-	"github.com/docker/docker/api/types"
 	"github.com/google/go-containerregistry/pkg/name"
 	"github.com/google/go-containerregistry/pkg/v1/compare"
 	"github.com/google/go-containerregistry/pkg/v1/tarball"
@@ -35,7 +36,7 @@ import (
 
 var imagePath = "../tarball/testdata/test_image_1.tar"
 
-var inspectResp = types.ImageInspect{
+var inspectResp = api.InspectResponse{
 	ID: "sha256:6e0b05049ed9c17d02e1a55e80d6599dbfcce7f4f4b022e3c673e685789c470e",
 	RepoTags: []string{
 		"bazel/v1/tarball:test_image_1",
@@ -48,15 +49,15 @@ var inspectResp = types.ImageInspect{
 	Size:         8,
 	VirtualSize:  8,
 	Config:       &container.Config{},
-	GraphDriver: types.GraphDriverData{
+	GraphDriver: storage.DriverData{
 		Data: map[string]string{
 			"MergedDir": "/var/lib/docker/overlay2/988ecd005d048fd47b241dd57687231859563ba65a1dfd01ae1771ebfc4cb7c5/merged",
 			"UpperDir":  "/var/lib/docker/overlay2/988ecd005d048fd47b241dd57687231859563ba65a1dfd01ae1771ebfc4cb7c5/diff",
 			"WorkDir":   "/var/lib/docker/overlay2/988ecd005d048fd47b241dd57687231859563ba65a1dfd01ae1771ebfc4cb7c5/work",
 		},
 		Name: "overlay2",
 	},
-	RootFS: types.RootFS{
+	RootFS: api.RootFS{
 		Type: "layers",
 		Layers: []string{
 			"sha256:8897395fd26dc44ad0e2a834335b33198cb41ac4d98dfddf58eced3853fa7b17",
@@ -78,7 +79,7 @@ type MockClient struct {
 	saveBody io.ReadCloser
 
 	inspectErr  error
-	inspectResp types.ImageInspect
+	inspectResp api.InspectResponse
 	inspectBody []byte
 
 	tagErr error
@@ -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")
 	}
@@ -100,11 +101,11 @@ func (m *MockClient) ImageSave(_ context.Context, _ []string) (io.ReadCloser, er
 	return m.saveBody, m.saveErr
 }
 
-func (m *MockClient) ImageInspectWithRaw(_ context.Context, _ string) (types.ImageInspect, []byte, error) {
+func (m *MockClient) ImageInspectWithRaw(_ context.Context, _ string) (api.InspectResponse, []byte, error) {
 	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 ...",

diff --git a/pkg/v1/daemon/options.go b/pkg/v1/daemon/options.go
@@ -18,7 +18,6 @@ import (
 	"context"
 	"io"
 
-	"github.com/docker/docker/api/types"
 	api "github.com/docker/docker/api/types/image"
 	"github.com/docker/docker/client"
 )
@@ -97,9 +96,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)
-	ImageHistory(context.Context, string) ([]api.HistoryResponseItem, error)
+	ImageInspectWithRaw(context.Context, string) (api.InspectResponse, []byte, error)
+	ImageHistory(context.Context, string, ...client.ImageHistoryOption) ([]api.HistoryResponseItem, error)
 }
diff --git a/pkg/v1/daemon/write.go b/pkg/v1/daemon/write.go
@@ -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"
@@ -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)
 	}

diff --git a/pkg/v1/daemon/write_test.go b/pkg/v1/daemon/write_test.go
@@ -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"
@@ -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")
 	}

diff --git a/vendor/github.com/docker/docker/AUTHORS b/vendor/github.com/docker/docker/AUTHORS