go.mod: module github.com/containerd/nerdctl/v2

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

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

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
 

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"
 )
 

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"
 )
 

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"
 )
 

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"
 )
 

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"
 )
 

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"
 )

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"
 )
 

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"
 )
 

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"
 )
 

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"
 )
 

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) {

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"
 )
 

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"
 )
 

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) {

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"
 )
 

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"
 )
 

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"
 )
 

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"
 )
 

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"
 )
 

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) {

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"
 )
 

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) {

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"
 )
 

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"
 )
 

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"
 )

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) {

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"
 )
 

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) {

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"
 )
 

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"
 )
 

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) {