From 722b2939799832601ed33fc33024cfdacdb4d2d7 Mon Sep 17 00:00:00 2001 From: Arjun Raja Yogidas Date: Fri, 20 Dec 2024 01:06:29 +0000 Subject: [PATCH] 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 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/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"