diff --git a/api/handlers/container/stats_test.go b/api/handlers/container/stats_test.go index e3363082..0cddd14b 100644 --- a/api/handlers/container/stats_test.go +++ b/api/handlers/container/stats_test.go @@ -11,7 +11,7 @@ import ( "time" "github.com/containerd/nerdctl/pkg/config" - dockertypes "github.com/docker/docker/api/types" + dockertypes "github.com/docker/docker/api/types/container" "github.com/golang/mock/gomock" "github.com/gorilla/mux" . "github.com/onsi/ginkgo/v2" diff --git a/api/types/container_types.go b/api/types/container_types.go index e29cbefd..44f44197 100644 --- a/api/types/container_types.go +++ b/api/types/container_types.go @@ -9,7 +9,7 @@ import ( "time" "github.com/containerd/nerdctl/pkg/inspecttypes/dockercompat" - dockertypes "github.com/docker/docker/api/types" + dockertypes "github.com/docker/docker/api/types/container" "github.com/docker/go-connections/nat" "github.com/docker/go-units" ) diff --git a/e2e/tests/container_stats.go b/e2e/tests/container_stats.go index 38f1ae1f..fd045594 100644 --- a/e2e/tests/container_stats.go +++ b/e2e/tests/container_stats.go @@ -10,7 +10,7 @@ import ( "net/http" "time" - dockertypes "github.com/docker/docker/api/types" + dockertypes "github.com/docker/docker/api/types/container" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "github.com/runfinch/common-tests/command" diff --git a/go.mod b/go.mod index 9a214ec9..4cc86130 100644 --- a/go.mod +++ b/go.mod @@ -19,7 +19,7 @@ require ( github.com/coreos/go-systemd/v22 v22.5.0 github.com/distribution/reference v0.6.0 github.com/docker/cli v26.0.0+incompatible - github.com/docker/docker v26.1.5+incompatible + github.com/docker/docker v27.4.1+incompatible github.com/docker/go-connections v0.5.0 github.com/getlantern/httptest v0.0.0-20161025015934-4b40f4c7e590 github.com/gofrs/flock v0.12.1 diff --git a/go.sum b/go.sum index 4666f4e6..03d22295 100644 --- a/go.sum +++ b/go.sum @@ -90,8 +90,8 @@ github.com/djherbis/times v1.6.0 h1:w2ctJ92J8fBvWPxugmXIv7Nz7Q3iDMKNx9v5ocVH20c= github.com/djherbis/times v1.6.0/go.mod h1:gOHeRAz2h+VJNZ5Gmc/o7iD9k4wW7NMVqieYCY99oc0= github.com/docker/cli v26.0.0+incompatible h1:90BKrx1a1HKYpSnnBFR6AgDq/FqkHxwlUyzJVPxD30I= github.com/docker/cli v26.0.0+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= -github.com/docker/docker v26.1.5+incompatible h1:NEAxTwEjxV6VbBMBoGG3zPqbiJosIApZjxlbrG9q3/g= -github.com/docker/docker v26.1.5+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= +github.com/docker/docker v27.4.1+incompatible h1:ZJvcY7gfwHn1JF48PfbyXg7Jyt9ZCWDW+GGXOIxEwp4= +github.com/docker/docker v27.4.1+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= github.com/docker/docker-credential-helpers v0.8.1 h1:j/eKUktUltBtMzKqmfLB0PAgqYyMHOp5vfsD1807oKo= github.com/docker/docker-credential-helpers v0.8.1/go.mod h1:P3ci7E3lwkZg6XiHdRKft1KckHiO9a2rNtyFbZ/ry9M= github.com/docker/go-connections v0.5.0 h1:USnMq7hx7gwdVZq1L49hLXaFtUdTADjXGp+uj1Br63c= diff --git a/internal/service/container/stats.go b/internal/service/container/stats.go index 7d3e63cf..be36885b 100644 --- a/internal/service/container/stats.go +++ b/internal/service/container/stats.go @@ -14,7 +14,7 @@ import ( cerrdefs "github.com/containerd/errdefs" "github.com/containerd/nerdctl/pkg/labels" "github.com/containerd/typeurl/v2" - dockertypes "github.com/docker/docker/api/types" + dockertypes "github.com/docker/docker/api/types/container" "github.com/runfinch/finch-daemon/api/types" ) diff --git a/internal/service/container/stats_test.go b/internal/service/container/stats_test.go index 8b0e860d..243e9b12 100644 --- a/internal/service/container/stats_test.go +++ b/internal/service/container/stats_test.go @@ -17,7 +17,7 @@ import ( "github.com/containerd/nerdctl/pkg/inspecttypes/native" "github.com/containerd/nerdctl/pkg/labels" "github.com/containerd/typeurl/v2" - dockertypes "github.com/docker/docker/api/types" + dockertypes "github.com/docker/docker/api/types/container" "github.com/golang/mock/gomock" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/pkg/statsutil/statsutil.go b/pkg/statsutil/statsutil.go index 2ce28508..e7294e78 100644 --- a/pkg/statsutil/statsutil.go +++ b/pkg/statsutil/statsutil.go @@ -12,7 +12,7 @@ import ( "strings" "github.com/containerd/nerdctl/pkg/inspecttypes/native" - dockertypes "github.com/docker/docker/api/types" + dockertypes "github.com/docker/docker/api/types/container" "github.com/vishvananda/netlink" "github.com/vishvananda/netns" "golang.org/x/sys/unix"