From 09aac934ef257d15306bfa7d065af5d090e39a43 Mon Sep 17 00:00:00 2001 From: secwall Date: Thu, 13 Jun 2024 16:51:56 +0200 Subject: [PATCH] Bump github.com/docker/docker --- go.mod | 2 +- go.sum | 4 ++-- tests/testutil/docker_composer.go | 10 +++++----- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/go.mod b/go.mod index 7bcb817..321047f 100644 --- a/go.mod +++ b/go.mod @@ -5,7 +5,7 @@ go 1.22 require ( github.com/cenkalti/backoff/v4 v4.3.0 github.com/cucumber/godog v0.14.1 - github.com/docker/docker v26.1.4+incompatible + github.com/docker/docker v27.0.0+incompatible github.com/go-zookeeper/zk v1.0.3 github.com/gofrs/flock v0.8.1 github.com/heetch/confita v0.10.0 diff --git a/go.sum b/go.sum index dc3293a..f45a1aa 100644 --- a/go.sum +++ b/go.sum @@ -51,8 +51,8 @@ github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f h1:lO4WD4F/r github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f/go.mod h1:cuUVRXasLTGF7a8hSLbxyZXjz+1KgoB3wDUb6vlszIc= github.com/distribution/reference v0.5.0 h1:/FUIFXtfc/x2gpa5/VGfiGLuOIdYa1t65IKK2OFGvA0= github.com/distribution/reference v0.5.0/go.mod h1:BbU0aIcezP1/5jX/8MP0YiH4SdvB5Y4f/wlDRiLyi3E= -github.com/docker/docker v26.1.4+incompatible h1:vuTpXDuoga+Z38m1OZHzl7NKisKWaWlhjQk7IDPSLsU= -github.com/docker/docker v26.1.4+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= +github.com/docker/docker v27.0.0+incompatible h1:JRugTYuelmWlW0M3jakcIadDx2HUoUO6+Tf2C5jVfwA= +github.com/docker/docker v27.0.0+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= github.com/docker/go-connections v0.5.0 h1:USnMq7hx7gwdVZq1L49hLXaFtUdTADjXGp+uj1Br63c= github.com/docker/go-connections v0.5.0/go.mod h1:ov60Kzw0kKElRwhNs9UlUHAE/F9Fe6GLaXnqyDdmEXc= github.com/docker/go-units v0.5.0 h1:69rxXcBk27SvSaaxTtLh/8llcHD8vYHT7WSdRZ/jvr4= diff --git a/tests/testutil/docker_composer.go b/tests/testutil/docker_composer.go index 3bac9ee..f0fa328 100644 --- a/tests/testutil/docker_composer.go +++ b/tests/testutil/docker_composer.go @@ -200,7 +200,7 @@ func (dc *DockerComposer) RunCommand(service string, cmd string, timeout time.Du } ctx, cancel := context.WithTimeout(context.Background(), timeout) defer cancel() - execCfg := types.ExecConfig{ + execCfg := container.ExecOptions{ AttachStdout: true, AttachStderr: true, Cmd: []string{shell, "-c", cmd}, @@ -209,7 +209,7 @@ func (dc *DockerComposer) RunCommand(service string, cmd string, timeout time.Du if err != nil { return 0, "", err } - attachResp, err := dc.api.ContainerExecAttach(ctx, execResp.ID, types.ExecStartCheck{}) + attachResp, err := dc.api.ContainerExecAttach(ctx, execResp.ID, container.ExecAttachOptions{}) if err != nil { return 0, "", err } @@ -218,7 +218,7 @@ func (dc *DockerComposer) RunCommand(service string, cmd string, timeout time.Du if err != nil { return 0, "", err } - var insp types.ContainerExecInspect + var insp container.ExecInspect Retry(func() bool { insp, err = dc.api.ContainerExecInspect(ctx, execResp.ID) return err != nil || !insp.Running @@ -238,7 +238,7 @@ func (dc *DockerComposer) RunAsyncCommand(service string, cmd string) error { if !ok { return fmt.Errorf("no such service: %s", service) } - execCfg := types.ExecConfig{ + execCfg := container.ExecOptions{ Detach: true, Cmd: []string{shell, "-c", cmd}, } @@ -246,7 +246,7 @@ func (dc *DockerComposer) RunAsyncCommand(service string, cmd string) error { if err != nil { return err } - return dc.api.ContainerExecStart(context.Background(), execResp.ID, types.ExecStartCheck{}) + return dc.api.ContainerExecStart(context.Background(), execResp.ID, container.ExecStartOptions{}) } // GetFile returns content of the fail from continer by path