Skip to content

Bump github.com/docker/docker from 27.4.0+incompatible to 27.4.1+incompatible in /tests #5741

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

Merged
merged 4 commits into from
Mar 27, 2025
Merged

Bump github.com/docker/docker from 27.4.0+incompatible to 27.4.1+incompatible in /tests #5741

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
352ce1f
Bump github.com/docker/docker in /tests
dependabot[bot] Mar 17, 2025
f193592
make tidy, make fmt
crobert-1 Mar 18, 2025
a254eac
Merge branch 'main' into dependabot/go_modules/tests/github.com/docke…
pjanotti Mar 27, 2025
0158040
Fix deprecated code
pjanotti Mar 27, 2025
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 tests/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ module github.com/signalfx/splunk-otel-collector/tests
go 1.23.0

require (
github.com/docker/docker v27.4.0+incompatible
github.com/docker/docker v28.0.1+incompatible
github.com/docker/go-connections v0.5.0
github.com/go-sql-driver/mysql v1.9.1
github.com/google/uuid v1.6.0
Expand Down
4 changes: 2 additions & 2 deletions tests/go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,8 @@ github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/distribution/reference v0.6.0 h1:0IXCQ5g4/QMHHkarYzh5l+u8T3t73zM5QvfrDyIgxBk=
github.com/distribution/reference v0.6.0/go.mod h1:BbU0aIcezP1/5jX/8MP0YiH4SdvB5Y4f/wlDRiLyi3E=
github.com/docker/docker v27.4.0+incompatible h1:I9z7sQ5qyzO0BfAb9IMOawRkAGxhYsidKiTMcm0DU+A=
github.com/docker/docker v27.4.0+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
github.com/docker/docker v28.0.1+incompatible h1:FCHjSRdXhNRFjlHMTv4jUNlIBbTeRjrWfeFuJp7jpo0=
github.com/docker/docker v28.0.1+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
3 changes: 2 additions & 1 deletion tests/testutils/collector_container.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -334,7 +334,8 @@ func CollectorImageIsForArm(t testing.TB) bool {
client.NegotiateAPIVersion(context.Background())
ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
defer cancel()
inspect, _, err := client.ImageInspectWithRaw(ctx, image)
var buf bytes.Buffer
inspect, err := client.ImageInspect(ctx, image, docker.ImageInspectWithRawResponse(&buf))
require.NoError(t, err)
return inspect.Architecture == "arm64"
}
5 changes: 2 additions & 3 deletions tests/testutils/container.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ import (
"testing"
"time"

"github.com/docker/docker/api/types"
dockerContainer "github.com/docker/docker/api/types/container"
"github.com/docker/docker/errdefs"
"github.com/docker/docker/pkg/stdcopy"
Expand Down Expand Up @@ -449,11 +448,11 @@ func (container *Container) IsRunning() bool {
return (*container.container).IsRunning()
}

func (container *Container) State(ctx context.Context) (*types.ContainerState, error) {
func (container *Container) State(ctx context.Context) (*dockerContainer.State, error) {
if err := container.assertStarted("State"); err != nil {
return nil, err
}
return (*container.container).State(ctx)
return (*container).State(ctx)
}

func (container *Container) CopyToContainer(ctx context.Context, fileContent []byte, containerFilePath string, fileMode int64) error {
Expand Down
Loading