From 6a35c1b8eae84c867a308e73eb3ddd5d5395fb9a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 5 Jun 2025 10:26:18 -0400 Subject: [PATCH] chore(deps): bump github.com/docker/docker from 28.1.1+incompatible to 28.2.2+incompatible (#25954) * chore(deps): bump github.com/docker/docker Bumps [github.com/docker/docker](https://github.com/docker/docker) from 28.1.1+incompatible to 28.2.2+incompatible. - [Release notes](https://github.com/docker/docker/releases) - [Commits](https://github.com/docker/docker/compare/v28.1.1...v28.2.2) --- updated-dependencies: - dependency-name: github.com/docker/docker dependency-version: 28.2.2+incompatible dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] * deps: containerd/errdefs instead of docker/errdefs moby's errdefs are deprecated as of https://github.com/moby/moby/commit/f1bb44aeee8fe115075fe06b588f5f4b8db471d8 and now merely point to containerd's --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Daniel Bennett --- drivers/docker/coordinator.go | 2 +- drivers/docker/docklog/docker_logger.go | 2 +- drivers/docker/driver.go | 4 ++-- drivers/docker/driver_test.go | 2 +- drivers/docker/handle.go | 2 +- go.mod | 4 +++- go.sum | 8 ++++++-- 7 files changed, 15 insertions(+), 9 deletions(-) diff --git a/drivers/docker/coordinator.go b/drivers/docker/coordinator.go index 75ffe5fce..01b3a896d 100644 --- a/drivers/docker/coordinator.go +++ b/drivers/docker/coordinator.go @@ -12,10 +12,10 @@ import ( "sync" "time" + "github.com/containerd/errdefs" "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/image" "github.com/docker/docker/api/types/registry" - "github.com/docker/docker/errdefs" hclog "github.com/hashicorp/go-hclog" "github.com/hashicorp/nomad/nomad/structs" ) diff --git a/drivers/docker/docklog/docker_logger.go b/drivers/docker/docklog/docker_logger.go index 15fbe68c5..71ee4bcbc 100644 --- a/drivers/docker/docklog/docker_logger.go +++ b/drivers/docker/docklog/docker_logger.go @@ -12,9 +12,9 @@ import ( "sync" "time" + "github.com/containerd/errdefs" containerapi "github.com/docker/docker/api/types/container" "github.com/docker/docker/client" - "github.com/docker/docker/errdefs" "github.com/docker/docker/pkg/stdcopy" "github.com/hashicorp/go-hclog" "github.com/hashicorp/go-multierror" diff --git a/drivers/docker/driver.go b/drivers/docker/driver.go index ab57420ff..69ac9fb4b 100644 --- a/drivers/docker/driver.go +++ b/drivers/docker/driver.go @@ -20,6 +20,7 @@ import ( "sync" "time" + "github.com/containerd/errdefs" "github.com/docker/docker/api/types" containerapi "github.com/docker/docker/api/types/container" "github.com/docker/docker/api/types/filters" @@ -27,7 +28,6 @@ import ( networkapi "github.com/docker/docker/api/types/network" "github.com/docker/docker/api/types/registry" "github.com/docker/docker/client" - "github.com/docker/docker/errdefs" "github.com/docker/docker/pkg/stdcopy" "github.com/hashicorp/consul-template/signals" hclog "github.com/hashicorp/go-hclog" @@ -1665,7 +1665,7 @@ func (d *Driver) DestroyTask(taskID string, force bool) error { c, err := dockerClient.ContainerInspect(d.ctx, h.containerID) if err != nil { - if _, ok := err.(errdefs.ErrNotFound); ok { + if errdefs.IsNotFound(err) { h.logger.Info("container was removed out of band, will proceed with DestroyTask", "error", err) } else { diff --git a/drivers/docker/driver_test.go b/drivers/docker/driver_test.go index 476604ff5..5ba354bfc 100644 --- a/drivers/docker/driver_test.go +++ b/drivers/docker/driver_test.go @@ -17,6 +17,7 @@ import ( "testing" "time" + "github.com/containerd/errdefs" "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/container" containerapi "github.com/docker/docker/api/types/container" @@ -27,7 +28,6 @@ import ( networkapi "github.com/docker/docker/api/types/network" "github.com/docker/docker/api/types/registry" "github.com/docker/docker/client" - "github.com/docker/docker/errdefs" "github.com/docker/go-connections/nat" hclog "github.com/hashicorp/go-hclog" "github.com/hashicorp/go-set/v3" diff --git a/drivers/docker/handle.go b/drivers/docker/handle.go index 968fe393a..c1c21ef87 100644 --- a/drivers/docker/handle.go +++ b/drivers/docker/handle.go @@ -12,9 +12,9 @@ import ( "time" "github.com/armon/circbuf" + "github.com/containerd/errdefs" containerapi "github.com/docker/docker/api/types/container" "github.com/docker/docker/client" - "github.com/docker/docker/errdefs" "github.com/docker/docker/pkg/stdcopy" "github.com/hashicorp/consul-template/signals" "github.com/hashicorp/go-hclog" diff --git a/go.mod b/go.mod index 060646df0..435227a06 100644 --- a/go.mod +++ b/go.mod @@ -20,13 +20,14 @@ require ( github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.30 github.com/aws/smithy-go v1.22.3 github.com/container-storage-interface/spec v1.11.0 + github.com/containerd/errdefs v1.0.0 github.com/containerd/go-cni v1.1.12 github.com/containernetworking/cni v1.3.0 github.com/coreos/go-iptables v0.8.0 github.com/creack/pty v1.1.24 github.com/distribution/reference v0.6.0 github.com/docker/cli v28.1.1+incompatible - github.com/docker/docker v28.1.1+incompatible + github.com/docker/docker v28.2.2+incompatible github.com/docker/go-connections v0.5.0 github.com/docker/go-units v0.5.0 github.com/dustin/go-humanize v1.0.1 @@ -207,6 +208,7 @@ require ( github.com/circonus-labs/circonusllhist v0.1.3 // indirect github.com/cncf/xds/go v0.0.0-20250121191232-2f005788dc42 // indirect github.com/containerd/console v1.0.4 // indirect + github.com/containerd/errdefs/pkg v0.3.0 // indirect github.com/containerd/log v0.1.0 // indirect github.com/coreos/go-oidc/v3 v3.11.0 // indirect github.com/coreos/go-systemd/v22 v22.5.0 // indirect diff --git a/go.sum b/go.sum index 268cd3419..c4d6ded39 100644 --- a/go.sum +++ b/go.sum @@ -825,6 +825,10 @@ github.com/container-storage-interface/spec v1.11.0/go.mod h1:DtUvaQszPml1YJfIK7 github.com/containerd/console v1.0.1/go.mod h1:XUsP6YE/mKtz6bxc+I8UiKKTP04qjQL4qcS3XoQ5xkw= github.com/containerd/console v1.0.4 h1:F2g4+oChYvBTsASRTz8NP6iIAi97J3TtSAsLbIFn4ro= github.com/containerd/console v1.0.4/go.mod h1:YynlIjWYF8myEu6sdkwKIvGQq+cOckRm6So2avqoYAk= +github.com/containerd/errdefs v1.0.0 h1:tg5yIfIlQIrxYtu9ajqY42W3lpS19XqdxRQeEwYG8PI= +github.com/containerd/errdefs v1.0.0/go.mod h1:+YBYIdtsnF4Iw6nWZhJcqGSg/dwvV7tyJ/kCkyJ2k+M= +github.com/containerd/errdefs/pkg v0.3.0 h1:9IKJ06FvyNlexW690DXuQNx2KA2cUJXx151Xdx3ZPPE= +github.com/containerd/errdefs/pkg v0.3.0/go.mod h1:NJw6s9HwNuRhnjJhM7pylWwMyAkmCQvQ4GpJHEqRLVk= github.com/containerd/go-cni v1.1.12 h1:wm/5VD/i255hjM4uIZjBRiEQ7y98W9ACy/mHeLi4+94= github.com/containerd/go-cni v1.1.12/go.mod h1:+jaqRBdtW5faJxj2Qwg1Of7GsV66xcvnCx4mSJtUlxU= github.com/containerd/log v0.1.0 h1:TCJt7ioM2cr/tfR8GPbGf9/VRAX8D2B4PjzCpfX540I= @@ -864,8 +868,8 @@ github.com/docker/cli v28.1.1+incompatible h1:eyUemzeI45DY7eDPuwUcmDyDj1pM98oD5M github.com/docker/cli v28.1.1+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= github.com/docker/distribution v2.8.3+incompatible h1:AtKxIZ36LoNK51+Z6RpzLpddBirtxJnzDrHLEKxTAYk= github.com/docker/distribution v2.8.3+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w= -github.com/docker/docker v28.1.1+incompatible h1:49M11BFLsVO1gxY9UX9p/zwkE/rswggs8AdFmXQw51I= -github.com/docker/docker v28.1.1+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= +github.com/docker/docker v28.2.2+incompatible h1:CjwRSksz8Yo4+RmQ339Dp/D2tGO5JxwYeqtMOEe0LDw= +github.com/docker/docker v28.2.2+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= github.com/docker/docker-credential-helpers v0.7.0 h1:xtCHsjxogADNZcdv1pKUHXryefjlVRqWqIhk/uXJp0A= github.com/docker/docker-credential-helpers v0.7.0/go.mod h1:rETQfLdHNT3foU5kuNkFR1R1V12OJRRO5lzt2D1b5X0= github.com/docker/go-connections v0.5.0 h1:USnMq7hx7gwdVZq1L49hLXaFtUdTADjXGp+uj1Br63c=