Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump github.com/docker/docker #56

Merged
merged 1 commit into from
Jun 13, 2024
Merged

Bump github.com/docker/docker #56

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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=
Expand Down
10 changes: 5 additions & 5 deletions tests/testutil/docker_composer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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},
Expand All @@ -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
}
Expand All @@ -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
Expand All @@ -238,15 +238,15 @@ 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},
}
execResp, err := dc.api.ContainerExecCreate(context.Background(), cont.ID, execCfg)
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
Expand Down
Loading