diff --git a/Dockerfile b/Dockerfile index c36a5ac26f5..bff4e86274b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -312,7 +312,7 @@ RUN curl -L -o nydus-static.tgz "https://github.com/dragonflyoss/image-service/r tar xzf nydus-static.tgz && \ mv nydus-static/nydus-image nydus-static/nydusd nydus-static/nydusify /usr/bin/ && \ rm nydus-static.tgz -CMD ["gotestsum", "--format=testname", "--rerun-fails=2", "--packages=github.com/containerd/nerdctl/cmd/nerdctl/...", \ +CMD ["gotestsum", "--format=testname", "--rerun-fails=2", "--packages=github.com/containerd/nerdctl/v2/cmd/nerdctl/...", \ "--", "-timeout=30m", "-args", "-test.kill-daemon"] FROM test-integration AS test-integration-rootless @@ -338,7 +338,7 @@ RUN go test -o /usr/local/bin/nerdctl.test -c ./cmd/nerdctl COPY ./Dockerfile.d/test-integration-rootless.sh / CMD ["/test-integration-rootless.sh", \ "gotestsum", "--format=testname", "--rerun-fails=2", "--raw-command", \ - "--", "/usr/local/go/bin/go", "tool", "test2json", "-t", "-p", "github.com/containerd/nerdctl/cmd/nerdctl", \ + "--", "/usr/local/go/bin/go", "tool", "test2json", "-t", "-p", "github.com/containerd/nerdctl/v2/cmd/nerdctl", \ "/usr/local/bin/nerdctl.test", "-test.v", "-test.timeout=30m", "-test.kill-daemon"] # test for CONTAINERD_ROOTLESS_ROOTLESSKIT_PORT_DRIVER=slirp4netns @@ -347,7 +347,7 @@ COPY ./Dockerfile.d/home_rootless_.config_systemd_user_containerd.service.d_port RUN chown -R rootless:rootless /home/rootless/.config FROM test-integration AS test-integration-ipv6 -CMD ["gotestsum", "--format=testname", "--rerun-fails=2", "--packages=github.com/containerd/nerdctl/cmd/nerdctl/...", \ +CMD ["gotestsum", "--format=testname", "--rerun-fails=2", "--packages=github.com/containerd/nerdctl/v2/cmd/nerdctl/...", \ "--", "-timeout=30m", "-args", "-test.kill-daemon", "-test.ipv6"] FROM base AS demo diff --git a/Makefile b/Makefile index 8978d22b149..844ae7213bd 100644 --- a/Makefile +++ b/Makefile @@ -24,7 +24,7 @@ ifeq ($(GOOS),windows) BIN_EXT := .exe endif -PACKAGE := github.com/containerd/nerdctl +PACKAGE := github.com/containerd/nerdctl/v2 # distro builders might wanna override these PREFIX ?= /usr/local diff --git a/README.md b/README.md index 4d1ceb02ab6..98e7a3d9b33 100644 --- a/README.md +++ b/README.md @@ -246,7 +246,7 @@ Run `make && sudo make install`. See the header of [`go.mod`](./go.mod) for the minimum supported version of Go. -Using `go install github.com/containerd/nerdctl/cmd/nerdctl` is possible, but unrecommended because it does not fill version strings printed in `nerdctl version` +Using `go install github.com/containerd/nerdctl/v2/cmd/nerdctl` is possible, but unrecommended because it does not fill version strings printed in `nerdctl version` ### Test suite diff --git a/cmd/nerdctl/apparmor_inspect_linux.go b/cmd/nerdctl/apparmor_inspect_linux.go index 0071a22a824..18a4e3afd00 100644 --- a/cmd/nerdctl/apparmor_inspect_linux.go +++ b/cmd/nerdctl/apparmor_inspect_linux.go @@ -19,10 +19,10 @@ package main import ( "fmt" - "github.com/containerd/nerdctl/pkg/api/types" + "github.com/containerd/nerdctl/v2/pkg/api/types" - "github.com/containerd/nerdctl/pkg/cmd/apparmor" - "github.com/containerd/nerdctl/pkg/defaults" + "github.com/containerd/nerdctl/v2/pkg/cmd/apparmor" + "github.com/containerd/nerdctl/v2/pkg/defaults" "github.com/spf13/cobra" ) diff --git a/cmd/nerdctl/apparmor_list_linux.go b/cmd/nerdctl/apparmor_list_linux.go index aa0073b048e..99cc8eb5aa6 100644 --- a/cmd/nerdctl/apparmor_list_linux.go +++ b/cmd/nerdctl/apparmor_list_linux.go @@ -17,8 +17,8 @@ package main import ( - "github.com/containerd/nerdctl/pkg/api/types" - "github.com/containerd/nerdctl/pkg/cmd/apparmor" + "github.com/containerd/nerdctl/v2/pkg/api/types" + "github.com/containerd/nerdctl/v2/pkg/cmd/apparmor" "github.com/spf13/cobra" ) diff --git a/cmd/nerdctl/apparmor_load_linux.go b/cmd/nerdctl/apparmor_load_linux.go index 38b7547242b..a7e25c3f71e 100644 --- a/cmd/nerdctl/apparmor_load_linux.go +++ b/cmd/nerdctl/apparmor_load_linux.go @@ -19,8 +19,8 @@ package main import ( "fmt" - "github.com/containerd/nerdctl/pkg/cmd/apparmor" - "github.com/containerd/nerdctl/pkg/defaults" + "github.com/containerd/nerdctl/v2/pkg/cmd/apparmor" + "github.com/containerd/nerdctl/v2/pkg/defaults" "github.com/spf13/cobra" ) diff --git a/cmd/nerdctl/apparmor_unload_linux.go b/cmd/nerdctl/apparmor_unload_linux.go index 92fc289eb31..1fb5c840c4a 100644 --- a/cmd/nerdctl/apparmor_unload_linux.go +++ b/cmd/nerdctl/apparmor_unload_linux.go @@ -19,8 +19,8 @@ package main import ( "fmt" - "github.com/containerd/nerdctl/pkg/cmd/apparmor" - "github.com/containerd/nerdctl/pkg/defaults" + "github.com/containerd/nerdctl/v2/pkg/cmd/apparmor" + "github.com/containerd/nerdctl/v2/pkg/defaults" "github.com/spf13/cobra" ) diff --git a/cmd/nerdctl/builder.go b/cmd/nerdctl/builder.go index 5b8357c2fa2..595c068cfc3 100644 --- a/cmd/nerdctl/builder.go +++ b/cmd/nerdctl/builder.go @@ -23,8 +23,8 @@ import ( "strings" "github.com/containerd/log" - "github.com/containerd/nerdctl/pkg/buildkitutil" - "github.com/containerd/nerdctl/pkg/defaults" + "github.com/containerd/nerdctl/v2/pkg/buildkitutil" + "github.com/containerd/nerdctl/v2/pkg/defaults" "github.com/spf13/cobra" ) diff --git a/cmd/nerdctl/builder_build.go b/cmd/nerdctl/builder_build.go index a74d3876e9a..a4d159791ac 100644 --- a/cmd/nerdctl/builder_build.go +++ b/cmd/nerdctl/builder_build.go @@ -22,12 +22,12 @@ import ( "os" "strings" - "github.com/containerd/nerdctl/pkg/api/types" - "github.com/containerd/nerdctl/pkg/buildkitutil" - "github.com/containerd/nerdctl/pkg/clientutil" - "github.com/containerd/nerdctl/pkg/cmd/builder" - "github.com/containerd/nerdctl/pkg/defaults" - "github.com/containerd/nerdctl/pkg/strutil" + "github.com/containerd/nerdctl/v2/pkg/api/types" + "github.com/containerd/nerdctl/v2/pkg/buildkitutil" + "github.com/containerd/nerdctl/v2/pkg/clientutil" + "github.com/containerd/nerdctl/v2/pkg/cmd/builder" + "github.com/containerd/nerdctl/v2/pkg/defaults" + "github.com/containerd/nerdctl/v2/pkg/strutil" "github.com/spf13/cobra" ) diff --git a/cmd/nerdctl/builder_build_test.go b/cmd/nerdctl/builder_build_test.go index 2341c850019..0091a7b6f2f 100644 --- a/cmd/nerdctl/builder_build_test.go +++ b/cmd/nerdctl/builder_build_test.go @@ -23,7 +23,7 @@ import ( "strings" "testing" - "github.com/containerd/nerdctl/pkg/testutil" + "github.com/containerd/nerdctl/v2/pkg/testutil" "gotest.tools/v3/assert" ) diff --git a/cmd/nerdctl/builder_linux_test.go b/cmd/nerdctl/builder_linux_test.go index 5376698242d..bdf1cc402d5 100644 --- a/cmd/nerdctl/builder_linux_test.go +++ b/cmd/nerdctl/builder_linux_test.go @@ -22,7 +22,7 @@ import ( "os" "testing" - "github.com/containerd/nerdctl/pkg/testutil" + "github.com/containerd/nerdctl/v2/pkg/testutil" "gotest.tools/v3/assert" ) diff --git a/cmd/nerdctl/completion.go b/cmd/nerdctl/completion.go index aefc30b45da..15dd83a3260 100644 --- a/cmd/nerdctl/completion.go +++ b/cmd/nerdctl/completion.go @@ -21,9 +21,9 @@ import ( "time" "github.com/containerd/containerd" - "github.com/containerd/nerdctl/pkg/clientutil" - "github.com/containerd/nerdctl/pkg/labels" - "github.com/containerd/nerdctl/pkg/netutil" + "github.com/containerd/nerdctl/v2/pkg/clientutil" + "github.com/containerd/nerdctl/v2/pkg/labels" + "github.com/containerd/nerdctl/v2/pkg/netutil" "github.com/spf13/cobra" ) diff --git a/cmd/nerdctl/completion_linux.go b/cmd/nerdctl/completion_linux.go index e89d5e40960..52baa8b974a 100644 --- a/cmd/nerdctl/completion_linux.go +++ b/cmd/nerdctl/completion_linux.go @@ -17,7 +17,7 @@ package main import ( - "github.com/containerd/nerdctl/pkg/apparmorutil" + "github.com/containerd/nerdctl/v2/pkg/apparmorutil" "github.com/spf13/cobra" ) diff --git a/cmd/nerdctl/completion_linux_test.go b/cmd/nerdctl/completion_linux_test.go index 20b95f7f412..0cde9191ee3 100644 --- a/cmd/nerdctl/completion_linux_test.go +++ b/cmd/nerdctl/completion_linux_test.go @@ -19,7 +19,7 @@ package main import ( "testing" - "github.com/containerd/nerdctl/pkg/testutil" + "github.com/containerd/nerdctl/v2/pkg/testutil" ) func TestCompletion(t *testing.T) { diff --git a/cmd/nerdctl/compose.go b/cmd/nerdctl/compose.go index 863ce44d59c..c64e719d4db 100644 --- a/cmd/nerdctl/compose.go +++ b/cmd/nerdctl/compose.go @@ -17,7 +17,7 @@ package main import ( - "github.com/containerd/nerdctl/pkg/composer" + "github.com/containerd/nerdctl/v2/pkg/composer" "github.com/spf13/cobra" ) diff --git a/cmd/nerdctl/compose_build.go b/cmd/nerdctl/compose_build.go index be59dbad7b7..9a001af2c57 100644 --- a/cmd/nerdctl/compose_build.go +++ b/cmd/nerdctl/compose_build.go @@ -17,9 +17,9 @@ package main import ( - "github.com/containerd/nerdctl/pkg/clientutil" - "github.com/containerd/nerdctl/pkg/cmd/compose" - "github.com/containerd/nerdctl/pkg/composer" + "github.com/containerd/nerdctl/v2/pkg/clientutil" + "github.com/containerd/nerdctl/v2/pkg/cmd/compose" + "github.com/containerd/nerdctl/v2/pkg/composer" "github.com/spf13/cobra" ) diff --git a/cmd/nerdctl/compose_build_linux_test.go b/cmd/nerdctl/compose_build_linux_test.go index e80bdd7895f..9e5cfbecc53 100644 --- a/cmd/nerdctl/compose_build_linux_test.go +++ b/cmd/nerdctl/compose_build_linux_test.go @@ -20,7 +20,7 @@ import ( "fmt" "testing" - "github.com/containerd/nerdctl/pkg/testutil" + "github.com/containerd/nerdctl/v2/pkg/testutil" ) func TestComposeBuild(t *testing.T) { diff --git a/cmd/nerdctl/compose_config.go b/cmd/nerdctl/compose_config.go index 90c506ce092..5a2b0be9820 100644 --- a/cmd/nerdctl/compose_config.go +++ b/cmd/nerdctl/compose_config.go @@ -19,9 +19,9 @@ package main import ( "fmt" - "github.com/containerd/nerdctl/pkg/clientutil" - "github.com/containerd/nerdctl/pkg/cmd/compose" - "github.com/containerd/nerdctl/pkg/composer" + "github.com/containerd/nerdctl/v2/pkg/clientutil" + "github.com/containerd/nerdctl/v2/pkg/cmd/compose" + "github.com/containerd/nerdctl/v2/pkg/composer" "github.com/spf13/cobra" ) diff --git a/cmd/nerdctl/compose_config_test.go b/cmd/nerdctl/compose_config_test.go index 29d371e98e4..d2af27b5832 100644 --- a/cmd/nerdctl/compose_config_test.go +++ b/cmd/nerdctl/compose_config_test.go @@ -22,7 +22,7 @@ import ( "path/filepath" "testing" - "github.com/containerd/nerdctl/pkg/testutil" + "github.com/containerd/nerdctl/v2/pkg/testutil" "gotest.tools/v3/assert" ) diff --git a/cmd/nerdctl/compose_cp.go b/cmd/nerdctl/compose_cp.go index 252b9e1c261..859ebb4f85e 100644 --- a/cmd/nerdctl/compose_cp.go +++ b/cmd/nerdctl/compose_cp.go @@ -19,10 +19,10 @@ package main import ( "errors" - "github.com/containerd/nerdctl/pkg/clientutil" - "github.com/containerd/nerdctl/pkg/cmd/compose" - "github.com/containerd/nerdctl/pkg/composer" - "github.com/containerd/nerdctl/pkg/rootlessutil" + "github.com/containerd/nerdctl/v2/pkg/clientutil" + "github.com/containerd/nerdctl/v2/pkg/cmd/compose" + "github.com/containerd/nerdctl/v2/pkg/composer" + "github.com/containerd/nerdctl/v2/pkg/rootlessutil" "github.com/spf13/cobra" ) diff --git a/cmd/nerdctl/compose_cp_linux_test.go b/cmd/nerdctl/compose_cp_linux_test.go index 8c65752db2c..46174e685e5 100644 --- a/cmd/nerdctl/compose_cp_linux_test.go +++ b/cmd/nerdctl/compose_cp_linux_test.go @@ -22,7 +22,7 @@ import ( "path/filepath" "testing" - "github.com/containerd/nerdctl/pkg/testutil" + "github.com/containerd/nerdctl/v2/pkg/testutil" "gotest.tools/v3/assert" ) diff --git a/cmd/nerdctl/compose_create.go b/cmd/nerdctl/compose_create.go index 7b60ed8dc98..14c757aaab8 100644 --- a/cmd/nerdctl/compose_create.go +++ b/cmd/nerdctl/compose_create.go @@ -19,9 +19,9 @@ package main import ( "errors" - "github.com/containerd/nerdctl/pkg/clientutil" - "github.com/containerd/nerdctl/pkg/cmd/compose" - "github.com/containerd/nerdctl/pkg/composer" + "github.com/containerd/nerdctl/v2/pkg/clientutil" + "github.com/containerd/nerdctl/v2/pkg/cmd/compose" + "github.com/containerd/nerdctl/v2/pkg/composer" "github.com/spf13/cobra" ) diff --git a/cmd/nerdctl/compose_create_linux_test.go b/cmd/nerdctl/compose_create_linux_test.go index 82d2ed50542..829e3ebded5 100644 --- a/cmd/nerdctl/compose_create_linux_test.go +++ b/cmd/nerdctl/compose_create_linux_test.go @@ -20,7 +20,7 @@ import ( "fmt" "testing" - "github.com/containerd/nerdctl/pkg/testutil" + "github.com/containerd/nerdctl/v2/pkg/testutil" ) func TestComposeCreate(t *testing.T) { diff --git a/cmd/nerdctl/compose_down.go b/cmd/nerdctl/compose_down.go index 236f96fd61a..19a5fe52bd6 100644 --- a/cmd/nerdctl/compose_down.go +++ b/cmd/nerdctl/compose_down.go @@ -17,9 +17,9 @@ package main import ( - "github.com/containerd/nerdctl/pkg/clientutil" - "github.com/containerd/nerdctl/pkg/cmd/compose" - "github.com/containerd/nerdctl/pkg/composer" + "github.com/containerd/nerdctl/v2/pkg/clientutil" + "github.com/containerd/nerdctl/v2/pkg/cmd/compose" + "github.com/containerd/nerdctl/v2/pkg/composer" "github.com/spf13/cobra" ) diff --git a/cmd/nerdctl/compose_down_linux_test.go b/cmd/nerdctl/compose_down_linux_test.go index 583e2c98c61..7b8a393b523 100644 --- a/cmd/nerdctl/compose_down_linux_test.go +++ b/cmd/nerdctl/compose_down_linux_test.go @@ -21,8 +21,8 @@ import ( "testing" "time" - "github.com/containerd/nerdctl/pkg/composer/serviceparser" - "github.com/containerd/nerdctl/pkg/testutil" + "github.com/containerd/nerdctl/v2/pkg/composer/serviceparser" + "github.com/containerd/nerdctl/v2/pkg/testutil" ) func TestComposeDownRemoveUsedNetwork(t *testing.T) { diff --git a/cmd/nerdctl/compose_exec.go b/cmd/nerdctl/compose_exec.go index 7f0ba6017bb..dee9ae91612 100644 --- a/cmd/nerdctl/compose_exec.go +++ b/cmd/nerdctl/compose_exec.go @@ -19,9 +19,9 @@ package main import ( "errors" - "github.com/containerd/nerdctl/pkg/clientutil" - "github.com/containerd/nerdctl/pkg/cmd/compose" - "github.com/containerd/nerdctl/pkg/composer" + "github.com/containerd/nerdctl/v2/pkg/clientutil" + "github.com/containerd/nerdctl/v2/pkg/cmd/compose" + "github.com/containerd/nerdctl/v2/pkg/composer" "github.com/spf13/cobra" ) diff --git a/cmd/nerdctl/compose_exec_linux_test.go b/cmd/nerdctl/compose_exec_linux_test.go index f12dc530fa2..26d9f07738c 100644 --- a/cmd/nerdctl/compose_exec_linux_test.go +++ b/cmd/nerdctl/compose_exec_linux_test.go @@ -25,7 +25,7 @@ import ( "strings" "testing" - "github.com/containerd/nerdctl/pkg/testutil" + "github.com/containerd/nerdctl/v2/pkg/testutil" "gotest.tools/v3/assert" ) diff --git a/cmd/nerdctl/compose_images.go b/cmd/nerdctl/compose_images.go index 36816769a0f..80ef81855eb 100644 --- a/cmd/nerdctl/compose_images.go +++ b/cmd/nerdctl/compose_images.go @@ -25,12 +25,12 @@ import ( "github.com/containerd/containerd" "github.com/containerd/containerd/pkg/progress" "github.com/containerd/containerd/snapshots" - "github.com/containerd/nerdctl/pkg/clientutil" - "github.com/containerd/nerdctl/pkg/cmd/compose" - "github.com/containerd/nerdctl/pkg/formatter" - "github.com/containerd/nerdctl/pkg/imgutil" - "github.com/containerd/nerdctl/pkg/labels" - "github.com/containerd/nerdctl/pkg/strutil" + "github.com/containerd/nerdctl/v2/pkg/clientutil" + "github.com/containerd/nerdctl/v2/pkg/cmd/compose" + "github.com/containerd/nerdctl/v2/pkg/formatter" + "github.com/containerd/nerdctl/v2/pkg/imgutil" + "github.com/containerd/nerdctl/v2/pkg/labels" + "github.com/containerd/nerdctl/v2/pkg/strutil" "github.com/spf13/cobra" "golang.org/x/sync/errgroup" ) diff --git a/cmd/nerdctl/compose_images_linux_test.go b/cmd/nerdctl/compose_images_linux_test.go index b10b18309ad..dd4ae118b72 100644 --- a/cmd/nerdctl/compose_images_linux_test.go +++ b/cmd/nerdctl/compose_images_linux_test.go @@ -22,7 +22,7 @@ import ( "strings" "testing" - "github.com/containerd/nerdctl/pkg/testutil" + "github.com/containerd/nerdctl/v2/pkg/testutil" ) func TestComposeImages(t *testing.T) { diff --git a/cmd/nerdctl/compose_kill.go b/cmd/nerdctl/compose_kill.go index 1e483273ff1..5a7cee00917 100644 --- a/cmd/nerdctl/compose_kill.go +++ b/cmd/nerdctl/compose_kill.go @@ -17,9 +17,9 @@ package main import ( - "github.com/containerd/nerdctl/pkg/clientutil" - "github.com/containerd/nerdctl/pkg/cmd/compose" - "github.com/containerd/nerdctl/pkg/composer" + "github.com/containerd/nerdctl/v2/pkg/clientutil" + "github.com/containerd/nerdctl/v2/pkg/cmd/compose" + "github.com/containerd/nerdctl/v2/pkg/composer" "github.com/spf13/cobra" ) diff --git a/cmd/nerdctl/compose_kill_linux_test.go b/cmd/nerdctl/compose_kill_linux_test.go index 3a1d138bed3..59e95519636 100644 --- a/cmd/nerdctl/compose_kill_linux_test.go +++ b/cmd/nerdctl/compose_kill_linux_test.go @@ -21,7 +21,7 @@ import ( "testing" "time" - "github.com/containerd/nerdctl/pkg/testutil" + "github.com/containerd/nerdctl/v2/pkg/testutil" ) func TestComposeKill(t *testing.T) { diff --git a/cmd/nerdctl/compose_logs.go b/cmd/nerdctl/compose_logs.go index 79902f7bad2..46bd2df7203 100644 --- a/cmd/nerdctl/compose_logs.go +++ b/cmd/nerdctl/compose_logs.go @@ -17,9 +17,9 @@ package main import ( - "github.com/containerd/nerdctl/pkg/clientutil" - "github.com/containerd/nerdctl/pkg/cmd/compose" - "github.com/containerd/nerdctl/pkg/composer" + "github.com/containerd/nerdctl/v2/pkg/clientutil" + "github.com/containerd/nerdctl/v2/pkg/cmd/compose" + "github.com/containerd/nerdctl/v2/pkg/composer" "github.com/spf13/cobra" ) diff --git a/cmd/nerdctl/compose_pause.go b/cmd/nerdctl/compose_pause.go index 429b7d853b0..7cf24cfb78b 100644 --- a/cmd/nerdctl/compose_pause.go +++ b/cmd/nerdctl/compose_pause.go @@ -17,8 +17,8 @@ package main import ( - "github.com/containerd/nerdctl/pkg/clientutil" - "github.com/containerd/nerdctl/pkg/cmd/compose" + "github.com/containerd/nerdctl/v2/pkg/clientutil" + "github.com/containerd/nerdctl/v2/pkg/cmd/compose" "github.com/spf13/cobra" ) diff --git a/cmd/nerdctl/compose_pause_linux_test.go b/cmd/nerdctl/compose_pause_linux_test.go index e6fe615ec4d..34c259734c6 100644 --- a/cmd/nerdctl/compose_pause_linux_test.go +++ b/cmd/nerdctl/compose_pause_linux_test.go @@ -20,7 +20,7 @@ import ( "fmt" "testing" - "github.com/containerd/nerdctl/pkg/testutil" + "github.com/containerd/nerdctl/v2/pkg/testutil" ) func TestComposePauseAndUnpause(t *testing.T) { diff --git a/cmd/nerdctl/compose_port.go b/cmd/nerdctl/compose_port.go index 92c3ea3189a..2156bd917e4 100644 --- a/cmd/nerdctl/compose_port.go +++ b/cmd/nerdctl/compose_port.go @@ -20,9 +20,9 @@ import ( "fmt" "strconv" - "github.com/containerd/nerdctl/pkg/clientutil" - "github.com/containerd/nerdctl/pkg/cmd/compose" - "github.com/containerd/nerdctl/pkg/composer" + "github.com/containerd/nerdctl/v2/pkg/clientutil" + "github.com/containerd/nerdctl/v2/pkg/cmd/compose" + "github.com/containerd/nerdctl/v2/pkg/composer" "github.com/spf13/cobra" ) diff --git a/cmd/nerdctl/compose_port_linux_test.go b/cmd/nerdctl/compose_port_linux_test.go index 991ac6c847a..39eff5c00a9 100644 --- a/cmd/nerdctl/compose_port_linux_test.go +++ b/cmd/nerdctl/compose_port_linux_test.go @@ -20,7 +20,7 @@ import ( "fmt" "testing" - "github.com/containerd/nerdctl/pkg/testutil" + "github.com/containerd/nerdctl/v2/pkg/testutil" ) func TestComposePort(t *testing.T) { diff --git a/cmd/nerdctl/compose_ps.go b/cmd/nerdctl/compose_ps.go index e9e569584fb..8d7d54e1b21 100644 --- a/cmd/nerdctl/compose_ps.go +++ b/cmd/nerdctl/compose_ps.go @@ -28,12 +28,12 @@ import ( "github.com/containerd/containerd/runtime/restart" gocni "github.com/containerd/go-cni" "github.com/containerd/log" - "github.com/containerd/nerdctl/pkg/clientutil" - "github.com/containerd/nerdctl/pkg/cmd/compose" - "github.com/containerd/nerdctl/pkg/containerutil" - "github.com/containerd/nerdctl/pkg/formatter" - "github.com/containerd/nerdctl/pkg/labels" - "github.com/containerd/nerdctl/pkg/portutil" + "github.com/containerd/nerdctl/v2/pkg/clientutil" + "github.com/containerd/nerdctl/v2/pkg/cmd/compose" + "github.com/containerd/nerdctl/v2/pkg/containerutil" + "github.com/containerd/nerdctl/v2/pkg/formatter" + "github.com/containerd/nerdctl/v2/pkg/labels" + "github.com/containerd/nerdctl/v2/pkg/portutil" "github.com/spf13/cobra" "golang.org/x/sync/errgroup" ) diff --git a/cmd/nerdctl/compose_ps_linux_test.go b/cmd/nerdctl/compose_ps_linux_test.go index 453829bbba4..55e0b5a756e 100644 --- a/cmd/nerdctl/compose_ps_linux_test.go +++ b/cmd/nerdctl/compose_ps_linux_test.go @@ -23,8 +23,8 @@ import ( "testing" "time" - "github.com/containerd/nerdctl/pkg/tabutil" - "github.com/containerd/nerdctl/pkg/testutil" + "github.com/containerd/nerdctl/v2/pkg/tabutil" + "github.com/containerd/nerdctl/v2/pkg/testutil" "gotest.tools/v3/assert" ) diff --git a/cmd/nerdctl/compose_pull.go b/cmd/nerdctl/compose_pull.go index 9d004353fc5..babe2e65752 100644 --- a/cmd/nerdctl/compose_pull.go +++ b/cmd/nerdctl/compose_pull.go @@ -17,9 +17,9 @@ package main import ( - "github.com/containerd/nerdctl/pkg/clientutil" - "github.com/containerd/nerdctl/pkg/cmd/compose" - "github.com/containerd/nerdctl/pkg/composer" + "github.com/containerd/nerdctl/v2/pkg/clientutil" + "github.com/containerd/nerdctl/v2/pkg/cmd/compose" + "github.com/containerd/nerdctl/v2/pkg/composer" "github.com/spf13/cobra" ) diff --git a/cmd/nerdctl/compose_pull_linux_test.go b/cmd/nerdctl/compose_pull_linux_test.go index d350892f1b3..4e86b053194 100644 --- a/cmd/nerdctl/compose_pull_linux_test.go +++ b/cmd/nerdctl/compose_pull_linux_test.go @@ -20,7 +20,7 @@ import ( "fmt" "testing" - "github.com/containerd/nerdctl/pkg/testutil" + "github.com/containerd/nerdctl/v2/pkg/testutil" ) func TestComposePullWithService(t *testing.T) { diff --git a/cmd/nerdctl/compose_push.go b/cmd/nerdctl/compose_push.go index 2c899dabf39..bfdf02a9d4e 100644 --- a/cmd/nerdctl/compose_push.go +++ b/cmd/nerdctl/compose_push.go @@ -17,9 +17,9 @@ package main import ( - "github.com/containerd/nerdctl/pkg/clientutil" - "github.com/containerd/nerdctl/pkg/cmd/compose" - "github.com/containerd/nerdctl/pkg/composer" + "github.com/containerd/nerdctl/v2/pkg/clientutil" + "github.com/containerd/nerdctl/v2/pkg/cmd/compose" + "github.com/containerd/nerdctl/v2/pkg/composer" "github.com/spf13/cobra" ) diff --git a/cmd/nerdctl/compose_restart.go b/cmd/nerdctl/compose_restart.go index adb47e3dee4..46ba6d31887 100644 --- a/cmd/nerdctl/compose_restart.go +++ b/cmd/nerdctl/compose_restart.go @@ -17,9 +17,9 @@ package main import ( - "github.com/containerd/nerdctl/pkg/clientutil" - "github.com/containerd/nerdctl/pkg/cmd/compose" - "github.com/containerd/nerdctl/pkg/composer" + "github.com/containerd/nerdctl/v2/pkg/clientutil" + "github.com/containerd/nerdctl/v2/pkg/cmd/compose" + "github.com/containerd/nerdctl/v2/pkg/composer" "github.com/spf13/cobra" ) diff --git a/cmd/nerdctl/compose_restart_linux_test.go b/cmd/nerdctl/compose_restart_linux_test.go index ed1d2bd1466..4b16f136215 100644 --- a/cmd/nerdctl/compose_restart_linux_test.go +++ b/cmd/nerdctl/compose_restart_linux_test.go @@ -20,7 +20,7 @@ import ( "fmt" "testing" - "github.com/containerd/nerdctl/pkg/testutil" + "github.com/containerd/nerdctl/v2/pkg/testutil" ) func TestComposeRestart(t *testing.T) { diff --git a/cmd/nerdctl/compose_rm.go b/cmd/nerdctl/compose_rm.go index 6ac686f6b86..536b919890b 100644 --- a/cmd/nerdctl/compose_rm.go +++ b/cmd/nerdctl/compose_rm.go @@ -20,9 +20,9 @@ import ( "fmt" "strings" - "github.com/containerd/nerdctl/pkg/clientutil" - "github.com/containerd/nerdctl/pkg/cmd/compose" - "github.com/containerd/nerdctl/pkg/composer" + "github.com/containerd/nerdctl/v2/pkg/clientutil" + "github.com/containerd/nerdctl/v2/pkg/cmd/compose" + "github.com/containerd/nerdctl/v2/pkg/composer" "github.com/spf13/cobra" ) diff --git a/cmd/nerdctl/compose_rm_linux_test.go b/cmd/nerdctl/compose_rm_linux_test.go index a699274883d..22ce6f5a487 100644 --- a/cmd/nerdctl/compose_rm_linux_test.go +++ b/cmd/nerdctl/compose_rm_linux_test.go @@ -21,7 +21,7 @@ import ( "testing" "time" - "github.com/containerd/nerdctl/pkg/testutil" + "github.com/containerd/nerdctl/v2/pkg/testutil" ) func TestComposeRemove(t *testing.T) { diff --git a/cmd/nerdctl/compose_run.go b/cmd/nerdctl/compose_run.go index c92c5ab1ae9..0cfe5cfd535 100644 --- a/cmd/nerdctl/compose_run.go +++ b/cmd/nerdctl/compose_run.go @@ -20,9 +20,9 @@ import ( "errors" "fmt" - "github.com/containerd/nerdctl/pkg/clientutil" - "github.com/containerd/nerdctl/pkg/cmd/compose" - "github.com/containerd/nerdctl/pkg/composer" + "github.com/containerd/nerdctl/v2/pkg/clientutil" + "github.com/containerd/nerdctl/v2/pkg/cmd/compose" + "github.com/containerd/nerdctl/v2/pkg/composer" "github.com/spf13/cobra" ) diff --git a/cmd/nerdctl/compose_run_linux_test.go b/cmd/nerdctl/compose_run_linux_test.go index f0778e74e82..ea075f4e9d9 100644 --- a/cmd/nerdctl/compose_run_linux_test.go +++ b/cmd/nerdctl/compose_run_linux_test.go @@ -24,9 +24,9 @@ import ( "time" "github.com/containerd/log" - "github.com/containerd/nerdctl/pkg/testutil" - "github.com/containerd/nerdctl/pkg/testutil/nettestutil" - "github.com/containerd/nerdctl/pkg/testutil/testregistry" + "github.com/containerd/nerdctl/v2/pkg/testutil" + "github.com/containerd/nerdctl/v2/pkg/testutil/nettestutil" + "github.com/containerd/nerdctl/v2/pkg/testutil/testregistry" "gotest.tools/v3/assert" ) diff --git a/cmd/nerdctl/compose_start.go b/cmd/nerdctl/compose_start.go index a5889b18aaa..0268ab4569b 100644 --- a/cmd/nerdctl/compose_start.go +++ b/cmd/nerdctl/compose_start.go @@ -23,10 +23,10 @@ import ( "github.com/containerd/containerd" "github.com/containerd/containerd/errdefs" - "github.com/containerd/nerdctl/pkg/clientutil" - "github.com/containerd/nerdctl/pkg/cmd/compose" - "github.com/containerd/nerdctl/pkg/containerutil" - "github.com/containerd/nerdctl/pkg/labels" + "github.com/containerd/nerdctl/v2/pkg/clientutil" + "github.com/containerd/nerdctl/v2/pkg/cmd/compose" + "github.com/containerd/nerdctl/v2/pkg/containerutil" + "github.com/containerd/nerdctl/v2/pkg/labels" "github.com/spf13/cobra" "golang.org/x/sync/errgroup" ) diff --git a/cmd/nerdctl/compose_start_linux_test.go b/cmd/nerdctl/compose_start_linux_test.go index 2a156052408..79ce8c990a8 100644 --- a/cmd/nerdctl/compose_start_linux_test.go +++ b/cmd/nerdctl/compose_start_linux_test.go @@ -20,7 +20,7 @@ import ( "fmt" "testing" - "github.com/containerd/nerdctl/pkg/testutil" + "github.com/containerd/nerdctl/v2/pkg/testutil" ) func TestComposeStart(t *testing.T) { diff --git a/cmd/nerdctl/compose_stop.go b/cmd/nerdctl/compose_stop.go index b35d4911143..ab6053d1d5a 100644 --- a/cmd/nerdctl/compose_stop.go +++ b/cmd/nerdctl/compose_stop.go @@ -17,9 +17,9 @@ package main import ( - "github.com/containerd/nerdctl/pkg/clientutil" - "github.com/containerd/nerdctl/pkg/cmd/compose" - "github.com/containerd/nerdctl/pkg/composer" + "github.com/containerd/nerdctl/v2/pkg/clientutil" + "github.com/containerd/nerdctl/v2/pkg/cmd/compose" + "github.com/containerd/nerdctl/v2/pkg/composer" "github.com/spf13/cobra" ) diff --git a/cmd/nerdctl/compose_stop_linux_test.go b/cmd/nerdctl/compose_stop_linux_test.go index d618894ab33..dcb1250e8a5 100644 --- a/cmd/nerdctl/compose_stop_linux_test.go +++ b/cmd/nerdctl/compose_stop_linux_test.go @@ -20,7 +20,7 @@ import ( "fmt" "testing" - "github.com/containerd/nerdctl/pkg/testutil" + "github.com/containerd/nerdctl/v2/pkg/testutil" ) func TestComposeStop(t *testing.T) { diff --git a/cmd/nerdctl/compose_top.go b/cmd/nerdctl/compose_top.go index 54aa9ce2b41..52ea6a71800 100644 --- a/cmd/nerdctl/compose_top.go +++ b/cmd/nerdctl/compose_top.go @@ -20,12 +20,12 @@ import ( "fmt" "github.com/containerd/containerd" - "github.com/containerd/nerdctl/pkg/api/types" - "github.com/containerd/nerdctl/pkg/clientutil" - "github.com/containerd/nerdctl/pkg/cmd/compose" - "github.com/containerd/nerdctl/pkg/cmd/container" - "github.com/containerd/nerdctl/pkg/containerutil" - "github.com/containerd/nerdctl/pkg/labels" + "github.com/containerd/nerdctl/v2/pkg/api/types" + "github.com/containerd/nerdctl/v2/pkg/clientutil" + "github.com/containerd/nerdctl/v2/pkg/cmd/compose" + "github.com/containerd/nerdctl/v2/pkg/cmd/container" + "github.com/containerd/nerdctl/v2/pkg/containerutil" + "github.com/containerd/nerdctl/v2/pkg/labels" "github.com/spf13/cobra" ) diff --git a/cmd/nerdctl/compose_top_linux_test.go b/cmd/nerdctl/compose_top_linux_test.go index 38a94fa84e9..09c01062f03 100644 --- a/cmd/nerdctl/compose_top_linux_test.go +++ b/cmd/nerdctl/compose_top_linux_test.go @@ -20,9 +20,9 @@ import ( "fmt" "testing" - "github.com/containerd/nerdctl/pkg/infoutil" - "github.com/containerd/nerdctl/pkg/rootlessutil" - "github.com/containerd/nerdctl/pkg/testutil" + "github.com/containerd/nerdctl/v2/pkg/infoutil" + "github.com/containerd/nerdctl/v2/pkg/rootlessutil" + "github.com/containerd/nerdctl/v2/pkg/testutil" ) func TestComposeTop(t *testing.T) { diff --git a/cmd/nerdctl/compose_up.go b/cmd/nerdctl/compose_up.go index 019bb795d10..4fe07ae11d7 100644 --- a/cmd/nerdctl/compose_up.go +++ b/cmd/nerdctl/compose_up.go @@ -22,9 +22,9 @@ import ( "strconv" "strings" - "github.com/containerd/nerdctl/pkg/clientutil" - "github.com/containerd/nerdctl/pkg/cmd/compose" - "github.com/containerd/nerdctl/pkg/composer" + "github.com/containerd/nerdctl/v2/pkg/clientutil" + "github.com/containerd/nerdctl/v2/pkg/cmd/compose" + "github.com/containerd/nerdctl/v2/pkg/composer" "github.com/spf13/cobra" ) diff --git a/cmd/nerdctl/compose_up_linux_test.go b/cmd/nerdctl/compose_up_linux_test.go index 481bbc5b16e..0580e10b28d 100644 --- a/cmd/nerdctl/compose_up_linux_test.go +++ b/cmd/nerdctl/compose_up_linux_test.go @@ -25,12 +25,12 @@ import ( "time" "github.com/containerd/log" - "github.com/containerd/nerdctl/pkg/composer/serviceparser" - "github.com/containerd/nerdctl/pkg/rootlessutil" + "github.com/containerd/nerdctl/v2/pkg/composer/serviceparser" + "github.com/containerd/nerdctl/v2/pkg/rootlessutil" "github.com/docker/go-connections/nat" - "github.com/containerd/nerdctl/pkg/testutil" - "github.com/containerd/nerdctl/pkg/testutil/nettestutil" + "github.com/containerd/nerdctl/v2/pkg/testutil" + "github.com/containerd/nerdctl/v2/pkg/testutil/nettestutil" "gotest.tools/v3/assert" ) diff --git a/cmd/nerdctl/compose_up_test.go b/cmd/nerdctl/compose_up_test.go index 308993ff124..8431ab4ece6 100644 --- a/cmd/nerdctl/compose_up_test.go +++ b/cmd/nerdctl/compose_up_test.go @@ -23,7 +23,7 @@ import ( "runtime" "testing" - "github.com/containerd/nerdctl/pkg/testutil" + "github.com/containerd/nerdctl/v2/pkg/testutil" "gotest.tools/v3/assert" "gotest.tools/v3/icmd" ) diff --git a/cmd/nerdctl/compose_version.go b/cmd/nerdctl/compose_version.go index 99a73274876..0382300ea02 100644 --- a/cmd/nerdctl/compose_version.go +++ b/cmd/nerdctl/compose_version.go @@ -20,7 +20,7 @@ import ( "fmt" "strings" - "github.com/containerd/nerdctl/pkg/version" + "github.com/containerd/nerdctl/v2/pkg/version" "github.com/spf13/cobra" ) diff --git a/cmd/nerdctl/compose_version_test.go b/cmd/nerdctl/compose_version_test.go index 2f3354745f3..222d41edd4d 100644 --- a/cmd/nerdctl/compose_version_test.go +++ b/cmd/nerdctl/compose_version_test.go @@ -19,7 +19,7 @@ package main import ( "testing" - "github.com/containerd/nerdctl/pkg/testutil" + "github.com/containerd/nerdctl/v2/pkg/testutil" ) func TestComposeVersion(t *testing.T) { diff --git a/cmd/nerdctl/container_attach.go b/cmd/nerdctl/container_attach.go index 8a18be23918..4c8067322ae 100644 --- a/cmd/nerdctl/container_attach.go +++ b/cmd/nerdctl/container_attach.go @@ -18,10 +18,10 @@ package main import ( "github.com/containerd/containerd" - "github.com/containerd/nerdctl/pkg/api/types" - "github.com/containerd/nerdctl/pkg/clientutil" - "github.com/containerd/nerdctl/pkg/cmd/container" - "github.com/containerd/nerdctl/pkg/consoleutil" + "github.com/containerd/nerdctl/v2/pkg/api/types" + "github.com/containerd/nerdctl/v2/pkg/clientutil" + "github.com/containerd/nerdctl/v2/pkg/cmd/container" + "github.com/containerd/nerdctl/v2/pkg/consoleutil" "github.com/spf13/cobra" ) diff --git a/cmd/nerdctl/container_attach_linux_test.go b/cmd/nerdctl/container_attach_linux_test.go index c1ab1356cb0..84a774c7e4a 100644 --- a/cmd/nerdctl/container_attach_linux_test.go +++ b/cmd/nerdctl/container_attach_linux_test.go @@ -21,7 +21,7 @@ import ( "strings" "testing" - "github.com/containerd/nerdctl/pkg/testutil" + "github.com/containerd/nerdctl/v2/pkg/testutil" "gotest.tools/v3/assert" ) diff --git a/cmd/nerdctl/container_commit.go b/cmd/nerdctl/container_commit.go index ad09be63e37..2b56c1de641 100644 --- a/cmd/nerdctl/container_commit.go +++ b/cmd/nerdctl/container_commit.go @@ -17,9 +17,9 @@ package main import ( - "github.com/containerd/nerdctl/pkg/api/types" - "github.com/containerd/nerdctl/pkg/clientutil" - "github.com/containerd/nerdctl/pkg/cmd/container" + "github.com/containerd/nerdctl/v2/pkg/api/types" + "github.com/containerd/nerdctl/v2/pkg/clientutil" + "github.com/containerd/nerdctl/v2/pkg/cmd/container" "github.com/spf13/cobra" ) diff --git a/cmd/nerdctl/container_commit_test.go b/cmd/nerdctl/container_commit_test.go index c48209f1d24..b569ebfbcc2 100644 --- a/cmd/nerdctl/container_commit_test.go +++ b/cmd/nerdctl/container_commit_test.go @@ -20,7 +20,7 @@ import ( "fmt" "testing" - "github.com/containerd/nerdctl/pkg/testutil" + "github.com/containerd/nerdctl/v2/pkg/testutil" ) func TestCommit(t *testing.T) { diff --git a/cmd/nerdctl/container_cp_linux.go b/cmd/nerdctl/container_cp_linux.go index f3f994794b5..9f38c394af7 100644 --- a/cmd/nerdctl/container_cp_linux.go +++ b/cmd/nerdctl/container_cp_linux.go @@ -19,10 +19,10 @@ package main import ( "fmt" - "github.com/containerd/nerdctl/pkg/api/types" - "github.com/containerd/nerdctl/pkg/clientutil" - "github.com/containerd/nerdctl/pkg/cmd/container" - "github.com/containerd/nerdctl/pkg/rootlessutil" + "github.com/containerd/nerdctl/v2/pkg/api/types" + "github.com/containerd/nerdctl/v2/pkg/clientutil" + "github.com/containerd/nerdctl/v2/pkg/cmd/container" + "github.com/containerd/nerdctl/v2/pkg/rootlessutil" "github.com/spf13/cobra" ) diff --git a/cmd/nerdctl/container_cp_linux_test.go b/cmd/nerdctl/container_cp_linux_test.go index b71d694c838..807ea0f0619 100644 --- a/cmd/nerdctl/container_cp_linux_test.go +++ b/cmd/nerdctl/container_cp_linux_test.go @@ -24,8 +24,8 @@ import ( "syscall" "testing" - "github.com/containerd/nerdctl/pkg/rootlessutil" - "github.com/containerd/nerdctl/pkg/testutil" + "github.com/containerd/nerdctl/v2/pkg/rootlessutil" + "github.com/containerd/nerdctl/v2/pkg/testutil" "gotest.tools/v3/assert" ) diff --git a/cmd/nerdctl/container_create.go b/cmd/nerdctl/container_create.go index 60b7de34d3a..f196e02cb05 100644 --- a/cmd/nerdctl/container_create.go +++ b/cmd/nerdctl/container_create.go @@ -20,10 +20,10 @@ import ( "fmt" "runtime" - "github.com/containerd/nerdctl/pkg/api/types" - "github.com/containerd/nerdctl/pkg/clientutil" - "github.com/containerd/nerdctl/pkg/cmd/container" - "github.com/containerd/nerdctl/pkg/containerutil" + "github.com/containerd/nerdctl/v2/pkg/api/types" + "github.com/containerd/nerdctl/v2/pkg/clientutil" + "github.com/containerd/nerdctl/v2/pkg/cmd/container" + "github.com/containerd/nerdctl/v2/pkg/containerutil" "github.com/spf13/cobra" ) diff --git a/cmd/nerdctl/container_create_linux_test.go b/cmd/nerdctl/container_create_linux_test.go index 403d463de8d..8a66c781c4a 100644 --- a/cmd/nerdctl/container_create_linux_test.go +++ b/cmd/nerdctl/container_create_linux_test.go @@ -21,8 +21,8 @@ import ( "runtime" "testing" - "github.com/containerd/nerdctl/pkg/testutil" - "github.com/containerd/nerdctl/pkg/testutil/nettestutil" + "github.com/containerd/nerdctl/v2/pkg/testutil" + "github.com/containerd/nerdctl/v2/pkg/testutil/nettestutil" "gotest.tools/v3/assert" ) diff --git a/cmd/nerdctl/container_create_windows_test.go b/cmd/nerdctl/container_create_windows_test.go index 643fce767b9..f52cda49819 100644 --- a/cmd/nerdctl/container_create_windows_test.go +++ b/cmd/nerdctl/container_create_windows_test.go @@ -20,7 +20,7 @@ import ( "testing" "time" - "github.com/containerd/nerdctl/pkg/testutil" + "github.com/containerd/nerdctl/v2/pkg/testutil" ) func TestCreateProcessContainer(t *testing.T) { diff --git a/cmd/nerdctl/container_diff.go b/cmd/nerdctl/container_diff.go index 48db2be7891..d5eb238fbf1 100644 --- a/cmd/nerdctl/container_diff.go +++ b/cmd/nerdctl/container_diff.go @@ -29,12 +29,12 @@ import ( "github.com/containerd/containerd/platforms" "github.com/containerd/continuity/fs" "github.com/containerd/log" - "github.com/containerd/nerdctl/pkg/api/types" - "github.com/containerd/nerdctl/pkg/clientutil" - "github.com/containerd/nerdctl/pkg/idgen" - "github.com/containerd/nerdctl/pkg/idutil/containerwalker" - "github.com/containerd/nerdctl/pkg/imgutil" - "github.com/containerd/nerdctl/pkg/labels" + "github.com/containerd/nerdctl/v2/pkg/api/types" + "github.com/containerd/nerdctl/v2/pkg/clientutil" + "github.com/containerd/nerdctl/v2/pkg/idgen" + "github.com/containerd/nerdctl/v2/pkg/idutil/containerwalker" + "github.com/containerd/nerdctl/v2/pkg/imgutil" + "github.com/containerd/nerdctl/v2/pkg/labels" "github.com/opencontainers/image-spec/identity" "github.com/spf13/cobra" ) diff --git a/cmd/nerdctl/container_diff_linux_test.go b/cmd/nerdctl/container_diff_linux_test.go index 7fd2c9ce71c..e74ba025333 100644 --- a/cmd/nerdctl/container_diff_linux_test.go +++ b/cmd/nerdctl/container_diff_linux_test.go @@ -19,7 +19,7 @@ package main import ( "testing" - "github.com/containerd/nerdctl/pkg/testutil" + "github.com/containerd/nerdctl/v2/pkg/testutil" ) func TestDiff(t *testing.T) { diff --git a/cmd/nerdctl/container_exec.go b/cmd/nerdctl/container_exec.go index 6b3447cd94b..751c3915190 100644 --- a/cmd/nerdctl/container_exec.go +++ b/cmd/nerdctl/container_exec.go @@ -20,9 +20,9 @@ import ( "errors" "github.com/containerd/containerd" - "github.com/containerd/nerdctl/pkg/api/types" - "github.com/containerd/nerdctl/pkg/clientutil" - "github.com/containerd/nerdctl/pkg/cmd/container" + "github.com/containerd/nerdctl/v2/pkg/api/types" + "github.com/containerd/nerdctl/v2/pkg/clientutil" + "github.com/containerd/nerdctl/v2/pkg/cmd/container" "github.com/spf13/cobra" ) diff --git a/cmd/nerdctl/container_exec_linux_test.go b/cmd/nerdctl/container_exec_linux_test.go index 37ffcb69d06..38c9a793d49 100644 --- a/cmd/nerdctl/container_exec_linux_test.go +++ b/cmd/nerdctl/container_exec_linux_test.go @@ -19,7 +19,7 @@ package main import ( "testing" - "github.com/containerd/nerdctl/pkg/testutil" + "github.com/containerd/nerdctl/v2/pkg/testutil" ) func TestExecWithUser(t *testing.T) { diff --git a/cmd/nerdctl/container_exec_test.go b/cmd/nerdctl/container_exec_test.go index b96cc74756a..bcd1b41abe9 100644 --- a/cmd/nerdctl/container_exec_test.go +++ b/cmd/nerdctl/container_exec_test.go @@ -23,7 +23,7 @@ import ( "strings" "testing" - "github.com/containerd/nerdctl/pkg/testutil" + "github.com/containerd/nerdctl/v2/pkg/testutil" ) func TestExec(t *testing.T) { diff --git a/cmd/nerdctl/container_inspect.go b/cmd/nerdctl/container_inspect.go index 0124a93dcda..7fe6dd4435c 100644 --- a/cmd/nerdctl/container_inspect.go +++ b/cmd/nerdctl/container_inspect.go @@ -19,9 +19,9 @@ package main import ( "fmt" - "github.com/containerd/nerdctl/pkg/api/types" - "github.com/containerd/nerdctl/pkg/clientutil" - "github.com/containerd/nerdctl/pkg/cmd/container" + "github.com/containerd/nerdctl/v2/pkg/api/types" + "github.com/containerd/nerdctl/v2/pkg/clientutil" + "github.com/containerd/nerdctl/v2/pkg/cmd/container" "github.com/spf13/cobra" ) diff --git a/cmd/nerdctl/container_inspect_linux_test.go b/cmd/nerdctl/container_inspect_linux_test.go index 6eb0ba9b2f1..7c1cc721543 100644 --- a/cmd/nerdctl/container_inspect_linux_test.go +++ b/cmd/nerdctl/container_inspect_linux_test.go @@ -21,8 +21,8 @@ import ( "strings" "testing" - "github.com/containerd/nerdctl/pkg/inspecttypes/dockercompat" - "github.com/containerd/nerdctl/pkg/testutil" + "github.com/containerd/nerdctl/v2/pkg/inspecttypes/dockercompat" + "github.com/containerd/nerdctl/v2/pkg/testutil" "github.com/docker/go-connections/nat" "gotest.tools/v3/assert" ) diff --git a/cmd/nerdctl/container_inspect_windows_test.go b/cmd/nerdctl/container_inspect_windows_test.go index 5ba9adbb08a..bc5cf33278b 100644 --- a/cmd/nerdctl/container_inspect_windows_test.go +++ b/cmd/nerdctl/container_inspect_windows_test.go @@ -19,7 +19,7 @@ package main import ( "testing" - "github.com/containerd/nerdctl/pkg/testutil" + "github.com/containerd/nerdctl/v2/pkg/testutil" "gotest.tools/v3/assert" ) diff --git a/cmd/nerdctl/container_kill.go b/cmd/nerdctl/container_kill.go index fdf8e488c72..fe0e26ca501 100644 --- a/cmd/nerdctl/container_kill.go +++ b/cmd/nerdctl/container_kill.go @@ -18,9 +18,9 @@ package main import ( "github.com/containerd/containerd" - "github.com/containerd/nerdctl/pkg/api/types" - "github.com/containerd/nerdctl/pkg/clientutil" - "github.com/containerd/nerdctl/pkg/cmd/container" + "github.com/containerd/nerdctl/v2/pkg/api/types" + "github.com/containerd/nerdctl/v2/pkg/clientutil" + "github.com/containerd/nerdctl/v2/pkg/cmd/container" "github.com/spf13/cobra" ) diff --git a/cmd/nerdctl/container_list.go b/cmd/nerdctl/container_list.go index be2aaaae831..549df18ca08 100644 --- a/cmd/nerdctl/container_list.go +++ b/cmd/nerdctl/container_list.go @@ -24,10 +24,10 @@ import ( "text/tabwriter" "text/template" - "github.com/containerd/nerdctl/pkg/api/types" - "github.com/containerd/nerdctl/pkg/clientutil" - "github.com/containerd/nerdctl/pkg/cmd/container" - "github.com/containerd/nerdctl/pkg/formatter" + "github.com/containerd/nerdctl/v2/pkg/api/types" + "github.com/containerd/nerdctl/v2/pkg/clientutil" + "github.com/containerd/nerdctl/v2/pkg/cmd/container" + "github.com/containerd/nerdctl/v2/pkg/formatter" "github.com/spf13/cobra" ) diff --git a/cmd/nerdctl/container_list_linux_test.go b/cmd/nerdctl/container_list_linux_test.go index 109e7f9469d..ea48531487c 100644 --- a/cmd/nerdctl/container_list_linux_test.go +++ b/cmd/nerdctl/container_list_linux_test.go @@ -23,10 +23,10 @@ import ( "strings" "testing" - "github.com/containerd/nerdctl/pkg/formatter" - "github.com/containerd/nerdctl/pkg/strutil" - "github.com/containerd/nerdctl/pkg/tabutil" - "github.com/containerd/nerdctl/pkg/testutil" + "github.com/containerd/nerdctl/v2/pkg/formatter" + "github.com/containerd/nerdctl/v2/pkg/strutil" + "github.com/containerd/nerdctl/v2/pkg/tabutil" + "github.com/containerd/nerdctl/v2/pkg/testutil" "gotest.tools/v3/assert" ) diff --git a/cmd/nerdctl/container_list_test.go b/cmd/nerdctl/container_list_test.go index 7ec299b62ed..9b48b67ef47 100644 --- a/cmd/nerdctl/container_list_test.go +++ b/cmd/nerdctl/container_list_test.go @@ -20,7 +20,7 @@ import ( "fmt" "testing" - "github.com/containerd/nerdctl/pkg/testutil" + "github.com/containerd/nerdctl/v2/pkg/testutil" ) // https://github.com/containerd/nerdctl/issues/2598 diff --git a/cmd/nerdctl/container_list_windows_test.go b/cmd/nerdctl/container_list_windows_test.go index e655a6cd1b3..5efbac82da3 100644 --- a/cmd/nerdctl/container_list_windows_test.go +++ b/cmd/nerdctl/container_list_windows_test.go @@ -21,10 +21,10 @@ import ( "strings" "testing" - "github.com/containerd/nerdctl/pkg/formatter" - "github.com/containerd/nerdctl/pkg/strutil" - "github.com/containerd/nerdctl/pkg/tabutil" - "github.com/containerd/nerdctl/pkg/testutil" + "github.com/containerd/nerdctl/v2/pkg/formatter" + "github.com/containerd/nerdctl/v2/pkg/strutil" + "github.com/containerd/nerdctl/v2/pkg/tabutil" + "github.com/containerd/nerdctl/v2/pkg/testutil" "gotest.tools/v3/assert" ) diff --git a/cmd/nerdctl/container_logs.go b/cmd/nerdctl/container_logs.go index 7ec46f80ccc..27e5dec0250 100644 --- a/cmd/nerdctl/container_logs.go +++ b/cmd/nerdctl/container_logs.go @@ -20,9 +20,9 @@ import ( "fmt" "strconv" - "github.com/containerd/nerdctl/pkg/api/types" - "github.com/containerd/nerdctl/pkg/clientutil" - "github.com/containerd/nerdctl/pkg/cmd/container" + "github.com/containerd/nerdctl/v2/pkg/api/types" + "github.com/containerd/nerdctl/v2/pkg/clientutil" + "github.com/containerd/nerdctl/v2/pkg/cmd/container" "github.com/spf13/cobra" ) diff --git a/cmd/nerdctl/container_logs_test.go b/cmd/nerdctl/container_logs_test.go index 66b0dc2ee81..b14824f84ad 100644 --- a/cmd/nerdctl/container_logs_test.go +++ b/cmd/nerdctl/container_logs_test.go @@ -23,7 +23,7 @@ import ( "testing" "time" - "github.com/containerd/nerdctl/pkg/testutil" + "github.com/containerd/nerdctl/v2/pkg/testutil" ) func TestLogs(t *testing.T) { diff --git a/cmd/nerdctl/container_pause.go b/cmd/nerdctl/container_pause.go index 8e4f0c85f2f..bf8cf4f0107 100644 --- a/cmd/nerdctl/container_pause.go +++ b/cmd/nerdctl/container_pause.go @@ -18,9 +18,9 @@ package main import ( "github.com/containerd/containerd" - "github.com/containerd/nerdctl/pkg/api/types" - "github.com/containerd/nerdctl/pkg/clientutil" - "github.com/containerd/nerdctl/pkg/cmd/container" + "github.com/containerd/nerdctl/v2/pkg/api/types" + "github.com/containerd/nerdctl/v2/pkg/clientutil" + "github.com/containerd/nerdctl/v2/pkg/cmd/container" "github.com/spf13/cobra" ) diff --git a/cmd/nerdctl/container_port.go b/cmd/nerdctl/container_port.go index e2fb467f000..072df21ba25 100644 --- a/cmd/nerdctl/container_port.go +++ b/cmd/nerdctl/container_port.go @@ -22,9 +22,9 @@ import ( "strconv" "strings" - "github.com/containerd/nerdctl/pkg/clientutil" - "github.com/containerd/nerdctl/pkg/containerutil" - "github.com/containerd/nerdctl/pkg/idutil/containerwalker" + "github.com/containerd/nerdctl/v2/pkg/clientutil" + "github.com/containerd/nerdctl/v2/pkg/containerutil" + "github.com/containerd/nerdctl/v2/pkg/idutil/containerwalker" "github.com/spf13/cobra" ) diff --git a/cmd/nerdctl/container_prune.go b/cmd/nerdctl/container_prune.go index dc02b5a316b..1d1e19afa6d 100644 --- a/cmd/nerdctl/container_prune.go +++ b/cmd/nerdctl/container_prune.go @@ -20,9 +20,9 @@ import ( "fmt" "strings" - "github.com/containerd/nerdctl/pkg/api/types" - "github.com/containerd/nerdctl/pkg/clientutil" - "github.com/containerd/nerdctl/pkg/cmd/container" + "github.com/containerd/nerdctl/v2/pkg/api/types" + "github.com/containerd/nerdctl/v2/pkg/clientutil" + "github.com/containerd/nerdctl/v2/pkg/cmd/container" "github.com/spf13/cobra" ) diff --git a/cmd/nerdctl/container_prune_linux_test.go b/cmd/nerdctl/container_prune_linux_test.go index bfcda034719..0aec844714f 100644 --- a/cmd/nerdctl/container_prune_linux_test.go +++ b/cmd/nerdctl/container_prune_linux_test.go @@ -19,7 +19,7 @@ package main import ( "testing" - "github.com/containerd/nerdctl/pkg/testutil" + "github.com/containerd/nerdctl/v2/pkg/testutil" ) func TestPruneContainer(t *testing.T) { diff --git a/cmd/nerdctl/container_remove.go b/cmd/nerdctl/container_remove.go index b6c0d39d472..05a7e059e38 100644 --- a/cmd/nerdctl/container_remove.go +++ b/cmd/nerdctl/container_remove.go @@ -17,9 +17,9 @@ package main import ( - "github.com/containerd/nerdctl/pkg/api/types" - "github.com/containerd/nerdctl/pkg/clientutil" - "github.com/containerd/nerdctl/pkg/cmd/container" + "github.com/containerd/nerdctl/v2/pkg/api/types" + "github.com/containerd/nerdctl/v2/pkg/clientutil" + "github.com/containerd/nerdctl/v2/pkg/cmd/container" "github.com/spf13/cobra" ) diff --git a/cmd/nerdctl/container_remove_linux_test.go b/cmd/nerdctl/container_remove_linux_test.go index 3020dfc42f4..71a060f2d41 100644 --- a/cmd/nerdctl/container_remove_linux_test.go +++ b/cmd/nerdctl/container_remove_linux_test.go @@ -19,7 +19,7 @@ package main import ( "testing" - "github.com/containerd/nerdctl/pkg/testutil" + "github.com/containerd/nerdctl/v2/pkg/testutil" ) func TestRemoveContainer(t *testing.T) { diff --git a/cmd/nerdctl/container_remove_windows_test.go b/cmd/nerdctl/container_remove_windows_test.go index 07ed0b44dd3..a93573c5ca5 100644 --- a/cmd/nerdctl/container_remove_windows_test.go +++ b/cmd/nerdctl/container_remove_windows_test.go @@ -19,7 +19,7 @@ package main import ( "testing" - "github.com/containerd/nerdctl/pkg/testutil" + "github.com/containerd/nerdctl/v2/pkg/testutil" "gotest.tools/v3/assert" ) diff --git a/cmd/nerdctl/container_rename.go b/cmd/nerdctl/container_rename.go index 2f1d482a6c1..6e5857117e6 100644 --- a/cmd/nerdctl/container_rename.go +++ b/cmd/nerdctl/container_rename.go @@ -17,9 +17,9 @@ package main import ( - "github.com/containerd/nerdctl/pkg/api/types" - "github.com/containerd/nerdctl/pkg/clientutil" - "github.com/containerd/nerdctl/pkg/cmd/container" + "github.com/containerd/nerdctl/v2/pkg/api/types" + "github.com/containerd/nerdctl/v2/pkg/clientutil" + "github.com/containerd/nerdctl/v2/pkg/cmd/container" "github.com/spf13/cobra" ) diff --git a/cmd/nerdctl/container_rename_linux_test.go b/cmd/nerdctl/container_rename_linux_test.go index b082514fe1c..ae48b82f84f 100644 --- a/cmd/nerdctl/container_rename_linux_test.go +++ b/cmd/nerdctl/container_rename_linux_test.go @@ -19,7 +19,7 @@ package main import ( "testing" - "github.com/containerd/nerdctl/pkg/testutil" + "github.com/containerd/nerdctl/v2/pkg/testutil" ) func TestRename(t *testing.T) { diff --git a/cmd/nerdctl/container_rename_windows_test.go b/cmd/nerdctl/container_rename_windows_test.go index 38d78cd5473..698f6bf004f 100644 --- a/cmd/nerdctl/container_rename_windows_test.go +++ b/cmd/nerdctl/container_rename_windows_test.go @@ -19,7 +19,7 @@ package main import ( "testing" - "github.com/containerd/nerdctl/pkg/testutil" + "github.com/containerd/nerdctl/v2/pkg/testutil" ) func TestRenameProcessContainer(t *testing.T) { diff --git a/cmd/nerdctl/container_restart.go b/cmd/nerdctl/container_restart.go index ae1b8d3d1e3..906c7ff6486 100644 --- a/cmd/nerdctl/container_restart.go +++ b/cmd/nerdctl/container_restart.go @@ -19,9 +19,9 @@ package main import ( "time" - "github.com/containerd/nerdctl/pkg/api/types" - "github.com/containerd/nerdctl/pkg/clientutil" - "github.com/containerd/nerdctl/pkg/cmd/container" + "github.com/containerd/nerdctl/v2/pkg/api/types" + "github.com/containerd/nerdctl/v2/pkg/clientutil" + "github.com/containerd/nerdctl/v2/pkg/cmd/container" "github.com/spf13/cobra" ) diff --git a/cmd/nerdctl/container_restart_linux_test.go b/cmd/nerdctl/container_restart_linux_test.go index 669d94d6640..374debc1d83 100644 --- a/cmd/nerdctl/container_restart_linux_test.go +++ b/cmd/nerdctl/container_restart_linux_test.go @@ -22,7 +22,7 @@ import ( "testing" "time" - "github.com/containerd/nerdctl/pkg/testutil" + "github.com/containerd/nerdctl/v2/pkg/testutil" "gotest.tools/v3/assert" ) diff --git a/cmd/nerdctl/container_run.go b/cmd/nerdctl/container_run.go index c1684e17e7a..5d74b627680 100644 --- a/cmd/nerdctl/container_run.go +++ b/cmd/nerdctl/container_run.go @@ -23,18 +23,18 @@ import ( "github.com/containerd/console" "github.com/containerd/log" - "github.com/containerd/nerdctl/pkg/api/types" - "github.com/containerd/nerdctl/pkg/clientutil" - "github.com/containerd/nerdctl/pkg/cmd/container" - "github.com/containerd/nerdctl/pkg/consoleutil" - "github.com/containerd/nerdctl/pkg/containerutil" - "github.com/containerd/nerdctl/pkg/defaults" - "github.com/containerd/nerdctl/pkg/errutil" - "github.com/containerd/nerdctl/pkg/labels" - "github.com/containerd/nerdctl/pkg/logging" - "github.com/containerd/nerdctl/pkg/netutil" - "github.com/containerd/nerdctl/pkg/signalutil" - "github.com/containerd/nerdctl/pkg/taskutil" + "github.com/containerd/nerdctl/v2/pkg/api/types" + "github.com/containerd/nerdctl/v2/pkg/clientutil" + "github.com/containerd/nerdctl/v2/pkg/cmd/container" + "github.com/containerd/nerdctl/v2/pkg/consoleutil" + "github.com/containerd/nerdctl/v2/pkg/containerutil" + "github.com/containerd/nerdctl/v2/pkg/defaults" + "github.com/containerd/nerdctl/v2/pkg/errutil" + "github.com/containerd/nerdctl/v2/pkg/labels" + "github.com/containerd/nerdctl/v2/pkg/logging" + "github.com/containerd/nerdctl/v2/pkg/netutil" + "github.com/containerd/nerdctl/v2/pkg/signalutil" + "github.com/containerd/nerdctl/v2/pkg/taskutil" "github.com/spf13/cobra" ) diff --git a/cmd/nerdctl/container_run_cgroup_linux_test.go b/cmd/nerdctl/container_run_cgroup_linux_test.go index 0301ae58e66..16e0b0acdbf 100644 --- a/cmd/nerdctl/container_run_cgroup_linux_test.go +++ b/cmd/nerdctl/container_run_cgroup_linux_test.go @@ -26,8 +26,8 @@ import ( "github.com/containerd/cgroups/v3" "github.com/containerd/containerd/pkg/userns" "github.com/containerd/continuity/testutil/loopback" - "github.com/containerd/nerdctl/pkg/cmd/container" - "github.com/containerd/nerdctl/pkg/testutil" + "github.com/containerd/nerdctl/v2/pkg/cmd/container" + "github.com/containerd/nerdctl/v2/pkg/testutil" "gotest.tools/v3/assert" ) diff --git a/cmd/nerdctl/container_run_gpus_test.go b/cmd/nerdctl/container_run_gpus_test.go index b9961aeccb5..392a978d618 100644 --- a/cmd/nerdctl/container_run_gpus_test.go +++ b/cmd/nerdctl/container_run_gpus_test.go @@ -19,7 +19,7 @@ package main import ( "testing" - "github.com/containerd/nerdctl/pkg/cmd/container" + "github.com/containerd/nerdctl/v2/pkg/cmd/container" "gotest.tools/v3/assert" is "gotest.tools/v3/assert/cmp" ) diff --git a/cmd/nerdctl/container_run_linux_test.go b/cmd/nerdctl/container_run_linux_test.go index 678ea108d46..e5b519c709f 100644 --- a/cmd/nerdctl/container_run_linux_test.go +++ b/cmd/nerdctl/container_run_linux_test.go @@ -32,9 +32,9 @@ import ( "testing" "time" - "github.com/containerd/nerdctl/pkg/rootlessutil" - "github.com/containerd/nerdctl/pkg/strutil" - "github.com/containerd/nerdctl/pkg/testutil" + "github.com/containerd/nerdctl/v2/pkg/rootlessutil" + "github.com/containerd/nerdctl/v2/pkg/strutil" + "github.com/containerd/nerdctl/v2/pkg/testutil" "gotest.tools/v3/assert" "gotest.tools/v3/icmd" ) diff --git a/cmd/nerdctl/container_run_log_driver_syslog_test.go b/cmd/nerdctl/container_run_log_driver_syslog_test.go index a46f8f8936b..ca0ea993e7c 100644 --- a/cmd/nerdctl/container_run_log_driver_syslog_test.go +++ b/cmd/nerdctl/container_run_log_driver_syslog_test.go @@ -25,10 +25,10 @@ import ( "testing" "time" - "github.com/containerd/nerdctl/pkg/rootlessutil" - "github.com/containerd/nerdctl/pkg/testutil" - "github.com/containerd/nerdctl/pkg/testutil/testca" - "github.com/containerd/nerdctl/pkg/testutil/testsyslog" + "github.com/containerd/nerdctl/v2/pkg/rootlessutil" + "github.com/containerd/nerdctl/v2/pkg/testutil" + "github.com/containerd/nerdctl/v2/pkg/testutil/testca" + "github.com/containerd/nerdctl/v2/pkg/testutil/testsyslog" syslog "github.com/yuchanns/srslog" ) diff --git a/cmd/nerdctl/container_run_mount_linux_test.go b/cmd/nerdctl/container_run_mount_linux_test.go index 19793c97340..55527bf0ae7 100644 --- a/cmd/nerdctl/container_run_mount_linux_test.go +++ b/cmd/nerdctl/container_run_mount_linux_test.go @@ -24,8 +24,8 @@ import ( "testing" "github.com/containerd/containerd/mount" - "github.com/containerd/nerdctl/pkg/rootlessutil" - "github.com/containerd/nerdctl/pkg/testutil" + "github.com/containerd/nerdctl/v2/pkg/rootlessutil" + "github.com/containerd/nerdctl/v2/pkg/testutil" mobymount "github.com/moby/sys/mount" "gotest.tools/v3/assert" ) diff --git a/cmd/nerdctl/container_run_mount_windows_test.go b/cmd/nerdctl/container_run_mount_windows_test.go index a560151b74c..7c84bd17f15 100644 --- a/cmd/nerdctl/container_run_mount_windows_test.go +++ b/cmd/nerdctl/container_run_mount_windows_test.go @@ -21,8 +21,8 @@ import ( "os" "testing" - "github.com/containerd/nerdctl/pkg/inspecttypes/dockercompat" - "github.com/containerd/nerdctl/pkg/testutil" + "github.com/containerd/nerdctl/v2/pkg/inspecttypes/dockercompat" + "github.com/containerd/nerdctl/v2/pkg/testutil" "gotest.tools/v3/assert" ) diff --git a/cmd/nerdctl/container_run_network.go b/cmd/nerdctl/container_run_network.go index e2d25a047e0..64822221d4e 100644 --- a/cmd/nerdctl/container_run_network.go +++ b/cmd/nerdctl/container_run_network.go @@ -20,9 +20,9 @@ import ( "net" gocni "github.com/containerd/go-cni" - "github.com/containerd/nerdctl/pkg/api/types" - "github.com/containerd/nerdctl/pkg/portutil" - "github.com/containerd/nerdctl/pkg/strutil" + "github.com/containerd/nerdctl/v2/pkg/api/types" + "github.com/containerd/nerdctl/v2/pkg/portutil" + "github.com/containerd/nerdctl/v2/pkg/strutil" "github.com/spf13/cobra" ) diff --git a/cmd/nerdctl/container_run_network_base_test.go b/cmd/nerdctl/container_run_network_base_test.go index d1cbfccc149..f072ac34ecb 100644 --- a/cmd/nerdctl/container_run_network_base_test.go +++ b/cmd/nerdctl/container_run_network_base_test.go @@ -26,8 +26,8 @@ import ( "strings" "testing" - "github.com/containerd/nerdctl/pkg/testutil" - "github.com/containerd/nerdctl/pkg/testutil/nettestutil" + "github.com/containerd/nerdctl/v2/pkg/testutil" + "github.com/containerd/nerdctl/v2/pkg/testutil/nettestutil" "gotest.tools/v3/assert" ) diff --git a/cmd/nerdctl/container_run_network_linux_test.go b/cmd/nerdctl/container_run_network_linux_test.go index 62d6ad978cc..79139736203 100644 --- a/cmd/nerdctl/container_run_network_linux_test.go +++ b/cmd/nerdctl/container_run_network_linux_test.go @@ -26,9 +26,9 @@ import ( "testing" "github.com/containerd/containerd/errdefs" - "github.com/containerd/nerdctl/pkg/rootlessutil" - "github.com/containerd/nerdctl/pkg/testutil" - "github.com/containerd/nerdctl/pkg/testutil/nettestutil" + "github.com/containerd/nerdctl/v2/pkg/rootlessutil" + "github.com/containerd/nerdctl/v2/pkg/testutil" + "github.com/containerd/nerdctl/v2/pkg/testutil/nettestutil" "gotest.tools/v3/assert" "gotest.tools/v3/icmd" ) diff --git a/cmd/nerdctl/container_run_network_windows_test.go b/cmd/nerdctl/container_run_network_windows_test.go index 914627607ec..5a842cde06e 100644 --- a/cmd/nerdctl/container_run_network_windows_test.go +++ b/cmd/nerdctl/container_run_network_windows_test.go @@ -23,9 +23,9 @@ import ( "testing" "github.com/Microsoft/hcsshim" - "github.com/containerd/nerdctl/pkg/defaults" - "github.com/containerd/nerdctl/pkg/netutil" - "github.com/containerd/nerdctl/pkg/testutil" + "github.com/containerd/nerdctl/v2/pkg/defaults" + "github.com/containerd/nerdctl/v2/pkg/netutil" + "github.com/containerd/nerdctl/v2/pkg/testutil" "gotest.tools/v3/assert" ) diff --git a/cmd/nerdctl/container_run_restart_linux_test.go b/cmd/nerdctl/container_run_restart_linux_test.go index be570699ac9..44e42b2393e 100644 --- a/cmd/nerdctl/container_run_restart_linux_test.go +++ b/cmd/nerdctl/container_run_restart_linux_test.go @@ -24,8 +24,8 @@ import ( "testing" "time" - "github.com/containerd/nerdctl/pkg/testutil" - "github.com/containerd/nerdctl/pkg/testutil/nettestutil" + "github.com/containerd/nerdctl/v2/pkg/testutil" + "github.com/containerd/nerdctl/v2/pkg/testutil/nettestutil" "gotest.tools/v3/assert" "gotest.tools/v3/poll" diff --git a/cmd/nerdctl/container_run_runtime_linux_test.go b/cmd/nerdctl/container_run_runtime_linux_test.go index fc33c21004a..90c61594009 100644 --- a/cmd/nerdctl/container_run_runtime_linux_test.go +++ b/cmd/nerdctl/container_run_runtime_linux_test.go @@ -19,7 +19,7 @@ package main import ( "testing" - "github.com/containerd/nerdctl/pkg/testutil" + "github.com/containerd/nerdctl/v2/pkg/testutil" ) func TestRunSysctl(t *testing.T) { diff --git a/cmd/nerdctl/container_run_security_linux_test.go b/cmd/nerdctl/container_run_security_linux_test.go index 49db43cbfe2..55ffdcf306b 100644 --- a/cmd/nerdctl/container_run_security_linux_test.go +++ b/cmd/nerdctl/container_run_security_linux_test.go @@ -24,9 +24,9 @@ import ( "strings" "testing" - "github.com/containerd/nerdctl/pkg/apparmorutil" - "github.com/containerd/nerdctl/pkg/rootlessutil" - "github.com/containerd/nerdctl/pkg/testutil" + "github.com/containerd/nerdctl/v2/pkg/apparmorutil" + "github.com/containerd/nerdctl/v2/pkg/rootlessutil" + "github.com/containerd/nerdctl/v2/pkg/testutil" "gotest.tools/v3/assert" ) diff --git a/cmd/nerdctl/container_run_soci_linux_test.go b/cmd/nerdctl/container_run_soci_linux_test.go index 2cde0118e3d..635f2710cf9 100644 --- a/cmd/nerdctl/container_run_soci_linux_test.go +++ b/cmd/nerdctl/container_run_soci_linux_test.go @@ -21,7 +21,7 @@ import ( "strings" "testing" - "github.com/containerd/nerdctl/pkg/testutil" + "github.com/containerd/nerdctl/v2/pkg/testutil" ) func TestRunSoci(t *testing.T) { diff --git a/cmd/nerdctl/container_run_stargz_linux_test.go b/cmd/nerdctl/container_run_stargz_linux_test.go index 0e1c8266b3d..3c3c621f746 100644 --- a/cmd/nerdctl/container_run_stargz_linux_test.go +++ b/cmd/nerdctl/container_run_stargz_linux_test.go @@ -19,7 +19,7 @@ package main import ( "testing" - "github.com/containerd/nerdctl/pkg/testutil" + "github.com/containerd/nerdctl/v2/pkg/testutil" ) func TestRunStargz(t *testing.T) { diff --git a/cmd/nerdctl/container_run_test.go b/cmd/nerdctl/container_run_test.go index e18aa7ac8e6..6b70d362b6b 100644 --- a/cmd/nerdctl/container_run_test.go +++ b/cmd/nerdctl/container_run_test.go @@ -30,7 +30,7 @@ import ( "testing" "time" - "github.com/containerd/nerdctl/pkg/testutil" + "github.com/containerd/nerdctl/v2/pkg/testutil" "gotest.tools/v3/assert" "gotest.tools/v3/icmd" "gotest.tools/v3/poll" diff --git a/cmd/nerdctl/container_run_user_linux_test.go b/cmd/nerdctl/container_run_user_linux_test.go index 23cdee352c6..114ba251d00 100644 --- a/cmd/nerdctl/container_run_user_linux_test.go +++ b/cmd/nerdctl/container_run_user_linux_test.go @@ -19,7 +19,7 @@ package main import ( "testing" - "github.com/containerd/nerdctl/pkg/testutil" + "github.com/containerd/nerdctl/v2/pkg/testutil" ) func TestRunUserGID(t *testing.T) { diff --git a/cmd/nerdctl/container_run_user_windows_test.go b/cmd/nerdctl/container_run_user_windows_test.go index 27cfd0697af..d6e45171680 100644 --- a/cmd/nerdctl/container_run_user_windows_test.go +++ b/cmd/nerdctl/container_run_user_windows_test.go @@ -19,7 +19,7 @@ package main import ( "testing" - "github.com/containerd/nerdctl/pkg/testutil" + "github.com/containerd/nerdctl/v2/pkg/testutil" ) func TestRunUserName(t *testing.T) { diff --git a/cmd/nerdctl/container_run_verify_linux_test.go b/cmd/nerdctl/container_run_verify_linux_test.go index ad4bef7d802..80e9ac5d99e 100644 --- a/cmd/nerdctl/container_run_verify_linux_test.go +++ b/cmd/nerdctl/container_run_verify_linux_test.go @@ -21,8 +21,8 @@ import ( "os" "testing" - "github.com/containerd/nerdctl/pkg/testutil" - "github.com/containerd/nerdctl/pkg/testutil/testregistry" + "github.com/containerd/nerdctl/v2/pkg/testutil" + "github.com/containerd/nerdctl/v2/pkg/testutil/testregistry" "gotest.tools/v3/assert" ) diff --git a/cmd/nerdctl/container_run_windows_test.go b/cmd/nerdctl/container_run_windows_test.go index 84cfa25294e..38faa432ec9 100644 --- a/cmd/nerdctl/container_run_windows_test.go +++ b/cmd/nerdctl/container_run_windows_test.go @@ -22,7 +22,7 @@ import ( "strings" "testing" - "github.com/containerd/nerdctl/pkg/testutil" + "github.com/containerd/nerdctl/v2/pkg/testutil" "gotest.tools/v3/assert" ) diff --git a/cmd/nerdctl/container_start.go b/cmd/nerdctl/container_start.go index 8596adc3bea..bd67d40f092 100644 --- a/cmd/nerdctl/container_start.go +++ b/cmd/nerdctl/container_start.go @@ -18,10 +18,10 @@ package main import ( "github.com/containerd/containerd" - "github.com/containerd/nerdctl/pkg/api/types" - "github.com/containerd/nerdctl/pkg/clientutil" - "github.com/containerd/nerdctl/pkg/cmd/container" - "github.com/containerd/nerdctl/pkg/consoleutil" + "github.com/containerd/nerdctl/v2/pkg/api/types" + "github.com/containerd/nerdctl/v2/pkg/clientutil" + "github.com/containerd/nerdctl/v2/pkg/cmd/container" + "github.com/containerd/nerdctl/v2/pkg/consoleutil" "github.com/spf13/cobra" ) diff --git a/cmd/nerdctl/container_start_linux_test.go b/cmd/nerdctl/container_start_linux_test.go index c83e310c40e..d7b35c6271b 100644 --- a/cmd/nerdctl/container_start_linux_test.go +++ b/cmd/nerdctl/container_start_linux_test.go @@ -21,7 +21,7 @@ import ( "strings" "testing" - "github.com/containerd/nerdctl/pkg/testutil" + "github.com/containerd/nerdctl/v2/pkg/testutil" "gotest.tools/v3/assert" ) diff --git a/cmd/nerdctl/container_start_test.go b/cmd/nerdctl/container_start_test.go index b9721b18241..374ee77c821 100644 --- a/cmd/nerdctl/container_start_test.go +++ b/cmd/nerdctl/container_start_test.go @@ -20,7 +20,7 @@ import ( "runtime" "testing" - "github.com/containerd/nerdctl/pkg/testutil" + "github.com/containerd/nerdctl/v2/pkg/testutil" ) func TestStart(t *testing.T) { diff --git a/cmd/nerdctl/container_stats.go b/cmd/nerdctl/container_stats.go index 9d47f34c172..f8281c12328 100644 --- a/cmd/nerdctl/container_stats.go +++ b/cmd/nerdctl/container_stats.go @@ -18,9 +18,9 @@ package main import ( "github.com/containerd/containerd" - "github.com/containerd/nerdctl/pkg/api/types" - "github.com/containerd/nerdctl/pkg/clientutil" - "github.com/containerd/nerdctl/pkg/cmd/container" + "github.com/containerd/nerdctl/v2/pkg/api/types" + "github.com/containerd/nerdctl/v2/pkg/clientutil" + "github.com/containerd/nerdctl/v2/pkg/cmd/container" "github.com/spf13/cobra" ) diff --git a/cmd/nerdctl/container_stats_linux_test.go b/cmd/nerdctl/container_stats_linux_test.go index 4b6fcd14bdc..6cd7ca3aaf8 100644 --- a/cmd/nerdctl/container_stats_linux_test.go +++ b/cmd/nerdctl/container_stats_linux_test.go @@ -20,9 +20,9 @@ import ( "fmt" "testing" - "github.com/containerd/nerdctl/pkg/infoutil" - "github.com/containerd/nerdctl/pkg/rootlessutil" - "github.com/containerd/nerdctl/pkg/testutil" + "github.com/containerd/nerdctl/v2/pkg/infoutil" + "github.com/containerd/nerdctl/v2/pkg/rootlessutil" + "github.com/containerd/nerdctl/v2/pkg/testutil" ) func TestStats(t *testing.T) { diff --git a/cmd/nerdctl/container_stop.go b/cmd/nerdctl/container_stop.go index 43a6f6bca44..0398e36ae44 100644 --- a/cmd/nerdctl/container_stop.go +++ b/cmd/nerdctl/container_stop.go @@ -20,9 +20,9 @@ import ( "time" "github.com/containerd/containerd" - "github.com/containerd/nerdctl/pkg/api/types" - "github.com/containerd/nerdctl/pkg/clientutil" - "github.com/containerd/nerdctl/pkg/cmd/container" + "github.com/containerd/nerdctl/v2/pkg/api/types" + "github.com/containerd/nerdctl/v2/pkg/clientutil" + "github.com/containerd/nerdctl/v2/pkg/cmd/container" "github.com/spf13/cobra" ) diff --git a/cmd/nerdctl/container_stop_linux_test.go b/cmd/nerdctl/container_stop_linux_test.go index a3940188ca7..de5338f7998 100644 --- a/cmd/nerdctl/container_stop_linux_test.go +++ b/cmd/nerdctl/container_stop_linux_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/containerd/nerdctl/pkg/testutil" - "github.com/containerd/nerdctl/pkg/testutil/nettestutil" + "github.com/containerd/nerdctl/v2/pkg/testutil" + "github.com/containerd/nerdctl/v2/pkg/testutil/nettestutil" "gotest.tools/v3/assert" ) diff --git a/cmd/nerdctl/container_top.go b/cmd/nerdctl/container_top.go index 141a200432e..c51b23d7242 100644 --- a/cmd/nerdctl/container_top.go +++ b/cmd/nerdctl/container_top.go @@ -21,11 +21,11 @@ import ( "fmt" "github.com/containerd/containerd" - "github.com/containerd/nerdctl/pkg/api/types" - "github.com/containerd/nerdctl/pkg/clientutil" - "github.com/containerd/nerdctl/pkg/cmd/container" - "github.com/containerd/nerdctl/pkg/infoutil" - "github.com/containerd/nerdctl/pkg/rootlessutil" + "github.com/containerd/nerdctl/v2/pkg/api/types" + "github.com/containerd/nerdctl/v2/pkg/clientutil" + "github.com/containerd/nerdctl/v2/pkg/cmd/container" + "github.com/containerd/nerdctl/v2/pkg/infoutil" + "github.com/containerd/nerdctl/v2/pkg/rootlessutil" "github.com/spf13/cobra" ) diff --git a/cmd/nerdctl/container_top_unix_test.go b/cmd/nerdctl/container_top_unix_test.go index acf3676362b..45b39f2a64f 100644 --- a/cmd/nerdctl/container_top_unix_test.go +++ b/cmd/nerdctl/container_top_unix_test.go @@ -21,9 +21,9 @@ package main import ( "testing" - "github.com/containerd/nerdctl/pkg/infoutil" - "github.com/containerd/nerdctl/pkg/rootlessutil" - "github.com/containerd/nerdctl/pkg/testutil" + "github.com/containerd/nerdctl/v2/pkg/infoutil" + "github.com/containerd/nerdctl/v2/pkg/rootlessutil" + "github.com/containerd/nerdctl/v2/pkg/testutil" ) func TestTop(t *testing.T) { diff --git a/cmd/nerdctl/container_top_windows_test.go b/cmd/nerdctl/container_top_windows_test.go index f862cf328ae..93d9616ce83 100644 --- a/cmd/nerdctl/container_top_windows_test.go +++ b/cmd/nerdctl/container_top_windows_test.go @@ -19,7 +19,7 @@ package main import ( "testing" - "github.com/containerd/nerdctl/pkg/testutil" + "github.com/containerd/nerdctl/v2/pkg/testutil" ) func TestTopProcessContainer(t *testing.T) { diff --git a/cmd/nerdctl/container_unpause.go b/cmd/nerdctl/container_unpause.go index 021d3d445b5..26909f790b2 100644 --- a/cmd/nerdctl/container_unpause.go +++ b/cmd/nerdctl/container_unpause.go @@ -18,9 +18,9 @@ package main import ( "github.com/containerd/containerd" - "github.com/containerd/nerdctl/pkg/api/types" - "github.com/containerd/nerdctl/pkg/clientutil" - "github.com/containerd/nerdctl/pkg/cmd/container" + "github.com/containerd/nerdctl/v2/pkg/api/types" + "github.com/containerd/nerdctl/v2/pkg/clientutil" + "github.com/containerd/nerdctl/v2/pkg/cmd/container" "github.com/spf13/cobra" ) diff --git a/cmd/nerdctl/container_update.go b/cmd/nerdctl/container_update.go index 73b39588271..d4f79775db9 100644 --- a/cmd/nerdctl/container_update.go +++ b/cmd/nerdctl/container_update.go @@ -27,12 +27,12 @@ import ( "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/pkg/cri/util" "github.com/containerd/log" - "github.com/containerd/nerdctl/pkg/api/types" - "github.com/containerd/nerdctl/pkg/clientutil" - nerdctlContainer "github.com/containerd/nerdctl/pkg/cmd/container" - "github.com/containerd/nerdctl/pkg/formatter" - "github.com/containerd/nerdctl/pkg/idutil/containerwalker" - "github.com/containerd/nerdctl/pkg/infoutil" + "github.com/containerd/nerdctl/v2/pkg/api/types" + "github.com/containerd/nerdctl/v2/pkg/clientutil" + nerdctlContainer "github.com/containerd/nerdctl/v2/pkg/cmd/container" + "github.com/containerd/nerdctl/v2/pkg/formatter" + "github.com/containerd/nerdctl/v2/pkg/idutil/containerwalker" + "github.com/containerd/nerdctl/v2/pkg/infoutil" "github.com/containerd/typeurl/v2" "github.com/docker/go-units" runtimespec "github.com/opencontainers/runtime-spec/specs-go" diff --git a/cmd/nerdctl/container_wait.go b/cmd/nerdctl/container_wait.go index ae4ce9ffc3d..98156c44175 100644 --- a/cmd/nerdctl/container_wait.go +++ b/cmd/nerdctl/container_wait.go @@ -18,9 +18,9 @@ package main import ( "github.com/containerd/containerd" - "github.com/containerd/nerdctl/pkg/api/types" - "github.com/containerd/nerdctl/pkg/clientutil" - "github.com/containerd/nerdctl/pkg/cmd/container" + "github.com/containerd/nerdctl/v2/pkg/api/types" + "github.com/containerd/nerdctl/v2/pkg/clientutil" + "github.com/containerd/nerdctl/v2/pkg/cmd/container" "github.com/spf13/cobra" ) diff --git a/cmd/nerdctl/container_wait_test.go b/cmd/nerdctl/container_wait_test.go index 6a580cf143b..d2048dd6618 100644 --- a/cmd/nerdctl/container_wait_test.go +++ b/cmd/nerdctl/container_wait_test.go @@ -19,7 +19,7 @@ package main import ( "testing" - "github.com/containerd/nerdctl/pkg/testutil" + "github.com/containerd/nerdctl/v2/pkg/testutil" ) func TestWait(t *testing.T) { diff --git a/cmd/nerdctl/flagutil.go b/cmd/nerdctl/flagutil.go index cf50b59a30e..795d9d2a0cd 100644 --- a/cmd/nerdctl/flagutil.go +++ b/cmd/nerdctl/flagutil.go @@ -17,7 +17,7 @@ package main import ( - "github.com/containerd/nerdctl/pkg/api/types" + "github.com/containerd/nerdctl/v2/pkg/api/types" "github.com/spf13/cobra" ) diff --git a/cmd/nerdctl/image_convert.go b/cmd/nerdctl/image_convert.go index e2ed0fe3e74..0b27e593d77 100644 --- a/cmd/nerdctl/image_convert.go +++ b/cmd/nerdctl/image_convert.go @@ -19,9 +19,9 @@ package main import ( "compress/gzip" - "github.com/containerd/nerdctl/pkg/api/types" - "github.com/containerd/nerdctl/pkg/clientutil" - "github.com/containerd/nerdctl/pkg/cmd/image" + "github.com/containerd/nerdctl/v2/pkg/api/types" + "github.com/containerd/nerdctl/v2/pkg/clientutil" + "github.com/containerd/nerdctl/v2/pkg/cmd/image" "github.com/spf13/cobra" ) diff --git a/cmd/nerdctl/image_convert_linux_test.go b/cmd/nerdctl/image_convert_linux_test.go index 4b7eff95856..c6fb457d962 100644 --- a/cmd/nerdctl/image_convert_linux_test.go +++ b/cmd/nerdctl/image_convert_linux_test.go @@ -21,9 +21,9 @@ import ( "runtime" "testing" - "github.com/containerd/nerdctl/pkg/rootlessutil" - "github.com/containerd/nerdctl/pkg/testutil" - "github.com/containerd/nerdctl/pkg/testutil/testregistry" + "github.com/containerd/nerdctl/v2/pkg/rootlessutil" + "github.com/containerd/nerdctl/v2/pkg/testutil" + "github.com/containerd/nerdctl/v2/pkg/testutil/testregistry" "gotest.tools/v3/icmd" ) diff --git a/cmd/nerdctl/image_convert_test.go b/cmd/nerdctl/image_convert_test.go index bcca02a2b2c..2984c9a1369 100644 --- a/cmd/nerdctl/image_convert_test.go +++ b/cmd/nerdctl/image_convert_test.go @@ -20,7 +20,7 @@ import ( "runtime" "testing" - "github.com/containerd/nerdctl/pkg/testutil" + "github.com/containerd/nerdctl/v2/pkg/testutil" ) func TestImageConvertEStargz(t *testing.T) { diff --git a/cmd/nerdctl/image_cryptutil.go b/cmd/nerdctl/image_cryptutil.go index 039f7720205..47d5fdb0c52 100644 --- a/cmd/nerdctl/image_cryptutil.go +++ b/cmd/nerdctl/image_cryptutil.go @@ -17,9 +17,9 @@ package main import ( - "github.com/containerd/nerdctl/pkg/api/types" - "github.com/containerd/nerdctl/pkg/clientutil" - "github.com/containerd/nerdctl/pkg/cmd/image" + "github.com/containerd/nerdctl/v2/pkg/api/types" + "github.com/containerd/nerdctl/v2/pkg/clientutil" + "github.com/containerd/nerdctl/v2/pkg/cmd/image" "github.com/spf13/cobra" ) diff --git a/cmd/nerdctl/image_encrypt_linux_test.go b/cmd/nerdctl/image_encrypt_linux_test.go index 873d08b212a..d20daa60b9a 100644 --- a/cmd/nerdctl/image_encrypt_linux_test.go +++ b/cmd/nerdctl/image_encrypt_linux_test.go @@ -26,9 +26,9 @@ import ( "github.com/containerd/containerd" "github.com/containerd/containerd/content" - "github.com/containerd/nerdctl/pkg/buildkitutil" - "github.com/containerd/nerdctl/pkg/testutil" - "github.com/containerd/nerdctl/pkg/testutil/testregistry" + "github.com/containerd/nerdctl/v2/pkg/buildkitutil" + "github.com/containerd/nerdctl/v2/pkg/testutil" + "github.com/containerd/nerdctl/v2/pkg/testutil/testregistry" "gotest.tools/v3/assert" ) diff --git a/cmd/nerdctl/image_history.go b/cmd/nerdctl/image_history.go index c5e53f0b0a7..d6024f9c17c 100644 --- a/cmd/nerdctl/image_history.go +++ b/cmd/nerdctl/image_history.go @@ -30,10 +30,10 @@ import ( "github.com/containerd/containerd" "github.com/containerd/containerd/pkg/progress" "github.com/containerd/log" - "github.com/containerd/nerdctl/pkg/clientutil" - "github.com/containerd/nerdctl/pkg/formatter" - "github.com/containerd/nerdctl/pkg/idutil/imagewalker" - "github.com/containerd/nerdctl/pkg/imgutil" + "github.com/containerd/nerdctl/v2/pkg/clientutil" + "github.com/containerd/nerdctl/v2/pkg/formatter" + "github.com/containerd/nerdctl/v2/pkg/idutil/imagewalker" + "github.com/containerd/nerdctl/v2/pkg/imgutil" "github.com/opencontainers/image-spec/identity" "github.com/spf13/cobra" ) diff --git a/cmd/nerdctl/image_inspect.go b/cmd/nerdctl/image_inspect.go index a255324ba2c..28a4ffe8a3f 100644 --- a/cmd/nerdctl/image_inspect.go +++ b/cmd/nerdctl/image_inspect.go @@ -17,9 +17,9 @@ package main import ( - "github.com/containerd/nerdctl/pkg/api/types" - "github.com/containerd/nerdctl/pkg/clientutil" - "github.com/containerd/nerdctl/pkg/cmd/image" + "github.com/containerd/nerdctl/v2/pkg/api/types" + "github.com/containerd/nerdctl/v2/pkg/clientutil" + "github.com/containerd/nerdctl/v2/pkg/cmd/image" "github.com/spf13/cobra" ) diff --git a/cmd/nerdctl/image_inspect_test.go b/cmd/nerdctl/image_inspect_test.go index ef35921ef03..f55fd575593 100644 --- a/cmd/nerdctl/image_inspect_test.go +++ b/cmd/nerdctl/image_inspect_test.go @@ -19,7 +19,7 @@ package main import ( "testing" - "github.com/containerd/nerdctl/pkg/testutil" + "github.com/containerd/nerdctl/v2/pkg/testutil" "gotest.tools/v3/assert" ) diff --git a/cmd/nerdctl/image_list.go b/cmd/nerdctl/image_list.go index e63f14fc6fd..a7dc5be6f23 100644 --- a/cmd/nerdctl/image_list.go +++ b/cmd/nerdctl/image_list.go @@ -19,10 +19,10 @@ package main import ( "fmt" - "github.com/containerd/nerdctl/pkg/api/types" - "github.com/containerd/nerdctl/pkg/clientutil" - "github.com/containerd/nerdctl/pkg/cmd/image" - "github.com/containerd/nerdctl/pkg/referenceutil" + "github.com/containerd/nerdctl/v2/pkg/api/types" + "github.com/containerd/nerdctl/v2/pkg/clientutil" + "github.com/containerd/nerdctl/v2/pkg/cmd/image" + "github.com/containerd/nerdctl/v2/pkg/referenceutil" "github.com/spf13/cobra" ) diff --git a/cmd/nerdctl/image_list_test.go b/cmd/nerdctl/image_list_test.go index 6a057b4430a..4043cf26633 100644 --- a/cmd/nerdctl/image_list_test.go +++ b/cmd/nerdctl/image_list_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/containerd/nerdctl/pkg/tabutil" - "github.com/containerd/nerdctl/pkg/testutil" + "github.com/containerd/nerdctl/v2/pkg/tabutil" + "github.com/containerd/nerdctl/v2/pkg/testutil" "gotest.tools/v3/assert" ) diff --git a/cmd/nerdctl/image_load.go b/cmd/nerdctl/image_load.go index 5d3f31063ce..39c027d42fa 100644 --- a/cmd/nerdctl/image_load.go +++ b/cmd/nerdctl/image_load.go @@ -17,9 +17,9 @@ package main import ( - "github.com/containerd/nerdctl/pkg/api/types" - "github.com/containerd/nerdctl/pkg/clientutil" - "github.com/containerd/nerdctl/pkg/cmd/image" + "github.com/containerd/nerdctl/v2/pkg/api/types" + "github.com/containerd/nerdctl/v2/pkg/clientutil" + "github.com/containerd/nerdctl/v2/pkg/cmd/image" "github.com/spf13/cobra" ) diff --git a/cmd/nerdctl/image_load_linux_test.go b/cmd/nerdctl/image_load_linux_test.go index 0f620363a19..bb48046844d 100644 --- a/cmd/nerdctl/image_load_linux_test.go +++ b/cmd/nerdctl/image_load_linux_test.go @@ -24,7 +24,7 @@ import ( "strings" "testing" - "github.com/containerd/nerdctl/pkg/testutil" + "github.com/containerd/nerdctl/v2/pkg/testutil" "gotest.tools/v3/assert" ) diff --git a/cmd/nerdctl/image_prune.go b/cmd/nerdctl/image_prune.go index f444c9bb8c2..0f42f9e9828 100644 --- a/cmd/nerdctl/image_prune.go +++ b/cmd/nerdctl/image_prune.go @@ -20,9 +20,9 @@ import ( "fmt" "strings" - "github.com/containerd/nerdctl/pkg/api/types" - "github.com/containerd/nerdctl/pkg/clientutil" - "github.com/containerd/nerdctl/pkg/cmd/image" + "github.com/containerd/nerdctl/v2/pkg/api/types" + "github.com/containerd/nerdctl/v2/pkg/clientutil" + "github.com/containerd/nerdctl/v2/pkg/cmd/image" "github.com/spf13/cobra" ) diff --git a/cmd/nerdctl/image_prune_test.go b/cmd/nerdctl/image_prune_test.go index a185d6f33c2..63ba0f5bdea 100644 --- a/cmd/nerdctl/image_prune_test.go +++ b/cmd/nerdctl/image_prune_test.go @@ -21,7 +21,7 @@ import ( "os" "testing" - "github.com/containerd/nerdctl/pkg/testutil" + "github.com/containerd/nerdctl/v2/pkg/testutil" "gotest.tools/v3/assert" ) diff --git a/cmd/nerdctl/image_pull.go b/cmd/nerdctl/image_pull.go index 11b2444870f..8c478fb68d9 100644 --- a/cmd/nerdctl/image_pull.go +++ b/cmd/nerdctl/image_pull.go @@ -17,10 +17,10 @@ package main import ( - "github.com/containerd/nerdctl/pkg/api/types" - "github.com/containerd/nerdctl/pkg/clientutil" - "github.com/containerd/nerdctl/pkg/cmd/image" - "github.com/containerd/nerdctl/pkg/imgutil" + "github.com/containerd/nerdctl/v2/pkg/api/types" + "github.com/containerd/nerdctl/v2/pkg/clientutil" + "github.com/containerd/nerdctl/v2/pkg/cmd/image" + "github.com/containerd/nerdctl/v2/pkg/imgutil" "github.com/spf13/cobra" ) diff --git a/cmd/nerdctl/image_pull_linux_test.go b/cmd/nerdctl/image_pull_linux_test.go index 5c09157cdcc..82c83871f3a 100644 --- a/cmd/nerdctl/image_pull_linux_test.go +++ b/cmd/nerdctl/image_pull_linux_test.go @@ -24,8 +24,8 @@ import ( "strings" "testing" - "github.com/containerd/nerdctl/pkg/testutil" - "github.com/containerd/nerdctl/pkg/testutil/testregistry" + "github.com/containerd/nerdctl/v2/pkg/testutil" + "github.com/containerd/nerdctl/v2/pkg/testutil/testregistry" "gotest.tools/v3/assert" ) diff --git a/cmd/nerdctl/image_push.go b/cmd/nerdctl/image_push.go index 3dac0d986c1..132318b82ad 100644 --- a/cmd/nerdctl/image_push.go +++ b/cmd/nerdctl/image_push.go @@ -17,9 +17,9 @@ package main import ( - "github.com/containerd/nerdctl/pkg/api/types" - "github.com/containerd/nerdctl/pkg/clientutil" - "github.com/containerd/nerdctl/pkg/cmd/image" + "github.com/containerd/nerdctl/v2/pkg/api/types" + "github.com/containerd/nerdctl/v2/pkg/clientutil" + "github.com/containerd/nerdctl/v2/pkg/cmd/image" "github.com/spf13/cobra" ) diff --git a/cmd/nerdctl/image_push_linux_test.go b/cmd/nerdctl/image_push_linux_test.go index 9a6bdbd5622..0a65980e19c 100644 --- a/cmd/nerdctl/image_push_linux_test.go +++ b/cmd/nerdctl/image_push_linux_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/containerd/nerdctl/pkg/testutil" - "github.com/containerd/nerdctl/pkg/testutil/testregistry" + "github.com/containerd/nerdctl/v2/pkg/testutil" + "github.com/containerd/nerdctl/v2/pkg/testutil/testregistry" "gotest.tools/v3/assert" ) diff --git a/cmd/nerdctl/image_remove.go b/cmd/nerdctl/image_remove.go index b060ec27a9e..26dfdefe4c2 100644 --- a/cmd/nerdctl/image_remove.go +++ b/cmd/nerdctl/image_remove.go @@ -17,9 +17,9 @@ package main import ( - "github.com/containerd/nerdctl/pkg/api/types" - "github.com/containerd/nerdctl/pkg/clientutil" - "github.com/containerd/nerdctl/pkg/cmd/image" + "github.com/containerd/nerdctl/v2/pkg/api/types" + "github.com/containerd/nerdctl/v2/pkg/clientutil" + "github.com/containerd/nerdctl/v2/pkg/cmd/image" "github.com/spf13/cobra" ) diff --git a/cmd/nerdctl/image_remove_linux_test.go b/cmd/nerdctl/image_remove_linux_test.go index 7594798f62d..0ad754cc596 100644 --- a/cmd/nerdctl/image_remove_linux_test.go +++ b/cmd/nerdctl/image_remove_linux_test.go @@ -19,7 +19,7 @@ package main import ( "testing" - "github.com/containerd/nerdctl/pkg/testutil" + "github.com/containerd/nerdctl/v2/pkg/testutil" ) func TestRemoveImage(t *testing.T) { diff --git a/cmd/nerdctl/image_save.go b/cmd/nerdctl/image_save.go index 3d9e9ca91cd..a72b7b245b2 100644 --- a/cmd/nerdctl/image_save.go +++ b/cmd/nerdctl/image_save.go @@ -20,9 +20,9 @@ import ( "fmt" "os" - "github.com/containerd/nerdctl/pkg/api/types" - "github.com/containerd/nerdctl/pkg/clientutil" - "github.com/containerd/nerdctl/pkg/cmd/image" + "github.com/containerd/nerdctl/v2/pkg/api/types" + "github.com/containerd/nerdctl/v2/pkg/clientutil" + "github.com/containerd/nerdctl/v2/pkg/cmd/image" "github.com/mattn/go-isatty" "github.com/spf13/cobra" ) diff --git a/cmd/nerdctl/image_save_linux_test.go b/cmd/nerdctl/image_save_linux_test.go index c2970a9f04c..be9504ca5d4 100644 --- a/cmd/nerdctl/image_save_linux_test.go +++ b/cmd/nerdctl/image_save_linux_test.go @@ -26,7 +26,7 @@ import ( "strings" "testing" - "github.com/containerd/nerdctl/pkg/testutil" + "github.com/containerd/nerdctl/v2/pkg/testutil" "gotest.tools/v3/assert" ) diff --git a/cmd/nerdctl/image_save_test.go b/cmd/nerdctl/image_save_test.go index cd4106b8bf7..2bfdeeeb2c1 100644 --- a/cmd/nerdctl/image_save_test.go +++ b/cmd/nerdctl/image_save_test.go @@ -21,7 +21,7 @@ import ( "strings" "testing" - "github.com/containerd/nerdctl/pkg/testutil" + "github.com/containerd/nerdctl/v2/pkg/testutil" ) func TestSaveById(t *testing.T) { diff --git a/cmd/nerdctl/image_tag.go b/cmd/nerdctl/image_tag.go index 4361eeffe3b..b6eede91c90 100644 --- a/cmd/nerdctl/image_tag.go +++ b/cmd/nerdctl/image_tag.go @@ -17,9 +17,9 @@ package main import ( - "github.com/containerd/nerdctl/pkg/api/types" - "github.com/containerd/nerdctl/pkg/clientutil" - "github.com/containerd/nerdctl/pkg/cmd/image" + "github.com/containerd/nerdctl/v2/pkg/api/types" + "github.com/containerd/nerdctl/v2/pkg/clientutil" + "github.com/containerd/nerdctl/v2/pkg/cmd/image" "github.com/spf13/cobra" ) diff --git a/cmd/nerdctl/inspect.go b/cmd/nerdctl/inspect.go index 30204ca7c5c..2cea1d97cc7 100644 --- a/cmd/nerdctl/inspect.go +++ b/cmd/nerdctl/inspect.go @@ -20,12 +20,12 @@ import ( "context" "fmt" - "github.com/containerd/nerdctl/pkg/api/types" - "github.com/containerd/nerdctl/pkg/clientutil" - "github.com/containerd/nerdctl/pkg/cmd/container" - "github.com/containerd/nerdctl/pkg/cmd/image" - "github.com/containerd/nerdctl/pkg/idutil/containerwalker" - "github.com/containerd/nerdctl/pkg/idutil/imagewalker" + "github.com/containerd/nerdctl/v2/pkg/api/types" + "github.com/containerd/nerdctl/v2/pkg/clientutil" + "github.com/containerd/nerdctl/v2/pkg/cmd/container" + "github.com/containerd/nerdctl/v2/pkg/cmd/image" + "github.com/containerd/nerdctl/v2/pkg/idutil/containerwalker" + "github.com/containerd/nerdctl/v2/pkg/idutil/imagewalker" "github.com/spf13/cobra" ) diff --git a/cmd/nerdctl/internal_oci_hook.go b/cmd/nerdctl/internal_oci_hook.go index e75b32b66a7..bb76c19bb31 100644 --- a/cmd/nerdctl/internal_oci_hook.go +++ b/cmd/nerdctl/internal_oci_hook.go @@ -20,8 +20,8 @@ import ( "errors" "os" - "github.com/containerd/nerdctl/pkg/clientutil" - "github.com/containerd/nerdctl/pkg/ocihook" + "github.com/containerd/nerdctl/v2/pkg/clientutil" + "github.com/containerd/nerdctl/v2/pkg/ocihook" "github.com/spf13/cobra" ) diff --git a/cmd/nerdctl/ipfs_build_linux_test.go b/cmd/nerdctl/ipfs_build_linux_test.go index e7af2400786..55a629aa13c 100644 --- a/cmd/nerdctl/ipfs_build_linux_test.go +++ b/cmd/nerdctl/ipfs_build_linux_test.go @@ -23,7 +23,7 @@ import ( "testing" "time" - "github.com/containerd/nerdctl/pkg/testutil" + "github.com/containerd/nerdctl/v2/pkg/testutil" "gotest.tools/v3/assert" "gotest.tools/v3/icmd" diff --git a/cmd/nerdctl/ipfs_compose_linux_test.go b/cmd/nerdctl/ipfs_compose_linux_test.go index 087fbed2e8a..30ff09b5a9a 100644 --- a/cmd/nerdctl/ipfs_compose_linux_test.go +++ b/cmd/nerdctl/ipfs_compose_linux_test.go @@ -23,8 +23,8 @@ import ( "strings" "testing" - "github.com/containerd/nerdctl/pkg/testutil" - "github.com/containerd/nerdctl/pkg/testutil/nettestutil" + "github.com/containerd/nerdctl/v2/pkg/testutil" + "github.com/containerd/nerdctl/v2/pkg/testutil/nettestutil" "gotest.tools/v3/assert" ) diff --git a/cmd/nerdctl/ipfs_linux_test.go b/cmd/nerdctl/ipfs_linux_test.go index 523d5eb981f..1c5582347ea 100644 --- a/cmd/nerdctl/ipfs_linux_test.go +++ b/cmd/nerdctl/ipfs_linux_test.go @@ -22,9 +22,9 @@ import ( "regexp" "testing" - "github.com/containerd/nerdctl/pkg/infoutil" - "github.com/containerd/nerdctl/pkg/rootlessutil" - "github.com/containerd/nerdctl/pkg/testutil" + "github.com/containerd/nerdctl/v2/pkg/infoutil" + "github.com/containerd/nerdctl/v2/pkg/rootlessutil" + "github.com/containerd/nerdctl/v2/pkg/testutil" "gotest.tools/v3/assert" ) diff --git a/cmd/nerdctl/ipfs_registry_linux_test.go b/cmd/nerdctl/ipfs_registry_linux_test.go index cec59e59756..70d7794fdc5 100644 --- a/cmd/nerdctl/ipfs_registry_linux_test.go +++ b/cmd/nerdctl/ipfs_registry_linux_test.go @@ -21,7 +21,7 @@ import ( "strings" "testing" - "github.com/containerd/nerdctl/pkg/testutil" + "github.com/containerd/nerdctl/v2/pkg/testutil" ) func TestIPFSRegistry(t *testing.T) { diff --git a/cmd/nerdctl/ipfs_registry_serve.go b/cmd/nerdctl/ipfs_registry_serve.go index 81708d2c56e..67a120919bf 100644 --- a/cmd/nerdctl/ipfs_registry_serve.go +++ b/cmd/nerdctl/ipfs_registry_serve.go @@ -17,8 +17,8 @@ package main import ( - "github.com/containerd/nerdctl/pkg/api/types" - "github.com/containerd/nerdctl/pkg/cmd/ipfs" + "github.com/containerd/nerdctl/v2/pkg/api/types" + "github.com/containerd/nerdctl/v2/pkg/cmd/ipfs" "github.com/spf13/cobra" ) diff --git a/cmd/nerdctl/login.go b/cmd/nerdctl/login.go index e64dfee1920..4cff2458bb8 100644 --- a/cmd/nerdctl/login.go +++ b/cmd/nerdctl/login.go @@ -22,8 +22,8 @@ import ( "strings" "github.com/containerd/log" - "github.com/containerd/nerdctl/pkg/api/types" - "github.com/containerd/nerdctl/pkg/cmd/login" + "github.com/containerd/nerdctl/v2/pkg/api/types" + "github.com/containerd/nerdctl/v2/pkg/cmd/login" "github.com/spf13/cobra" ) diff --git a/cmd/nerdctl/login_linux_test.go b/cmd/nerdctl/login_linux_test.go index 12fbc8d4377..ce145e530ee 100644 --- a/cmd/nerdctl/login_linux_test.go +++ b/cmd/nerdctl/login_linux_test.go @@ -23,8 +23,8 @@ import ( "strconv" "testing" - "github.com/containerd/nerdctl/pkg/testutil" - "github.com/containerd/nerdctl/pkg/testutil/testregistry" + "github.com/containerd/nerdctl/v2/pkg/testutil" + "github.com/containerd/nerdctl/v2/pkg/testutil/testregistry" ) func TestLogin(t *testing.T) { diff --git a/cmd/nerdctl/logout.go b/cmd/nerdctl/logout.go index 09b4ee43179..a08c2bdd0a8 100644 --- a/cmd/nerdctl/logout.go +++ b/cmd/nerdctl/logout.go @@ -19,7 +19,7 @@ package main import ( "fmt" - "github.com/containerd/nerdctl/pkg/imgutil/dockerconfigresolver" + "github.com/containerd/nerdctl/v2/pkg/imgutil/dockerconfigresolver" dockercliconfig "github.com/docker/cli/cli/config" "github.com/spf13/cobra" ) diff --git a/cmd/nerdctl/main.go b/cmd/nerdctl/main.go index c97da084cac..42e5eb7d925 100644 --- a/cmd/nerdctl/main.go +++ b/cmd/nerdctl/main.go @@ -26,12 +26,12 @@ import ( "time" "github.com/containerd/log" - "github.com/containerd/nerdctl/pkg/config" - ncdefaults "github.com/containerd/nerdctl/pkg/defaults" - "github.com/containerd/nerdctl/pkg/errutil" - "github.com/containerd/nerdctl/pkg/logging" - "github.com/containerd/nerdctl/pkg/rootlessutil" - "github.com/containerd/nerdctl/pkg/version" + "github.com/containerd/nerdctl/v2/pkg/config" + ncdefaults "github.com/containerd/nerdctl/v2/pkg/defaults" + "github.com/containerd/nerdctl/v2/pkg/errutil" + "github.com/containerd/nerdctl/v2/pkg/logging" + "github.com/containerd/nerdctl/v2/pkg/rootlessutil" + "github.com/containerd/nerdctl/v2/pkg/version" "github.com/fatih/color" "github.com/pelletier/go-toml/v2" diff --git a/cmd/nerdctl/main_linux.go b/cmd/nerdctl/main_linux.go index d4c81209421..5f1f5ae9355 100644 --- a/cmd/nerdctl/main_linux.go +++ b/cmd/nerdctl/main_linux.go @@ -17,9 +17,9 @@ package main import ( - ncdefaults "github.com/containerd/nerdctl/pkg/defaults" - "github.com/containerd/nerdctl/pkg/rootlessutil" - "github.com/containerd/nerdctl/pkg/strutil" + ncdefaults "github.com/containerd/nerdctl/v2/pkg/defaults" + "github.com/containerd/nerdctl/v2/pkg/rootlessutil" + "github.com/containerd/nerdctl/v2/pkg/strutil" "github.com/spf13/cobra" ) diff --git a/cmd/nerdctl/main_linux_test.go b/cmd/nerdctl/main_linux_test.go index a61fa50ee2b..a0e82861a84 100644 --- a/cmd/nerdctl/main_linux_test.go +++ b/cmd/nerdctl/main_linux_test.go @@ -19,7 +19,7 @@ package main import ( "testing" - "github.com/containerd/nerdctl/pkg/testutil" + "github.com/containerd/nerdctl/v2/pkg/testutil" ) // TestIssue108 tests https://github.com/containerd/nerdctl/issues/108 diff --git a/cmd/nerdctl/main_test.go b/cmd/nerdctl/main_test.go index 03a09360147..184b2d399be 100644 --- a/cmd/nerdctl/main_test.go +++ b/cmd/nerdctl/main_test.go @@ -22,7 +22,7 @@ import ( "testing" "github.com/containerd/containerd" - "github.com/containerd/nerdctl/pkg/testutil" + "github.com/containerd/nerdctl/v2/pkg/testutil" "gotest.tools/v3/assert" ) diff --git a/cmd/nerdctl/main_unix.go b/cmd/nerdctl/main_unix.go index d85a980ccd4..93ac2f9134e 100644 --- a/cmd/nerdctl/main_unix.go +++ b/cmd/nerdctl/main_unix.go @@ -20,9 +20,9 @@ package main import ( "github.com/containerd/log" - "github.com/containerd/nerdctl/pkg/clientutil" - "github.com/containerd/nerdctl/pkg/infoutil" - "github.com/containerd/nerdctl/pkg/rootlessutil" + "github.com/containerd/nerdctl/v2/pkg/clientutil" + "github.com/containerd/nerdctl/v2/pkg/infoutil" + "github.com/containerd/nerdctl/v2/pkg/rootlessutil" "github.com/spf13/cobra" ) diff --git a/cmd/nerdctl/multi_platform_linux_test.go b/cmd/nerdctl/multi_platform_linux_test.go index 017d2827c8b..cc76cae4f08 100644 --- a/cmd/nerdctl/multi_platform_linux_test.go +++ b/cmd/nerdctl/multi_platform_linux_test.go @@ -23,9 +23,9 @@ import ( "strings" "testing" - "github.com/containerd/nerdctl/pkg/testutil" - "github.com/containerd/nerdctl/pkg/testutil/nettestutil" - "github.com/containerd/nerdctl/pkg/testutil/testregistry" + "github.com/containerd/nerdctl/v2/pkg/testutil" + "github.com/containerd/nerdctl/v2/pkg/testutil/nettestutil" + "github.com/containerd/nerdctl/v2/pkg/testutil/testregistry" "gotest.tools/v3/assert" ) diff --git a/cmd/nerdctl/namespace.go b/cmd/nerdctl/namespace.go index 58a3ca0a0d1..b60e89ccd37 100644 --- a/cmd/nerdctl/namespace.go +++ b/cmd/nerdctl/namespace.go @@ -25,8 +25,8 @@ import ( "github.com/containerd/containerd/namespaces" "github.com/containerd/log" - "github.com/containerd/nerdctl/pkg/clientutil" - "github.com/containerd/nerdctl/pkg/mountutil/volumestore" + "github.com/containerd/nerdctl/v2/pkg/clientutil" + "github.com/containerd/nerdctl/v2/pkg/mountutil/volumestore" "github.com/spf13/cobra" ) diff --git a/cmd/nerdctl/namespace_create.go b/cmd/nerdctl/namespace_create.go index 2d8d6617137..ae4b9e08b68 100644 --- a/cmd/nerdctl/namespace_create.go +++ b/cmd/nerdctl/namespace_create.go @@ -17,9 +17,9 @@ package main import ( - "github.com/containerd/nerdctl/pkg/api/types" - "github.com/containerd/nerdctl/pkg/clientutil" - "github.com/containerd/nerdctl/pkg/cmd/namespace" + "github.com/containerd/nerdctl/v2/pkg/api/types" + "github.com/containerd/nerdctl/v2/pkg/clientutil" + "github.com/containerd/nerdctl/v2/pkg/cmd/namespace" "github.com/spf13/cobra" ) diff --git a/cmd/nerdctl/namespace_inspect.go b/cmd/nerdctl/namespace_inspect.go index b308c95b93f..669d2002a60 100644 --- a/cmd/nerdctl/namespace_inspect.go +++ b/cmd/nerdctl/namespace_inspect.go @@ -17,9 +17,9 @@ package main import ( - "github.com/containerd/nerdctl/pkg/api/types" - "github.com/containerd/nerdctl/pkg/clientutil" - "github.com/containerd/nerdctl/pkg/cmd/namespace" + "github.com/containerd/nerdctl/v2/pkg/api/types" + "github.com/containerd/nerdctl/v2/pkg/clientutil" + "github.com/containerd/nerdctl/v2/pkg/cmd/namespace" "github.com/spf13/cobra" ) diff --git a/cmd/nerdctl/namespace_remove.go b/cmd/nerdctl/namespace_remove.go index 7f23031b581..c8b6c1c8c1c 100644 --- a/cmd/nerdctl/namespace_remove.go +++ b/cmd/nerdctl/namespace_remove.go @@ -17,9 +17,9 @@ package main import ( - "github.com/containerd/nerdctl/pkg/api/types" - "github.com/containerd/nerdctl/pkg/clientutil" - "github.com/containerd/nerdctl/pkg/cmd/namespace" + "github.com/containerd/nerdctl/v2/pkg/api/types" + "github.com/containerd/nerdctl/v2/pkg/clientutil" + "github.com/containerd/nerdctl/v2/pkg/cmd/namespace" "github.com/spf13/cobra" ) diff --git a/cmd/nerdctl/namespace_update.go b/cmd/nerdctl/namespace_update.go index fb58ae6edcc..aeabcf3aef7 100644 --- a/cmd/nerdctl/namespace_update.go +++ b/cmd/nerdctl/namespace_update.go @@ -17,9 +17,9 @@ package main import ( - "github.com/containerd/nerdctl/pkg/api/types" - "github.com/containerd/nerdctl/pkg/clientutil" - "github.com/containerd/nerdctl/pkg/cmd/namespace" + "github.com/containerd/nerdctl/v2/pkg/api/types" + "github.com/containerd/nerdctl/v2/pkg/clientutil" + "github.com/containerd/nerdctl/v2/pkg/cmd/namespace" "github.com/spf13/cobra" ) diff --git a/cmd/nerdctl/network_create.go b/cmd/nerdctl/network_create.go index b5c4f1e81e3..d00cf8fe5c2 100644 --- a/cmd/nerdctl/network_create.go +++ b/cmd/nerdctl/network_create.go @@ -20,10 +20,10 @@ import ( "fmt" "github.com/containerd/containerd/identifiers" - "github.com/containerd/nerdctl/pkg/api/types" - "github.com/containerd/nerdctl/pkg/cmd/network" - "github.com/containerd/nerdctl/pkg/netutil" - "github.com/containerd/nerdctl/pkg/strutil" + "github.com/containerd/nerdctl/v2/pkg/api/types" + "github.com/containerd/nerdctl/v2/pkg/cmd/network" + "github.com/containerd/nerdctl/v2/pkg/netutil" + "github.com/containerd/nerdctl/v2/pkg/strutil" "github.com/spf13/cobra" ) diff --git a/cmd/nerdctl/network_create_linux_test.go b/cmd/nerdctl/network_create_linux_test.go index 58b8fcecaed..d27bf24dd4a 100644 --- a/cmd/nerdctl/network_create_linux_test.go +++ b/cmd/nerdctl/network_create_linux_test.go @@ -22,7 +22,7 @@ import ( "strings" "testing" - "github.com/containerd/nerdctl/pkg/testutil" + "github.com/containerd/nerdctl/v2/pkg/testutil" "gotest.tools/v3/assert" ) diff --git a/cmd/nerdctl/network_inspect.go b/cmd/nerdctl/network_inspect.go index cea18685fcd..f1cf21d1c9e 100644 --- a/cmd/nerdctl/network_inspect.go +++ b/cmd/nerdctl/network_inspect.go @@ -17,8 +17,8 @@ package main import ( - "github.com/containerd/nerdctl/pkg/api/types" - "github.com/containerd/nerdctl/pkg/cmd/network" + "github.com/containerd/nerdctl/v2/pkg/api/types" + "github.com/containerd/nerdctl/v2/pkg/cmd/network" "github.com/spf13/cobra" ) diff --git a/cmd/nerdctl/network_inspect_test.go b/cmd/nerdctl/network_inspect_test.go index 76b93ec7097..5a43cab1ceb 100644 --- a/cmd/nerdctl/network_inspect_test.go +++ b/cmd/nerdctl/network_inspect_test.go @@ -20,8 +20,8 @@ import ( "runtime" "testing" - "github.com/containerd/nerdctl/pkg/inspecttypes/dockercompat" - "github.com/containerd/nerdctl/pkg/testutil" + "github.com/containerd/nerdctl/v2/pkg/inspecttypes/dockercompat" + "github.com/containerd/nerdctl/v2/pkg/testutil" "gotest.tools/v3/assert" ) diff --git a/cmd/nerdctl/network_list.go b/cmd/nerdctl/network_list.go index 73d2dac2807..0e98257f492 100644 --- a/cmd/nerdctl/network_list.go +++ b/cmd/nerdctl/network_list.go @@ -17,8 +17,8 @@ package main import ( - "github.com/containerd/nerdctl/pkg/api/types" - "github.com/containerd/nerdctl/pkg/cmd/network" + "github.com/containerd/nerdctl/v2/pkg/api/types" + "github.com/containerd/nerdctl/v2/pkg/cmd/network" "github.com/spf13/cobra" ) diff --git a/cmd/nerdctl/network_list_linux_test.go b/cmd/nerdctl/network_list_linux_test.go index 5bbb5e2f9b8..adf5cd71efa 100644 --- a/cmd/nerdctl/network_list_linux_test.go +++ b/cmd/nerdctl/network_list_linux_test.go @@ -22,7 +22,7 @@ import ( "strings" "testing" - "github.com/containerd/nerdctl/pkg/testutil" + "github.com/containerd/nerdctl/v2/pkg/testutil" ) func TestNetworkLsFilter(t *testing.T) { diff --git a/cmd/nerdctl/network_prune.go b/cmd/nerdctl/network_prune.go index f67996a2733..89e24ad2cf4 100644 --- a/cmd/nerdctl/network_prune.go +++ b/cmd/nerdctl/network_prune.go @@ -20,9 +20,9 @@ import ( "fmt" "strings" - "github.com/containerd/nerdctl/pkg/api/types" - "github.com/containerd/nerdctl/pkg/clientutil" - "github.com/containerd/nerdctl/pkg/cmd/network" + "github.com/containerd/nerdctl/v2/pkg/api/types" + "github.com/containerd/nerdctl/v2/pkg/clientutil" + "github.com/containerd/nerdctl/v2/pkg/cmd/network" "github.com/spf13/cobra" ) diff --git a/cmd/nerdctl/network_prune_linux_test.go b/cmd/nerdctl/network_prune_linux_test.go index d872d540b26..68ad06efaa2 100644 --- a/cmd/nerdctl/network_prune_linux_test.go +++ b/cmd/nerdctl/network_prune_linux_test.go @@ -19,7 +19,7 @@ package main import ( "testing" - "github.com/containerd/nerdctl/pkg/testutil" + "github.com/containerd/nerdctl/v2/pkg/testutil" ) func TestNetworkPrune(t *testing.T) { diff --git a/cmd/nerdctl/network_remove.go b/cmd/nerdctl/network_remove.go index 4d26b579461..3b8dae7fb1d 100644 --- a/cmd/nerdctl/network_remove.go +++ b/cmd/nerdctl/network_remove.go @@ -17,10 +17,10 @@ package main import ( - "github.com/containerd/nerdctl/pkg/api/types" - "github.com/containerd/nerdctl/pkg/clientutil" - "github.com/containerd/nerdctl/pkg/cmd/network" - "github.com/containerd/nerdctl/pkg/netutil" + "github.com/containerd/nerdctl/v2/pkg/api/types" + "github.com/containerd/nerdctl/v2/pkg/clientutil" + "github.com/containerd/nerdctl/v2/pkg/cmd/network" + "github.com/containerd/nerdctl/v2/pkg/netutil" "github.com/spf13/cobra" ) diff --git a/cmd/nerdctl/network_remove_linux_test.go b/cmd/nerdctl/network_remove_linux_test.go index 9003f2a4bcf..80ccc504069 100644 --- a/cmd/nerdctl/network_remove_linux_test.go +++ b/cmd/nerdctl/network_remove_linux_test.go @@ -19,8 +19,8 @@ package main import ( "testing" - "github.com/containerd/nerdctl/pkg/rootlessutil" - "github.com/containerd/nerdctl/pkg/testutil" + "github.com/containerd/nerdctl/v2/pkg/rootlessutil" + "github.com/containerd/nerdctl/v2/pkg/testutil" "github.com/vishvananda/netlink" "gotest.tools/v3/assert" ) diff --git a/cmd/nerdctl/system_events.go b/cmd/nerdctl/system_events.go index 9455cd1ca59..db41ab17dba 100644 --- a/cmd/nerdctl/system_events.go +++ b/cmd/nerdctl/system_events.go @@ -17,9 +17,9 @@ package main import ( - "github.com/containerd/nerdctl/pkg/api/types" - "github.com/containerd/nerdctl/pkg/clientutil" - "github.com/containerd/nerdctl/pkg/cmd/system" + "github.com/containerd/nerdctl/v2/pkg/api/types" + "github.com/containerd/nerdctl/v2/pkg/clientutil" + "github.com/containerd/nerdctl/v2/pkg/cmd/system" "github.com/spf13/cobra" ) diff --git a/cmd/nerdctl/system_info.go b/cmd/nerdctl/system_info.go index 1a8c94304a9..b7a69568df6 100644 --- a/cmd/nerdctl/system_info.go +++ b/cmd/nerdctl/system_info.go @@ -17,9 +17,9 @@ package main import ( - "github.com/containerd/nerdctl/pkg/api/types" - "github.com/containerd/nerdctl/pkg/clientutil" - "github.com/containerd/nerdctl/pkg/cmd/system" + "github.com/containerd/nerdctl/v2/pkg/api/types" + "github.com/containerd/nerdctl/v2/pkg/clientutil" + "github.com/containerd/nerdctl/v2/pkg/cmd/system" "github.com/spf13/cobra" ) diff --git a/cmd/nerdctl/system_info_test.go b/cmd/nerdctl/system_info_test.go index 7606b0ed601..dfe2665bf3d 100644 --- a/cmd/nerdctl/system_info_test.go +++ b/cmd/nerdctl/system_info_test.go @@ -22,9 +22,9 @@ import ( "os" "testing" - "github.com/containerd/nerdctl/pkg/infoutil" - "github.com/containerd/nerdctl/pkg/inspecttypes/dockercompat" - "github.com/containerd/nerdctl/pkg/testutil" + "github.com/containerd/nerdctl/v2/pkg/infoutil" + "github.com/containerd/nerdctl/v2/pkg/inspecttypes/dockercompat" + "github.com/containerd/nerdctl/v2/pkg/testutil" ) func testInfoJSON(stdout string) error { diff --git a/cmd/nerdctl/system_prune.go b/cmd/nerdctl/system_prune.go index 944b2fdcf45..bfe1b8257d3 100644 --- a/cmd/nerdctl/system_prune.go +++ b/cmd/nerdctl/system_prune.go @@ -21,9 +21,9 @@ import ( "strings" "github.com/containerd/log" - "github.com/containerd/nerdctl/pkg/api/types" - "github.com/containerd/nerdctl/pkg/clientutil" - "github.com/containerd/nerdctl/pkg/cmd/system" + "github.com/containerd/nerdctl/v2/pkg/api/types" + "github.com/containerd/nerdctl/v2/pkg/clientutil" + "github.com/containerd/nerdctl/v2/pkg/cmd/system" "github.com/spf13/cobra" ) diff --git a/cmd/nerdctl/system_prune_linux_test.go b/cmd/nerdctl/system_prune_linux_test.go index 24c7b9d481e..32fbf04c4c0 100644 --- a/cmd/nerdctl/system_prune_linux_test.go +++ b/cmd/nerdctl/system_prune_linux_test.go @@ -26,8 +26,8 @@ import ( "testing" "github.com/containerd/log" - "github.com/containerd/nerdctl/pkg/buildkitutil" - "github.com/containerd/nerdctl/pkg/testutil" + "github.com/containerd/nerdctl/v2/pkg/buildkitutil" + "github.com/containerd/nerdctl/v2/pkg/testutil" ) func TestSystemPrune(t *testing.T) { diff --git a/cmd/nerdctl/version.go b/cmd/nerdctl/version.go index 88eec8c775b..6d09a364321 100644 --- a/cmd/nerdctl/version.go +++ b/cmd/nerdctl/version.go @@ -24,11 +24,11 @@ import ( "text/template" "github.com/containerd/log" - "github.com/containerd/nerdctl/pkg/clientutil" - "github.com/containerd/nerdctl/pkg/formatter" - "github.com/containerd/nerdctl/pkg/infoutil" - "github.com/containerd/nerdctl/pkg/inspecttypes/dockercompat" - "github.com/containerd/nerdctl/pkg/rootlessutil" + "github.com/containerd/nerdctl/v2/pkg/clientutil" + "github.com/containerd/nerdctl/v2/pkg/formatter" + "github.com/containerd/nerdctl/v2/pkg/infoutil" + "github.com/containerd/nerdctl/v2/pkg/inspecttypes/dockercompat" + "github.com/containerd/nerdctl/v2/pkg/rootlessutil" "github.com/spf13/cobra" ) diff --git a/cmd/nerdctl/volume_create.go b/cmd/nerdctl/volume_create.go index 4a90d082a77..972d5fc0359 100644 --- a/cmd/nerdctl/volume_create.go +++ b/cmd/nerdctl/volume_create.go @@ -17,8 +17,8 @@ package main import ( - "github.com/containerd/nerdctl/pkg/api/types" - "github.com/containerd/nerdctl/pkg/cmd/volume" + "github.com/containerd/nerdctl/v2/pkg/api/types" + "github.com/containerd/nerdctl/v2/pkg/cmd/volume" "github.com/spf13/cobra" ) diff --git a/cmd/nerdctl/volume_create_test.go b/cmd/nerdctl/volume_create_test.go index 742810b0223..f8f5997b501 100644 --- a/cmd/nerdctl/volume_create_test.go +++ b/cmd/nerdctl/volume_create_test.go @@ -19,7 +19,7 @@ package main import ( "testing" - "github.com/containerd/nerdctl/pkg/testutil" + "github.com/containerd/nerdctl/v2/pkg/testutil" "gotest.tools/v3/assert" ) diff --git a/cmd/nerdctl/volume_inspect.go b/cmd/nerdctl/volume_inspect.go index 64ef29a35d2..0eee9c41231 100644 --- a/cmd/nerdctl/volume_inspect.go +++ b/cmd/nerdctl/volume_inspect.go @@ -17,8 +17,8 @@ package main import ( - "github.com/containerd/nerdctl/pkg/api/types" - "github.com/containerd/nerdctl/pkg/cmd/volume" + "github.com/containerd/nerdctl/v2/pkg/api/types" + "github.com/containerd/nerdctl/v2/pkg/cmd/volume" "github.com/spf13/cobra" ) diff --git a/cmd/nerdctl/volume_inspect_test.go b/cmd/nerdctl/volume_inspect_test.go index 6dc948b31cd..24fff144a77 100644 --- a/cmd/nerdctl/volume_inspect_test.go +++ b/cmd/nerdctl/volume_inspect_test.go @@ -22,7 +22,7 @@ import ( "path/filepath" "testing" - "github.com/containerd/nerdctl/pkg/testutil" + "github.com/containerd/nerdctl/v2/pkg/testutil" "gotest.tools/v3/assert" ) diff --git a/cmd/nerdctl/volume_list.go b/cmd/nerdctl/volume_list.go index 163c5da4427..5f01f6c5146 100644 --- a/cmd/nerdctl/volume_list.go +++ b/cmd/nerdctl/volume_list.go @@ -17,9 +17,9 @@ package main import ( - "github.com/containerd/nerdctl/pkg/api/types" - "github.com/containerd/nerdctl/pkg/cmd/volume" - "github.com/containerd/nerdctl/pkg/inspecttypes/native" + "github.com/containerd/nerdctl/v2/pkg/api/types" + "github.com/containerd/nerdctl/v2/pkg/cmd/volume" + "github.com/containerd/nerdctl/v2/pkg/inspecttypes/native" "github.com/spf13/cobra" ) diff --git a/cmd/nerdctl/volume_list_test.go b/cmd/nerdctl/volume_list_test.go index 9a62dd102d4..9b88e13eac9 100644 --- a/cmd/nerdctl/volume_list_test.go +++ b/cmd/nerdctl/volume_list_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/containerd/nerdctl/pkg/tabutil" - "github.com/containerd/nerdctl/pkg/testutil" + "github.com/containerd/nerdctl/v2/pkg/tabutil" + "github.com/containerd/nerdctl/v2/pkg/testutil" ) func TestVolumeLs(t *testing.T) { diff --git a/cmd/nerdctl/volume_prune.go b/cmd/nerdctl/volume_prune.go index d015462134b..a6fa42392e9 100644 --- a/cmd/nerdctl/volume_prune.go +++ b/cmd/nerdctl/volume_prune.go @@ -20,9 +20,9 @@ import ( "fmt" "strings" - "github.com/containerd/nerdctl/pkg/api/types" - "github.com/containerd/nerdctl/pkg/clientutil" - "github.com/containerd/nerdctl/pkg/cmd/volume" + "github.com/containerd/nerdctl/v2/pkg/api/types" + "github.com/containerd/nerdctl/v2/pkg/clientutil" + "github.com/containerd/nerdctl/v2/pkg/cmd/volume" "github.com/spf13/cobra" ) diff --git a/cmd/nerdctl/volume_prune_linux_test.go b/cmd/nerdctl/volume_prune_linux_test.go index be7a7fc093b..a744de0f5fe 100644 --- a/cmd/nerdctl/volume_prune_linux_test.go +++ b/cmd/nerdctl/volume_prune_linux_test.go @@ -20,7 +20,7 @@ import ( "fmt" "testing" - "github.com/containerd/nerdctl/pkg/testutil" + "github.com/containerd/nerdctl/v2/pkg/testutil" ) func TestVolumePrune(t *testing.T) { diff --git a/cmd/nerdctl/volume_remove.go b/cmd/nerdctl/volume_remove.go index 71245937b47..0d237c10b6f 100644 --- a/cmd/nerdctl/volume_remove.go +++ b/cmd/nerdctl/volume_remove.go @@ -17,9 +17,9 @@ package main import ( - "github.com/containerd/nerdctl/pkg/api/types" - "github.com/containerd/nerdctl/pkg/clientutil" - "github.com/containerd/nerdctl/pkg/cmd/volume" + "github.com/containerd/nerdctl/v2/pkg/api/types" + "github.com/containerd/nerdctl/v2/pkg/clientutil" + "github.com/containerd/nerdctl/v2/pkg/cmd/volume" "github.com/spf13/cobra" ) diff --git a/cmd/nerdctl/volume_remove_linux_test.go b/cmd/nerdctl/volume_remove_linux_test.go index b244a5101e2..35a478e530e 100644 --- a/cmd/nerdctl/volume_remove_linux_test.go +++ b/cmd/nerdctl/volume_remove_linux_test.go @@ -20,7 +20,7 @@ import ( "fmt" "testing" - "github.com/containerd/nerdctl/pkg/testutil" + "github.com/containerd/nerdctl/v2/pkg/testutil" ) func TestVolumeRemove(t *testing.T) { diff --git a/go.mod b/go.mod index bd206d11d81..672726c0b66 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/containerd/nerdctl +module github.com/containerd/nerdctl/v2 go 1.20 diff --git a/hack/verify-pkg-isolation.sh b/hack/verify-pkg-isolation.sh index e6b2150608a..3f1edd22e30 100755 --- a/hack/verify-pkg-isolation.sh +++ b/hack/verify-pkg-isolation.sh @@ -17,7 +17,7 @@ echo "Verifying that ./pkg/... is decoupled from the CLI packages" set -eux -o pipefail -if go list -f '{{join .Deps "\n"}}' ./pkg/... | grep -E '^(github.com/spf13/cobra|github.com/spf13/pflag|github.com/containerd/nerdctl/cmd)'; then +if go list -f '{{join .Deps "\n"}}' ./pkg/... | grep -E '^(github.com/spf13/cobra|github.com/spf13/pflag|github.com/containerd/nerdctl/v2/cmd)'; then echo >&2 "ERROR: ./pkg/... is not decoupled from the CLI packages" exit 1 fi diff --git a/pkg/api/types/global.go b/pkg/api/types/global.go index bffb23eee26..132fb17e137 100644 --- a/pkg/api/types/global.go +++ b/pkg/api/types/global.go @@ -16,6 +16,6 @@ package types -import "github.com/containerd/nerdctl/pkg/config" +import "github.com/containerd/nerdctl/v2/pkg/config" type GlobalCommandOptions config.Config diff --git a/pkg/api/types/image_types.go b/pkg/api/types/image_types.go index aebee69ea03..16a6602b06e 100644 --- a/pkg/api/types/image_types.go +++ b/pkg/api/types/image_types.go @@ -19,7 +19,7 @@ package types import ( "io" - "github.com/containerd/nerdctl/pkg/imgutil" + "github.com/containerd/nerdctl/v2/pkg/imgutil" ) // ImageListOptions specifies options for `nerdctl image list`. diff --git a/pkg/api/types/network_types.go b/pkg/api/types/network_types.go index a3f15e7d69e..c8fa1cc5645 100644 --- a/pkg/api/types/network_types.go +++ b/pkg/api/types/network_types.go @@ -19,7 +19,7 @@ package types import ( "io" - "github.com/containerd/nerdctl/pkg/netutil" + "github.com/containerd/nerdctl/v2/pkg/netutil" ) // NetworkCreateOptions specifies options for `nerdctl network create`. diff --git a/pkg/buildkitutil/buildkitutil.go b/pkg/buildkitutil/buildkitutil.go index b89170d91ba..2f72f8c1ff5 100644 --- a/pkg/buildkitutil/buildkitutil.go +++ b/pkg/buildkitutil/buildkitutil.go @@ -36,7 +36,7 @@ import ( "runtime" "github.com/containerd/log" - "github.com/containerd/nerdctl/pkg/rootlessutil" + "github.com/containerd/nerdctl/v2/pkg/rootlessutil" ) const ( diff --git a/pkg/bypass4netnsutil/bypass4netnsutil.go b/pkg/bypass4netnsutil/bypass4netnsutil.go index 4e2dfa826e3..133102ae98f 100644 --- a/pkg/bypass4netnsutil/bypass4netnsutil.go +++ b/pkg/bypass4netnsutil/bypass4netnsutil.go @@ -25,7 +25,7 @@ import ( "github.com/containerd/containerd/containers" "github.com/containerd/containerd/oci" - "github.com/containerd/nerdctl/pkg/labels" + "github.com/containerd/nerdctl/v2/pkg/labels" "github.com/opencontainers/runtime-spec/specs-go" b4nnoci "github.com/rootless-containers/bypass4netns/pkg/oci" ) diff --git a/pkg/clientutil/client.go b/pkg/clientutil/client.go index 5f3aa4e82eb..c6a799a55ec 100644 --- a/pkg/clientutil/client.go +++ b/pkg/clientutil/client.go @@ -28,8 +28,8 @@ import ( "github.com/containerd/containerd/namespaces" "github.com/containerd/containerd/platforms" "github.com/containerd/log" - "github.com/containerd/nerdctl/pkg/platformutil" - "github.com/containerd/nerdctl/pkg/systemutil" + "github.com/containerd/nerdctl/v2/pkg/platformutil" + "github.com/containerd/nerdctl/v2/pkg/systemutil" "github.com/opencontainers/go-digest" ) diff --git a/pkg/cmd/apparmor/inspect_linux.go b/pkg/cmd/apparmor/inspect_linux.go index 5fa2a17286d..e24dc1f0a27 100644 --- a/pkg/cmd/apparmor/inspect_linux.go +++ b/pkg/cmd/apparmor/inspect_linux.go @@ -20,8 +20,8 @@ import ( "fmt" "github.com/containerd/containerd/contrib/apparmor" - "github.com/containerd/nerdctl/pkg/api/types" - "github.com/containerd/nerdctl/pkg/defaults" + "github.com/containerd/nerdctl/v2/pkg/api/types" + "github.com/containerd/nerdctl/v2/pkg/defaults" ) func Inspect(options types.ApparmorInspectOptions) error { diff --git a/pkg/cmd/apparmor/list_linux.go b/pkg/cmd/apparmor/list_linux.go index ca4b8c7e632..b5825545159 100644 --- a/pkg/cmd/apparmor/list_linux.go +++ b/pkg/cmd/apparmor/list_linux.go @@ -23,9 +23,9 @@ import ( "text/tabwriter" "text/template" - "github.com/containerd/nerdctl/pkg/api/types" - "github.com/containerd/nerdctl/pkg/apparmorutil" - "github.com/containerd/nerdctl/pkg/formatter" + "github.com/containerd/nerdctl/v2/pkg/api/types" + "github.com/containerd/nerdctl/v2/pkg/apparmorutil" + "github.com/containerd/nerdctl/v2/pkg/formatter" ) func List(options types.ApparmorListOptions) error { diff --git a/pkg/cmd/apparmor/load_linux.go b/pkg/cmd/apparmor/load_linux.go index ed45eaf7da5..aace881f288 100644 --- a/pkg/cmd/apparmor/load_linux.go +++ b/pkg/cmd/apparmor/load_linux.go @@ -19,7 +19,7 @@ package apparmor import ( "github.com/containerd/containerd/contrib/apparmor" "github.com/containerd/log" - "github.com/containerd/nerdctl/pkg/defaults" + "github.com/containerd/nerdctl/v2/pkg/defaults" ) func Load() error { diff --git a/pkg/cmd/apparmor/unload_linux.go b/pkg/cmd/apparmor/unload_linux.go index b5e349ae4dd..87458d87341 100644 --- a/pkg/cmd/apparmor/unload_linux.go +++ b/pkg/cmd/apparmor/unload_linux.go @@ -18,7 +18,7 @@ package apparmor import ( "github.com/containerd/log" - "github.com/containerd/nerdctl/pkg/apparmorutil" + "github.com/containerd/nerdctl/v2/pkg/apparmorutil" ) func Unload(target string) error { diff --git a/pkg/cmd/builder/build.go b/pkg/cmd/builder/build.go index fa2feeaa085..401bb5f504a 100644 --- a/pkg/cmd/builder/build.go +++ b/pkg/cmd/builder/build.go @@ -35,11 +35,11 @@ import ( "github.com/containerd/containerd/platforms" dockerreference "github.com/containerd/containerd/reference/docker" "github.com/containerd/log" - "github.com/containerd/nerdctl/pkg/api/types" - "github.com/containerd/nerdctl/pkg/buildkitutil" - "github.com/containerd/nerdctl/pkg/clientutil" - "github.com/containerd/nerdctl/pkg/platformutil" - "github.com/containerd/nerdctl/pkg/strutil" + "github.com/containerd/nerdctl/v2/pkg/api/types" + "github.com/containerd/nerdctl/v2/pkg/buildkitutil" + "github.com/containerd/nerdctl/v2/pkg/clientutil" + "github.com/containerd/nerdctl/v2/pkg/platformutil" + "github.com/containerd/nerdctl/v2/pkg/strutil" ) func Build(ctx context.Context, client *containerd.Client, options types.BuilderBuildOptions) error { diff --git a/pkg/cmd/builder/prune.go b/pkg/cmd/builder/prune.go index 0bd970df320..121b9230962 100644 --- a/pkg/cmd/builder/prune.go +++ b/pkg/cmd/builder/prune.go @@ -24,8 +24,8 @@ import ( "os/exec" "github.com/containerd/log" - "github.com/containerd/nerdctl/pkg/api/types" - "github.com/containerd/nerdctl/pkg/buildkitutil" + "github.com/containerd/nerdctl/v2/pkg/api/types" + "github.com/containerd/nerdctl/v2/pkg/buildkitutil" ) // Prune will prune all build cache. diff --git a/pkg/cmd/compose/compose.go b/pkg/cmd/compose/compose.go index 65be64b8965..b7ab4543561 100644 --- a/pkg/cmd/compose/compose.go +++ b/pkg/cmd/compose/compose.go @@ -26,16 +26,16 @@ import ( "github.com/containerd/containerd" "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/platforms" - "github.com/containerd/nerdctl/pkg/api/types" - "github.com/containerd/nerdctl/pkg/cmd/volume" - "github.com/containerd/nerdctl/pkg/composer" - "github.com/containerd/nerdctl/pkg/composer/serviceparser" - "github.com/containerd/nerdctl/pkg/imgutil" - "github.com/containerd/nerdctl/pkg/ipfs" - "github.com/containerd/nerdctl/pkg/netutil" - "github.com/containerd/nerdctl/pkg/referenceutil" - "github.com/containerd/nerdctl/pkg/signutil" - "github.com/containerd/nerdctl/pkg/strutil" + "github.com/containerd/nerdctl/v2/pkg/api/types" + "github.com/containerd/nerdctl/v2/pkg/cmd/volume" + "github.com/containerd/nerdctl/v2/pkg/composer" + "github.com/containerd/nerdctl/v2/pkg/composer/serviceparser" + "github.com/containerd/nerdctl/v2/pkg/imgutil" + "github.com/containerd/nerdctl/v2/pkg/ipfs" + "github.com/containerd/nerdctl/v2/pkg/netutil" + "github.com/containerd/nerdctl/v2/pkg/referenceutil" + "github.com/containerd/nerdctl/v2/pkg/signutil" + "github.com/containerd/nerdctl/v2/pkg/strutil" ocispec "github.com/opencontainers/image-spec/specs-go/v1" ) diff --git a/pkg/cmd/container/attach.go b/pkg/cmd/container/attach.go index a4c3944e60a..c7fda751628 100644 --- a/pkg/cmd/container/attach.go +++ b/pkg/cmd/container/attach.go @@ -25,11 +25,11 @@ import ( "github.com/containerd/containerd" "github.com/containerd/containerd/cio" "github.com/containerd/log" - "github.com/containerd/nerdctl/pkg/api/types" - "github.com/containerd/nerdctl/pkg/consoleutil" - "github.com/containerd/nerdctl/pkg/errutil" - "github.com/containerd/nerdctl/pkg/idutil/containerwalker" - "github.com/containerd/nerdctl/pkg/signalutil" + "github.com/containerd/nerdctl/v2/pkg/api/types" + "github.com/containerd/nerdctl/v2/pkg/consoleutil" + "github.com/containerd/nerdctl/v2/pkg/errutil" + "github.com/containerd/nerdctl/v2/pkg/idutil/containerwalker" + "github.com/containerd/nerdctl/v2/pkg/signalutil" ) // Attach attaches stdin, stdout, and stderr to a running container. diff --git a/pkg/cmd/container/commit.go b/pkg/cmd/container/commit.go index b355d1c02a8..4a6a98bc110 100644 --- a/pkg/cmd/container/commit.go +++ b/pkg/cmd/container/commit.go @@ -24,10 +24,10 @@ import ( "github.com/containerd/containerd" "github.com/containerd/log" - "github.com/containerd/nerdctl/pkg/api/types" - "github.com/containerd/nerdctl/pkg/idutil/containerwalker" - "github.com/containerd/nerdctl/pkg/imgutil/commit" - "github.com/containerd/nerdctl/pkg/referenceutil" + "github.com/containerd/nerdctl/v2/pkg/api/types" + "github.com/containerd/nerdctl/v2/pkg/idutil/containerwalker" + "github.com/containerd/nerdctl/v2/pkg/imgutil/commit" + "github.com/containerd/nerdctl/v2/pkg/referenceutil" ) // Commit will commit a container’s file changes or settings into a new image. diff --git a/pkg/cmd/container/cp_linux.go b/pkg/cmd/container/cp_linux.go index a392aacc8e9..79466203894 100644 --- a/pkg/cmd/container/cp_linux.go +++ b/pkg/cmd/container/cp_linux.go @@ -21,9 +21,9 @@ import ( "fmt" "github.com/containerd/containerd" - "github.com/containerd/nerdctl/pkg/api/types" - "github.com/containerd/nerdctl/pkg/containerutil" - "github.com/containerd/nerdctl/pkg/idutil/containerwalker" + "github.com/containerd/nerdctl/v2/pkg/api/types" + "github.com/containerd/nerdctl/v2/pkg/containerutil" + "github.com/containerd/nerdctl/v2/pkg/idutil/containerwalker" ) // Cp copies files/folders between a running container and the local filesystem. diff --git a/pkg/cmd/container/create.go b/pkg/cmd/container/create.go index 43f5e6828d4..dc5b3491bf7 100644 --- a/pkg/cmd/container/create.go +++ b/pkg/cmd/container/create.go @@ -36,21 +36,21 @@ import ( "github.com/containerd/containerd/oci" gocni "github.com/containerd/go-cni" "github.com/containerd/log" - "github.com/containerd/nerdctl/pkg/api/types" - "github.com/containerd/nerdctl/pkg/clientutil" - "github.com/containerd/nerdctl/pkg/cmd/image" - "github.com/containerd/nerdctl/pkg/containerutil" - "github.com/containerd/nerdctl/pkg/flagutil" - "github.com/containerd/nerdctl/pkg/idgen" - "github.com/containerd/nerdctl/pkg/imgutil" - "github.com/containerd/nerdctl/pkg/inspecttypes/dockercompat" - "github.com/containerd/nerdctl/pkg/labels" - "github.com/containerd/nerdctl/pkg/logging" - "github.com/containerd/nerdctl/pkg/mountutil" - "github.com/containerd/nerdctl/pkg/namestore" - "github.com/containerd/nerdctl/pkg/platformutil" - "github.com/containerd/nerdctl/pkg/referenceutil" - "github.com/containerd/nerdctl/pkg/strutil" + "github.com/containerd/nerdctl/v2/pkg/api/types" + "github.com/containerd/nerdctl/v2/pkg/clientutil" + "github.com/containerd/nerdctl/v2/pkg/cmd/image" + "github.com/containerd/nerdctl/v2/pkg/containerutil" + "github.com/containerd/nerdctl/v2/pkg/flagutil" + "github.com/containerd/nerdctl/v2/pkg/idgen" + "github.com/containerd/nerdctl/v2/pkg/imgutil" + "github.com/containerd/nerdctl/v2/pkg/inspecttypes/dockercompat" + "github.com/containerd/nerdctl/v2/pkg/labels" + "github.com/containerd/nerdctl/v2/pkg/logging" + "github.com/containerd/nerdctl/v2/pkg/mountutil" + "github.com/containerd/nerdctl/v2/pkg/namestore" + "github.com/containerd/nerdctl/v2/pkg/platformutil" + "github.com/containerd/nerdctl/v2/pkg/referenceutil" + "github.com/containerd/nerdctl/v2/pkg/strutil" dockercliopts "github.com/docker/cli/opts" dockeropts "github.com/docker/docker/opts" "github.com/opencontainers/runtime-spec/specs-go" diff --git a/pkg/cmd/container/exec.go b/pkg/cmd/container/exec.go index a50f4106e84..8beefcf1091 100644 --- a/pkg/cmd/container/exec.go +++ b/pkg/cmd/container/exec.go @@ -26,13 +26,13 @@ import ( "github.com/containerd/containerd" "github.com/containerd/containerd/cio" "github.com/containerd/log" - "github.com/containerd/nerdctl/pkg/api/types" - "github.com/containerd/nerdctl/pkg/consoleutil" - "github.com/containerd/nerdctl/pkg/flagutil" - "github.com/containerd/nerdctl/pkg/idgen" - "github.com/containerd/nerdctl/pkg/idutil/containerwalker" - "github.com/containerd/nerdctl/pkg/signalutil" - "github.com/containerd/nerdctl/pkg/taskutil" + "github.com/containerd/nerdctl/v2/pkg/api/types" + "github.com/containerd/nerdctl/v2/pkg/consoleutil" + "github.com/containerd/nerdctl/v2/pkg/flagutil" + "github.com/containerd/nerdctl/v2/pkg/idgen" + "github.com/containerd/nerdctl/v2/pkg/idutil/containerwalker" + "github.com/containerd/nerdctl/v2/pkg/signalutil" + "github.com/containerd/nerdctl/v2/pkg/taskutil" "github.com/opencontainers/runtime-spec/specs-go" ) diff --git a/pkg/cmd/container/inspect.go b/pkg/cmd/container/inspect.go index 458fd0e60a4..4cdad9faf27 100644 --- a/pkg/cmd/container/inspect.go +++ b/pkg/cmd/container/inspect.go @@ -23,11 +23,11 @@ import ( "github.com/containerd/containerd" "github.com/containerd/log" - "github.com/containerd/nerdctl/pkg/api/types" - "github.com/containerd/nerdctl/pkg/containerinspector" - "github.com/containerd/nerdctl/pkg/formatter" - "github.com/containerd/nerdctl/pkg/idutil/containerwalker" - "github.com/containerd/nerdctl/pkg/inspecttypes/dockercompat" + "github.com/containerd/nerdctl/v2/pkg/api/types" + "github.com/containerd/nerdctl/v2/pkg/containerinspector" + "github.com/containerd/nerdctl/v2/pkg/formatter" + "github.com/containerd/nerdctl/v2/pkg/idutil/containerwalker" + "github.com/containerd/nerdctl/v2/pkg/inspecttypes/dockercompat" ) // Inspect prints detailed information for each container in `containers`. diff --git a/pkg/cmd/container/kill.go b/pkg/cmd/container/kill.go index 6c0f7031752..ad2104b283c 100644 --- a/pkg/cmd/container/kill.go +++ b/pkg/cmd/container/kill.go @@ -27,9 +27,9 @@ import ( "github.com/containerd/containerd/cio" "github.com/containerd/containerd/errdefs" "github.com/containerd/log" - "github.com/containerd/nerdctl/pkg/api/types" - "github.com/containerd/nerdctl/pkg/containerutil" - "github.com/containerd/nerdctl/pkg/idutil/containerwalker" + "github.com/containerd/nerdctl/v2/pkg/api/types" + "github.com/containerd/nerdctl/v2/pkg/containerutil" + "github.com/containerd/nerdctl/v2/pkg/idutil/containerwalker" "github.com/moby/sys/signal" ) diff --git a/pkg/cmd/container/list.go b/pkg/cmd/container/list.go index 97f6033f9f8..b4b0a5f4ee4 100644 --- a/pkg/cmd/container/list.go +++ b/pkg/cmd/container/list.go @@ -29,11 +29,11 @@ import ( "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/pkg/progress" "github.com/containerd/log" - "github.com/containerd/nerdctl/pkg/api/types" - "github.com/containerd/nerdctl/pkg/formatter" - "github.com/containerd/nerdctl/pkg/imgutil" - "github.com/containerd/nerdctl/pkg/labels" - "github.com/containerd/nerdctl/pkg/labels/k8slabels" + "github.com/containerd/nerdctl/v2/pkg/api/types" + "github.com/containerd/nerdctl/v2/pkg/formatter" + "github.com/containerd/nerdctl/v2/pkg/imgutil" + "github.com/containerd/nerdctl/v2/pkg/labels" + "github.com/containerd/nerdctl/v2/pkg/labels/k8slabels" ) // List prints containers according to `options`. diff --git a/pkg/cmd/container/list_util.go b/pkg/cmd/container/list_util.go index 6067405fb87..4647faa213a 100644 --- a/pkg/cmd/container/list_util.go +++ b/pkg/cmd/container/list_util.go @@ -26,7 +26,7 @@ import ( "github.com/containerd/containerd" "github.com/containerd/containerd/containers" "github.com/containerd/log" - "github.com/containerd/nerdctl/pkg/containerutil" + "github.com/containerd/nerdctl/v2/pkg/containerutil" ) func foldContainerFilters(ctx context.Context, containers []containerd.Container, filters []string) (*containerFilterContext, error) { diff --git a/pkg/cmd/container/logs.go b/pkg/cmd/container/logs.go index 239074c36cd..1cc79c02bf2 100644 --- a/pkg/cmd/container/logs.go +++ b/pkg/cmd/container/logs.go @@ -26,13 +26,13 @@ import ( "github.com/containerd/containerd" "github.com/containerd/containerd/errdefs" "github.com/containerd/log" - "github.com/containerd/nerdctl/pkg/api/types" - "github.com/containerd/nerdctl/pkg/api/types/cri" - "github.com/containerd/nerdctl/pkg/clientutil" - "github.com/containerd/nerdctl/pkg/idutil/containerwalker" - "github.com/containerd/nerdctl/pkg/labels" - "github.com/containerd/nerdctl/pkg/labels/k8slabels" - "github.com/containerd/nerdctl/pkg/logging" + "github.com/containerd/nerdctl/v2/pkg/api/types" + "github.com/containerd/nerdctl/v2/pkg/api/types/cri" + "github.com/containerd/nerdctl/v2/pkg/clientutil" + "github.com/containerd/nerdctl/v2/pkg/idutil/containerwalker" + "github.com/containerd/nerdctl/v2/pkg/labels" + "github.com/containerd/nerdctl/v2/pkg/labels/k8slabels" + "github.com/containerd/nerdctl/v2/pkg/logging" ) func Logs(ctx context.Context, client *containerd.Client, container string, options types.ContainerLogsOptions) error { diff --git a/pkg/cmd/container/pause.go b/pkg/cmd/container/pause.go index 8a18a35ba41..11bcbd02613 100644 --- a/pkg/cmd/container/pause.go +++ b/pkg/cmd/container/pause.go @@ -21,9 +21,9 @@ import ( "fmt" "github.com/containerd/containerd" - "github.com/containerd/nerdctl/pkg/api/types" - "github.com/containerd/nerdctl/pkg/containerutil" - "github.com/containerd/nerdctl/pkg/idutil/containerwalker" + "github.com/containerd/nerdctl/v2/pkg/api/types" + "github.com/containerd/nerdctl/v2/pkg/containerutil" + "github.com/containerd/nerdctl/v2/pkg/idutil/containerwalker" ) // Pause pauses all containers specified by `reqs`. diff --git a/pkg/cmd/container/prune.go b/pkg/cmd/container/prune.go index b0f8f1221ca..cc36e77a126 100644 --- a/pkg/cmd/container/prune.go +++ b/pkg/cmd/container/prune.go @@ -24,7 +24,7 @@ import ( "github.com/containerd/containerd" "github.com/containerd/log" - "github.com/containerd/nerdctl/pkg/api/types" + "github.com/containerd/nerdctl/v2/pkg/api/types" ) // Prune remove all stopped containers diff --git a/pkg/cmd/container/remove.go b/pkg/cmd/container/remove.go index 11e4a91c230..842f62d7e54 100644 --- a/pkg/cmd/container/remove.go +++ b/pkg/cmd/container/remove.go @@ -30,14 +30,14 @@ import ( "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/namespaces" "github.com/containerd/log" - "github.com/containerd/nerdctl/pkg/api/types" - "github.com/containerd/nerdctl/pkg/clientutil" - "github.com/containerd/nerdctl/pkg/cmd/volume" - "github.com/containerd/nerdctl/pkg/containerutil" - "github.com/containerd/nerdctl/pkg/dnsutil/hostsstore" - "github.com/containerd/nerdctl/pkg/idutil/containerwalker" - "github.com/containerd/nerdctl/pkg/labels" - "github.com/containerd/nerdctl/pkg/namestore" + "github.com/containerd/nerdctl/v2/pkg/api/types" + "github.com/containerd/nerdctl/v2/pkg/clientutil" + "github.com/containerd/nerdctl/v2/pkg/cmd/volume" + "github.com/containerd/nerdctl/v2/pkg/containerutil" + "github.com/containerd/nerdctl/v2/pkg/dnsutil/hostsstore" + "github.com/containerd/nerdctl/v2/pkg/idutil/containerwalker" + "github.com/containerd/nerdctl/v2/pkg/labels" + "github.com/containerd/nerdctl/v2/pkg/namestore" ) var _ error = ErrContainerStatus{} diff --git a/pkg/cmd/container/rename.go b/pkg/cmd/container/rename.go index 31b357e25e9..959bf68152e 100644 --- a/pkg/cmd/container/rename.go +++ b/pkg/cmd/container/rename.go @@ -22,12 +22,12 @@ import ( "runtime" "github.com/containerd/containerd" - "github.com/containerd/nerdctl/pkg/api/types" - "github.com/containerd/nerdctl/pkg/clientutil" - "github.com/containerd/nerdctl/pkg/dnsutil/hostsstore" - "github.com/containerd/nerdctl/pkg/idutil/containerwalker" - "github.com/containerd/nerdctl/pkg/labels" - "github.com/containerd/nerdctl/pkg/namestore" + "github.com/containerd/nerdctl/v2/pkg/api/types" + "github.com/containerd/nerdctl/v2/pkg/clientutil" + "github.com/containerd/nerdctl/v2/pkg/dnsutil/hostsstore" + "github.com/containerd/nerdctl/v2/pkg/idutil/containerwalker" + "github.com/containerd/nerdctl/v2/pkg/labels" + "github.com/containerd/nerdctl/v2/pkg/namestore" ) // Rename change container name to a new name diff --git a/pkg/cmd/container/restart.go b/pkg/cmd/container/restart.go index 5547074d128..a24a5f641d3 100644 --- a/pkg/cmd/container/restart.go +++ b/pkg/cmd/container/restart.go @@ -21,9 +21,9 @@ import ( "fmt" "github.com/containerd/containerd" - "github.com/containerd/nerdctl/pkg/api/types" - "github.com/containerd/nerdctl/pkg/containerutil" - "github.com/containerd/nerdctl/pkg/idutil/containerwalker" + "github.com/containerd/nerdctl/v2/pkg/api/types" + "github.com/containerd/nerdctl/v2/pkg/containerutil" + "github.com/containerd/nerdctl/v2/pkg/idutil/containerwalker" ) // Restart will restart one or more containers. diff --git a/pkg/cmd/container/run_cgroup_freebsd.go b/pkg/cmd/container/run_cgroup_freebsd.go index 7ae22379ef9..fcf07cb7bb2 100644 --- a/pkg/cmd/container/run_cgroup_freebsd.go +++ b/pkg/cmd/container/run_cgroup_freebsd.go @@ -18,7 +18,7 @@ package container import ( "github.com/containerd/containerd/oci" - "github.com/containerd/nerdctl/pkg/api/types" + "github.com/containerd/nerdctl/v2/pkg/api/types" ) func generateCgroupOpts(id string, options types.ContainerCreateOptions) ([]oci.SpecOpts, error) { diff --git a/pkg/cmd/container/run_cgroup_linux.go b/pkg/cmd/container/run_cgroup_linux.go index 87b57035ec9..d7e6b4e4bc2 100644 --- a/pkg/cmd/container/run_cgroup_linux.go +++ b/pkg/cmd/container/run_cgroup_linux.go @@ -26,9 +26,9 @@ import ( "github.com/containerd/containerd/containers" "github.com/containerd/containerd/oci" "github.com/containerd/log" - "github.com/containerd/nerdctl/pkg/api/types" - "github.com/containerd/nerdctl/pkg/infoutil" - "github.com/containerd/nerdctl/pkg/rootlessutil" + "github.com/containerd/nerdctl/v2/pkg/api/types" + "github.com/containerd/nerdctl/v2/pkg/infoutil" + "github.com/containerd/nerdctl/v2/pkg/rootlessutil" "github.com/docker/go-units" "github.com/opencontainers/runtime-spec/specs-go" ) diff --git a/pkg/cmd/container/run_cgroup_windows.go b/pkg/cmd/container/run_cgroup_windows.go index 7ae22379ef9..fcf07cb7bb2 100644 --- a/pkg/cmd/container/run_cgroup_windows.go +++ b/pkg/cmd/container/run_cgroup_windows.go @@ -18,7 +18,7 @@ package container import ( "github.com/containerd/containerd/oci" - "github.com/containerd/nerdctl/pkg/api/types" + "github.com/containerd/nerdctl/v2/pkg/api/types" ) func generateCgroupOpts(id string, options types.ContainerCreateOptions) ([]oci.SpecOpts, error) { diff --git a/pkg/cmd/container/run_freebsd.go b/pkg/cmd/container/run_freebsd.go index 5aabb440848..87a07a12753 100644 --- a/pkg/cmd/container/run_freebsd.go +++ b/pkg/cmd/container/run_freebsd.go @@ -22,7 +22,7 @@ import ( "github.com/containerd/containerd" "github.com/containerd/containerd/containers" "github.com/containerd/containerd/oci" - "github.com/containerd/nerdctl/pkg/api/types" + "github.com/containerd/nerdctl/v2/pkg/api/types" ) func WithoutRunMount() func(ctx context.Context, client oci.Client, c *containers.Container, s *oci.Spec) error { diff --git a/pkg/cmd/container/run_gpus.go b/pkg/cmd/container/run_gpus.go index fdd14455d85..9c3891c053d 100644 --- a/pkg/cmd/container/run_gpus.go +++ b/pkg/cmd/container/run_gpus.go @@ -25,7 +25,7 @@ import ( "github.com/containerd/containerd/contrib/nvidia" "github.com/containerd/containerd/oci" - "github.com/containerd/nerdctl/pkg/rootlessutil" + "github.com/containerd/nerdctl/v2/pkg/rootlessutil" ) // GPUReq is a request for GPUs. diff --git a/pkg/cmd/container/run_linux.go b/pkg/cmd/container/run_linux.go index cf22e642715..06ef8416294 100644 --- a/pkg/cmd/container/run_linux.go +++ b/pkg/cmd/container/run_linux.go @@ -26,12 +26,12 @@ import ( "github.com/containerd/containerd/oci" "github.com/containerd/containerd/pkg/userns" "github.com/containerd/log" - "github.com/containerd/nerdctl/pkg/api/types" - "github.com/containerd/nerdctl/pkg/bypass4netnsutil" - "github.com/containerd/nerdctl/pkg/containerutil" - "github.com/containerd/nerdctl/pkg/idutil/containerwalker" - "github.com/containerd/nerdctl/pkg/rootlessutil" - "github.com/containerd/nerdctl/pkg/strutil" + "github.com/containerd/nerdctl/v2/pkg/api/types" + "github.com/containerd/nerdctl/v2/pkg/bypass4netnsutil" + "github.com/containerd/nerdctl/v2/pkg/containerutil" + "github.com/containerd/nerdctl/v2/pkg/idutil/containerwalker" + "github.com/containerd/nerdctl/v2/pkg/rootlessutil" + "github.com/containerd/nerdctl/v2/pkg/strutil" "github.com/docker/go-units" "github.com/opencontainers/runtime-spec/specs-go" ) diff --git a/pkg/cmd/container/run_mount.go b/pkg/cmd/container/run_mount.go index be29aa6f164..3a53c8c6f70 100644 --- a/pkg/cmd/container/run_mount.go +++ b/pkg/cmd/container/run_mount.go @@ -36,15 +36,15 @@ import ( "github.com/containerd/containerd/pkg/userns" "github.com/containerd/continuity/fs" "github.com/containerd/log" - "github.com/containerd/nerdctl/pkg/api/types" - "github.com/containerd/nerdctl/pkg/cmd/volume" - "github.com/containerd/nerdctl/pkg/idgen" - "github.com/containerd/nerdctl/pkg/imgutil" - "github.com/containerd/nerdctl/pkg/inspecttypes/dockercompat" - "github.com/containerd/nerdctl/pkg/labels" - "github.com/containerd/nerdctl/pkg/mountutil" - "github.com/containerd/nerdctl/pkg/mountutil/volumestore" - "github.com/containerd/nerdctl/pkg/strutil" + "github.com/containerd/nerdctl/v2/pkg/api/types" + "github.com/containerd/nerdctl/v2/pkg/cmd/volume" + "github.com/containerd/nerdctl/v2/pkg/idgen" + "github.com/containerd/nerdctl/v2/pkg/imgutil" + "github.com/containerd/nerdctl/v2/pkg/inspecttypes/dockercompat" + "github.com/containerd/nerdctl/v2/pkg/labels" + "github.com/containerd/nerdctl/v2/pkg/mountutil" + "github.com/containerd/nerdctl/v2/pkg/mountutil/volumestore" + "github.com/containerd/nerdctl/v2/pkg/strutil" securejoin "github.com/cyphar/filepath-securejoin" "github.com/opencontainers/image-spec/identity" "github.com/opencontainers/runtime-spec/specs-go" diff --git a/pkg/cmd/container/run_restart.go b/pkg/cmd/container/run_restart.go index 81c190133c6..b300dc0698d 100644 --- a/pkg/cmd/container/run_restart.go +++ b/pkg/cmd/container/run_restart.go @@ -23,7 +23,7 @@ import ( "github.com/containerd/containerd" "github.com/containerd/containerd/runtime/restart" - "github.com/containerd/nerdctl/pkg/strutil" + "github.com/containerd/nerdctl/v2/pkg/strutil" ) func checkRestartCapabilities(ctx context.Context, client *containerd.Client, restartFlag string) (bool, error) { diff --git a/pkg/cmd/container/run_security_linux.go b/pkg/cmd/container/run_security_linux.go index 2e1b0d19e74..5b74cce49f9 100644 --- a/pkg/cmd/container/run_security_linux.go +++ b/pkg/cmd/container/run_security_linux.go @@ -26,10 +26,10 @@ import ( "github.com/containerd/containerd/oci" "github.com/containerd/containerd/pkg/cap" "github.com/containerd/log" - "github.com/containerd/nerdctl/pkg/apparmorutil" - "github.com/containerd/nerdctl/pkg/defaults" - "github.com/containerd/nerdctl/pkg/maputil" - "github.com/containerd/nerdctl/pkg/strutil" + "github.com/containerd/nerdctl/v2/pkg/apparmorutil" + "github.com/containerd/nerdctl/v2/pkg/defaults" + "github.com/containerd/nerdctl/v2/pkg/maputil" + "github.com/containerd/nerdctl/v2/pkg/strutil" ) var privilegedOpts = []oci.SpecOpts{ diff --git a/pkg/cmd/container/run_ulimit.go b/pkg/cmd/container/run_ulimit.go index 52fec1f8ba6..5b825a7ec16 100644 --- a/pkg/cmd/container/run_ulimit.go +++ b/pkg/cmd/container/run_ulimit.go @@ -22,7 +22,7 @@ import ( "github.com/containerd/containerd/containers" "github.com/containerd/containerd/oci" - "github.com/containerd/nerdctl/pkg/strutil" + "github.com/containerd/nerdctl/v2/pkg/strutil" "github.com/docker/go-units" "github.com/opencontainers/runtime-spec/specs-go" ) diff --git a/pkg/cmd/container/run_windows.go b/pkg/cmd/container/run_windows.go index 6d6e5a32184..4e2f5fe07b5 100644 --- a/pkg/cmd/container/run_windows.go +++ b/pkg/cmd/container/run_windows.go @@ -25,7 +25,7 @@ import ( "github.com/containerd/containerd" "github.com/containerd/containerd/containers" "github.com/containerd/containerd/oci" - "github.com/containerd/nerdctl/pkg/api/types" + "github.com/containerd/nerdctl/v2/pkg/api/types" "github.com/docker/go-units" "github.com/opencontainers/runtime-spec/specs-go" ) diff --git a/pkg/cmd/container/start.go b/pkg/cmd/container/start.go index 7267972b614..926c521f6df 100644 --- a/pkg/cmd/container/start.go +++ b/pkg/cmd/container/start.go @@ -21,9 +21,9 @@ import ( "fmt" "github.com/containerd/containerd" - "github.com/containerd/nerdctl/pkg/api/types" - "github.com/containerd/nerdctl/pkg/containerutil" - "github.com/containerd/nerdctl/pkg/idutil/containerwalker" + "github.com/containerd/nerdctl/v2/pkg/api/types" + "github.com/containerd/nerdctl/v2/pkg/containerutil" + "github.com/containerd/nerdctl/v2/pkg/idutil/containerwalker" ) // Start starts a list of `containers`. If attach is true, it only starts a single container. diff --git a/pkg/cmd/container/stats.go b/pkg/cmd/container/stats.go index 64811db4c72..537e6a54193 100644 --- a/pkg/cmd/container/stats.go +++ b/pkg/cmd/container/stats.go @@ -32,16 +32,16 @@ import ( "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/events" "github.com/containerd/log" - "github.com/containerd/nerdctl/pkg/api/types" - "github.com/containerd/nerdctl/pkg/clientutil" - "github.com/containerd/nerdctl/pkg/containerinspector" - "github.com/containerd/nerdctl/pkg/eventutil" - "github.com/containerd/nerdctl/pkg/formatter" - "github.com/containerd/nerdctl/pkg/idutil/containerwalker" - "github.com/containerd/nerdctl/pkg/infoutil" - "github.com/containerd/nerdctl/pkg/labels" - "github.com/containerd/nerdctl/pkg/rootlessutil" - "github.com/containerd/nerdctl/pkg/statsutil" + "github.com/containerd/nerdctl/v2/pkg/api/types" + "github.com/containerd/nerdctl/v2/pkg/clientutil" + "github.com/containerd/nerdctl/v2/pkg/containerinspector" + "github.com/containerd/nerdctl/v2/pkg/eventutil" + "github.com/containerd/nerdctl/v2/pkg/formatter" + "github.com/containerd/nerdctl/v2/pkg/idutil/containerwalker" + "github.com/containerd/nerdctl/v2/pkg/infoutil" + "github.com/containerd/nerdctl/v2/pkg/labels" + "github.com/containerd/nerdctl/v2/pkg/rootlessutil" + "github.com/containerd/nerdctl/v2/pkg/statsutil" "github.com/containerd/typeurl/v2" ) diff --git a/pkg/cmd/container/stats_freebsd.go b/pkg/cmd/container/stats_freebsd.go index e2dbea58ea6..ef2c98fdfad 100644 --- a/pkg/cmd/container/stats_freebsd.go +++ b/pkg/cmd/container/stats_freebsd.go @@ -17,8 +17,8 @@ package container import ( - "github.com/containerd/nerdctl/pkg/inspecttypes/native" - "github.com/containerd/nerdctl/pkg/statsutil" + "github.com/containerd/nerdctl/v2/pkg/inspecttypes/native" + "github.com/containerd/nerdctl/v2/pkg/statsutil" ) func setContainerStatsAndRenderStatsEntry(previousStats *statsutil.ContainerStats, firstSet bool, anydata interface{}, pid int, interfaces []native.NetInterface) (statsutil.StatsEntry, error) { diff --git a/pkg/cmd/container/stats_linux.go b/pkg/cmd/container/stats_linux.go index 49d9eb488db..762dec200ac 100644 --- a/pkg/cmd/container/stats_linux.go +++ b/pkg/cmd/container/stats_linux.go @@ -25,8 +25,8 @@ import ( v1 "github.com/containerd/cgroups/v3/cgroup1/stats" v2 "github.com/containerd/cgroups/v3/cgroup2/stats" - "github.com/containerd/nerdctl/pkg/inspecttypes/native" - "github.com/containerd/nerdctl/pkg/statsutil" + "github.com/containerd/nerdctl/v2/pkg/inspecttypes/native" + "github.com/containerd/nerdctl/v2/pkg/statsutil" "github.com/vishvananda/netlink" "github.com/vishvananda/netns" ) diff --git a/pkg/cmd/container/stats_windows.go b/pkg/cmd/container/stats_windows.go index e2dbea58ea6..ef2c98fdfad 100644 --- a/pkg/cmd/container/stats_windows.go +++ b/pkg/cmd/container/stats_windows.go @@ -17,8 +17,8 @@ package container import ( - "github.com/containerd/nerdctl/pkg/inspecttypes/native" - "github.com/containerd/nerdctl/pkg/statsutil" + "github.com/containerd/nerdctl/v2/pkg/inspecttypes/native" + "github.com/containerd/nerdctl/v2/pkg/statsutil" ) func setContainerStatsAndRenderStatsEntry(previousStats *statsutil.ContainerStats, firstSet bool, anydata interface{}, pid int, interfaces []native.NetInterface) (statsutil.StatsEntry, error) { diff --git a/pkg/cmd/container/stop.go b/pkg/cmd/container/stop.go index 25b78a9d769..6398abe9e65 100644 --- a/pkg/cmd/container/stop.go +++ b/pkg/cmd/container/stop.go @@ -22,9 +22,9 @@ import ( "github.com/containerd/containerd" "github.com/containerd/containerd/errdefs" - "github.com/containerd/nerdctl/pkg/api/types" - "github.com/containerd/nerdctl/pkg/containerutil" - "github.com/containerd/nerdctl/pkg/idutil/containerwalker" + "github.com/containerd/nerdctl/v2/pkg/api/types" + "github.com/containerd/nerdctl/v2/pkg/containerutil" + "github.com/containerd/nerdctl/v2/pkg/idutil/containerwalker" ) // Stop stops a list of containers specified by `reqs`. diff --git a/pkg/cmd/container/top.go b/pkg/cmd/container/top.go index f1a3f238b6f..2f4cae35c4c 100644 --- a/pkg/cmd/container/top.go +++ b/pkg/cmd/container/top.go @@ -33,8 +33,8 @@ import ( "strings" "github.com/containerd/containerd" - "github.com/containerd/nerdctl/pkg/api/types" - "github.com/containerd/nerdctl/pkg/idutil/containerwalker" + "github.com/containerd/nerdctl/v2/pkg/api/types" + "github.com/containerd/nerdctl/v2/pkg/idutil/containerwalker" ) // ContainerTopOKBody is from https://github.com/moby/moby/blob/v20.10.6/api/types/container/container_top.go diff --git a/pkg/cmd/container/unpause.go b/pkg/cmd/container/unpause.go index f8044ba5992..f0e6325e81f 100644 --- a/pkg/cmd/container/unpause.go +++ b/pkg/cmd/container/unpause.go @@ -21,9 +21,9 @@ import ( "fmt" "github.com/containerd/containerd" - "github.com/containerd/nerdctl/pkg/api/types" - "github.com/containerd/nerdctl/pkg/containerutil" - "github.com/containerd/nerdctl/pkg/idutil/containerwalker" + "github.com/containerd/nerdctl/v2/pkg/api/types" + "github.com/containerd/nerdctl/v2/pkg/containerutil" + "github.com/containerd/nerdctl/v2/pkg/idutil/containerwalker" ) // Unpause unpauses all containers specified by `reqs`. diff --git a/pkg/cmd/container/wait.go b/pkg/cmd/container/wait.go index 5540e7b3c11..f726f81cd3a 100644 --- a/pkg/cmd/container/wait.go +++ b/pkg/cmd/container/wait.go @@ -23,8 +23,8 @@ import ( "io" "github.com/containerd/containerd" - "github.com/containerd/nerdctl/pkg/api/types" - "github.com/containerd/nerdctl/pkg/idutil/containerwalker" + "github.com/containerd/nerdctl/v2/pkg/api/types" + "github.com/containerd/nerdctl/v2/pkg/idutil/containerwalker" ) // Wait blocks until all the containers specified by reqs have stopped, then print their exit codes. diff --git a/pkg/cmd/image/convert.go b/pkg/cmd/image/convert.go index 64007060033..0cb9c560f8c 100644 --- a/pkg/cmd/image/convert.go +++ b/pkg/cmd/image/convert.go @@ -32,11 +32,11 @@ import ( "github.com/containerd/containerd/images/converter" "github.com/containerd/containerd/images/converter/uncompress" "github.com/containerd/log" - "github.com/containerd/nerdctl/pkg/api/types" - "github.com/containerd/nerdctl/pkg/clientutil" - converterutil "github.com/containerd/nerdctl/pkg/imgutil/converter" - "github.com/containerd/nerdctl/pkg/platformutil" - "github.com/containerd/nerdctl/pkg/referenceutil" + "github.com/containerd/nerdctl/v2/pkg/api/types" + "github.com/containerd/nerdctl/v2/pkg/clientutil" + converterutil "github.com/containerd/nerdctl/v2/pkg/imgutil/converter" + "github.com/containerd/nerdctl/v2/pkg/platformutil" + "github.com/containerd/nerdctl/v2/pkg/referenceutil" nydusconvert "github.com/containerd/nydus-snapshotter/pkg/converter" "github.com/containerd/stargz-snapshotter/estargz" estargzconvert "github.com/containerd/stargz-snapshotter/nativeconverter/estargz" diff --git a/pkg/cmd/image/crypt.go b/pkg/cmd/image/crypt.go index 9aa08318e1c..be134fcf972 100644 --- a/pkg/cmd/image/crypt.go +++ b/pkg/cmd/image/crypt.go @@ -26,9 +26,9 @@ import ( "github.com/containerd/containerd/images/converter" "github.com/containerd/imgcrypt/images/encryption" "github.com/containerd/imgcrypt/images/encryption/parsehelpers" - "github.com/containerd/nerdctl/pkg/api/types" - "github.com/containerd/nerdctl/pkg/platformutil" - "github.com/containerd/nerdctl/pkg/referenceutil" + "github.com/containerd/nerdctl/v2/pkg/api/types" + "github.com/containerd/nerdctl/v2/pkg/platformutil" + "github.com/containerd/nerdctl/v2/pkg/referenceutil" ocispec "github.com/opencontainers/image-spec/specs-go/v1" ) diff --git a/pkg/cmd/image/inspect.go b/pkg/cmd/image/inspect.go index fcaa46d2f38..f37e9e0e217 100644 --- a/pkg/cmd/image/inspect.go +++ b/pkg/cmd/image/inspect.go @@ -23,11 +23,11 @@ import ( "github.com/containerd/containerd" "github.com/containerd/log" - "github.com/containerd/nerdctl/pkg/api/types" - "github.com/containerd/nerdctl/pkg/formatter" - "github.com/containerd/nerdctl/pkg/idutil/imagewalker" - "github.com/containerd/nerdctl/pkg/imageinspector" - "github.com/containerd/nerdctl/pkg/inspecttypes/dockercompat" + "github.com/containerd/nerdctl/v2/pkg/api/types" + "github.com/containerd/nerdctl/v2/pkg/formatter" + "github.com/containerd/nerdctl/v2/pkg/idutil/imagewalker" + "github.com/containerd/nerdctl/v2/pkg/imageinspector" + "github.com/containerd/nerdctl/v2/pkg/inspecttypes/dockercompat" ) // Inspect prints detailed information of each image in `images`. diff --git a/pkg/cmd/image/list.go b/pkg/cmd/image/list.go index 9a4f927e2f0..be256b3ddb5 100644 --- a/pkg/cmd/image/list.go +++ b/pkg/cmd/image/list.go @@ -35,9 +35,9 @@ import ( "github.com/containerd/containerd/platforms" "github.com/containerd/containerd/snapshots" "github.com/containerd/log" - "github.com/containerd/nerdctl/pkg/api/types" - "github.com/containerd/nerdctl/pkg/formatter" - "github.com/containerd/nerdctl/pkg/imgutil" + "github.com/containerd/nerdctl/v2/pkg/api/types" + "github.com/containerd/nerdctl/v2/pkg/formatter" + "github.com/containerd/nerdctl/v2/pkg/imgutil" v1 "github.com/opencontainers/image-spec/specs-go/v1" ) diff --git a/pkg/cmd/image/load.go b/pkg/cmd/image/load.go index b3871279dd5..7922c2448ad 100644 --- a/pkg/cmd/image/load.go +++ b/pkg/cmd/image/load.go @@ -28,9 +28,9 @@ import ( "github.com/containerd/containerd/images" "github.com/containerd/containerd/images/archive" "github.com/containerd/containerd/platforms" - "github.com/containerd/nerdctl/pkg/api/types" - "github.com/containerd/nerdctl/pkg/imgutil" - "github.com/containerd/nerdctl/pkg/platformutil" + "github.com/containerd/nerdctl/v2/pkg/api/types" + "github.com/containerd/nerdctl/v2/pkg/imgutil" + "github.com/containerd/nerdctl/v2/pkg/platformutil" ) type readCounter struct { diff --git a/pkg/cmd/image/prune.go b/pkg/cmd/image/prune.go index abcee6bd86a..5691f331023 100644 --- a/pkg/cmd/image/prune.go +++ b/pkg/cmd/image/prune.go @@ -24,8 +24,8 @@ import ( "github.com/containerd/containerd/images" "github.com/containerd/containerd/platforms" "github.com/containerd/log" - "github.com/containerd/nerdctl/pkg/api/types" - "github.com/containerd/nerdctl/pkg/imgutil" + "github.com/containerd/nerdctl/v2/pkg/api/types" + "github.com/containerd/nerdctl/v2/pkg/imgutil" "github.com/opencontainers/go-digest" ) diff --git a/pkg/cmd/image/pull.go b/pkg/cmd/image/pull.go index 68e14e03735..0a87df16d5a 100644 --- a/pkg/cmd/image/pull.go +++ b/pkg/cmd/image/pull.go @@ -23,13 +23,13 @@ import ( "path/filepath" "github.com/containerd/containerd" - "github.com/containerd/nerdctl/pkg/api/types" - "github.com/containerd/nerdctl/pkg/imgutil" - "github.com/containerd/nerdctl/pkg/ipfs" - "github.com/containerd/nerdctl/pkg/platformutil" - "github.com/containerd/nerdctl/pkg/referenceutil" - "github.com/containerd/nerdctl/pkg/signutil" - "github.com/containerd/nerdctl/pkg/strutil" + "github.com/containerd/nerdctl/v2/pkg/api/types" + "github.com/containerd/nerdctl/v2/pkg/imgutil" + "github.com/containerd/nerdctl/v2/pkg/ipfs" + "github.com/containerd/nerdctl/v2/pkg/platformutil" + "github.com/containerd/nerdctl/v2/pkg/referenceutil" + "github.com/containerd/nerdctl/v2/pkg/signutil" + "github.com/containerd/nerdctl/v2/pkg/strutil" v1 "github.com/opencontainers/image-spec/specs-go/v1" ) diff --git a/pkg/cmd/image/push.go b/pkg/cmd/image/push.go index 64c3b6cc7c8..0970a6972fe 100644 --- a/pkg/cmd/image/push.go +++ b/pkg/cmd/image/push.go @@ -33,15 +33,15 @@ import ( "github.com/containerd/containerd/remotes/docker" dockerconfig "github.com/containerd/containerd/remotes/docker/config" "github.com/containerd/log" - "github.com/containerd/nerdctl/pkg/api/types" - "github.com/containerd/nerdctl/pkg/errutil" - "github.com/containerd/nerdctl/pkg/imgutil/dockerconfigresolver" - "github.com/containerd/nerdctl/pkg/imgutil/push" - "github.com/containerd/nerdctl/pkg/ipfs" - "github.com/containerd/nerdctl/pkg/platformutil" - "github.com/containerd/nerdctl/pkg/referenceutil" - "github.com/containerd/nerdctl/pkg/signutil" - "github.com/containerd/nerdctl/pkg/snapshotterutil" + "github.com/containerd/nerdctl/v2/pkg/api/types" + "github.com/containerd/nerdctl/v2/pkg/errutil" + "github.com/containerd/nerdctl/v2/pkg/imgutil/dockerconfigresolver" + "github.com/containerd/nerdctl/v2/pkg/imgutil/push" + "github.com/containerd/nerdctl/v2/pkg/ipfs" + "github.com/containerd/nerdctl/v2/pkg/platformutil" + "github.com/containerd/nerdctl/v2/pkg/referenceutil" + "github.com/containerd/nerdctl/v2/pkg/signutil" + "github.com/containerd/nerdctl/v2/pkg/snapshotterutil" "github.com/containerd/stargz-snapshotter/estargz" "github.com/containerd/stargz-snapshotter/estargz/zstdchunked" estargzconvert "github.com/containerd/stargz-snapshotter/nativeconverter/estargz" diff --git a/pkg/cmd/image/remove.go b/pkg/cmd/image/remove.go index 0e0c20d8a60..19d5cd8ea7c 100644 --- a/pkg/cmd/image/remove.go +++ b/pkg/cmd/image/remove.go @@ -26,9 +26,9 @@ import ( "github.com/containerd/containerd/images" "github.com/containerd/containerd/platforms" "github.com/containerd/log" - "github.com/containerd/nerdctl/pkg/api/types" - "github.com/containerd/nerdctl/pkg/containerutil" - "github.com/containerd/nerdctl/pkg/idutil/imagewalker" + "github.com/containerd/nerdctl/v2/pkg/api/types" + "github.com/containerd/nerdctl/v2/pkg/containerutil" + "github.com/containerd/nerdctl/v2/pkg/idutil/imagewalker" ) // Remove removes a list of `images`. diff --git a/pkg/cmd/image/save.go b/pkg/cmd/image/save.go index cf4dbf3069e..db910323a89 100644 --- a/pkg/cmd/image/save.go +++ b/pkg/cmd/image/save.go @@ -22,10 +22,10 @@ import ( "github.com/containerd/containerd" "github.com/containerd/containerd/images/archive" - "github.com/containerd/nerdctl/pkg/api/types" - "github.com/containerd/nerdctl/pkg/idutil/imagewalker" - "github.com/containerd/nerdctl/pkg/platformutil" - "github.com/containerd/nerdctl/pkg/strutil" + "github.com/containerd/nerdctl/v2/pkg/api/types" + "github.com/containerd/nerdctl/v2/pkg/idutil/imagewalker" + "github.com/containerd/nerdctl/v2/pkg/platformutil" + "github.com/containerd/nerdctl/v2/pkg/strutil" ) // Save exports `images` to a `io.Writer` (e.g., a file writer, or os.Stdout) specified by `options.Stdout`. diff --git a/pkg/cmd/image/tag.go b/pkg/cmd/image/tag.go index 8349fc6c769..4543f2a070d 100644 --- a/pkg/cmd/image/tag.go +++ b/pkg/cmd/image/tag.go @@ -22,9 +22,9 @@ import ( "github.com/containerd/containerd" "github.com/containerd/containerd/errdefs" - "github.com/containerd/nerdctl/pkg/api/types" - "github.com/containerd/nerdctl/pkg/idutil/imagewalker" - "github.com/containerd/nerdctl/pkg/referenceutil" + "github.com/containerd/nerdctl/v2/pkg/api/types" + "github.com/containerd/nerdctl/v2/pkg/idutil/imagewalker" + "github.com/containerd/nerdctl/v2/pkg/referenceutil" ) func Tag(ctx context.Context, client *containerd.Client, options types.ImageTagOptions) error { diff --git a/pkg/cmd/ipfs/registry_serve.go b/pkg/cmd/ipfs/registry_serve.go index ede278f115e..9ee048a9a94 100644 --- a/pkg/cmd/ipfs/registry_serve.go +++ b/pkg/cmd/ipfs/registry_serve.go @@ -22,8 +22,8 @@ import ( "path/filepath" "github.com/containerd/log" - "github.com/containerd/nerdctl/pkg/api/types" - "github.com/containerd/nerdctl/pkg/ipfs" + "github.com/containerd/nerdctl/v2/pkg/api/types" + "github.com/containerd/nerdctl/v2/pkg/ipfs" ) func RegistryServe(options types.IPFSRegistryServeOptions) error { diff --git a/pkg/cmd/login/login.go b/pkg/cmd/login/login.go index 385a9609f44..64573c7e0e5 100644 --- a/pkg/cmd/login/login.go +++ b/pkg/cmd/login/login.go @@ -30,9 +30,9 @@ import ( "github.com/containerd/containerd/remotes/docker" "github.com/containerd/containerd/remotes/docker/config" "github.com/containerd/log" - "github.com/containerd/nerdctl/pkg/api/types" - "github.com/containerd/nerdctl/pkg/errutil" - "github.com/containerd/nerdctl/pkg/imgutil/dockerconfigresolver" + "github.com/containerd/nerdctl/v2/pkg/api/types" + "github.com/containerd/nerdctl/v2/pkg/errutil" + "github.com/containerd/nerdctl/v2/pkg/imgutil/dockerconfigresolver" dockercliconfig "github.com/docker/cli/cli/config" dockercliconfigtypes "github.com/docker/cli/cli/config/types" "github.com/docker/docker/api/types/registry" diff --git a/pkg/cmd/namespace/create.go b/pkg/cmd/namespace/create.go index f23765dcbab..6f79e999797 100644 --- a/pkg/cmd/namespace/create.go +++ b/pkg/cmd/namespace/create.go @@ -20,7 +20,7 @@ import ( "context" "github.com/containerd/containerd" - "github.com/containerd/nerdctl/pkg/api/types" + "github.com/containerd/nerdctl/v2/pkg/api/types" ) func Create(ctx context.Context, client *containerd.Client, namespace string, options types.NamespaceCreateOptions) error { diff --git a/pkg/cmd/namespace/inspect.go b/pkg/cmd/namespace/inspect.go index 99341ca03d2..3f602ef6187 100644 --- a/pkg/cmd/namespace/inspect.go +++ b/pkg/cmd/namespace/inspect.go @@ -21,9 +21,9 @@ import ( "github.com/containerd/containerd" "github.com/containerd/containerd/namespaces" - "github.com/containerd/nerdctl/pkg/api/types" - "github.com/containerd/nerdctl/pkg/formatter" - "github.com/containerd/nerdctl/pkg/inspecttypes/native" + "github.com/containerd/nerdctl/v2/pkg/api/types" + "github.com/containerd/nerdctl/v2/pkg/formatter" + "github.com/containerd/nerdctl/v2/pkg/inspecttypes/native" ) func Inspect(ctx context.Context, client *containerd.Client, inspectedNamespaces []string, options types.NamespaceInspectOptions) error { diff --git a/pkg/cmd/namespace/remove.go b/pkg/cmd/namespace/remove.go index 25a8720cf84..a4de8514e87 100644 --- a/pkg/cmd/namespace/remove.go +++ b/pkg/cmd/namespace/remove.go @@ -23,7 +23,7 @@ import ( "github.com/containerd/containerd" "github.com/containerd/containerd/errdefs" "github.com/containerd/log" - "github.com/containerd/nerdctl/pkg/api/types" + "github.com/containerd/nerdctl/v2/pkg/api/types" ) func Remove(ctx context.Context, client *containerd.Client, deletedNamespaces []string, options types.NamespaceRemoveOptions) error { diff --git a/pkg/cmd/namespace/update.go b/pkg/cmd/namespace/update.go index a8b4eb31aef..3952f98a6cc 100644 --- a/pkg/cmd/namespace/update.go +++ b/pkg/cmd/namespace/update.go @@ -20,7 +20,7 @@ import ( "context" "github.com/containerd/containerd" - "github.com/containerd/nerdctl/pkg/api/types" + "github.com/containerd/nerdctl/v2/pkg/api/types" ) func Update(ctx context.Context, client *containerd.Client, namespace string, options types.NamespaceUpdateOptions) error { diff --git a/pkg/cmd/network/create.go b/pkg/cmd/network/create.go index 8a032433478..f1dd42a1b6b 100644 --- a/pkg/cmd/network/create.go +++ b/pkg/cmd/network/create.go @@ -21,8 +21,8 @@ import ( "io" "github.com/containerd/containerd/errdefs" - "github.com/containerd/nerdctl/pkg/api/types" - "github.com/containerd/nerdctl/pkg/netutil" + "github.com/containerd/nerdctl/v2/pkg/api/types" + "github.com/containerd/nerdctl/v2/pkg/netutil" ) func Create(options types.NetworkCreateOptions, stdout io.Writer) error { diff --git a/pkg/cmd/network/inspect.go b/pkg/cmd/network/inspect.go index 39c5ffc1aed..9ef9581b4a4 100644 --- a/pkg/cmd/network/inspect.go +++ b/pkg/cmd/network/inspect.go @@ -22,12 +22,12 @@ import ( "fmt" "github.com/containerd/log" - "github.com/containerd/nerdctl/pkg/api/types" - "github.com/containerd/nerdctl/pkg/formatter" - "github.com/containerd/nerdctl/pkg/idutil/netwalker" - "github.com/containerd/nerdctl/pkg/inspecttypes/dockercompat" - "github.com/containerd/nerdctl/pkg/inspecttypes/native" - "github.com/containerd/nerdctl/pkg/netutil" + "github.com/containerd/nerdctl/v2/pkg/api/types" + "github.com/containerd/nerdctl/v2/pkg/formatter" + "github.com/containerd/nerdctl/v2/pkg/idutil/netwalker" + "github.com/containerd/nerdctl/v2/pkg/inspecttypes/dockercompat" + "github.com/containerd/nerdctl/v2/pkg/inspecttypes/native" + "github.com/containerd/nerdctl/v2/pkg/netutil" ) func Inspect(ctx context.Context, options types.NetworkInspectOptions) error { diff --git a/pkg/cmd/network/list.go b/pkg/cmd/network/list.go index a045900ff35..ab7c2696ee2 100644 --- a/pkg/cmd/network/list.go +++ b/pkg/cmd/network/list.go @@ -25,9 +25,9 @@ import ( "text/tabwriter" "text/template" - "github.com/containerd/nerdctl/pkg/api/types" - "github.com/containerd/nerdctl/pkg/formatter" - "github.com/containerd/nerdctl/pkg/netutil" + "github.com/containerd/nerdctl/v2/pkg/api/types" + "github.com/containerd/nerdctl/v2/pkg/formatter" + "github.com/containerd/nerdctl/v2/pkg/netutil" ) type networkPrintable struct { diff --git a/pkg/cmd/network/prune.go b/pkg/cmd/network/prune.go index 645e6d2362a..4595e6fe2b4 100644 --- a/pkg/cmd/network/prune.go +++ b/pkg/cmd/network/prune.go @@ -22,9 +22,9 @@ import ( "github.com/containerd/containerd" "github.com/containerd/log" - "github.com/containerd/nerdctl/pkg/api/types" - "github.com/containerd/nerdctl/pkg/netutil" - "github.com/containerd/nerdctl/pkg/strutil" + "github.com/containerd/nerdctl/v2/pkg/api/types" + "github.com/containerd/nerdctl/v2/pkg/netutil" + "github.com/containerd/nerdctl/v2/pkg/strutil" ) func Prune(ctx context.Context, client *containerd.Client, options types.NetworkPruneOptions) error { diff --git a/pkg/cmd/network/remove.go b/pkg/cmd/network/remove.go index 76da1eeabca..a2fc73c0e17 100644 --- a/pkg/cmd/network/remove.go +++ b/pkg/cmd/network/remove.go @@ -21,9 +21,9 @@ import ( "fmt" "github.com/containerd/containerd" - "github.com/containerd/nerdctl/pkg/api/types" - "github.com/containerd/nerdctl/pkg/idutil/netwalker" - "github.com/containerd/nerdctl/pkg/netutil" + "github.com/containerd/nerdctl/v2/pkg/api/types" + "github.com/containerd/nerdctl/v2/pkg/idutil/netwalker" + "github.com/containerd/nerdctl/v2/pkg/netutil" ) func Remove(ctx context.Context, client *containerd.Client, options types.NetworkRemoveOptions) error { diff --git a/pkg/cmd/system/events.go b/pkg/cmd/system/events.go index b18955611e1..cb313eca2a7 100644 --- a/pkg/cmd/system/events.go +++ b/pkg/cmd/system/events.go @@ -29,8 +29,8 @@ import ( _ "github.com/containerd/containerd/api/events" // Register grpc event types "github.com/containerd/containerd/events" "github.com/containerd/log" - "github.com/containerd/nerdctl/pkg/api/types" - "github.com/containerd/nerdctl/pkg/formatter" + "github.com/containerd/nerdctl/v2/pkg/api/types" + "github.com/containerd/nerdctl/v2/pkg/formatter" "github.com/containerd/typeurl/v2" ) diff --git a/pkg/cmd/system/info.go b/pkg/cmd/system/info.go index 77aa78cb2b6..5e87cf24fc4 100644 --- a/pkg/cmd/system/info.go +++ b/pkg/cmd/system/info.go @@ -26,17 +26,17 @@ import ( "github.com/containerd/containerd" "github.com/containerd/log" - "github.com/containerd/nerdctl/pkg/api/types" + "github.com/containerd/nerdctl/v2/pkg/api/types" "golang.org/x/text/cases" "golang.org/x/text/language" "github.com/containerd/containerd/api/services/introspection/v1" - "github.com/containerd/nerdctl/pkg/formatter" - "github.com/containerd/nerdctl/pkg/infoutil" - "github.com/containerd/nerdctl/pkg/inspecttypes/dockercompat" - "github.com/containerd/nerdctl/pkg/inspecttypes/native" - "github.com/containerd/nerdctl/pkg/rootlessutil" - "github.com/containerd/nerdctl/pkg/strutil" + "github.com/containerd/nerdctl/v2/pkg/formatter" + "github.com/containerd/nerdctl/v2/pkg/infoutil" + "github.com/containerd/nerdctl/v2/pkg/inspecttypes/dockercompat" + "github.com/containerd/nerdctl/v2/pkg/inspecttypes/native" + "github.com/containerd/nerdctl/v2/pkg/rootlessutil" + "github.com/containerd/nerdctl/v2/pkg/strutil" "github.com/docker/go-units" ) diff --git a/pkg/cmd/system/prune.go b/pkg/cmd/system/prune.go index 94c941a48aa..efc1d934261 100644 --- a/pkg/cmd/system/prune.go +++ b/pkg/cmd/system/prune.go @@ -21,12 +21,12 @@ import ( "fmt" "github.com/containerd/containerd" - "github.com/containerd/nerdctl/pkg/api/types" - "github.com/containerd/nerdctl/pkg/cmd/builder" - "github.com/containerd/nerdctl/pkg/cmd/container" - "github.com/containerd/nerdctl/pkg/cmd/image" - "github.com/containerd/nerdctl/pkg/cmd/network" - "github.com/containerd/nerdctl/pkg/cmd/volume" + "github.com/containerd/nerdctl/v2/pkg/api/types" + "github.com/containerd/nerdctl/v2/pkg/cmd/builder" + "github.com/containerd/nerdctl/v2/pkg/cmd/container" + "github.com/containerd/nerdctl/v2/pkg/cmd/image" + "github.com/containerd/nerdctl/v2/pkg/cmd/network" + "github.com/containerd/nerdctl/v2/pkg/cmd/volume" ) // Prune will remove all unused containers, networks, diff --git a/pkg/cmd/volume/create.go b/pkg/cmd/volume/create.go index 77290f9d666..c00fe00efa3 100644 --- a/pkg/cmd/volume/create.go +++ b/pkg/cmd/volume/create.go @@ -20,10 +20,10 @@ import ( "fmt" "github.com/containerd/containerd/identifiers" - "github.com/containerd/nerdctl/pkg/api/types" - "github.com/containerd/nerdctl/pkg/inspecttypes/native" - "github.com/containerd/nerdctl/pkg/labels" - "github.com/containerd/nerdctl/pkg/strutil" + "github.com/containerd/nerdctl/v2/pkg/api/types" + "github.com/containerd/nerdctl/v2/pkg/inspecttypes/native" + "github.com/containerd/nerdctl/v2/pkg/labels" + "github.com/containerd/nerdctl/v2/pkg/strutil" "github.com/docker/docker/pkg/stringid" ) diff --git a/pkg/cmd/volume/inspect.go b/pkg/cmd/volume/inspect.go index 78221c6bd56..4c9442ed286 100644 --- a/pkg/cmd/volume/inspect.go +++ b/pkg/cmd/volume/inspect.go @@ -17,8 +17,8 @@ package volume import ( - "github.com/containerd/nerdctl/pkg/api/types" - "github.com/containerd/nerdctl/pkg/formatter" + "github.com/containerd/nerdctl/v2/pkg/api/types" + "github.com/containerd/nerdctl/v2/pkg/formatter" ) func Inspect(volumes []string, options types.VolumeInspectOptions) error { diff --git a/pkg/cmd/volume/list.go b/pkg/cmd/volume/list.go index b10ad9d3cca..a0e275a10c0 100644 --- a/pkg/cmd/volume/list.go +++ b/pkg/cmd/volume/list.go @@ -27,9 +27,9 @@ import ( "github.com/containerd/containerd/pkg/progress" "github.com/containerd/log" - "github.com/containerd/nerdctl/pkg/api/types" - "github.com/containerd/nerdctl/pkg/formatter" - "github.com/containerd/nerdctl/pkg/inspecttypes/native" + "github.com/containerd/nerdctl/v2/pkg/api/types" + "github.com/containerd/nerdctl/v2/pkg/formatter" + "github.com/containerd/nerdctl/v2/pkg/inspecttypes/native" ) type volumePrintable struct { diff --git a/pkg/cmd/volume/prune.go b/pkg/cmd/volume/prune.go index cc7faa85b5b..d8161be8bfa 100644 --- a/pkg/cmd/volume/prune.go +++ b/pkg/cmd/volume/prune.go @@ -21,8 +21,8 @@ import ( "fmt" "github.com/containerd/containerd" - "github.com/containerd/nerdctl/pkg/api/types" - "github.com/containerd/nerdctl/pkg/labels" + "github.com/containerd/nerdctl/v2/pkg/api/types" + "github.com/containerd/nerdctl/v2/pkg/labels" ) func Prune(ctx context.Context, client *containerd.Client, options types.VolumePruneOptions) error { diff --git a/pkg/cmd/volume/rm.go b/pkg/cmd/volume/rm.go index 98a5a44c4bb..e25a3ff19a8 100644 --- a/pkg/cmd/volume/rm.go +++ b/pkg/cmd/volume/rm.go @@ -22,10 +22,10 @@ import ( "fmt" "github.com/containerd/containerd" - "github.com/containerd/nerdctl/pkg/api/types" - "github.com/containerd/nerdctl/pkg/inspecttypes/dockercompat" - "github.com/containerd/nerdctl/pkg/labels" - "github.com/containerd/nerdctl/pkg/mountutil" + "github.com/containerd/nerdctl/v2/pkg/api/types" + "github.com/containerd/nerdctl/v2/pkg/inspecttypes/dockercompat" + "github.com/containerd/nerdctl/v2/pkg/labels" + "github.com/containerd/nerdctl/v2/pkg/mountutil" ) func Remove(ctx context.Context, client *containerd.Client, volumes []string, options types.VolumeRemoveOptions) error { diff --git a/pkg/cmd/volume/volume.go b/pkg/cmd/volume/volume.go index 6efb1a7b46b..1a6fc9f16f1 100644 --- a/pkg/cmd/volume/volume.go +++ b/pkg/cmd/volume/volume.go @@ -17,8 +17,8 @@ package volume import ( - "github.com/containerd/nerdctl/pkg/clientutil" - "github.com/containerd/nerdctl/pkg/mountutil/volumestore" + "github.com/containerd/nerdctl/v2/pkg/clientutil" + "github.com/containerd/nerdctl/v2/pkg/mountutil/volumestore" ) // Store returns a volume store diff --git a/pkg/composer/build.go b/pkg/composer/build.go index 1fe7b72837c..8f34835bc3b 100644 --- a/pkg/composer/build.go +++ b/pkg/composer/build.go @@ -23,7 +23,7 @@ import ( "github.com/compose-spec/compose-go/types" "github.com/containerd/log" - "github.com/containerd/nerdctl/pkg/composer/serviceparser" + "github.com/containerd/nerdctl/v2/pkg/composer/serviceparser" ) type BuildOptions struct { diff --git a/pkg/composer/composer.go b/pkg/composer/composer.go index 2c5bd4d2e8c..2ebadc4407e 100644 --- a/pkg/composer/composer.go +++ b/pkg/composer/composer.go @@ -28,8 +28,8 @@ import ( "github.com/containerd/containerd" "github.com/containerd/containerd/identifiers" "github.com/containerd/log" - "github.com/containerd/nerdctl/pkg/composer/serviceparser" - "github.com/containerd/nerdctl/pkg/reflectutil" + "github.com/containerd/nerdctl/v2/pkg/composer/serviceparser" + "github.com/containerd/nerdctl/v2/pkg/reflectutil" ) // Options groups the command line options recommended for a Compose implementation (ProjectOptions) and extra options for nerdctl diff --git a/pkg/composer/container.go b/pkg/composer/container.go index 33b4b699775..3a0169e74dc 100644 --- a/pkg/composer/container.go +++ b/pkg/composer/container.go @@ -22,7 +22,7 @@ import ( "github.com/containerd/containerd" "github.com/containerd/log" - "github.com/containerd/nerdctl/pkg/labels" + "github.com/containerd/nerdctl/v2/pkg/labels" ) func (c *Composer) Containers(ctx context.Context, services ...string) ([]containerd.Container, error) { diff --git a/pkg/composer/copy.go b/pkg/composer/copy.go index 76caeead512..0442b5775ae 100644 --- a/pkg/composer/copy.go +++ b/pkg/composer/copy.go @@ -24,7 +24,7 @@ import ( "github.com/containerd/containerd" "github.com/containerd/log" - "github.com/containerd/nerdctl/pkg/labels" + "github.com/containerd/nerdctl/v2/pkg/labels" "github.com/docker/docker/pkg/system" ) diff --git a/pkg/composer/create.go b/pkg/composer/create.go index 7a62f24fa1e..97112f27744 100644 --- a/pkg/composer/create.go +++ b/pkg/composer/create.go @@ -25,8 +25,8 @@ import ( "github.com/compose-spec/compose-go/types" "github.com/containerd/log" - "github.com/containerd/nerdctl/pkg/composer/serviceparser" - "github.com/containerd/nerdctl/pkg/labels" + "github.com/containerd/nerdctl/v2/pkg/composer/serviceparser" + "github.com/containerd/nerdctl/v2/pkg/labels" "golang.org/x/sync/errgroup" ) diff --git a/pkg/composer/down.go b/pkg/composer/down.go index 2b40e5d9073..3ea0221d209 100644 --- a/pkg/composer/down.go +++ b/pkg/composer/down.go @@ -21,7 +21,7 @@ import ( "fmt" "github.com/containerd/log" - "github.com/containerd/nerdctl/pkg/strutil" + "github.com/containerd/nerdctl/v2/pkg/strutil" ) type DownOptions struct { diff --git a/pkg/composer/exec.go b/pkg/composer/exec.go index 95ffee05620..1d8ab64f069 100644 --- a/pkg/composer/exec.go +++ b/pkg/composer/exec.go @@ -26,8 +26,8 @@ import ( "github.com/containerd/containerd" "github.com/containerd/log" - "github.com/containerd/nerdctl/pkg/composer/serviceparser" - "github.com/containerd/nerdctl/pkg/labels" + "github.com/containerd/nerdctl/v2/pkg/composer/serviceparser" + "github.com/containerd/nerdctl/v2/pkg/labels" ) // ExecOptions stores options passed from users as flags and args. diff --git a/pkg/composer/logs.go b/pkg/composer/logs.go index c6109bdb2fb..21cb4fb5623 100644 --- a/pkg/composer/logs.go +++ b/pkg/composer/logs.go @@ -26,9 +26,9 @@ import ( "github.com/compose-spec/compose-go/types" "github.com/containerd/containerd" "github.com/containerd/log" - "github.com/containerd/nerdctl/pkg/composer/pipetagger" - "github.com/containerd/nerdctl/pkg/composer/serviceparser" - "github.com/containerd/nerdctl/pkg/labels" + "github.com/containerd/nerdctl/v2/pkg/composer/pipetagger" + "github.com/containerd/nerdctl/v2/pkg/composer/serviceparser" + "github.com/containerd/nerdctl/v2/pkg/labels" ) type LogsOptions struct { diff --git a/pkg/composer/orphans.go b/pkg/composer/orphans.go index 2466d4ca174..2df49253132 100644 --- a/pkg/composer/orphans.go +++ b/pkg/composer/orphans.go @@ -21,8 +21,8 @@ import ( "fmt" "github.com/containerd/containerd" - "github.com/containerd/nerdctl/pkg/composer/serviceparser" - "github.com/containerd/nerdctl/pkg/labels" + "github.com/containerd/nerdctl/v2/pkg/composer/serviceparser" + "github.com/containerd/nerdctl/v2/pkg/labels" ) func (c *Composer) getOrphanContainers(ctx context.Context, parsedServices []*serviceparser.Service) ([]containerd.Container, error) { diff --git a/pkg/composer/pause.go b/pkg/composer/pause.go index 51a05503b62..4817a5710d6 100644 --- a/pkg/composer/pause.go +++ b/pkg/composer/pause.go @@ -23,8 +23,8 @@ import ( "sync" "github.com/containerd/containerd" - "github.com/containerd/nerdctl/pkg/containerutil" - "github.com/containerd/nerdctl/pkg/labels" + "github.com/containerd/nerdctl/v2/pkg/containerutil" + "github.com/containerd/nerdctl/v2/pkg/labels" "golang.org/x/sync/errgroup" ) diff --git a/pkg/composer/port.go b/pkg/composer/port.go index 12676eb981f..750ee8ae970 100644 --- a/pkg/composer/port.go +++ b/pkg/composer/port.go @@ -21,7 +21,7 @@ import ( "fmt" "io" - "github.com/containerd/nerdctl/pkg/containerutil" + "github.com/containerd/nerdctl/v2/pkg/containerutil" ) // PortOptions has args for getting the public port of a given private port/protocol diff --git a/pkg/composer/pull.go b/pkg/composer/pull.go index 62e5c683178..1036df783ba 100644 --- a/pkg/composer/pull.go +++ b/pkg/composer/pull.go @@ -23,7 +23,7 @@ import ( "github.com/compose-spec/compose-go/types" "github.com/containerd/log" - "github.com/containerd/nerdctl/pkg/composer/serviceparser" + "github.com/containerd/nerdctl/v2/pkg/composer/serviceparser" ) type PullOptions struct { diff --git a/pkg/composer/push.go b/pkg/composer/push.go index eabec25db97..ae8f580a6bb 100644 --- a/pkg/composer/push.go +++ b/pkg/composer/push.go @@ -23,7 +23,7 @@ import ( "github.com/compose-spec/compose-go/types" "github.com/containerd/log" - "github.com/containerd/nerdctl/pkg/composer/serviceparser" + "github.com/containerd/nerdctl/v2/pkg/composer/serviceparser" ) type PushOptions struct { diff --git a/pkg/composer/restart.go b/pkg/composer/restart.go index c473cf71eff..a2d430b3603 100644 --- a/pkg/composer/restart.go +++ b/pkg/composer/restart.go @@ -24,7 +24,7 @@ import ( "github.com/compose-spec/compose-go/types" "github.com/containerd/containerd" "github.com/containerd/log" - "github.com/containerd/nerdctl/pkg/labels" + "github.com/containerd/nerdctl/v2/pkg/labels" ) // RestartOptions stores all option input from `nerdctl compose restart` diff --git a/pkg/composer/rm.go b/pkg/composer/rm.go index 2ad1b798fb8..86cae7c9000 100644 --- a/pkg/composer/rm.go +++ b/pkg/composer/rm.go @@ -23,10 +23,10 @@ import ( "github.com/containerd/containerd" "github.com/containerd/log" - "github.com/containerd/nerdctl/pkg/composer/serviceparser" - "github.com/containerd/nerdctl/pkg/formatter" - "github.com/containerd/nerdctl/pkg/labels" - "github.com/containerd/nerdctl/pkg/strutil" + "github.com/containerd/nerdctl/v2/pkg/composer/serviceparser" + "github.com/containerd/nerdctl/v2/pkg/formatter" + "github.com/containerd/nerdctl/v2/pkg/labels" + "github.com/containerd/nerdctl/v2/pkg/strutil" ) // RemoveOptions stores all options when removing compose containers: diff --git a/pkg/composer/run.go b/pkg/composer/run.go index 5c065d7f5ef..58c8fc13727 100644 --- a/pkg/composer/run.go +++ b/pkg/composer/run.go @@ -25,8 +25,8 @@ import ( "github.com/compose-spec/compose-go/loader" "github.com/compose-spec/compose-go/types" "github.com/containerd/log" - "github.com/containerd/nerdctl/pkg/composer/serviceparser" - "github.com/containerd/nerdctl/pkg/idgen" + "github.com/containerd/nerdctl/v2/pkg/composer/serviceparser" + "github.com/containerd/nerdctl/v2/pkg/idgen" "golang.org/x/sync/errgroup" ) diff --git a/pkg/composer/serviceparser/build.go b/pkg/composer/serviceparser/build.go index 6859af2e95e..ed0046a95ed 100644 --- a/pkg/composer/serviceparser/build.go +++ b/pkg/composer/serviceparser/build.go @@ -26,7 +26,7 @@ import ( "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/identifiers" "github.com/containerd/log" - "github.com/containerd/nerdctl/pkg/reflectutil" + "github.com/containerd/nerdctl/v2/pkg/reflectutil" securejoin "github.com/cyphar/filepath-securejoin" ) diff --git a/pkg/composer/serviceparser/build_test.go b/pkg/composer/serviceparser/build_test.go index d0411054a94..55d2ecc2e87 100644 --- a/pkg/composer/serviceparser/build_test.go +++ b/pkg/composer/serviceparser/build_test.go @@ -19,8 +19,8 @@ package serviceparser import ( "testing" - "github.com/containerd/nerdctl/pkg/composer/projectloader" - "github.com/containerd/nerdctl/pkg/testutil" + "github.com/containerd/nerdctl/v2/pkg/composer/projectloader" + "github.com/containerd/nerdctl/v2/pkg/testutil" "gotest.tools/v3/assert" ) diff --git a/pkg/composer/serviceparser/serviceparser.go b/pkg/composer/serviceparser/serviceparser.go index b914437b250..60dd5ee8d86 100644 --- a/pkg/composer/serviceparser/serviceparser.go +++ b/pkg/composer/serviceparser/serviceparser.go @@ -32,7 +32,7 @@ import ( "github.com/containerd/containerd/contrib/nvidia" "github.com/containerd/containerd/identifiers" "github.com/containerd/log" - "github.com/containerd/nerdctl/pkg/reflectutil" + "github.com/containerd/nerdctl/v2/pkg/reflectutil" ) // ComposeExtensionKey defines fields used to implement extension features. diff --git a/pkg/composer/serviceparser/serviceparser_test.go b/pkg/composer/serviceparser/serviceparser_test.go index 72d96b1ab09..ca363e7c49b 100644 --- a/pkg/composer/serviceparser/serviceparser_test.go +++ b/pkg/composer/serviceparser/serviceparser_test.go @@ -24,9 +24,9 @@ import ( "testing" "github.com/compose-spec/compose-go/types" - "github.com/containerd/nerdctl/pkg/composer/projectloader" - "github.com/containerd/nerdctl/pkg/strutil" - "github.com/containerd/nerdctl/pkg/testutil" + "github.com/containerd/nerdctl/v2/pkg/composer/projectloader" + "github.com/containerd/nerdctl/v2/pkg/strutil" + "github.com/containerd/nerdctl/v2/pkg/testutil" "gotest.tools/v3/assert" ) diff --git a/pkg/composer/stop.go b/pkg/composer/stop.go index 6df54863815..6baa0f9edb2 100644 --- a/pkg/composer/stop.go +++ b/pkg/composer/stop.go @@ -23,9 +23,9 @@ import ( "github.com/containerd/containerd" "github.com/containerd/log" - "github.com/containerd/nerdctl/pkg/composer/serviceparser" - "github.com/containerd/nerdctl/pkg/labels" - "github.com/containerd/nerdctl/pkg/strutil" + "github.com/containerd/nerdctl/v2/pkg/composer/serviceparser" + "github.com/containerd/nerdctl/v2/pkg/labels" + "github.com/containerd/nerdctl/v2/pkg/strutil" ) // StopOptions stores all option input from `nerdctl compose stop` diff --git a/pkg/composer/up.go b/pkg/composer/up.go index 3e65ba89a71..eb2239476cd 100644 --- a/pkg/composer/up.go +++ b/pkg/composer/up.go @@ -23,8 +23,8 @@ import ( "github.com/compose-spec/compose-go/types" "github.com/containerd/log" - "github.com/containerd/nerdctl/pkg/composer/serviceparser" - "github.com/containerd/nerdctl/pkg/reflectutil" + "github.com/containerd/nerdctl/v2/pkg/composer/serviceparser" + "github.com/containerd/nerdctl/v2/pkg/reflectutil" ) type UpOptions struct { diff --git a/pkg/composer/up_network.go b/pkg/composer/up_network.go index 32d35bb7d77..65ffdd7dd1d 100644 --- a/pkg/composer/up_network.go +++ b/pkg/composer/up_network.go @@ -21,8 +21,8 @@ import ( "fmt" "github.com/containerd/log" - "github.com/containerd/nerdctl/pkg/labels" - "github.com/containerd/nerdctl/pkg/reflectutil" + "github.com/containerd/nerdctl/v2/pkg/labels" + "github.com/containerd/nerdctl/v2/pkg/reflectutil" ) func (c *Composer) upNetwork(ctx context.Context, shortName string) error { diff --git a/pkg/composer/up_service.go b/pkg/composer/up_service.go index 32f1e3b52a2..ce4a5d798b3 100644 --- a/pkg/composer/up_service.go +++ b/pkg/composer/up_service.go @@ -26,8 +26,8 @@ import ( "sync" "github.com/containerd/log" - "github.com/containerd/nerdctl/pkg/composer/serviceparser" - "github.com/containerd/nerdctl/pkg/labels" + "github.com/containerd/nerdctl/v2/pkg/composer/serviceparser" + "github.com/containerd/nerdctl/v2/pkg/labels" "golang.org/x/sync/errgroup" ) diff --git a/pkg/composer/up_volume.go b/pkg/composer/up_volume.go index b1578b89a03..11f0417b5dc 100644 --- a/pkg/composer/up_volume.go +++ b/pkg/composer/up_volume.go @@ -21,8 +21,8 @@ import ( "fmt" "github.com/containerd/log" - "github.com/containerd/nerdctl/pkg/labels" - "github.com/containerd/nerdctl/pkg/reflectutil" + "github.com/containerd/nerdctl/v2/pkg/labels" + "github.com/containerd/nerdctl/v2/pkg/reflectutil" ) func (c *Composer) upVolume(ctx context.Context, shortName string) error { diff --git a/pkg/config/config.go b/pkg/config/config.go index e393933779d..6c3273f9ea5 100644 --- a/pkg/config/config.go +++ b/pkg/config/config.go @@ -20,7 +20,7 @@ import ( "github.com/containerd/containerd" "github.com/containerd/containerd/defaults" "github.com/containerd/containerd/namespaces" - ncdefaults "github.com/containerd/nerdctl/pkg/defaults" + ncdefaults "github.com/containerd/nerdctl/v2/pkg/defaults" ) // Config corresponds to nerdctl.toml . diff --git a/pkg/containerinspector/containerinspector.go b/pkg/containerinspector/containerinspector.go index 4ff3624c4c1..c60f90baca3 100644 --- a/pkg/containerinspector/containerinspector.go +++ b/pkg/containerinspector/containerinspector.go @@ -22,7 +22,7 @@ import ( "github.com/containerd/containerd" "github.com/containerd/containerd/errdefs" "github.com/containerd/log" - "github.com/containerd/nerdctl/pkg/inspecttypes/native" + "github.com/containerd/nerdctl/v2/pkg/inspecttypes/native" "github.com/containerd/typeurl/v2" ) diff --git a/pkg/containerinspector/containerinspector_freebsd.go b/pkg/containerinspector/containerinspector_freebsd.go index c9c53558955..e5a2dbc42fb 100644 --- a/pkg/containerinspector/containerinspector_freebsd.go +++ b/pkg/containerinspector/containerinspector_freebsd.go @@ -19,7 +19,7 @@ package containerinspector import ( "context" - "github.com/containerd/nerdctl/pkg/inspecttypes/native" + "github.com/containerd/nerdctl/v2/pkg/inspecttypes/native" ) func InspectNetNS(ctx context.Context, pid int) (*native.NetNS, error) { diff --git a/pkg/containerinspector/containerinspector_linux.go b/pkg/containerinspector/containerinspector_linux.go index b409166d85e..2bf39fd5d56 100644 --- a/pkg/containerinspector/containerinspector_linux.go +++ b/pkg/containerinspector/containerinspector_linux.go @@ -22,7 +22,7 @@ import ( "net" "strings" - "github.com/containerd/nerdctl/pkg/inspecttypes/native" + "github.com/containerd/nerdctl/v2/pkg/inspecttypes/native" "github.com/containernetworking/plugins/pkg/ns" ) diff --git a/pkg/containerinspector/containerinspector_windows.go b/pkg/containerinspector/containerinspector_windows.go index c9c53558955..e5a2dbc42fb 100644 --- a/pkg/containerinspector/containerinspector_windows.go +++ b/pkg/containerinspector/containerinspector_windows.go @@ -19,7 +19,7 @@ package containerinspector import ( "context" - "github.com/containerd/nerdctl/pkg/inspecttypes/native" + "github.com/containerd/nerdctl/v2/pkg/inspecttypes/native" ) func InspectNetNS(ctx context.Context, pid int) (*native.NetNS, error) { diff --git a/pkg/containerutil/config.go b/pkg/containerutil/config.go index dfe4ec47e93..44bf50286dc 100644 --- a/pkg/containerutil/config.go +++ b/pkg/containerutil/config.go @@ -26,8 +26,8 @@ import ( "github.com/containerd/containerd" "github.com/containerd/containerd/oci" - "github.com/containerd/nerdctl/pkg/labels" - "github.com/containerd/nerdctl/pkg/netutil/nettype" + "github.com/containerd/nerdctl/v2/pkg/labels" + "github.com/containerd/nerdctl/v2/pkg/netutil/nettype" "github.com/opencontainers/runtime-spec/specs-go" ) diff --git a/pkg/containerutil/container_network_manager.go b/pkg/containerutil/container_network_manager.go index 67a49f2dd88..6dc57f2f08a 100644 --- a/pkg/containerutil/container_network_manager.go +++ b/pkg/containerutil/container_network_manager.go @@ -30,15 +30,15 @@ import ( "github.com/containerd/containerd" "github.com/containerd/containerd/containers" "github.com/containerd/containerd/oci" - "github.com/containerd/nerdctl/pkg/api/types" - "github.com/containerd/nerdctl/pkg/clientutil" - "github.com/containerd/nerdctl/pkg/dnsutil/hostsstore" - "github.com/containerd/nerdctl/pkg/idutil/containerwalker" - "github.com/containerd/nerdctl/pkg/labels" - "github.com/containerd/nerdctl/pkg/mountutil" - "github.com/containerd/nerdctl/pkg/netutil" - "github.com/containerd/nerdctl/pkg/netutil/nettype" - "github.com/containerd/nerdctl/pkg/strutil" + "github.com/containerd/nerdctl/v2/pkg/api/types" + "github.com/containerd/nerdctl/v2/pkg/clientutil" + "github.com/containerd/nerdctl/v2/pkg/dnsutil/hostsstore" + "github.com/containerd/nerdctl/v2/pkg/idutil/containerwalker" + "github.com/containerd/nerdctl/v2/pkg/labels" + "github.com/containerd/nerdctl/v2/pkg/mountutil" + "github.com/containerd/nerdctl/v2/pkg/netutil" + "github.com/containerd/nerdctl/v2/pkg/netutil/nettype" + "github.com/containerd/nerdctl/v2/pkg/strutil" "github.com/opencontainers/runtime-spec/specs-go" ) diff --git a/pkg/containerutil/container_network_manager_linux.go b/pkg/containerutil/container_network_manager_linux.go index 4702b2ce81b..e4d058f856f 100644 --- a/pkg/containerutil/container_network_manager_linux.go +++ b/pkg/containerutil/container_network_manager_linux.go @@ -25,13 +25,13 @@ import ( "github.com/containerd/containerd" "github.com/containerd/containerd/oci" "github.com/containerd/log" - "github.com/containerd/nerdctl/pkg/api/types" - "github.com/containerd/nerdctl/pkg/clientutil" - "github.com/containerd/nerdctl/pkg/dnsutil" - "github.com/containerd/nerdctl/pkg/dnsutil/hostsstore" - "github.com/containerd/nerdctl/pkg/netutil" - "github.com/containerd/nerdctl/pkg/resolvconf" - "github.com/containerd/nerdctl/pkg/rootlessutil" + "github.com/containerd/nerdctl/v2/pkg/api/types" + "github.com/containerd/nerdctl/v2/pkg/clientutil" + "github.com/containerd/nerdctl/v2/pkg/dnsutil" + "github.com/containerd/nerdctl/v2/pkg/dnsutil/hostsstore" + "github.com/containerd/nerdctl/v2/pkg/netutil" + "github.com/containerd/nerdctl/v2/pkg/resolvconf" + "github.com/containerd/nerdctl/v2/pkg/rootlessutil" ) type cniNetworkManagerPlatform struct { diff --git a/pkg/containerutil/container_network_manager_other.go b/pkg/containerutil/container_network_manager_other.go index af6c337e8b8..914a3553c1a 100644 --- a/pkg/containerutil/container_network_manager_other.go +++ b/pkg/containerutil/container_network_manager_other.go @@ -25,7 +25,7 @@ import ( "github.com/containerd/containerd" "github.com/containerd/containerd/oci" - "github.com/containerd/nerdctl/pkg/api/types" + "github.com/containerd/nerdctl/v2/pkg/api/types" ) type cniNetworkManagerPlatform struct { diff --git a/pkg/containerutil/container_network_manager_windows.go b/pkg/containerutil/container_network_manager_windows.go index 774c737ac82..ba7304c30f5 100644 --- a/pkg/containerutil/container_network_manager_windows.go +++ b/pkg/containerutil/container_network_manager_windows.go @@ -25,9 +25,9 @@ import ( "github.com/containerd/containerd/pkg/netns" gocni "github.com/containerd/go-cni" - "github.com/containerd/nerdctl/pkg/api/types" - "github.com/containerd/nerdctl/pkg/netutil" - "github.com/containerd/nerdctl/pkg/ocihook" + "github.com/containerd/nerdctl/v2/pkg/api/types" + "github.com/containerd/nerdctl/v2/pkg/netutil" + "github.com/containerd/nerdctl/v2/pkg/ocihook" ) type cniNetworkManagerPlatform struct { diff --git a/pkg/containerutil/containerutil.go b/pkg/containerutil/containerutil.go index 23d03545177..ad05e8fab5d 100644 --- a/pkg/containerutil/containerutil.go +++ b/pkg/containerutil/containerutil.go @@ -35,15 +35,15 @@ import ( "github.com/containerd/containerd/oci" "github.com/containerd/containerd/runtime/restart" "github.com/containerd/log" - "github.com/containerd/nerdctl/pkg/consoleutil" - "github.com/containerd/nerdctl/pkg/errutil" - "github.com/containerd/nerdctl/pkg/formatter" - "github.com/containerd/nerdctl/pkg/labels" - "github.com/containerd/nerdctl/pkg/nsutil" - "github.com/containerd/nerdctl/pkg/portutil" - "github.com/containerd/nerdctl/pkg/rootlessutil" - "github.com/containerd/nerdctl/pkg/signalutil" - "github.com/containerd/nerdctl/pkg/taskutil" + "github.com/containerd/nerdctl/v2/pkg/consoleutil" + "github.com/containerd/nerdctl/v2/pkg/errutil" + "github.com/containerd/nerdctl/v2/pkg/formatter" + "github.com/containerd/nerdctl/v2/pkg/labels" + "github.com/containerd/nerdctl/v2/pkg/nsutil" + "github.com/containerd/nerdctl/v2/pkg/portutil" + "github.com/containerd/nerdctl/v2/pkg/rootlessutil" + "github.com/containerd/nerdctl/v2/pkg/signalutil" + "github.com/containerd/nerdctl/v2/pkg/taskutil" "github.com/moby/sys/signal" "github.com/opencontainers/runtime-spec/specs-go" ) diff --git a/pkg/containerutil/cp_linux.go b/pkg/containerutil/cp_linux.go index 21fb413701b..7e6ed4928b7 100644 --- a/pkg/containerutil/cp_linux.go +++ b/pkg/containerutil/cp_linux.go @@ -32,8 +32,8 @@ import ( "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/mount" "github.com/containerd/log" - "github.com/containerd/nerdctl/pkg/rootlessutil" - "github.com/containerd/nerdctl/pkg/tarutil" + "github.com/containerd/nerdctl/v2/pkg/rootlessutil" + "github.com/containerd/nerdctl/v2/pkg/tarutil" securejoin "github.com/cyphar/filepath-securejoin" ) diff --git a/pkg/defaults/cgroup_linux.go b/pkg/defaults/cgroup_linux.go index caaae236e61..2a3963c52ee 100644 --- a/pkg/defaults/cgroup_linux.go +++ b/pkg/defaults/cgroup_linux.go @@ -20,7 +20,7 @@ import ( "os" "github.com/containerd/cgroups/v3" - "github.com/containerd/nerdctl/pkg/rootlessutil" + "github.com/containerd/nerdctl/v2/pkg/rootlessutil" ) func IsSystemdAvailable() bool { diff --git a/pkg/defaults/defaults_linux.go b/pkg/defaults/defaults_linux.go index 63f35ab93e5..76c5ffa60a5 100644 --- a/pkg/defaults/defaults_linux.go +++ b/pkg/defaults/defaults_linux.go @@ -25,7 +25,7 @@ import ( "github.com/containerd/containerd/plugin" gocni "github.com/containerd/go-cni" "github.com/containerd/log" - "github.com/containerd/nerdctl/pkg/rootlessutil" + "github.com/containerd/nerdctl/v2/pkg/rootlessutil" ) const ( diff --git a/pkg/dnsutil/dnsutil.go b/pkg/dnsutil/dnsutil.go index acbfc68c7c4..433a19b324b 100644 --- a/pkg/dnsutil/dnsutil.go +++ b/pkg/dnsutil/dnsutil.go @@ -19,7 +19,7 @@ package dnsutil import ( "context" - "github.com/containerd/nerdctl/pkg/rootlessutil" + "github.com/containerd/nerdctl/v2/pkg/rootlessutil" ) func GetSlirp4netnsDNS() ([]string, error) { diff --git a/pkg/dnsutil/hostsstore/hostsstore.go b/pkg/dnsutil/hostsstore/hostsstore.go index 40a7726e66d..1edb5256331 100644 --- a/pkg/dnsutil/hostsstore/hostsstore.go +++ b/pkg/dnsutil/hostsstore/hostsstore.go @@ -25,7 +25,7 @@ import ( "path/filepath" "github.com/containerd/containerd/errdefs" - "github.com/containerd/nerdctl/pkg/lockutil" + "github.com/containerd/nerdctl/v2/pkg/lockutil" types100 "github.com/containernetworking/cni/pkg/types/100" ) diff --git a/pkg/dnsutil/hostsstore/updater.go b/pkg/dnsutil/hostsstore/updater.go index 58116e8b5b8..2ce10385ca1 100644 --- a/pkg/dnsutil/hostsstore/updater.go +++ b/pkg/dnsutil/hostsstore/updater.go @@ -26,7 +26,7 @@ import ( "github.com/containerd/containerd/errdefs" "github.com/containerd/log" - "github.com/containerd/nerdctl/pkg/netutil" + "github.com/containerd/nerdctl/v2/pkg/netutil" ) // newUpdater creates an updater for hostsD (/var/lib/nerdctl//etchosts) diff --git a/pkg/flagutil/flagutil.go b/pkg/flagutil/flagutil.go index 064b8a8ab1a..663a5746161 100644 --- a/pkg/flagutil/flagutil.go +++ b/pkg/flagutil/flagutil.go @@ -23,7 +23,7 @@ import ( "os" "strings" - "github.com/containerd/nerdctl/pkg/strutil" + "github.com/containerd/nerdctl/v2/pkg/strutil" ) // ReplaceOrAppendEnvValues returns the defaults with the overrides either diff --git a/pkg/formatter/formatter.go b/pkg/formatter/formatter.go index f8374ff94e8..e8258bde35a 100644 --- a/pkg/formatter/formatter.go +++ b/pkg/formatter/formatter.go @@ -33,7 +33,7 @@ import ( "github.com/containerd/containerd/oci" "github.com/containerd/containerd/runtime/restart" "github.com/containerd/log" - "github.com/containerd/nerdctl/pkg/portutil" + "github.com/containerd/nerdctl/v2/pkg/portutil" "github.com/docker/go-units" ) diff --git a/pkg/idutil/containerwalker/containerwalker.go b/pkg/idutil/containerwalker/containerwalker.go index d90896e894b..94c497e9f10 100644 --- a/pkg/idutil/containerwalker/containerwalker.go +++ b/pkg/idutil/containerwalker/containerwalker.go @@ -23,7 +23,7 @@ import ( "strings" "github.com/containerd/containerd" - "github.com/containerd/nerdctl/pkg/labels" + "github.com/containerd/nerdctl/v2/pkg/labels" ) type Found struct { diff --git a/pkg/idutil/imagewalker/imagewalker.go b/pkg/idutil/imagewalker/imagewalker.go index a67f9e58051..68f8c9fe269 100644 --- a/pkg/idutil/imagewalker/imagewalker.go +++ b/pkg/idutil/imagewalker/imagewalker.go @@ -24,7 +24,7 @@ import ( "github.com/containerd/containerd" "github.com/containerd/containerd/images" - "github.com/containerd/nerdctl/pkg/referenceutil" + "github.com/containerd/nerdctl/v2/pkg/referenceutil" "github.com/opencontainers/go-digest" ) diff --git a/pkg/idutil/netwalker/netwalker.go b/pkg/idutil/netwalker/netwalker.go index cd92d4eaa89..40debd9bfd2 100644 --- a/pkg/idutil/netwalker/netwalker.go +++ b/pkg/idutil/netwalker/netwalker.go @@ -22,7 +22,7 @@ import ( "regexp" "strings" - "github.com/containerd/nerdctl/pkg/netutil" + "github.com/containerd/nerdctl/v2/pkg/netutil" ) type Found struct { diff --git a/pkg/imageinspector/imageinspector.go b/pkg/imageinspector/imageinspector.go index 3fff0bd5abe..239720e154f 100644 --- a/pkg/imageinspector/imageinspector.go +++ b/pkg/imageinspector/imageinspector.go @@ -22,8 +22,8 @@ import ( "github.com/containerd/containerd" "github.com/containerd/containerd/images" "github.com/containerd/log" - imgutil "github.com/containerd/nerdctl/pkg/imgutil" - "github.com/containerd/nerdctl/pkg/inspecttypes/native" + imgutil "github.com/containerd/nerdctl/v2/pkg/imgutil" + "github.com/containerd/nerdctl/v2/pkg/inspecttypes/native" ) // Inspect inspects the image, for the platform specified in image.platform. diff --git a/pkg/imgutil/commit/commit.go b/pkg/imgutil/commit/commit.go index 81bd0d6a425..38c866929c5 100644 --- a/pkg/imgutil/commit/commit.go +++ b/pkg/imgutil/commit/commit.go @@ -38,8 +38,8 @@ import ( "github.com/containerd/containerd/rootfs" "github.com/containerd/containerd/snapshots" "github.com/containerd/log" - imgutil "github.com/containerd/nerdctl/pkg/imgutil" - "github.com/containerd/nerdctl/pkg/labels" + imgutil "github.com/containerd/nerdctl/v2/pkg/imgutil" + "github.com/containerd/nerdctl/v2/pkg/labels" "github.com/opencontainers/go-digest" "github.com/opencontainers/image-spec/identity" "github.com/opencontainers/image-spec/specs-go" diff --git a/pkg/imgutil/converter/zstd.go b/pkg/imgutil/converter/zstd.go index 859f1d3cc0c..aee052bc07f 100644 --- a/pkg/imgutil/converter/zstd.go +++ b/pkg/imgutil/converter/zstd.go @@ -27,7 +27,7 @@ import ( "github.com/containerd/containerd/images/converter" "github.com/containerd/containerd/images/converter/uncompress" "github.com/containerd/log" - "github.com/containerd/nerdctl/pkg/api/types" + "github.com/containerd/nerdctl/v2/pkg/api/types" "github.com/klauspost/compress/zstd" ocispec "github.com/opencontainers/image-spec/specs-go/v1" ) diff --git a/pkg/imgutil/filtering.go b/pkg/imgutil/filtering.go index 898b6f1c1e2..ad31d0617e4 100644 --- a/pkg/imgutil/filtering.go +++ b/pkg/imgutil/filtering.go @@ -27,7 +27,7 @@ import ( "github.com/containerd/containerd/images" dockerreference "github.com/containerd/containerd/reference/docker" "github.com/containerd/log" - "github.com/containerd/nerdctl/pkg/referenceutil" + "github.com/containerd/nerdctl/v2/pkg/referenceutil" ) // Filter types supported to filter images. diff --git a/pkg/imgutil/imgutil.go b/pkg/imgutil/imgutil.go index 9dd63502cff..356836eae29 100644 --- a/pkg/imgutil/imgutil.go +++ b/pkg/imgutil/imgutil.go @@ -33,10 +33,10 @@ import ( "github.com/containerd/imgcrypt" "github.com/containerd/imgcrypt/images/encryption" "github.com/containerd/log" - "github.com/containerd/nerdctl/pkg/errutil" - "github.com/containerd/nerdctl/pkg/idutil/imagewalker" - "github.com/containerd/nerdctl/pkg/imgutil/dockerconfigresolver" - "github.com/containerd/nerdctl/pkg/imgutil/pull" + "github.com/containerd/nerdctl/v2/pkg/errutil" + "github.com/containerd/nerdctl/v2/pkg/idutil/imagewalker" + "github.com/containerd/nerdctl/v2/pkg/imgutil/dockerconfigresolver" + "github.com/containerd/nerdctl/v2/pkg/imgutil/pull" "github.com/docker/docker/errdefs" "github.com/opencontainers/image-spec/identity" ocispec "github.com/opencontainers/image-spec/specs-go/v1" diff --git a/pkg/imgutil/pull/pull.go b/pkg/imgutil/pull/pull.go index bbe18bf792a..dae303eaa1c 100644 --- a/pkg/imgutil/pull/pull.go +++ b/pkg/imgutil/pull/pull.go @@ -25,8 +25,8 @@ import ( "github.com/containerd/containerd/images" "github.com/containerd/containerd/remotes" "github.com/containerd/log" - "github.com/containerd/nerdctl/pkg/imgutil/jobs" - "github.com/containerd/nerdctl/pkg/platformutil" + "github.com/containerd/nerdctl/v2/pkg/imgutil/jobs" + "github.com/containerd/nerdctl/v2/pkg/platformutil" ocispec "github.com/opencontainers/image-spec/specs-go/v1" ) diff --git a/pkg/imgutil/push/push.go b/pkg/imgutil/push/push.go index 09930a3fa86..36b1774d741 100644 --- a/pkg/imgutil/push/push.go +++ b/pkg/imgutil/push/push.go @@ -32,7 +32,7 @@ import ( "github.com/containerd/containerd/remotes" "github.com/containerd/containerd/remotes/docker" "github.com/containerd/log" - "github.com/containerd/nerdctl/pkg/imgutil/jobs" + "github.com/containerd/nerdctl/v2/pkg/imgutil/jobs" ocispec "github.com/opencontainers/image-spec/specs-go/v1" "golang.org/x/sync/errgroup" diff --git a/pkg/imgutil/snapshotter.go b/pkg/imgutil/snapshotter.go index 694ea518e19..46ff8b5f3ac 100644 --- a/pkg/imgutil/snapshotter.go +++ b/pkg/imgutil/snapshotter.go @@ -24,7 +24,7 @@ import ( "github.com/containerd/containerd/images" ctdsnapshotters "github.com/containerd/containerd/pkg/snapshotters" "github.com/containerd/log" - "github.com/containerd/nerdctl/pkg/imgutil/pull" + "github.com/containerd/nerdctl/v2/pkg/imgutil/pull" "github.com/containerd/stargz-snapshotter/fs/source" ) diff --git a/pkg/imgutil/snapshotter_test.go b/pkg/imgutil/snapshotter_test.go index f50c863c296..f09da014012 100644 --- a/pkg/imgutil/snapshotter_test.go +++ b/pkg/imgutil/snapshotter_test.go @@ -23,7 +23,7 @@ import ( "github.com/containerd/containerd" ctdsnapshotters "github.com/containerd/containerd/pkg/snapshotters" - "github.com/containerd/nerdctl/pkg/imgutil/pull" + "github.com/containerd/nerdctl/v2/pkg/imgutil/pull" digest "github.com/opencontainers/go-digest" ocispec "github.com/opencontainers/image-spec/specs-go/v1" "gotest.tools/v3/assert" diff --git a/pkg/infoutil/infoutil.go b/pkg/infoutil/infoutil.go index e5eb2efddab..3b4c57e6968 100644 --- a/pkg/infoutil/infoutil.go +++ b/pkg/infoutil/infoutil.go @@ -30,11 +30,11 @@ import ( ptypes "github.com/containerd/containerd/protobuf/types" "github.com/containerd/containerd/services/introspection" "github.com/containerd/log" - "github.com/containerd/nerdctl/pkg/buildkitutil" - "github.com/containerd/nerdctl/pkg/inspecttypes/dockercompat" - "github.com/containerd/nerdctl/pkg/inspecttypes/native" - "github.com/containerd/nerdctl/pkg/logging" - "github.com/containerd/nerdctl/pkg/version" + "github.com/containerd/nerdctl/v2/pkg/buildkitutil" + "github.com/containerd/nerdctl/v2/pkg/inspecttypes/dockercompat" + "github.com/containerd/nerdctl/v2/pkg/inspecttypes/native" + "github.com/containerd/nerdctl/v2/pkg/logging" + "github.com/containerd/nerdctl/v2/pkg/version" ) func NativeDaemonInfo(ctx context.Context, client *containerd.Client) (*native.DaemonInfo, error) { diff --git a/pkg/infoutil/infoutil_freebsd.go b/pkg/infoutil/infoutil_freebsd.go index ca8d67c6eaa..4cf753ad9e4 100644 --- a/pkg/infoutil/infoutil_freebsd.go +++ b/pkg/infoutil/infoutil_freebsd.go @@ -17,7 +17,7 @@ package infoutil import ( - "github.com/containerd/nerdctl/pkg/inspecttypes/dockercompat" + "github.com/containerd/nerdctl/v2/pkg/inspecttypes/dockercompat" "github.com/docker/docker/pkg/sysinfo" ) diff --git a/pkg/infoutil/infoutil_linux.go b/pkg/infoutil/infoutil_linux.go index 2ed28e22aa9..8dbe95274b5 100644 --- a/pkg/infoutil/infoutil_linux.go +++ b/pkg/infoutil/infoutil_linux.go @@ -21,10 +21,10 @@ import ( "strings" "github.com/containerd/cgroups/v3" - "github.com/containerd/nerdctl/pkg/apparmorutil" - "github.com/containerd/nerdctl/pkg/defaults" - "github.com/containerd/nerdctl/pkg/inspecttypes/dockercompat" - "github.com/containerd/nerdctl/pkg/rootlessutil" + "github.com/containerd/nerdctl/v2/pkg/apparmorutil" + "github.com/containerd/nerdctl/v2/pkg/defaults" + "github.com/containerd/nerdctl/v2/pkg/inspecttypes/dockercompat" + "github.com/containerd/nerdctl/v2/pkg/rootlessutil" "github.com/docker/docker/pkg/meminfo" "github.com/docker/docker/pkg/sysinfo" ) diff --git a/pkg/infoutil/infoutil_test.go b/pkg/infoutil/infoutil_test.go index 632e9dd03c6..ebf6d367cf3 100644 --- a/pkg/infoutil/infoutil_test.go +++ b/pkg/infoutil/infoutil_test.go @@ -19,7 +19,7 @@ package infoutil import ( "testing" - "github.com/containerd/nerdctl/pkg/inspecttypes/dockercompat" + "github.com/containerd/nerdctl/v2/pkg/inspecttypes/dockercompat" "gotest.tools/v3/assert" ) diff --git a/pkg/infoutil/infoutil_windows.go b/pkg/infoutil/infoutil_windows.go index 3131731eb3a..7612bd2015a 100644 --- a/pkg/infoutil/infoutil_windows.go +++ b/pkg/infoutil/infoutil_windows.go @@ -17,7 +17,7 @@ package infoutil import ( - "github.com/containerd/nerdctl/pkg/inspecttypes/dockercompat" + "github.com/containerd/nerdctl/v2/pkg/inspecttypes/dockercompat" "github.com/docker/docker/pkg/sysinfo" ) diff --git a/pkg/inspecttypes/dockercompat/dockercompat.go b/pkg/inspecttypes/dockercompat/dockercompat.go index 2312274f9af..a344a2e9ec3 100644 --- a/pkg/inspecttypes/dockercompat/dockercompat.go +++ b/pkg/inspecttypes/dockercompat/dockercompat.go @@ -39,9 +39,9 @@ import ( "github.com/containerd/containerd/runtime/restart" gocni "github.com/containerd/go-cni" "github.com/containerd/log" - "github.com/containerd/nerdctl/pkg/imgutil" - "github.com/containerd/nerdctl/pkg/inspecttypes/native" - "github.com/containerd/nerdctl/pkg/labels" + "github.com/containerd/nerdctl/v2/pkg/imgutil" + "github.com/containerd/nerdctl/v2/pkg/inspecttypes/native" + "github.com/containerd/nerdctl/v2/pkg/labels" "github.com/docker/go-connections/nat" "github.com/opencontainers/runtime-spec/specs-go" "github.com/tidwall/gjson" diff --git a/pkg/ipfs/image.go b/pkg/ipfs/image.go index 0519eefbf15..ffe2db4eb34 100644 --- a/pkg/ipfs/image.go +++ b/pkg/ipfs/image.go @@ -27,10 +27,10 @@ import ( "github.com/containerd/containerd/images/converter" "github.com/containerd/containerd/remotes" "github.com/containerd/log" - "github.com/containerd/nerdctl/pkg/idutil/imagewalker" - "github.com/containerd/nerdctl/pkg/imgutil" - "github.com/containerd/nerdctl/pkg/platformutil" - "github.com/containerd/nerdctl/pkg/referenceutil" + "github.com/containerd/nerdctl/v2/pkg/idutil/imagewalker" + "github.com/containerd/nerdctl/v2/pkg/imgutil" + "github.com/containerd/nerdctl/v2/pkg/platformutil" + "github.com/containerd/nerdctl/v2/pkg/referenceutil" "github.com/containerd/stargz-snapshotter/ipfs" ipfsclient "github.com/containerd/stargz-snapshotter/ipfs/client" "github.com/docker/docker/errdefs" diff --git a/pkg/logging/cri_logger.go b/pkg/logging/cri_logger.go index 9865a99d6c1..c3c3b35efc3 100644 --- a/pkg/logging/cri_logger.go +++ b/pkg/logging/cri_logger.go @@ -34,7 +34,7 @@ import ( "time" "github.com/containerd/log" - "github.com/containerd/nerdctl/pkg/logging/tail" + "github.com/containerd/nerdctl/v2/pkg/logging/tail" ) // LogStreamType is the type of the stream in CRI container log. diff --git a/pkg/logging/fluentd_logger.go b/pkg/logging/fluentd_logger.go index 9abf9157962..5cc12e76c73 100644 --- a/pkg/logging/fluentd_logger.go +++ b/pkg/logging/fluentd_logger.go @@ -28,7 +28,7 @@ import ( "github.com/containerd/containerd/runtime/v2/logging" "github.com/containerd/log" - "github.com/containerd/nerdctl/pkg/strutil" + "github.com/containerd/nerdctl/v2/pkg/strutil" "github.com/fluent/fluent-logger-golang/fluent" ) diff --git a/pkg/logging/journald_logger.go b/pkg/logging/journald_logger.go index d5617eb8e97..02d49b0c411 100644 --- a/pkg/logging/journald_logger.go +++ b/pkg/logging/journald_logger.go @@ -30,7 +30,7 @@ import ( "github.com/containerd/containerd/runtime/v2/logging" "github.com/containerd/log" - "github.com/containerd/nerdctl/pkg/strutil" + "github.com/containerd/nerdctl/v2/pkg/strutil" "github.com/coreos/go-systemd/v22/journal" "github.com/docker/cli/templates" timetypes "github.com/docker/docker/api/types/time" diff --git a/pkg/logging/json_logger.go b/pkg/logging/json_logger.go index 88c8555d3e0..f30511897d2 100644 --- a/pkg/logging/json_logger.go +++ b/pkg/logging/json_logger.go @@ -28,8 +28,8 @@ import ( "github.com/containerd/containerd/runtime/v2/logging" "github.com/containerd/log" - "github.com/containerd/nerdctl/pkg/logging/jsonfile" - "github.com/containerd/nerdctl/pkg/strutil" + "github.com/containerd/nerdctl/v2/pkg/logging/jsonfile" + "github.com/containerd/nerdctl/v2/pkg/strutil" "github.com/docker/go-units" "github.com/fahedouch/go-logrotate" ) diff --git a/pkg/logging/log_viewer.go b/pkg/logging/log_viewer.go index b96670ac160..891086bc47c 100644 --- a/pkg/logging/log_viewer.go +++ b/pkg/logging/log_viewer.go @@ -24,7 +24,7 @@ import ( "path/filepath" "github.com/containerd/log" - "github.com/containerd/nerdctl/pkg/labels/k8slabels" + "github.com/containerd/nerdctl/v2/pkg/labels/k8slabels" ) // Type alias for functions which write out logs to the provided stdout/stderr Writers. diff --git a/pkg/logging/syslog_logger.go b/pkg/logging/syslog_logger.go index c5108e821b1..398d3a8ea67 100644 --- a/pkg/logging/syslog_logger.go +++ b/pkg/logging/syslog_logger.go @@ -32,7 +32,7 @@ import ( syslog "github.com/yuchanns/srslog" "github.com/containerd/containerd/runtime/v2/logging" - "github.com/containerd/nerdctl/pkg/strutil" + "github.com/containerd/nerdctl/v2/pkg/strutil" ) const ( diff --git a/pkg/mountutil/mountutil.go b/pkg/mountutil/mountutil.go index bb938d073a8..f8e184033b0 100644 --- a/pkg/mountutil/mountutil.go +++ b/pkg/mountutil/mountutil.go @@ -29,9 +29,9 @@ import ( "github.com/containerd/containerd/oci" "github.com/containerd/containerd/pkg/userns" "github.com/containerd/log" - "github.com/containerd/nerdctl/pkg/idgen" - "github.com/containerd/nerdctl/pkg/mountutil/volumestore" - "github.com/containerd/nerdctl/pkg/strutil" + "github.com/containerd/nerdctl/v2/pkg/idgen" + "github.com/containerd/nerdctl/v2/pkg/mountutil/volumestore" + "github.com/containerd/nerdctl/v2/pkg/strutil" "github.com/opencontainers/runtime-spec/specs-go" ) diff --git a/pkg/mountutil/mountutil_freebsd.go b/pkg/mountutil/mountutil_freebsd.go index 637bdfebc2b..dd9433af559 100644 --- a/pkg/mountutil/mountutil_freebsd.go +++ b/pkg/mountutil/mountutil_freebsd.go @@ -23,7 +23,7 @@ import ( "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/oci" "github.com/containerd/log" - "github.com/containerd/nerdctl/pkg/mountutil/volumestore" + "github.com/containerd/nerdctl/v2/pkg/mountutil/volumestore" ) const ( diff --git a/pkg/mountutil/mountutil_linux.go b/pkg/mountutil/mountutil_linux.go index ef46bdd6de1..d42112a2073 100644 --- a/pkg/mountutil/mountutil_linux.go +++ b/pkg/mountutil/mountutil_linux.go @@ -29,7 +29,7 @@ import ( "github.com/containerd/containerd/mount" "github.com/containerd/containerd/oci" "github.com/containerd/log" - "github.com/containerd/nerdctl/pkg/mountutil/volumestore" + "github.com/containerd/nerdctl/v2/pkg/mountutil/volumestore" "github.com/docker/go-units" mobymount "github.com/moby/sys/mount" "github.com/opencontainers/runtime-spec/specs-go" diff --git a/pkg/mountutil/mountutil_linux_test.go b/pkg/mountutil/mountutil_linux_test.go index c707837ea29..956dcd40447 100644 --- a/pkg/mountutil/mountutil_linux_test.go +++ b/pkg/mountutil/mountutil_linux_test.go @@ -23,8 +23,8 @@ import ( "github.com/containerd/containerd/mount" "github.com/containerd/containerd/oci" - "github.com/containerd/nerdctl/pkg/inspecttypes/native" - mocks "github.com/containerd/nerdctl/pkg/mountutil/mountutilmock" + "github.com/containerd/nerdctl/v2/pkg/inspecttypes/native" + mocks "github.com/containerd/nerdctl/v2/pkg/mountutil/mountutilmock" "github.com/opencontainers/runtime-spec/specs-go" "go.uber.org/mock/gomock" "gotest.tools/v3/assert" diff --git a/pkg/mountutil/mountutil_other.go b/pkg/mountutil/mountutil_other.go index 184926a1354..eed4431382a 100644 --- a/pkg/mountutil/mountutil_other.go +++ b/pkg/mountutil/mountutil_other.go @@ -23,7 +23,7 @@ import ( "path/filepath" "strings" - "github.com/containerd/nerdctl/pkg/mountutil/volumestore" + "github.com/containerd/nerdctl/v2/pkg/mountutil/volumestore" ) func splitVolumeSpec(s string) ([]string, error) { diff --git a/pkg/mountutil/mountutil_windows.go b/pkg/mountutil/mountutil_windows.go index 35faafb72ee..eee76ba40b6 100644 --- a/pkg/mountutil/mountutil_windows.go +++ b/pkg/mountutil/mountutil_windows.go @@ -34,7 +34,7 @@ import ( "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/oci" "github.com/containerd/log" - "github.com/containerd/nerdctl/pkg/mountutil/volumestore" + "github.com/containerd/nerdctl/v2/pkg/mountutil/volumestore" ) const ( diff --git a/pkg/mountutil/mountutil_windows_test.go b/pkg/mountutil/mountutil_windows_test.go index ed69dfdf96b..81322f9b8c6 100644 --- a/pkg/mountutil/mountutil_windows_test.go +++ b/pkg/mountutil/mountutil_windows_test.go @@ -21,8 +21,8 @@ import ( "strings" "testing" - "github.com/containerd/nerdctl/pkg/inspecttypes/native" - mocks "github.com/containerd/nerdctl/pkg/mountutil/mountutilmock" + "github.com/containerd/nerdctl/v2/pkg/inspecttypes/native" + mocks "github.com/containerd/nerdctl/v2/pkg/mountutil/mountutilmock" "github.com/opencontainers/runtime-spec/specs-go" "go.uber.org/mock/gomock" "gotest.tools/v3/assert" diff --git a/pkg/mountutil/mountutilmock/volumestore.mock.go b/pkg/mountutil/mountutilmock/volumestore.mock.go index 427d6138b55..b5c933cd125 100644 --- a/pkg/mountutil/mountutilmock/volumestore.mock.go +++ b/pkg/mountutil/mountutilmock/volumestore.mock.go @@ -19,7 +19,7 @@ package mountutilmock import ( "reflect" - "github.com/containerd/nerdctl/pkg/inspecttypes/native" + "github.com/containerd/nerdctl/v2/pkg/inspecttypes/native" "go.uber.org/mock/gomock" ) diff --git a/pkg/mountutil/volumestore/volumestore.go b/pkg/mountutil/volumestore/volumestore.go index f645a167e71..48fbbfa5397 100644 --- a/pkg/mountutil/volumestore/volumestore.go +++ b/pkg/mountutil/volumestore/volumestore.go @@ -24,9 +24,9 @@ import ( "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/identifiers" - "github.com/containerd/nerdctl/pkg/inspecttypes/native" - "github.com/containerd/nerdctl/pkg/lockutil" - "github.com/containerd/nerdctl/pkg/strutil" + "github.com/containerd/nerdctl/v2/pkg/inspecttypes/native" + "github.com/containerd/nerdctl/v2/pkg/lockutil" + "github.com/containerd/nerdctl/v2/pkg/strutil" ) // Path returns a string like `/var/lib/nerdctl/1935db59/volumes/default`. diff --git a/pkg/namestore/namestore.go b/pkg/namestore/namestore.go index 1ab9b4b3b18..73e073b911a 100644 --- a/pkg/namestore/namestore.go +++ b/pkg/namestore/namestore.go @@ -23,7 +23,7 @@ import ( "strings" "github.com/containerd/containerd/identifiers" - "github.com/containerd/nerdctl/pkg/lockutil" + "github.com/containerd/nerdctl/v2/pkg/lockutil" ) func New(dataStore, ns string) (NameStore, error) { diff --git a/pkg/netutil/netutil.go b/pkg/netutil/netutil.go index f6e0079cd9f..1a29d7dc67d 100644 --- a/pkg/netutil/netutil.go +++ b/pkg/netutil/netutil.go @@ -34,11 +34,11 @@ import ( "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/namespaces" "github.com/containerd/log" - "github.com/containerd/nerdctl/pkg/labels" - "github.com/containerd/nerdctl/pkg/lockutil" - "github.com/containerd/nerdctl/pkg/netutil/nettype" - subnetutil "github.com/containerd/nerdctl/pkg/netutil/subnet" - "github.com/containerd/nerdctl/pkg/strutil" + "github.com/containerd/nerdctl/v2/pkg/labels" + "github.com/containerd/nerdctl/v2/pkg/lockutil" + "github.com/containerd/nerdctl/v2/pkg/netutil/nettype" + subnetutil "github.com/containerd/nerdctl/v2/pkg/netutil/subnet" + "github.com/containerd/nerdctl/v2/pkg/strutil" "github.com/containernetworking/cni/libcni" ) diff --git a/pkg/netutil/netutil_linux_test.go b/pkg/netutil/netutil_linux_test.go index d3c090072a4..1f64dbbd5af 100644 --- a/pkg/netutil/netutil_linux_test.go +++ b/pkg/netutil/netutil_linux_test.go @@ -21,7 +21,7 @@ package netutil import ( "testing" - "github.com/containerd/nerdctl/pkg/rootlessutil" + "github.com/containerd/nerdctl/v2/pkg/rootlessutil" ) // Tests whether nerdctl properly creates the default network when required. diff --git a/pkg/netutil/netutil_test.go b/pkg/netutil/netutil_test.go index c102f281999..c3f692c397f 100644 --- a/pkg/netutil/netutil_test.go +++ b/pkg/netutil/netutil_test.go @@ -26,9 +26,9 @@ import ( "testing" "text/template" - ncdefaults "github.com/containerd/nerdctl/pkg/defaults" - "github.com/containerd/nerdctl/pkg/labels" - "github.com/containerd/nerdctl/pkg/testutil" + ncdefaults "github.com/containerd/nerdctl/v2/pkg/defaults" + "github.com/containerd/nerdctl/v2/pkg/labels" + "github.com/containerd/nerdctl/v2/pkg/testutil" "gotest.tools/v3/assert" ) diff --git a/pkg/netutil/netutil_unix.go b/pkg/netutil/netutil_unix.go index d149a1e9ebd..d935f0972ec 100644 --- a/pkg/netutil/netutil_unix.go +++ b/pkg/netutil/netutil_unix.go @@ -30,9 +30,9 @@ import ( "github.com/Masterminds/semver/v3" "github.com/containerd/log" - "github.com/containerd/nerdctl/pkg/defaults" - "github.com/containerd/nerdctl/pkg/strutil" - "github.com/containerd/nerdctl/pkg/systemutil" + "github.com/containerd/nerdctl/v2/pkg/defaults" + "github.com/containerd/nerdctl/v2/pkg/strutil" + "github.com/containerd/nerdctl/v2/pkg/systemutil" "github.com/mitchellh/mapstructure" "github.com/vishvananda/netlink" ) diff --git a/pkg/nsutil/nsutil_test.go b/pkg/nsutil/nsutil_test.go index 4c3645faf6e..7b6f19a8933 100644 --- a/pkg/nsutil/nsutil_test.go +++ b/pkg/nsutil/nsutil_test.go @@ -19,7 +19,7 @@ package nsutil_test import ( "testing" - "github.com/containerd/nerdctl/pkg/nsutil" + "github.com/containerd/nerdctl/v2/pkg/nsutil" "gotest.tools/v3/assert" ) diff --git a/pkg/ocihook/ocihook.go b/pkg/ocihook/ocihook.go index 222993c709c..1cd9b86e4ce 100644 --- a/pkg/ocihook/ocihook.go +++ b/pkg/ocihook/ocihook.go @@ -29,13 +29,13 @@ import ( gocni "github.com/containerd/go-cni" "github.com/containerd/log" - "github.com/containerd/nerdctl/pkg/bypass4netnsutil" - "github.com/containerd/nerdctl/pkg/dnsutil/hostsstore" - "github.com/containerd/nerdctl/pkg/labels" - "github.com/containerd/nerdctl/pkg/namestore" - "github.com/containerd/nerdctl/pkg/netutil" - "github.com/containerd/nerdctl/pkg/netutil/nettype" - "github.com/containerd/nerdctl/pkg/rootlessutil" + "github.com/containerd/nerdctl/v2/pkg/bypass4netnsutil" + "github.com/containerd/nerdctl/v2/pkg/dnsutil/hostsstore" + "github.com/containerd/nerdctl/v2/pkg/labels" + "github.com/containerd/nerdctl/v2/pkg/namestore" + "github.com/containerd/nerdctl/v2/pkg/netutil" + "github.com/containerd/nerdctl/v2/pkg/netutil/nettype" + "github.com/containerd/nerdctl/v2/pkg/rootlessutil" types100 "github.com/containernetworking/cni/pkg/types/100" "github.com/opencontainers/runtime-spec/specs-go" diff --git a/pkg/ocihook/ocihook_linux.go b/pkg/ocihook/ocihook_linux.go index fd9d7878c85..43cd714046d 100644 --- a/pkg/ocihook/ocihook_linux.go +++ b/pkg/ocihook/ocihook_linux.go @@ -19,8 +19,8 @@ package ocihook import ( "github.com/containerd/containerd/contrib/apparmor" "github.com/containerd/log" - "github.com/containerd/nerdctl/pkg/apparmorutil" - "github.com/containerd/nerdctl/pkg/defaults" + "github.com/containerd/nerdctl/v2/pkg/apparmorutil" + "github.com/containerd/nerdctl/v2/pkg/defaults" ) func loadAppArmor() { diff --git a/pkg/ocihook/rootless_linux.go b/pkg/ocihook/rootless_linux.go index 2b1f4db7730..582ad76f0d3 100644 --- a/pkg/ocihook/rootless_linux.go +++ b/pkg/ocihook/rootless_linux.go @@ -20,7 +20,7 @@ import ( "context" gocni "github.com/containerd/go-cni" - "github.com/containerd/nerdctl/pkg/rootlessutil" + "github.com/containerd/nerdctl/v2/pkg/rootlessutil" rlkclient "github.com/rootless-containers/rootlesskit/pkg/api/client" ) diff --git a/pkg/platformutil/platformutil.go b/pkg/platformutil/platformutil.go index 13e90dcdc15..fc5cc6f6296 100644 --- a/pkg/platformutil/platformutil.go +++ b/pkg/platformutil/platformutil.go @@ -20,7 +20,7 @@ import ( "fmt" "github.com/containerd/containerd/platforms" - "github.com/containerd/nerdctl/pkg/strutil" + "github.com/containerd/nerdctl/v2/pkg/strutil" ocispec "github.com/opencontainers/image-spec/specs-go/v1" ) diff --git a/pkg/portutil/port_allocate_linux.go b/pkg/portutil/port_allocate_linux.go index 75ae344a58d..bd396a52555 100644 --- a/pkg/portutil/port_allocate_linux.go +++ b/pkg/portutil/port_allocate_linux.go @@ -19,8 +19,8 @@ package portutil import ( "fmt" - "github.com/containerd/nerdctl/pkg/portutil/iptable" - "github.com/containerd/nerdctl/pkg/portutil/procnet" + "github.com/containerd/nerdctl/v2/pkg/portutil/iptable" + "github.com/containerd/nerdctl/v2/pkg/portutil/procnet" ) const ( diff --git a/pkg/portutil/portutil.go b/pkg/portutil/portutil.go index c8c132717e0..f0ffe9b96de 100644 --- a/pkg/portutil/portutil.go +++ b/pkg/portutil/portutil.go @@ -24,8 +24,8 @@ import ( gocni "github.com/containerd/go-cni" "github.com/containerd/log" - "github.com/containerd/nerdctl/pkg/labels" - "github.com/containerd/nerdctl/pkg/rootlessutil" + "github.com/containerd/nerdctl/v2/pkg/labels" + "github.com/containerd/nerdctl/v2/pkg/rootlessutil" "github.com/docker/go-connections/nat" ) diff --git a/pkg/portutil/portutil_test.go b/pkg/portutil/portutil_test.go index 8b15c07596c..87f0f5dc892 100644 --- a/pkg/portutil/portutil_test.go +++ b/pkg/portutil/portutil_test.go @@ -23,8 +23,8 @@ import ( "testing" gocni "github.com/containerd/go-cni" - "github.com/containerd/nerdctl/pkg/labels" - "github.com/containerd/nerdctl/pkg/rootlessutil" + "github.com/containerd/nerdctl/v2/pkg/labels" + "github.com/containerd/nerdctl/v2/pkg/rootlessutil" ) func TestTestParseFlagPWithPlatformSpec(t *testing.T) { diff --git a/pkg/signutil/cosignutil.go b/pkg/signutil/cosignutil.go index 2932353e0c8..8a3a3b26417 100644 --- a/pkg/signutil/cosignutil.go +++ b/pkg/signutil/cosignutil.go @@ -25,7 +25,7 @@ import ( "strings" "github.com/containerd/log" - "github.com/containerd/nerdctl/pkg/imgutil" + "github.com/containerd/nerdctl/v2/pkg/imgutil" ) // SignCosign signs an image(`rawRef`) using a cosign private key (`keyRef`) diff --git a/pkg/signutil/notationutil.go b/pkg/signutil/notationutil.go index b15c80aaf5f..297756ae470 100644 --- a/pkg/signutil/notationutil.go +++ b/pkg/signutil/notationutil.go @@ -24,7 +24,7 @@ import ( "strings" "github.com/containerd/log" - "github.com/containerd/nerdctl/pkg/imgutil" + "github.com/containerd/nerdctl/v2/pkg/imgutil" ) // SignNotation signs an image(`rawRef`) using a notation key name (`keyNameRef`) diff --git a/pkg/signutil/signutil.go b/pkg/signutil/signutil.go index d599458048c..6ddef610b6c 100644 --- a/pkg/signutil/signutil.go +++ b/pkg/signutil/signutil.go @@ -21,7 +21,7 @@ import ( "fmt" "github.com/containerd/log" - "github.com/containerd/nerdctl/pkg/api/types" + "github.com/containerd/nerdctl/v2/pkg/api/types" ) // Sign signs an image using a signer and options provided in options. diff --git a/pkg/snapshotterutil/sociutil.go b/pkg/snapshotterutil/sociutil.go index 5a4043ac9e6..9770a571316 100644 --- a/pkg/snapshotterutil/sociutil.go +++ b/pkg/snapshotterutil/sociutil.go @@ -24,7 +24,7 @@ import ( "strings" "github.com/containerd/log" - "github.com/containerd/nerdctl/pkg/api/types" + "github.com/containerd/nerdctl/v2/pkg/api/types" ) // CreateSoci creates a SOCI index(`rawRef`) diff --git a/pkg/taskutil/taskutil.go b/pkg/taskutil/taskutil.go index 022da8c7df2..101452f8b0e 100644 --- a/pkg/taskutil/taskutil.go +++ b/pkg/taskutil/taskutil.go @@ -31,9 +31,9 @@ import ( "github.com/containerd/containerd" "github.com/containerd/containerd/cio" "github.com/containerd/log" - "github.com/containerd/nerdctl/pkg/cioutil" - "github.com/containerd/nerdctl/pkg/consoleutil" - "github.com/containerd/nerdctl/pkg/infoutil" + "github.com/containerd/nerdctl/v2/pkg/cioutil" + "github.com/containerd/nerdctl/v2/pkg/consoleutil" + "github.com/containerd/nerdctl/v2/pkg/infoutil" "golang.org/x/term" ) diff --git a/pkg/testutil/testregistry/testregistry_linux.go b/pkg/testutil/testregistry/testregistry_linux.go index 9eb77985e9e..4b15df56e68 100644 --- a/pkg/testutil/testregistry/testregistry_linux.go +++ b/pkg/testutil/testregistry/testregistry_linux.go @@ -23,9 +23,9 @@ import ( "path/filepath" "strconv" - "github.com/containerd/nerdctl/pkg/testutil" - "github.com/containerd/nerdctl/pkg/testutil/nettestutil" - "github.com/containerd/nerdctl/pkg/testutil/testca" + "github.com/containerd/nerdctl/v2/pkg/testutil" + "github.com/containerd/nerdctl/v2/pkg/testutil/nettestutil" + "github.com/containerd/nerdctl/v2/pkg/testutil/testca" "golang.org/x/crypto/bcrypt" "gotest.tools/v3/assert" diff --git a/pkg/testutil/testsyslog/testsyslog.go b/pkg/testutil/testsyslog/testsyslog.go index 8d7b9aa6ef8..a5eeb0cbf37 100644 --- a/pkg/testutil/testsyslog/testsyslog.go +++ b/pkg/testutil/testsyslog/testsyslog.go @@ -26,8 +26,8 @@ import ( "runtime" "time" - "github.com/containerd/nerdctl/pkg/rootlessutil" - "github.com/containerd/nerdctl/pkg/testutil/testca" + "github.com/containerd/nerdctl/v2/pkg/rootlessutil" + "github.com/containerd/nerdctl/v2/pkg/testutil/testca" ) func StartServer(n, la string, done chan<- string, certs ...*testca.Cert) (addr string, sock io.Closer) { diff --git a/pkg/testutil/testutil.go b/pkg/testutil/testutil.go index 340ff7bf059..35d3bdef447 100644 --- a/pkg/testutil/testutil.go +++ b/pkg/testutil/testutil.go @@ -31,13 +31,13 @@ import ( "github.com/Masterminds/semver/v3" "github.com/containerd/containerd/defaults" - "github.com/containerd/nerdctl/pkg/buildkitutil" - "github.com/containerd/nerdctl/pkg/imgutil" - "github.com/containerd/nerdctl/pkg/infoutil" - "github.com/containerd/nerdctl/pkg/inspecttypes/dockercompat" - "github.com/containerd/nerdctl/pkg/inspecttypes/native" - "github.com/containerd/nerdctl/pkg/platformutil" - "github.com/containerd/nerdctl/pkg/rootlessutil" + "github.com/containerd/nerdctl/v2/pkg/buildkitutil" + "github.com/containerd/nerdctl/v2/pkg/imgutil" + "github.com/containerd/nerdctl/v2/pkg/infoutil" + "github.com/containerd/nerdctl/v2/pkg/inspecttypes/dockercompat" + "github.com/containerd/nerdctl/v2/pkg/inspecttypes/native" + "github.com/containerd/nerdctl/v2/pkg/platformutil" + "github.com/containerd/nerdctl/v2/pkg/rootlessutil" "github.com/opencontainers/go-digest" "gotest.tools/v3/assert" "gotest.tools/v3/icmd" diff --git a/pkg/testutil/testutil_windows.go b/pkg/testutil/testutil_windows.go index 5d4de6d24e5..76740064de5 100644 --- a/pkg/testutil/testutil_windows.go +++ b/pkg/testutil/testutil_windows.go @@ -23,7 +23,7 @@ import ( "sync" "github.com/Microsoft/hcsshim" - "github.com/containerd/nerdctl/pkg/inspecttypes/dockercompat" + "github.com/containerd/nerdctl/v2/pkg/inspecttypes/dockercompat" "golang.org/x/sys/windows/svc/mgr" )