From e4b5dc4d977696443bd4aa9fd8fb4901d8095cfe Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 19 Dec 2024 03:05:22 +0000 Subject: [PATCH 1/2] build(deps): Bump github.com/docker/docker Bumps [github.com/docker/docker](https://github.com/docker/docker) from 26.1.5+incompatible to 27.4.1+incompatible. - [Release notes](https://github.com/docker/docker/releases) - [Commits](https://github.com/docker/docker/compare/v26.1.5...v27.4.1) --- updated-dependencies: - dependency-name: github.com/docker/docker dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 9a214ec..4cc8613 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 4666f4e..03d2229 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= From 722b2939799832601ed33fc33024cfdacdb4d2d7 Mon Sep 17 00:00:00 2001 From: Arjun Raja Yogidas Date: Fri, 20 Dec 2024 01:06:29 +0000 Subject: [PATCH 2/2] fix: Update docker api types Signed-off-by: Arjun Raja Yogidas --- api/handlers/container/stats_test.go | 2 +- api/types/container_types.go | 2 +- e2e/tests/container_stats.go | 2 +- internal/service/container/stats.go | 2 +- internal/service/container/stats_test.go | 2 +- pkg/statsutil/statsutil.go | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/api/handlers/container/stats_test.go b/api/handlers/container/stats_test.go index e336308..0cddd14 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 e29cbef..44f4419 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 38f1ae1..fd04559 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/internal/service/container/stats.go b/internal/service/container/stats.go index 7d3e63c..be36885 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 8b0e860..243e9b1 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 2ce2850..e7294e7 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"