Skip to content

Commit

Permalink
chore(deps): bump github.com/docker/docker from 24.0.9+incompatible t…
Browse files Browse the repository at this point in the history 
…o 25.0.6+incompatible (#9780)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Corban Beaird <corban.beaird@hpe.com>
  • Loading branch information
@dependabot @corban-beaird
dependabot[bot] and corban-beaird authored Sep 10, 2024
1 parent c1499ac commit 481bddb
Show file tree
Hide file tree
Showing 5 changed files with 140 additions and 138 deletions.
8 changes: 4 additions & 4 deletions agent/pkg/docker/docker.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ func (d *Client) ReattachContainer(
id cproto.ID,
) (*Container, *aproto.ExitCode, error) {
filter := LabelFilter(ContainerIDLabel, id.String())
containers, err := d.cl.ContainerList(ctx, types.ContainerListOptions{Filters: filter})
containers, err := d.cl.ContainerList(ctx, dcontainer.ListOptions{Filters: filter})
if err != nil {
return nil, nil, fmt.Errorf("while reattaching container: %w", err)
}
Expand Down Expand Up @@ -299,7 +299,7 @@ func (d *Client) RunContainer(
// Wait before start to not miss immediate exits.
waiter, errs := d.cl.ContainerWait(waitCtx, id, dcontainer.WaitConditionNextExit)

if err := d.cl.ContainerStart(ctx, id, types.ContainerStartOptions{}); err != nil {
if err := d.cl.ContainerStart(ctx, id, dcontainer.StartOptions{}); err != nil {
return nil, fmt.Errorf("starting container: %w", err)
}

Expand Down Expand Up @@ -330,7 +330,7 @@ func (d *Client) SignalContainer(ctx context.Context, id string, sig syscall.Sig

// RemoveContainer removes a Docker container by ID.
func (d *Client) RemoveContainer(ctx context.Context, id string, force bool) error {
return d.cl.ContainerRemove(ctx, id, types.ContainerRemoveOptions{Force: force})
return d.cl.ContainerRemove(ctx, id, dcontainer.RemoveOptions{Force: force})
}

// ListRunningContainers lists running Docker containers satisfying the given filters.
Expand All @@ -339,7 +339,7 @@ func (d *Client) ListRunningContainers(ctx context.Context, fs filters.Args) (
) {
// List "our" running containers, based on `dockerAgentLabel`.
// This doesn't include containers spawned by other agents.
containers, err := d.cl.ContainerList(ctx, types.ContainerListOptions{All: false, Filters: fs})
containers, err := d.cl.ContainerList(ctx, dcontainer.ListOptions{All: false, Filters: fs})
if err != nil {
return nil, err
}
Expand Down
4 changes: 2 additions & 2 deletions agent/pkg/docker/docker_api_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@ func TestRunContainer(t *testing.T) {
if err := rawCl.ContainerRemove(
ctx,
dockerID,
types.ContainerRemoveOptions{Force: true},
container.RemoveOptions{Force: true},
); err != nil {
t.Errorf("failed to cleanup container %s: %s", dockerID, err)
}
Expand Down Expand Up @@ -244,7 +244,7 @@ func TestRunContainerWithService(t *testing.T) {
if rErr := rawCl.ContainerRemove(
ctx,
c.ContainerInfo.ID,
types.ContainerRemoveOptions{Force: true},
container.RemoveOptions{Force: true},
); rErr != nil {
t.Errorf("failed to cleanup container %s: %s", c.ContainerInfo.ID, rErr)
}
Expand Down
83 changes: 43 additions & 40 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@ module github.com/determined-ai/determined
go 1.22.0

require (
cloud.google.com/go v0.110.4 // indirect
cloud.google.com/go v0.112.1 // indirect
github.com/Masterminds/sprig/v3 v3.2.2
github.com/aws/aws-sdk-go v1.40.34
github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869 // indirect
github.com/coreos/go-systemd v0.0.0-20190719114852-fd7a80b32e1f
github.com/davecgh/go-spew v1.1.1
github.com/docker/docker v24.0.9+incompatible
github.com/docker/docker v25.0.6+incompatible
github.com/docker/go-connections v0.4.0
github.com/docker/go-units v0.4.0
github.com/dustinkirkland/golang-petname v0.0.0-20191129215211-8e5a1ed0cff0
Expand All @@ -21,7 +21,7 @@ require (
github.com/golang-jwt/jwt v3.2.2+incompatible // indirect
github.com/golang/protobuf v1.5.4
github.com/google/go-cmp v0.6.0
github.com/google/uuid v1.5.0
github.com/google/uuid v1.6.0
github.com/gorilla/websocket v1.5.0
github.com/grpc-ecosystem/go-grpc-middleware v1.3.0
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0
Expand All @@ -41,19 +41,19 @@ require (
github.com/prometheus/client_golang v1.17.0
github.com/santhosh-tekuri/jsonschema/v2 v2.2.0
github.com/segmentio/backo-go v0.0.0-20200129164019-23eae7c10bd3 // indirect
github.com/sirupsen/logrus v1.9.0
github.com/sirupsen/logrus v1.9.3
github.com/soheilhy/cmux v0.1.4
github.com/spf13/cobra v1.7.0
github.com/spf13/pflag v1.0.5
github.com/spf13/viper v1.9.0
github.com/stretchr/testify v1.8.4
github.com/stretchr/testify v1.9.0
github.com/xtgo/uuid v0.0.0-20140804021211-a0b114877d4c // indirect
golang.org/x/crypto v0.21.0
golang.org/x/net v0.23.0
google.golang.org/api v0.126.0
google.golang.org/grpc v1.58.3
golang.org/x/crypto v0.24.0
golang.org/x/net v0.26.0
google.golang.org/api v0.169.0
google.golang.org/grpc v1.64.0
google.golang.org/grpc/examples v0.0.0-20210525230658-4bae49e05b28 // indirect
google.golang.org/protobuf v1.33.0 // v1.27.1
google.golang.org/protobuf v1.34.2 // v1.27.1
gopkg.in/guregu/null.v3 v3.4.0
gopkg.in/segmentio/analytics-go.v3 v3.1.0
gotest.tools v2.2.0+incompatible
Expand All @@ -67,10 +67,10 @@ require (
github.com/crewjam/saml v0.4.14
github.hpe.com/hpe/hpc-ard-launcher-go/launcher v0.0.0-00010101000000-000000000000
go.opentelemetry.io/contrib/instrumentation/github.com/labstack/echo/otelecho v0.44.0
go.opentelemetry.io/otel v1.18.0
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.18.0
go.opentelemetry.io/otel v1.28.0
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.28.0
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.18.0
go.opentelemetry.io/otel/sdk v1.18.0
go.opentelemetry.io/otel/sdk v1.28.0
gopkg.in/oauth2.v3 v3.12.0
)

Expand All @@ -81,19 +81,19 @@ require (
github.com/aead/chacha20poly1305 v0.0.0-20170617001512-233f39982aeb // indirect
github.com/aead/poly1305 v0.0.0-20180717145839-3fee0db0b635 // indirect
github.com/beorn7/perks v1.0.1 // indirect
github.com/cenkalti/backoff/v4 v4.2.1
github.com/cenkalti/backoff/v4 v4.3.0
github.com/cespare/xxhash/v2 v2.2.0 // indirect
github.com/fsnotify/fsnotify v1.7.0 // indirect
github.com/go-logr/logr v1.2.4 // indirect
github.com/go-logr/logr v1.4.2 // indirect
github.com/go-logr/stdr v1.2.2 // indirect
github.com/go-pg/zerochecker v0.2.0 // indirect
github.com/go-sql-driver/mysql v1.6.0 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang-jwt/jwt/v4 v4.4.3
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
github.com/google/gofuzz v1.2.0 // indirect
github.com/googleapis/gax-go/v2 v2.11.0 // indirect
github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0 // indirect
github.com/googleapis/gax-go/v2 v2.12.2 // indirect
github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0 // indirect
github.com/hashicorp/errwrap v1.0.0 // indirect
github.com/hashicorp/hcl v1.0.0 // indirect
github.com/imdario/mergo v0.3.16 // indirect
Expand Down Expand Up @@ -124,7 +124,7 @@ require (
github.com/spf13/afero v1.6.0 // indirect
github.com/spf13/cast v1.4.1 // indirect
github.com/spf13/jwalterweatherman v1.1.0 // indirect
github.com/stretchr/objx v0.5.0 // indirect
github.com/stretchr/objx v0.5.2 // indirect
github.com/subosito/gotenv v1.2.0 // indirect
github.com/tmthrgd/go-hex v0.0.0-20190904060850-447a3041c3bc // indirect
github.com/valyala/bytebufferpool v1.0.0 // indirect
Expand All @@ -134,15 +134,14 @@ require (
github.com/vmihailenco/tagparser v0.1.2 // indirect
github.com/vmihailenco/tagparser/v2 v2.0.0 // indirect
go.opencensus.io v0.24.0 // indirect
go.opentelemetry.io/otel/trace v1.18.0 // indirect
go.opentelemetry.io/proto/otlp v1.0.0 // indirect
golang.org/x/oauth2 v0.13.0
golang.org/x/sys v0.18.0
golang.org/x/term v0.18.0 // indirect
golang.org/x/text v0.14.0
golang.org/x/time v0.3.0
google.golang.org/appengine v1.6.8 // indirect
google.golang.org/genproto v0.0.0-20230711160842-782d3b101e98
go.opentelemetry.io/otel/trace v1.28.0 // indirect
go.opentelemetry.io/proto/otlp v1.3.1 // indirect
golang.org/x/oauth2 v0.20.0
golang.org/x/sys v0.21.0
golang.org/x/term v0.21.0 // indirect
golang.org/x/text v0.16.0
golang.org/x/time v0.5.0
google.golang.org/genproto v0.0.0-20240213162025-012b6fc9bca9
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/ini.v1 v1.63.2 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
Expand All @@ -157,7 +156,7 @@ require (
)

require (
cloud.google.com/go/storage v1.30.1
cloud.google.com/go/storage v1.38.0
github.com/docker/distribution v2.8.2+incompatible
github.com/docker/docker-credential-helpers v0.6.4
github.com/fatih/color v1.16.0 // indirect
Expand All @@ -174,28 +173,30 @@ require (
github.com/uptrace/bun/dialect/pgdialect v1.2.0
github.com/uptrace/bun/extra/bundebug v1.2.0
golang.org/x/exp v0.0.0-20231219180239-dc181d75b848
golang.org/x/tools v0.16.0
golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d
)

require (
cloud.google.com/go/compute v1.21.0 // indirect
cloud.google.com/go/iam v1.1.1 // indirect
cloud.google.com/go/iam v1.1.6 // indirect
github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect
github.com/Microsoft/go-winio v0.6.1 // indirect
github.com/beevik/etree v1.3.0 // indirect
github.com/containerd/log v0.1.0 // indirect
github.com/crewjam/httperr v0.2.0 // indirect
github.com/dgrijalva/jwt-go v3.2.0+incompatible // indirect
github.com/distribution/reference v0.6.0 // indirect
github.com/docker/go-metrics v0.0.1 // indirect
github.com/docker/libtrust v0.0.0-20160708172513-aabc10ec26b7 // indirect
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
github.com/felixge/httpsnoop v1.0.4 // indirect
github.com/go-jose/go-jose/v3 v3.0.3 // indirect
github.com/go-ole/go-ole v1.2.6 // indirect
github.com/go-openapi/jsonpointer v0.20.0 // indirect
github.com/go-openapi/jsonreference v0.20.2 // indirect
github.com/go-openapi/swag v0.22.4 // indirect
github.com/google/gnostic-models v0.6.8 // indirect
github.com/google/s2a-go v0.1.4 // indirect
github.com/googleapis/enterprise-certificate-proxy v0.2.3 // indirect
github.com/google/s2a-go v0.1.7 // indirect
github.com/googleapis/enterprise-certificate-proxy v0.3.2 // indirect
github.com/gorilla/mux v1.8.0 // indirect
github.com/josharian/intern v1.0.0 // indirect
github.com/mailru/easyjson v0.7.7 // indirect
Expand All @@ -208,17 +209,19 @@ require (
github.com/tklauser/go-sysconf v0.3.12 // indirect
github.com/tklauser/numcpus v0.6.1 // indirect
github.com/yusufpapurcu/wmi v1.2.3 // indirect
go.opentelemetry.io/otel/metric v1.18.0 // indirect
golang.org/x/mod v0.14.0 // indirect
golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20230711160842-782d3b101e98 // indirect
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.28.0 // indirect
go.opentelemetry.io/otel/metric v1.28.0 // indirect
golang.org/x/mod v0.17.0 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094 // indirect
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
)

require (
cloud.google.com/go/compute/metadata v0.2.3
golang.org/x/sync v0.5.0
google.golang.org/genproto/googleapis/api v0.0.0-20230711160842-782d3b101e98
cloud.google.com/go/compute/metadata v0.3.0
golang.org/x/sync v0.7.0
google.golang.org/genproto/googleapis/api v0.0.0-20240701130421-f6361c86f094
k8s.io/component-helpers v0.28.3
sigs.k8s.io/gateway-api v1.0.0
)
Expand Down
Loading

0 comments on commit 481bddb

Please sign in to comment.