go.mod: github.com/docker/docker v24.0.7+incompatible (Mirantis#279)

Signed-off-by: Akihiro Suda <[email protected]>
muraliv21 · Nov 30, 2023 · 9c5ee55 · 9c5ee55
1 parent 5669596
commit 9c5ee55
Show file tree

Hide file tree

Showing 57 changed files with 631 additions and 443 deletions.
diff --git a/core/sandbox_helpers.go b/core/sandbox_helpers.go
@@ -376,7 +376,7 @@ func recoverFromCreationConflictIfNeeded(
 	client libdocker.DockerClientInterface,
 	createConfig dockertypes.ContainerCreateConfig,
 	err error,
-) (*dockercontainer.ContainerCreateCreatedBody, error) {
+) (*dockercontainer.CreateResponse, error) {
 	matches := conflictRE.FindStringSubmatch(err.Error())
 	if len(matches) != 2 {
 		return nil, err

diff --git a/go.mod b/go.mod
@@ -10,7 +10,7 @@ require (
 	github.com/coreos/go-systemd/v22 v22.5.0
 	github.com/davecgh/go-spew v1.1.1
 	github.com/docker/distribution v2.8.3+incompatible
-	github.com/docker/docker v23.0.3+incompatible
+	github.com/docker/docker v24.0.7+incompatible
 	github.com/docker/go-connections v0.4.0
 	github.com/emicklei/go-restful v2.16.0+incompatible
 	github.com/golang/mock v1.6.0

diff --git a/go.sum b/go.sum
@@ -204,8 +204,8 @@ github.com/docker/distribution v2.8.3+incompatible h1:AtKxIZ36LoNK51+Z6RpzLpddBi
 github.com/docker/distribution v2.8.3+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
 github.com/docker/docker v20.10.2+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
 github.com/docker/docker v20.10.12+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
-github.com/docker/docker v23.0.3+incompatible h1:9GhVsShNWz1hO//9BNg/dpMnZW25KydO4wtVxWAIbho=
-github.com/docker/docker v23.0.3+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
+github.com/docker/docker v24.0.7+incompatible h1:Wo6l37AuwP3JaMnZa226lzVXGA3F9Ig1seQen0cKYlM=
+github.com/docker/docker v24.0.7+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
 github.com/docker/go-connections v0.4.0 h1:El9xVISelRB7BuFusrZozjnkIM5YnzCViNKohAFqRJQ=
 github.com/docker/go-connections v0.4.0/go.mod h1:Gbd7IOopHjR8Iph03tsViu4nIes5XhDvyHbTtUxmeec=
 github.com/docker/go-units v0.4.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk=

diff --git a/libdocker/client.go b/libdocker/client.go
@@ -48,7 +48,7 @@ type DockerClientInterface interface {
 	InspectContainerWithSize(id string) (*dockertypes.ContainerJSON, error)
 	CreateContainer(
 		dockertypes.ContainerCreateConfig,
-	) (*dockercontainer.ContainerCreateCreatedBody, error)
+	) (*dockercontainer.CreateResponse, error)
 	StartContainer(id string) error
 	StopContainer(id string, timeout time.Duration) error
 	UpdateContainerResources(id string, updateConfig dockercontainer.UpdateConfig) error

diff --git a/libdocker/fake_client.go b/libdocker/fake_client.go
@@ -480,7 +480,7 @@ func GetFakeContainerID(name string) string {
 // It adds an entry "create" to the internal method call record.
 func (f *FakeDockerClient) CreateContainer(
 	c dockertypes.ContainerCreateConfig,
-) (*dockercontainer.ContainerCreateCreatedBody, error) {
+) (*dockercontainer.CreateResponse, error) {
 	f.Lock()
 	defer f.Unlock()
 	f.appendCalled(CalledDetail{name: "create"})
@@ -508,7 +508,7 @@ func (f *FakeDockerClient) CreateContainer(
 
 	f.normalSleep(100, 25, 25)
 
-	return &dockercontainer.ContainerCreateCreatedBody{ID: id}, nil
+	return &dockercontainer.CreateResponse{ID: id}, nil
 }
 
 // StartContainer is a test-spy implementation of DockerClientInterface.StartContainer.

diff --git a/libdocker/instrumented_client.go b/libdocker/instrumented_client.go
@@ -93,7 +93,7 @@ func (in instrumentedInterface) InspectContainerWithSize(
 
 func (in instrumentedInterface) CreateContainer(
 	opts dockertypes.ContainerCreateConfig,
-) (*dockercontainer.ContainerCreateCreatedBody, error) {
+) (*dockercontainer.CreateResponse, error) {
 	const operation = "create_container"
 	defer recordOperation(operation, time.Now())
 

diff --git a/libdocker/kube_docker_client.go b/libdocker/kube_docker_client.go
@@ -142,7 +142,7 @@ func (d *kubeDockerClient) InspectContainerWithSize(id string) (*dockertypes.Con
 
 func (d *kubeDockerClient) CreateContainer(
 	opts dockertypes.ContainerCreateConfig,
-) (*dockercontainer.ContainerCreateCreatedBody, error) {
+) (*dockercontainer.CreateResponse, error) {
 	ctx, cancel := context.WithTimeout(context.Background(), d.timeout)
 	defer cancel()
 	// we provide an explicit default shm size as to not depend on docker daemon.

diff --git a/libdocker/testing/mock_client.go b/libdocker/testing/mock_client.go
diff --git a/vendor/github.com/docker/docker/AUTHORS b/vendor/github.com/docker/docker/AUTHORS
diff --git a/vendor/github.com/docker/docker/api/common.go b/vendor/github.com/docker/docker/api/common.go