Skip to content

Commit ebd9de0

Browse files
cncalcncal
authored
Bump github.com/docker/docker to 27.0.2+incompatible (Mirantis#381)
Signed-off-by: cncal <[email protected]>
1 parent 3921bcd commit ebd9de0

Some content is hidden

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

65 files changed

+1490
-656
lines changed

‎core/exec.go

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,10 @@ import (
2222
"io"
2323
"time"
2424

25+
dockertypes "github.com/docker/docker/api/types"
2526
"k8s.io/client-go/tools/remotecommand"
2627

27-
dockertypes "github.com/docker/docker/api/types"
28+
dockercontainer "github.com/docker/docker/api/types/container"
2829
"github.com/sirupsen/logrus"
2930

3031
"github.com/Mirantis/cri-dockerd/libdocker"
@@ -33,7 +34,7 @@ import (
3334
)
3435

3536
type dockerExitError struct {
36-
Inspect *dockertypes.ContainerExecInspect
37+
Inspect *dockercontainer.ExecInspect
3738
}
3839

3940
func (d *dockerExitError) String() string {
@@ -87,7 +88,7 @@ func (*NativeExecHandler) ExecInContainer(
8788
done := make(chan struct{})
8889
defer close(done)
8990

90-
createOpts := dockertypes.ExecConfig{
91+
createOpts := dockercontainer.ExecOptions{
9192
Cmd: cmd,
9293
AttachStdin: stdin != nil,
9394
AttachStdout: stdout != nil,
@@ -119,7 +120,7 @@ func (*NativeExecHandler) ExecInContainer(
119120
})
120121
}()
121122

122-
startOpts := dockertypes.ExecStartCheck{Detach: false, Tty: tty}
123+
startOpts := dockercontainer.ExecStartOptions{Detach: false, Tty: tty}
123124
streamOpts := libdocker.StreamOptions{
124125
InputStream: stdin,
125126
OutputStream: stdout,

‎core/exec_test.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ import (
2424
"time"
2525

2626
dockertypes "github.com/docker/docker/api/types"
27+
dockercontainer "github.com/docker/docker/api/types/container"
2728
"github.com/golang/mock/gomock"
2829
"github.com/stretchr/testify/assert"
2930
"k8s.io/client-go/tools/remotecommand"
@@ -39,7 +40,7 @@ func TestExecInContainer(t *testing.T) {
3940
returnCreateExec1 *dockertypes.IDResponse
4041
returnCreateExec2 error
4142
returnStartExec error
42-
returnInspectExec1 *dockertypes.ContainerExecInspect
43+
returnInspectExec1 *dockercontainer.ExecInspect
4344
returnInspectExec2 error
4445
expectError error
4546
}{{
@@ -48,7 +49,7 @@ func TestExecInContainer(t *testing.T) {
4849
returnCreateExec1: &dockertypes.IDResponse{ID: "12345678"},
4950
returnCreateExec2: nil,
5051
returnStartExec: nil,
51-
returnInspectExec1: &dockertypes.ContainerExecInspect{
52+
returnInspectExec1: &dockercontainer.ExecInspect{
5253
ExecID: "200",
5354
ContainerID: "12345678",
5455
Running: false,
@@ -91,7 +92,7 @@ func TestExecInContainer(t *testing.T) {
9192
returnCreateExec1: &dockertypes.IDResponse{ID: "12345678"},
9293
returnCreateExec2: nil,
9394
returnStartExec: context.DeadlineExceeded,
94-
returnInspectExec1: &dockertypes.ContainerExecInspect{
95+
returnInspectExec1: &dockercontainer.ExecInspect{
9596
ExecID: "200",
9697
ContainerID: "12345678",
9798
Running: true,
@@ -149,7 +150,6 @@ func TestExecInContainer(t *testing.T) {
149150
}
150151
}
151152

152-
153153
func getFakeContainerJSON() *dockertypes.ContainerJSON {
154154
return &dockertypes.ContainerJSON{
155155
ContainerJSONBase: &dockertypes.ContainerJSONBase{

‎core/image.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ import (
2323
"strconv"
2424
"strings"
2525

26-
dockertypes "github.com/docker/docker/api/types"
2726
dockerfilters "github.com/docker/docker/api/types/filters"
27+
dockerimage "github.com/docker/docker/api/types/image"
2828
dockerregistry "github.com/docker/docker/api/types/registry"
2929
"github.com/docker/docker/pkg/jsonmessage"
3030

@@ -62,7 +62,7 @@ func (ds *dockerService) ListImages(
6262
r *runtimeapi.ListImagesRequest,
6363
) (*runtimeapi.ListImagesResponse, error) {
6464
filter := r.GetFilter()
65-
opts := dockertypes.ImageListOptions{}
65+
opts := dockerimage.ListOptions{}
6666
if filter != nil {
6767
if filter.GetImage().GetImage() != "" {
6868
opts.Filters = dockerfilters.NewArgs()
@@ -149,7 +149,7 @@ func (ds *dockerService) PullImage(
149149
}
150150
err := ds.client.PullImage(image.Image,
151151
authConfig,
152-
dockertypes.ImagePullOptions{},
152+
dockerimage.PullOptions{},
153153
)
154154
if err != nil {
155155
return nil, filterHTTPError(err, image.Image)
@@ -193,7 +193,7 @@ func (ds *dockerService) RemoveImage(
193193
images = append(images, image.Image)
194194

195195
for _, image := range images {
196-
if _, err := ds.client.RemoveImage(image, dockertypes.ImageRemoveOptions{PruneChildren: true}); err != nil &&
196+
if _, err := ds.client.RemoveImage(image, dockerimage.RemoveOptions{PruneChildren: true}); err != nil &&
197197
!libdocker.IsImageNotFoundError(err) {
198198
return nil, err
199199
}

‎core/image_test.go

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ import (
2121
"testing"
2222

2323
dockertypes "github.com/docker/docker/api/types"
24+
dockerimage "github.com/docker/docker/api/types/image"
2425
"github.com/docker/docker/pkg/jsonmessage"
2526
"github.com/stretchr/testify/assert"
2627
"github.com/stretchr/testify/require"
@@ -41,11 +42,11 @@ func TestRemoveImage(t *testing.T) {
4142
libdocker.NewCalledDetail("inspect_image", nil),
4243
libdocker.NewCalledDetail(
4344
"remove_image",
44-
[]interface{}{"foo", dockertypes.ImageRemoveOptions{PruneChildren: true}},
45+
[]interface{}{"foo", dockerimage.RemoveOptions{PruneChildren: true}},
4546
),
4647
libdocker.NewCalledDetail(
4748
"remove_image",
48-
[]interface{}{"1111", dockertypes.ImageRemoveOptions{PruneChildren: true}},
49+
[]interface{}{"1111", dockerimage.RemoveOptions{PruneChildren: true}},
4950
),
5051
},
5152
},
@@ -55,15 +56,15 @@ func TestRemoveImage(t *testing.T) {
5556
libdocker.NewCalledDetail("inspect_image", nil),
5657
libdocker.NewCalledDetail(
5758
"remove_image",
58-
[]interface{}{"foo", dockertypes.ImageRemoveOptions{PruneChildren: true}},
59+
[]interface{}{"foo", dockerimage.RemoveOptions{PruneChildren: true}},
5960
),
6061
libdocker.NewCalledDetail(
6162
"remove_image",
62-
[]interface{}{"bar", dockertypes.ImageRemoveOptions{PruneChildren: true}},
63+
[]interface{}{"bar", dockerimage.RemoveOptions{PruneChildren: true}},
6364
),
6465
libdocker.NewCalledDetail(
6566
"remove_image",
66-
[]interface{}{"2222", dockertypes.ImageRemoveOptions{PruneChildren: true}},
67+
[]interface{}{"2222", dockerimage.RemoveOptions{PruneChildren: true}},
6768
),
6869
},
6970
},
@@ -77,22 +78,22 @@ func TestRemoveImage(t *testing.T) {
7778
libdocker.NewCalledDetail("inspect_image", nil),
7879
libdocker.NewCalledDetail(
7980
"remove_image",
80-
[]interface{}{"foo", dockertypes.ImageRemoveOptions{PruneChildren: true}},
81+
[]interface{}{"foo", dockerimage.RemoveOptions{PruneChildren: true}},
8182
),
8283
libdocker.NewCalledDetail(
8384
"remove_image",
84-
[]interface{}{"foo@3333", dockertypes.ImageRemoveOptions{PruneChildren: true}},
85+
[]interface{}{"foo@3333", dockerimage.RemoveOptions{PruneChildren: true}},
8586
),
8687
libdocker.NewCalledDetail(
8788
"remove_image",
8889
[]interface{}{
8990
"example.com/foo@3333",
90-
dockertypes.ImageRemoveOptions{PruneChildren: true},
91+
dockerimage.RemoveOptions{PruneChildren: true},
9192
},
9293
),
9394
libdocker.NewCalledDetail(
9495
"remove_image",
95-
[]interface{}{"3333", dockertypes.ImageRemoveOptions{PruneChildren: true}},
96+
[]interface{}{"3333", dockerimage.RemoveOptions{PruneChildren: true}},
9697
),
9798
},
9899
},
@@ -106,18 +107,18 @@ func TestRemoveImage(t *testing.T) {
106107
libdocker.NewCalledDetail("inspect_image", nil),
107108
libdocker.NewCalledDetail(
108109
"remove_image",
109-
[]interface{}{"foo@4444", dockertypes.ImageRemoveOptions{PruneChildren: true}},
110+
[]interface{}{"foo@4444", dockerimage.RemoveOptions{PruneChildren: true}},
110111
),
111112
libdocker.NewCalledDetail(
112113
"remove_image",
113114
[]interface{}{
114115
"example.com/foo@4444",
115-
dockertypes.ImageRemoveOptions{PruneChildren: true},
116+
dockerimage.RemoveOptions{PruneChildren: true},
116117
},
117118
),
118119
libdocker.NewCalledDetail(
119120
"remove_image",
120-
[]interface{}{"4444", dockertypes.ImageRemoveOptions{PruneChildren: true}},
121+
[]interface{}{"4444", dockerimage.RemoveOptions{PruneChildren: true}},
121122
),
122123
},
123124
},

‎core/imagefs_linux.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import (
2323
"syscall"
2424
"time"
2525

26-
"github.com/docker/docker/api/types"
26+
"github.com/docker/docker/api/types/image"
2727
"github.com/sirupsen/logrus"
2828

2929
runtimeapi "k8s.io/cri-api/pkg/apis/runtime/v1"
@@ -43,7 +43,7 @@ func (ds *dockerService) imageFsInfo() (*runtimeapi.ImageFsInfoResponse, error)
4343
logrus.Debugf("Filesystem usage containing '%s': usedBytes=%v, iNodesUsed=%v", ds.dockerRootDir, usedBytes, iNodesUsed)
4444

4545
// compute total used bytes by docker images
46-
images, err := ds.client.ListImages(types.ImageListOptions{All: true, SharedSize: true})
46+
images, err := ds.client.ListImages(image.ListOptions{All: true, SharedSize: true})
4747
if err != nil {
4848
logrus.Error(err, "Failed to get image list from docker")
4949
return nil, err

‎core/sandbox_helpers.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ import (
3131
dockertypes "github.com/docker/docker/api/types"
3232
dockerbackend "github.com/docker/docker/api/types/backend"
3333
dockercontainer "github.com/docker/docker/api/types/container"
34+
dockerimage "github.com/docker/docker/api/types/image"
3435
dockerregistry "github.com/docker/docker/api/types/registry"
3536
"github.com/sirupsen/logrus"
3637
runtimeapi "k8s.io/cri-api/pkg/apis/runtime/v1"
@@ -442,7 +443,7 @@ func ensureSandboxImageExists(client libdocker.DockerClientInterface, image stri
442443
if !withCredentials {
443444
logrus.Infof("Pulling the image without credentials. Image: %v", image)
444445

445-
err := client.PullImage(image, dockerregistry.AuthConfig{}, dockertypes.ImagePullOptions{})
446+
err := client.PullImage(image, dockerregistry.AuthConfig{}, dockerimage.PullOptions{})
446447
if err != nil {
447448
return fmt.Errorf("failed pulling image %q: %v", image, err)
448449
}
@@ -453,7 +454,7 @@ func ensureSandboxImageExists(client libdocker.DockerClientInterface, image stri
453454
var pullErrs []error
454455
for _, currentCreds := range creds {
455456
authConfig := dockerregistry.AuthConfig(currentCreds)
456-
err := client.PullImage(image, authConfig, dockertypes.ImagePullOptions{})
457+
err := client.PullImage(image, authConfig, dockerimage.PullOptions{})
457458
// If there was no error, return success
458459
if err == nil {
459460
return nil

‎core/stats_test.go

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ package core
1919
import (
2020
"testing"
2121

22-
dockertypes "github.com/docker/docker/api/types"
2322
"github.com/docker/docker/api/types/container"
2423
"github.com/stretchr/testify/assert"
2524
runtimeapi "k8s.io/cri-api/pkg/apis/runtime/v1"
@@ -32,7 +31,7 @@ func TestContainerStats(t *testing.T) {
3231
tests := map[string]struct {
3332
containerID string
3433
container *libdocker.FakeContainer
35-
containerStats *dockertypes.StatsJSON
34+
containerStats *container.StatsResponse
3635
calledDetails []libdocker.CalledDetail
3736
}{
3837
"container exists": {
@@ -44,7 +43,7 @@ func TestContainerStats(t *testing.T) {
4443
Labels: labels,
4544
},
4645
},
47-
&dockertypes.StatsJSON{},
46+
&container.StatsResponse{},
4847
[]libdocker.CalledDetail{
4948
libdocker.NewCalledDetail("list", nil),
5049
libdocker.NewCalledDetail("get_container_stats", nil),
@@ -59,7 +58,7 @@ func TestContainerStats(t *testing.T) {
5958
Labels: labels,
6059
},
6160
},
62-
&dockertypes.StatsJSON{},
61+
&container.StatsResponse{},
6362
[]libdocker.CalledDetail{
6463
libdocker.NewCalledDetail("list", nil),
6564
},
@@ -71,7 +70,7 @@ func TestContainerStats(t *testing.T) {
7170
ds, fakeDocker, _ := newTestDockerService()
7271
fakeDocker.SetFakeContainers([]*libdocker.FakeContainer{test.container})
7372
fakeDocker.InjectContainerStats(
74-
map[string]*dockertypes.StatsJSON{test.container.ID: test.containerStats},
73+
map[string]*container.StatsResponse{test.container.ID: test.containerStats},
7574
)
7675
ds.ContainerStats(
7776
getTestCTX(),

‎go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ require (
1010
github.com/coreos/go-systemd/v22 v22.5.0
1111
github.com/davecgh/go-spew v1.1.1
1212
github.com/docker/distribution v2.8.3+incompatible
13-
github.com/docker/docker v26.1.2+incompatible
13+
github.com/docker/docker v27.0.2+incompatible
1414
github.com/docker/go-connections v0.5.0
1515
github.com/emicklei/go-restful v2.16.0+incompatible
1616
github.com/golang/mock v1.6.0

‎go.sum

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -714,6 +714,8 @@ github.com/docker/distribution v2.8.3+incompatible/go.mod h1:J2gT2udsDAN96Uj4Kfc
714714
github.com/docker/docker v20.10.21+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
715715
github.com/docker/docker v26.1.2+incompatible h1:UVX5ZOrrfTGZZYEP+ZDq3Xn9PdHNXaSYMFPDumMqG2k=
716716
github.com/docker/docker v26.1.2+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
717+
github.com/docker/docker v27.0.2+incompatible h1:mNhCtgXNV1fIRns102grG7rdzIsGGCq1OlOD0KunZos=
718+
github.com/docker/docker v27.0.2+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
717719
github.com/docker/go-connections v0.4.0/go.mod h1:Gbd7IOopHjR8Iph03tsViu4nIes5XhDvyHbTtUxmeec=
718720
github.com/docker/go-connections v0.5.0 h1:USnMq7hx7gwdVZq1L49hLXaFtUdTADjXGp+uj1Br63c=
719721
github.com/docker/go-connections v0.5.0/go.mod h1:ov60Kzw0kKElRwhNs9UlUHAE/F9Fe6GLaXnqyDdmEXc=

‎libdocker/client.go

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -59,23 +59,20 @@ type DockerClientInterface interface {
5959
RemoveContainer(id string, opts dockercontainer.RemoveOptions) error
6060
InspectImageByRef(imageRef string) (*dockertypes.ImageInspect, error)
6161
InspectImageByID(imageID string) (*dockertypes.ImageInspect, error)
62-
ListImages(opts dockertypes.ImageListOptions) ([]dockerimagetypes.Summary, error)
63-
PullImage(image string, auth dockerregistry.AuthConfig, opts dockertypes.ImagePullOptions) error
64-
RemoveImage(
65-
image string,
66-
opts dockertypes.ImageRemoveOptions,
67-
) ([]dockerimagetypes.DeleteResponse, error)
62+
ListImages(opts dockerimagetypes.ListOptions) ([]dockerimagetypes.Summary, error)
63+
PullImage(image string, auth dockerregistry.AuthConfig, opts dockerimagetypes.PullOptions) error
64+
RemoveImage(imageStr string, opts dockerimagetypes.RemoveOptions) ([]dockerimagetypes.DeleteResponse, error)
6865
ImageHistory(id string) ([]dockerimagetypes.HistoryResponseItem, error)
6966
Logs(string, dockercontainer.LogsOptions, StreamOptions) error
7067
Version() (*dockertypes.Version, error)
7168
Info() (*dockersystem.Info, error)
72-
CreateExec(string, dockertypes.ExecConfig) (*dockertypes.IDResponse, error)
73-
StartExec(string, dockertypes.ExecStartCheck, StreamOptions) error
74-
InspectExec(id string) (*dockertypes.ContainerExecInspect, error)
69+
CreateExec(string, dockercontainer.ExecOptions) (*dockertypes.IDResponse, error)
70+
StartExec(string, dockercontainer.ExecStartOptions, StreamOptions) error
71+
InspectExec(id string) (*dockercontainer.ExecInspect, error)
7572
AttachToContainer(string, dockercontainer.AttachOptions, StreamOptions) error
7673
ResizeContainerTTY(id string, height, width uint) error
7774
ResizeExecTTY(id string, height, width uint) error
78-
GetContainerStats(id string) (*dockertypes.StatsJSON, error)
75+
GetContainerStats(id string) (*dockercontainer.StatsResponse, error)
7976
}
8077

8178
// Get a *dockerapi.Client, either using the endpoint passed in, or using

0 commit comments

Comments
 (0)