move go module to v2

With the advent of Podman 2.0.0 we crossed the magical barrier of go
modules.  While we were able to continue importing all packages inside
of the project, the project could not be vendored anymore from the
outside.

Move the go module to new major version and change all imports to
`github.com/containers/libpod/v2`.  The renaming of the imports
was done via `gomove` [1].

[1] https://github.com/KSubedi/gomove

Signed-off-by: Valentin Rothberg <rothberg@redhat.com>

cmd/podman/auto-update.go

@@ -4,9 +4,9 @@ import (
 	"fmt"
 
 	"github.com/containers/common/pkg/auth"
-	"github.com/containers/libpod/cmd/podman/registry"
+	"github.com/containers/libpod/v2/cmd/podman/registry"
-	"github.com/containers/libpod/pkg/domain/entities"
+	"github.com/containers/libpod/v2/pkg/domain/entities"
-	"github.com/containers/libpod/pkg/errorhandling"
+	"github.com/containers/libpod/v2/pkg/errorhandling"
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 )

cmd/podman/common/create.go

@@ -5,7 +5,7 @@ import (
 	"os"
 
 	"github.com/containers/common/pkg/auth"
-	"github.com/containers/libpod/cmd/podman/registry"
+	"github.com/containers/libpod/v2/cmd/podman/registry"
 	"github.com/spf13/pflag"
 )
 

cmd/podman/common/create_opts.go

@@ -1,6 +1,6 @@
 package common
 
-import "github.com/containers/libpod/pkg/domain/entities"
+import "github.com/containers/libpod/v2/pkg/domain/entities"
 
 type ContainerCLIOpts struct {
 	Annotation        []string

cmd/podman/common/createparse.go

@@ -1,7 +1,7 @@
 package common
 
 import (
-	"github.com/containers/libpod/pkg/util"
+	"github.com/containers/libpod/v2/pkg/util"
 	"github.com/pkg/errors"
 )
 

cmd/podman/common/default.go

@@ -1,7 +1,7 @@
 package common
 
 import (
-	"github.com/containers/libpod/cmd/podman/registry"
+	"github.com/containers/libpod/v2/cmd/podman/registry"
 )
 
 var (

cmd/podman/common/netflags.go

@@ -3,10 +3,10 @@ package common
 import (
 	"net"
 
-	"github.com/containers/libpod/cmd/podman/parse"
+	"github.com/containers/libpod/v2/cmd/podman/parse"
-	"github.com/containers/libpod/libpod/define"
+	"github.com/containers/libpod/v2/libpod/define"
-	"github.com/containers/libpod/pkg/domain/entities"
+	"github.com/containers/libpod/v2/pkg/domain/entities"
-	"github.com/containers/libpod/pkg/specgen"
+	"github.com/containers/libpod/v2/pkg/specgen"
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 	"github.com/spf13/pflag"

cmd/podman/common/specgen.go

@@ -9,15 +9,15 @@ import (
 
 	"github.com/containers/common/pkg/config"
 	"github.com/containers/image/v5/manifest"
-	"github.com/containers/libpod/cmd/podman/parse"
+	"github.com/containers/libpod/v2/cmd/podman/parse"
-	"github.com/containers/libpod/libpod/define"
+	"github.com/containers/libpod/v2/libpod/define"
-	ann "github.com/containers/libpod/pkg/annotations"
+	ann "github.com/containers/libpod/v2/pkg/annotations"
-	envLib "github.com/containers/libpod/pkg/env"
+	envLib "github.com/containers/libpod/v2/pkg/env"
-	ns "github.com/containers/libpod/pkg/namespaces"
+	ns "github.com/containers/libpod/v2/pkg/namespaces"
-	"github.com/containers/libpod/pkg/rootless"
+	"github.com/containers/libpod/v2/pkg/rootless"
-	"github.com/containers/libpod/pkg/specgen"
+	"github.com/containers/libpod/v2/pkg/specgen"
-	systemdGen "github.com/containers/libpod/pkg/systemd/generate"
+	systemdGen "github.com/containers/libpod/v2/pkg/systemd/generate"
-	"github.com/containers/libpod/pkg/util"
+	"github.com/containers/libpod/v2/pkg/util"
 	"github.com/docker/go-units"
 	"github.com/opencontainers/runtime-spec/specs-go"
 	"github.com/pkg/errors"

cmd/podman/common/util.go

@@ -6,7 +6,7 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/containers/libpod/pkg/specgen"
+	"github.com/containers/libpod/v2/pkg/specgen"
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
 )

cmd/podman/common/volumes.go

@@ -6,8 +6,8 @@ import (
 	"strings"
 
 	"github.com/containers/buildah/pkg/parse"
-	"github.com/containers/libpod/pkg/specgen"
+	"github.com/containers/libpod/v2/pkg/specgen"
-	"github.com/containers/libpod/pkg/util"
+	"github.com/containers/libpod/v2/pkg/util"
 	spec "github.com/opencontainers/runtime-spec/specs-go"
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"

cmd/podman/containers/attach.go

@@ -3,9 +3,9 @@ package containers
 import (
 	"os"
 
-	"github.com/containers/libpod/cmd/podman/registry"
+	"github.com/containers/libpod/v2/cmd/podman/registry"
-	"github.com/containers/libpod/cmd/podman/validate"
+	"github.com/containers/libpod/v2/cmd/podman/validate"
-	"github.com/containers/libpod/pkg/domain/entities"
+	"github.com/containers/libpod/v2/pkg/domain/entities"
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 	"github.com/spf13/pflag"

cmd/podman/containers/checkpoint.go

@@ -4,11 +4,11 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/containers/libpod/cmd/podman/registry"
+	"github.com/containers/libpod/v2/cmd/podman/registry"
-	"github.com/containers/libpod/cmd/podman/utils"
+	"github.com/containers/libpod/v2/cmd/podman/utils"
-	"github.com/containers/libpod/cmd/podman/validate"
+	"github.com/containers/libpod/v2/cmd/podman/validate"
-	"github.com/containers/libpod/pkg/domain/entities"
+	"github.com/containers/libpod/v2/pkg/domain/entities"
-	"github.com/containers/libpod/pkg/rootless"
+	"github.com/containers/libpod/v2/pkg/rootless"
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 )

cmd/podman/containers/cleanup.go

@@ -3,10 +3,10 @@ package containers
 import (
 	"fmt"
 
-	"github.com/containers/libpod/cmd/podman/registry"
+	"github.com/containers/libpod/v2/cmd/podman/registry"
-	"github.com/containers/libpod/cmd/podman/utils"
+	"github.com/containers/libpod/v2/cmd/podman/utils"
-	"github.com/containers/libpod/cmd/podman/validate"
+	"github.com/containers/libpod/v2/cmd/podman/validate"
-	"github.com/containers/libpod/pkg/domain/entities"
+	"github.com/containers/libpod/v2/pkg/domain/entities"
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"

cmd/podman/containers/commit.go

@@ -7,8 +7,8 @@ import (
 	"os"
 	"strings"
 
-	"github.com/containers/libpod/cmd/podman/registry"
+	"github.com/containers/libpod/v2/cmd/podman/registry"
-	"github.com/containers/libpod/pkg/domain/entities"
+	"github.com/containers/libpod/v2/pkg/domain/entities"
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 	"github.com/spf13/pflag"

cmd/podman/containers/container.go

@@ -1,10 +1,10 @@
 package containers
 
 import (
-	"github.com/containers/libpod/cmd/podman/registry"
+	"github.com/containers/libpod/v2/cmd/podman/registry"
-	"github.com/containers/libpod/cmd/podman/validate"
+	"github.com/containers/libpod/v2/cmd/podman/validate"
-	"github.com/containers/libpod/pkg/domain/entities"
+	"github.com/containers/libpod/v2/pkg/domain/entities"
-	"github.com/containers/libpod/pkg/util"
+	"github.com/containers/libpod/v2/pkg/util"
 	"github.com/spf13/cobra"
 )
 

cmd/podman/containers/cp.go

@@ -1,10 +1,10 @@
 package containers
 
 import (
-	"github.com/containers/libpod/cmd/podman/registry"
+	"github.com/containers/libpod/v2/cmd/podman/registry"
-	"github.com/containers/libpod/pkg/cgroups"
+	"github.com/containers/libpod/v2/pkg/cgroups"
-	"github.com/containers/libpod/pkg/domain/entities"
+	"github.com/containers/libpod/v2/pkg/domain/entities"
-	"github.com/containers/libpod/pkg/rootless"
+	"github.com/containers/libpod/v2/pkg/rootless"
 	"github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
 	"github.com/spf13/pflag"

cmd/podman/containers/create.go

@@ -9,13 +9,13 @@ import (
 	"github.com/containers/common/pkg/config"
 	"github.com/containers/image/v5/storage"
 	"github.com/containers/image/v5/transports/alltransports"
-	"github.com/containers/libpod/cmd/podman/common"
+	"github.com/containers/libpod/v2/cmd/podman/common"
-	"github.com/containers/libpod/cmd/podman/registry"
+	"github.com/containers/libpod/v2/cmd/podman/registry"
-	"github.com/containers/libpod/libpod/define"
+	"github.com/containers/libpod/v2/libpod/define"
-	"github.com/containers/libpod/pkg/domain/entities"
+	"github.com/containers/libpod/v2/pkg/domain/entities"
-	"github.com/containers/libpod/pkg/errorhandling"
+	"github.com/containers/libpod/v2/pkg/errorhandling"
-	"github.com/containers/libpod/pkg/specgen"
+	"github.com/containers/libpod/v2/pkg/specgen"
-	"github.com/containers/libpod/pkg/util"
+	"github.com/containers/libpod/v2/pkg/util"
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"

cmd/podman/containers/diff.go

@@ -1,10 +1,10 @@
 package containers
 
 import (
-	"github.com/containers/libpod/cmd/podman/registry"
+	"github.com/containers/libpod/v2/cmd/podman/registry"
-	"github.com/containers/libpod/cmd/podman/report"
+	"github.com/containers/libpod/v2/cmd/podman/report"
-	"github.com/containers/libpod/cmd/podman/validate"
+	"github.com/containers/libpod/v2/cmd/podman/validate"
-	"github.com/containers/libpod/pkg/domain/entities"
+	"github.com/containers/libpod/v2/pkg/domain/entities"
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 )

cmd/podman/containers/exec.go

@@ -5,11 +5,11 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/containers/libpod/cmd/podman/registry"
+	"github.com/containers/libpod/v2/cmd/podman/registry"
-	"github.com/containers/libpod/cmd/podman/validate"
+	"github.com/containers/libpod/v2/cmd/podman/validate"
-	"github.com/containers/libpod/libpod/define"
+	"github.com/containers/libpod/v2/libpod/define"
-	"github.com/containers/libpod/pkg/domain/entities"
+	"github.com/containers/libpod/v2/pkg/domain/entities"
-	envLib "github.com/containers/libpod/pkg/env"
+	envLib "github.com/containers/libpod/v2/pkg/env"
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 	"github.com/spf13/pflag"

cmd/podman/containers/exists.go

@@ -3,8 +3,8 @@ package containers
 import (
 	"context"
 
-	"github.com/containers/libpod/cmd/podman/registry"
+	"github.com/containers/libpod/v2/cmd/podman/registry"
-	"github.com/containers/libpod/pkg/domain/entities"
+	"github.com/containers/libpod/v2/pkg/domain/entities"
 	"github.com/spf13/cobra"
 )
 

cmd/podman/containers/export.go

@@ -4,9 +4,9 @@ import (
 	"context"
 	"os"
 
-	"github.com/containers/libpod/cmd/podman/parse"
+	"github.com/containers/libpod/v2/cmd/podman/parse"
-	"github.com/containers/libpod/cmd/podman/registry"
+	"github.com/containers/libpod/v2/cmd/podman/registry"
-	"github.com/containers/libpod/pkg/domain/entities"
+	"github.com/containers/libpod/v2/pkg/domain/entities"
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 	"github.com/spf13/pflag"

cmd/podman/containers/init.go

@@ -3,10 +3,10 @@ package containers
 import (
 	"fmt"
 
-	"github.com/containers/libpod/cmd/podman/registry"
+	"github.com/containers/libpod/v2/cmd/podman/registry"
-	"github.com/containers/libpod/cmd/podman/utils"
+	"github.com/containers/libpod/v2/cmd/podman/utils"
-	"github.com/containers/libpod/cmd/podman/validate"
+	"github.com/containers/libpod/v2/cmd/podman/validate"
-	"github.com/containers/libpod/pkg/domain/entities"
+	"github.com/containers/libpod/v2/pkg/domain/entities"
 	"github.com/spf13/cobra"
 	"github.com/spf13/pflag"
 )

cmd/podman/containers/inspect.go

@@ -1,10 +1,10 @@
 package containers
 
 import (
-	"github.com/containers/libpod/cmd/podman/inspect"
+	"github.com/containers/libpod/v2/cmd/podman/inspect"
-	"github.com/containers/libpod/cmd/podman/registry"
+	"github.com/containers/libpod/v2/cmd/podman/registry"
-	"github.com/containers/libpod/cmd/podman/validate"
+	"github.com/containers/libpod/v2/cmd/podman/validate"
-	"github.com/containers/libpod/pkg/domain/entities"
+	"github.com/containers/libpod/v2/pkg/domain/entities"
 	"github.com/spf13/cobra"
 )
 

cmd/podman/containers/kill.go

@@ -5,11 +5,11 @@ import (
 	"errors"
 	"fmt"
 
-	"github.com/containers/libpod/cmd/podman/registry"
+	"github.com/containers/libpod/v2/cmd/podman/registry"
-	"github.com/containers/libpod/cmd/podman/utils"
+	"github.com/containers/libpod/v2/cmd/podman/utils"
-	"github.com/containers/libpod/cmd/podman/validate"
+	"github.com/containers/libpod/v2/cmd/podman/validate"
-	"github.com/containers/libpod/pkg/domain/entities"
+	"github.com/containers/libpod/v2/pkg/domain/entities"
-	"github.com/containers/libpod/pkg/signal"
+	"github.com/containers/libpod/v2/pkg/signal"
 	"github.com/spf13/cobra"
 	"github.com/spf13/pflag"
 )

cmd/podman/containers/list.go

@@ -1,9 +1,9 @@
 package containers
 
 import (
-	"github.com/containers/libpod/cmd/podman/registry"
+	"github.com/containers/libpod/v2/cmd/podman/registry"
-	"github.com/containers/libpod/cmd/podman/validate"
+	"github.com/containers/libpod/v2/cmd/podman/validate"
-	"github.com/containers/libpod/pkg/domain/entities"
+	"github.com/containers/libpod/v2/pkg/domain/entities"
 	"github.com/spf13/cobra"
 )
 

cmd/podman/containers/logs.go

@@ -3,10 +3,10 @@ package containers
 import (
 	"os"
 
-	"github.com/containers/libpod/cmd/podman/registry"
+	"github.com/containers/libpod/v2/cmd/podman/registry"
-	"github.com/containers/libpod/cmd/podman/validate"
+	"github.com/containers/libpod/v2/cmd/podman/validate"
-	"github.com/containers/libpod/pkg/domain/entities"
+	"github.com/containers/libpod/v2/pkg/domain/entities"
-	"github.com/containers/libpod/pkg/util"
+	"github.com/containers/libpod/v2/pkg/util"
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 	"github.com/spf13/pflag"

cmd/podman/containers/mount.go

@@ -6,10 +6,10 @@ import (
 	"text/tabwriter"
 	"text/template"
 
-	"github.com/containers/libpod/cmd/podman/registry"
+	"github.com/containers/libpod/v2/cmd/podman/registry"
-	"github.com/containers/libpod/cmd/podman/utils"
+	"github.com/containers/libpod/v2/cmd/podman/utils"
-	"github.com/containers/libpod/cmd/podman/validate"
+	"github.com/containers/libpod/v2/cmd/podman/validate"
-	"github.com/containers/libpod/pkg/domain/entities"
+	"github.com/containers/libpod/v2/pkg/domain/entities"
 	"github.com/spf13/cobra"
 	"github.com/spf13/pflag"
 )

cmd/podman/containers/pause.go

@@ -4,10 +4,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/containers/libpod/cmd/podman/registry"
+	"github.com/containers/libpod/v2/cmd/podman/registry"
-	"github.com/containers/libpod/cmd/podman/utils"
+	"github.com/containers/libpod/v2/cmd/podman/utils"
-	"github.com/containers/libpod/pkg/domain/entities"
+	"github.com/containers/libpod/v2/pkg/domain/entities"
-	"github.com/containers/libpod/pkg/rootless"
+	"github.com/containers/libpod/v2/pkg/rootless"
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 	"github.com/spf13/pflag"

cmd/podman/containers/port.go

@@ -5,9 +5,9 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/containers/libpod/cmd/podman/registry"
+	"github.com/containers/libpod/v2/cmd/podman/registry"
-	"github.com/containers/libpod/cmd/podman/validate"
+	"github.com/containers/libpod/v2/cmd/podman/validate"
-	"github.com/containers/libpod/pkg/domain/entities"
+	"github.com/containers/libpod/v2/pkg/domain/entities"
 	"github.com/cri-o/ocicni/pkg/ocicni"
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"

cmd/podman/containers/prune.go

@@ -8,9 +8,9 @@ import (
 	"os"
 	"strings"
 
-	"github.com/containers/libpod/cmd/podman/registry"
+	"github.com/containers/libpod/v2/cmd/podman/registry"
-	"github.com/containers/libpod/cmd/podman/utils"
+	"github.com/containers/libpod/v2/cmd/podman/utils"
-	"github.com/containers/libpod/pkg/domain/entities"
+	"github.com/containers/libpod/v2/pkg/domain/entities"
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 )

cmd/podman/containers/ps.go

@@ -12,9 +12,9 @@ import (
 
 	tm "github.com/buger/goterm"
 	"github.com/containers/buildah/pkg/formats"
-	"github.com/containers/libpod/cmd/podman/registry"
+	"github.com/containers/libpod/v2/cmd/podman/registry"
-	"github.com/containers/libpod/cmd/podman/validate"
+	"github.com/containers/libpod/v2/cmd/podman/validate"
-	"github.com/containers/libpod/pkg/domain/entities"
+	"github.com/containers/libpod/v2/pkg/domain/entities"
 	"github.com/cri-o/ocicni/pkg/ocicni"
 	"github.com/docker/go-units"
 	"github.com/pkg/errors"

cmd/podman/containers/restart.go

@@ -4,11 +4,11 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/containers/libpod/cmd/podman/registry"
+	"github.com/containers/libpod/v2/cmd/podman/registry"
-	"github.com/containers/libpod/cmd/podman/utils"
+	"github.com/containers/libpod/v2/cmd/podman/utils"
-	"github.com/containers/libpod/cmd/podman/validate"
+	"github.com/containers/libpod/v2/cmd/podman/validate"
-	"github.com/containers/libpod/libpod/define"
+	"github.com/containers/libpod/v2/libpod/define"
-	"github.com/containers/libpod/pkg/domain/entities"
+	"github.com/containers/libpod/v2/pkg/domain/entities"
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 	"github.com/spf13/pflag"

cmd/podman/containers/restore.go

@@ -4,11 +4,11 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/containers/libpod/cmd/podman/registry"
+	"github.com/containers/libpod/v2/cmd/podman/registry"
-	"github.com/containers/libpod/cmd/podman/utils"
+	"github.com/containers/libpod/v2/cmd/podman/utils"
-	"github.com/containers/libpod/cmd/podman/validate"
+	"github.com/containers/libpod/v2/cmd/podman/validate"
-	"github.com/containers/libpod/pkg/domain/entities"
+	"github.com/containers/libpod/v2/pkg/domain/entities"
-	"github.com/containers/libpod/pkg/rootless"
+	"github.com/containers/libpod/v2/pkg/rootless"
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 )

cmd/podman/containers/rm.go

@@ -5,11 +5,11 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/containers/libpod/cmd/podman/registry"
+	"github.com/containers/libpod/v2/cmd/podman/registry"
-	"github.com/containers/libpod/cmd/podman/utils"
+	"github.com/containers/libpod/v2/cmd/podman/utils"
-	"github.com/containers/libpod/cmd/podman/validate"
+	"github.com/containers/libpod/v2/cmd/podman/validate"
-	"github.com/containers/libpod/libpod/define"
+	"github.com/containers/libpod/v2/libpod/define"
-	"github.com/containers/libpod/pkg/domain/entities"
+	"github.com/containers/libpod/v2/pkg/domain/entities"
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"

cmd/podman/containers/run.go

@@ -6,14 +6,14 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/containers/libpod/cmd/podman/common"
+	"github.com/containers/libpod/v2/cmd/podman/common"
-	"github.com/containers/libpod/cmd/podman/registry"
+	"github.com/containers/libpod/v2/cmd/podman/registry"
-	"github.com/containers/libpod/libpod/define"
+	"github.com/containers/libpod/v2/libpod/define"
-	"github.com/containers/libpod/pkg/domain/entities"
+	"github.com/containers/libpod/v2/pkg/domain/entities"
-	"github.com/containers/libpod/pkg/errorhandling"
+	"github.com/containers/libpod/v2/pkg/errorhandling"
-	"github.com/containers/libpod/pkg/rootless"
+	"github.com/containers/libpod/v2/pkg/rootless"
-	"github.com/containers/libpod/pkg/specgen"
+	"github.com/containers/libpod/v2/pkg/specgen"
-	"github.com/containers/libpod/pkg/util"
+	"github.com/containers/libpod/v2/pkg/util"
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"

cmd/podman/containers/runlabel.go

@@ -6,8 +6,8 @@ import (
 
 	"github.com/containers/common/pkg/auth"
 	"github.com/containers/image/v5/types"
-	"github.com/containers/libpod/cmd/podman/registry"
+	"github.com/containers/libpod/v2/cmd/podman/registry"
-	"github.com/containers/libpod/pkg/domain/entities"
+	"github.com/containers/libpod/v2/pkg/domain/entities"
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"

cmd/podman/containers/start.go

@@ -4,11 +4,11 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/containers/libpod/cmd/podman/registry"
+	"github.com/containers/libpod/v2/cmd/podman/registry"
-	"github.com/containers/libpod/cmd/podman/utils"
+	"github.com/containers/libpod/v2/cmd/podman/utils"
-	"github.com/containers/libpod/cmd/podman/validate"
+	"github.com/containers/libpod/v2/cmd/podman/validate"
-	"github.com/containers/libpod/libpod/define"
+	"github.com/containers/libpod/v2/libpod/define"
-	"github.com/containers/libpod/pkg/domain/entities"
+	"github.com/containers/libpod/v2/pkg/domain/entities"
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 	"github.com/spf13/pflag"

cmd/podman/containers/stats.go

@@ -9,13 +9,13 @@ import (
 	"text/template"
 
 	tm "github.com/buger/goterm"
-	"github.com/containers/libpod/cmd/podman/registry"
+	"github.com/containers/libpod/v2/cmd/podman/registry"
-	"github.com/containers/libpod/cmd/podman/validate"
+	"github.com/containers/libpod/v2/cmd/podman/validate"
-	"github.com/containers/libpod/libpod/define"
+	"github.com/containers/libpod/v2/libpod/define"
-	"github.com/containers/libpod/pkg/cgroups"
+	"github.com/containers/libpod/v2/pkg/cgroups"
-	"github.com/containers/libpod/pkg/domain/entities"
+	"github.com/containers/libpod/v2/pkg/domain/entities"
-	"github.com/containers/libpod/pkg/rootless"
+	"github.com/containers/libpod/v2/pkg/rootless"
-	"github.com/containers/libpod/utils"
+	"github.com/containers/libpod/v2/utils"
 	"github.com/docker/go-units"
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"

cmd/podman/containers/stop.go

@@ -4,10 +4,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/containers/libpod/cmd/podman/registry"
+	"github.com/containers/libpod/v2/cmd/podman/registry"
-	"github.com/containers/libpod/cmd/podman/utils"
+	"github.com/containers/libpod/v2/cmd/podman/utils"
-	"github.com/containers/libpod/cmd/podman/validate"
+	"github.com/containers/libpod/v2/cmd/podman/validate"
-	"github.com/containers/libpod/pkg/domain/entities"
+	"github.com/containers/libpod/v2/pkg/domain/entities"
 	"github.com/spf13/cobra"
 	"github.com/spf13/pflag"
 )

cmd/podman/containers/top.go

@@ -7,10 +7,10 @@ import (
 	"strings"
 	"text/tabwriter"
 
-	"github.com/containers/libpod/cmd/podman/registry"
+	"github.com/containers/libpod/v2/cmd/podman/registry"
-	"github.com/containers/libpod/cmd/podman/validate"
+	"github.com/containers/libpod/v2/cmd/podman/validate"
-	"github.com/containers/libpod/pkg/domain/entities"
+	"github.com/containers/libpod/v2/pkg/domain/entities"
-	"github.com/containers/libpod/pkg/util"
+	"github.com/containers/libpod/v2/pkg/util"
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 	"github.com/spf13/pflag"

cmd/podman/containers/unmount.go

@@ -3,10 +3,10 @@ package containers
 import (
 	"fmt"
 
-	"github.com/containers/libpod/cmd/podman/registry"
+	"github.com/containers/libpod/v2/cmd/podman/registry"
-	"github.com/containers/libpod/cmd/podman/utils"
+	"github.com/containers/libpod/v2/cmd/podman/utils"
-	"github.com/containers/libpod/cmd/podman/validate"
+	"github.com/containers/libpod/v2/cmd/podman/validate"
-	"github.com/containers/libpod/pkg/domain/entities"
+	"github.com/containers/libpod/v2/pkg/domain/entities"
 	"github.com/spf13/cobra"
 	"github.com/spf13/pflag"
 )

cmd/podman/containers/unpause.go

@@ -4,10 +4,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/containers/libpod/cmd/podman/registry"
+	"github.com/containers/libpod/v2/cmd/podman/registry"
-	"github.com/containers/libpod/cmd/podman/utils"
+	"github.com/containers/libpod/v2/cmd/podman/utils"
-	"github.com/containers/libpod/pkg/domain/entities"
+	"github.com/containers/libpod/v2/pkg/domain/entities"
-	"github.com/containers/libpod/pkg/rootless"
+	"github.com/containers/libpod/v2/pkg/rootless"
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 	"github.com/spf13/pflag"

cmd/podman/containers/wait.go

@@ -5,11 +5,11 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/containers/libpod/cmd/podman/registry"
+	"github.com/containers/libpod/v2/cmd/podman/registry"
-	"github.com/containers/libpod/cmd/podman/utils"
+	"github.com/containers/libpod/v2/cmd/podman/utils"
-	"github.com/containers/libpod/cmd/podman/validate"
+	"github.com/containers/libpod/v2/cmd/podman/validate"
-	"github.com/containers/libpod/libpod/define"
+	"github.com/containers/libpod/v2/libpod/define"
-	"github.com/containers/libpod/pkg/domain/entities"
+	"github.com/containers/libpod/v2/pkg/domain/entities"
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 	"github.com/spf13/pflag"

cmd/podman/diff.go

@@ -3,11 +3,11 @@ package main
 import (
 	"fmt"
 
-	"github.com/containers/libpod/cmd/podman/containers"
+	"github.com/containers/libpod/v2/cmd/podman/containers"
-	"github.com/containers/libpod/cmd/podman/images"
+	"github.com/containers/libpod/v2/cmd/podman/images"
-	"github.com/containers/libpod/cmd/podman/registry"
+	"github.com/containers/libpod/v2/cmd/podman/registry"
-	"github.com/containers/libpod/cmd/podman/validate"
+	"github.com/containers/libpod/v2/cmd/podman/validate"
-	"github.com/containers/libpod/pkg/domain/entities"
+	"github.com/containers/libpod/v2/pkg/domain/entities"
 	"github.com/spf13/cobra"
 )
 

cmd/podman/generate/generate.go

@@ -1,10 +1,10 @@
 package pods
 
 import (
-	"github.com/containers/libpod/cmd/podman/registry"
+	"github.com/containers/libpod/v2/cmd/podman/registry"
-	"github.com/containers/libpod/cmd/podman/validate"
+	"github.com/containers/libpod/v2/cmd/podman/validate"
-	"github.com/containers/libpod/pkg/domain/entities"
+	"github.com/containers/libpod/v2/pkg/domain/entities"
-	"github.com/containers/libpod/pkg/util"
+	"github.com/containers/libpod/v2/pkg/util"
 	"github.com/spf13/cobra"
 )
 

cmd/podman/generate/kube.go

@@ -5,9 +5,9 @@ import (
 	"io/ioutil"
 	"os"
 
-	"github.com/containers/libpod/cmd/podman/registry"
+	"github.com/containers/libpod/v2/cmd/podman/registry"
-	"github.com/containers/libpod/cmd/podman/utils"
+	"github.com/containers/libpod/v2/cmd/podman/utils"
-	"github.com/containers/libpod/pkg/domain/entities"
+	"github.com/containers/libpod/v2/pkg/domain/entities"
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 )

cmd/podman/generate/systemd.go

@@ -3,9 +3,9 @@ package pods
 import (
 	"fmt"
 
-	"github.com/containers/libpod/cmd/podman/registry"
+	"github.com/containers/libpod/v2/cmd/podman/registry"
-	"github.com/containers/libpod/cmd/podman/utils"
+	"github.com/containers/libpod/v2/cmd/podman/utils"
-	"github.com/containers/libpod/pkg/domain/entities"
+	"github.com/containers/libpod/v2/pkg/domain/entities"
 	"github.com/spf13/cobra"
 )
 

cmd/podman/healthcheck/healthcheck.go

@@ -1,9 +1,9 @@
 package healthcheck
 
 import (
-	"github.com/containers/libpod/cmd/podman/registry"
+	"github.com/containers/libpod/v2/cmd/podman/registry"
-	"github.com/containers/libpod/cmd/podman/validate"
+	"github.com/containers/libpod/v2/cmd/podman/validate"
-	"github.com/containers/libpod/pkg/domain/entities"
+	"github.com/containers/libpod/v2/pkg/domain/entities"
 	"github.com/spf13/cobra"
 )
 

cmd/podman/healthcheck/run.go

@@ -4,8 +4,8 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/containers/libpod/cmd/podman/registry"
+	"github.com/containers/libpod/v2/cmd/podman/registry"
-	"github.com/containers/libpod/pkg/domain/entities"
+	"github.com/containers/libpod/v2/pkg/domain/entities"
 	"github.com/spf13/cobra"
 )
 

cmd/podman/images/build.go

@@ -10,9 +10,9 @@ import (
 	buildahCLI "github.com/containers/buildah/pkg/cli"
 	"github.com/containers/buildah/pkg/parse"
 	"github.com/containers/common/pkg/config"
-	"github.com/containers/libpod/cmd/podman/registry"
+	"github.com/containers/libpod/v2/cmd/podman/registry"
-	"github.com/containers/libpod/cmd/podman/utils"
+	"github.com/containers/libpod/v2/cmd/podman/utils"
-	"github.com/containers/libpod/pkg/domain/entities"
+	"github.com/containers/libpod/v2/pkg/domain/entities"
 	"github.com/docker/go-units"
 	"github.com/opencontainers/runtime-spec/specs-go"
 	"github.com/pkg/errors"

cmd/podman/images/diff.go

@@ -1,9 +1,9 @@
 package images
 
 import (
-	"github.com/containers/libpod/cmd/podman/registry"
+	"github.com/containers/libpod/v2/cmd/podman/registry"
-	"github.com/containers/libpod/cmd/podman/report"
+	"github.com/containers/libpod/v2/cmd/podman/report"
-	"github.com/containers/libpod/pkg/domain/entities"
+	"github.com/containers/libpod/v2/pkg/domain/entities"
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 	"github.com/spf13/pflag"

cmd/podman/images/exists.go

@@ -1,8 +1,8 @@
 package images
 
 import (
-	"github.com/containers/libpod/cmd/podman/registry"
+	"github.com/containers/libpod/v2/cmd/podman/registry"
-	"github.com/containers/libpod/pkg/domain/entities"
+	"github.com/containers/libpod/v2/pkg/domain/entities"
 	"github.com/spf13/cobra"
 )
 

cmd/podman/images/history.go

@@ -10,8 +10,8 @@ import (
 	"time"
 	"unicode"
 
-	"github.com/containers/libpod/cmd/podman/registry"
+	"github.com/containers/libpod/v2/cmd/podman/registry"
-	"github.com/containers/libpod/pkg/domain/entities"
+	"github.com/containers/libpod/v2/pkg/domain/entities"
 	"github.com/docker/go-units"
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"

cmd/podman/images/image.go

@@ -1,9 +1,9 @@
 package images
 
 import (
-	"github.com/containers/libpod/cmd/podman/registry"
+	"github.com/containers/libpod/v2/cmd/podman/registry"
-	"github.com/containers/libpod/cmd/podman/validate"
+	"github.com/containers/libpod/v2/cmd/podman/validate"
-	"github.com/containers/libpod/pkg/domain/entities"
+	"github.com/containers/libpod/v2/pkg/domain/entities"
 	"github.com/spf13/cobra"
 )
 

cmd/podman/images/images.go

@@ -3,8 +3,8 @@ package images
 import (
 	"strings"
 
-	"github.com/containers/libpod/cmd/podman/registry"
+	"github.com/containers/libpod/v2/cmd/podman/registry"
-	"github.com/containers/libpod/pkg/domain/entities"
+	"github.com/containers/libpod/v2/pkg/domain/entities"
 	"github.com/spf13/cobra"
 )
 

cmd/podman/images/import.go

@@ -4,9 +4,9 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/containers/libpod/cmd/podman/parse"
+	"github.com/containers/libpod/v2/cmd/podman/parse"
-	"github.com/containers/libpod/cmd/podman/registry"
+	"github.com/containers/libpod/v2/cmd/podman/registry"
-	"github.com/containers/libpod/pkg/domain/entities"
+	"github.com/containers/libpod/v2/pkg/domain/entities"
 	"github.com/hashicorp/go-multierror"
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"

cmd/podman/images/inspect.go

@@ -1,9 +1,9 @@
 package images
 
 import (
-	"github.com/containers/libpod/cmd/podman/inspect"
+	"github.com/containers/libpod/v2/cmd/podman/inspect"
-	"github.com/containers/libpod/cmd/podman/registry"
+	"github.com/containers/libpod/v2/cmd/podman/registry"
-	"github.com/containers/libpod/pkg/domain/entities"
+	"github.com/containers/libpod/v2/pkg/domain/entities"
 	"github.com/spf13/cobra"
 )
 

cmd/podman/images/list.go

@@ -11,8 +11,8 @@ import (
 	"time"
 	"unicode"
 
-	"github.com/containers/libpod/cmd/podman/registry"
+	"github.com/containers/libpod/v2/cmd/podman/registry"
-	"github.com/containers/libpod/pkg/domain/entities"
+	"github.com/containers/libpod/v2/pkg/domain/entities"
 	"github.com/docker/go-units"
 	"github.com/spf13/cobra"
 	"github.com/spf13/pflag"

cmd/podman/images/load.go

@@ -9,10 +9,10 @@ import (
 	"strings"
 
 	"github.com/containers/image/v5/docker/reference"
-	"github.com/containers/libpod/cmd/podman/parse"
+	"github.com/containers/libpod/v2/cmd/podman/parse"
-	"github.com/containers/libpod/cmd/podman/registry"
+	"github.com/containers/libpod/v2/cmd/podman/registry"
-	"github.com/containers/libpod/pkg/domain/entities"
+	"github.com/containers/libpod/v2/pkg/domain/entities"
-	"github.com/containers/libpod/pkg/util"
+	"github.com/containers/libpod/v2/pkg/util"
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 	"github.com/spf13/pflag"

cmd/podman/images/prune.go

@@ -6,10 +6,10 @@ import (
 	"os"
 	"strings"
 
-	"github.com/containers/libpod/cmd/podman/registry"
+	"github.com/containers/libpod/v2/cmd/podman/registry"
-	"github.com/containers/libpod/cmd/podman/utils"
+	"github.com/containers/libpod/v2/cmd/podman/utils"
-	"github.com/containers/libpod/cmd/podman/validate"
+	"github.com/containers/libpod/v2/cmd/podman/validate"
-	"github.com/containers/libpod/pkg/domain/entities"
+	"github.com/containers/libpod/v2/pkg/domain/entities"
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 )

cmd/podman/images/pull.go

@@ -6,9 +6,9 @@ import (
 
 	"github.com/containers/common/pkg/auth"
 	"github.com/containers/image/v5/types"
-	"github.com/containers/libpod/cmd/podman/registry"
+	"github.com/containers/libpod/v2/cmd/podman/registry"
-	"github.com/containers/libpod/pkg/domain/entities"
+	"github.com/containers/libpod/v2/pkg/domain/entities"
-	"github.com/containers/libpod/pkg/util"
+	"github.com/containers/libpod/v2/pkg/util"
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 	"github.com/spf13/pflag"

cmd/podman/images/push.go

@@ -5,9 +5,9 @@ import (
 
 	"github.com/containers/common/pkg/auth"
 	"github.com/containers/image/v5/types"
-	"github.com/containers/libpod/cmd/podman/registry"
+	"github.com/containers/libpod/v2/cmd/podman/registry"
-	"github.com/containers/libpod/pkg/domain/entities"
+	"github.com/containers/libpod/v2/pkg/domain/entities"
-	"github.com/containers/libpod/pkg/util"
+	"github.com/containers/libpod/v2/pkg/util"
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 	"github.com/spf13/pflag"

cmd/podman/images/rm.go

@@ -3,9 +3,9 @@ package images
 import (
 	"fmt"
 
-	"github.com/containers/libpod/cmd/podman/registry"
+	"github.com/containers/libpod/v2/cmd/podman/registry"
-	"github.com/containers/libpod/pkg/domain/entities"
+	"github.com/containers/libpod/v2/pkg/domain/entities"
-	"github.com/containers/libpod/pkg/errorhandling"
+	"github.com/containers/libpod/v2/pkg/errorhandling"
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 	"github.com/spf13/pflag"

cmd/podman/images/rmi.go

@@ -3,8 +3,8 @@ package images
 import (
 	"strings"
 
-	"github.com/containers/libpod/cmd/podman/registry"
+	"github.com/containers/libpod/v2/cmd/podman/registry"
-	"github.com/containers/libpod/pkg/domain/entities"
+	"github.com/containers/libpod/v2/pkg/domain/entities"
 	"github.com/spf13/cobra"
 )
 

cmd/podman/images/save.go

@@ -5,12 +5,12 @@ import (
 	"os"
 	"strings"
 
-	"github.com/containers/libpod/libpod/define"
+	"github.com/containers/libpod/v2/libpod/define"
 
-	"github.com/containers/libpod/cmd/podman/parse"
+	"github.com/containers/libpod/v2/cmd/podman/parse"
-	"github.com/containers/libpod/cmd/podman/registry"
+	"github.com/containers/libpod/v2/cmd/podman/registry"
-	"github.com/containers/libpod/pkg/domain/entities"
+	"github.com/containers/libpod/v2/pkg/domain/entities"
-	"github.com/containers/libpod/pkg/util"
+	"github.com/containers/libpod/v2/pkg/util"
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 	"github.com/spf13/pflag"

cmd/podman/images/search.go

@@ -8,9 +8,9 @@ import (
 	"github.com/containers/buildah/pkg/formats"
 	"github.com/containers/common/pkg/auth"
 	"github.com/containers/image/v5/types"
-	"github.com/containers/libpod/cmd/podman/registry"
+	"github.com/containers/libpod/v2/cmd/podman/registry"
-	"github.com/containers/libpod/pkg/domain/entities"
+	"github.com/containers/libpod/v2/pkg/domain/entities"
-	"github.com/containers/libpod/pkg/util/camelcase"
+	"github.com/containers/libpod/v2/pkg/util/camelcase"
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 	"github.com/spf13/pflag"

cmd/podman/images/sign.go

@@ -3,8 +3,8 @@ package images
 import (
 	"os"
 
-	"github.com/containers/libpod/cmd/podman/registry"
+	"github.com/containers/libpod/v2/cmd/podman/registry"
-	"github.com/containers/libpod/pkg/domain/entities"
+	"github.com/containers/libpod/v2/pkg/domain/entities"
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 )

cmd/podman/images/tag.go

@@ -1,8 +1,8 @@
 package images
 
 import (
-	"github.com/containers/libpod/cmd/podman/registry"
+	"github.com/containers/libpod/v2/cmd/podman/registry"
-	"github.com/containers/libpod/pkg/domain/entities"
+	"github.com/containers/libpod/v2/pkg/domain/entities"
 	"github.com/spf13/cobra"
 )
 

cmd/podman/images/tree.go

@@ -3,8 +3,8 @@ package images
 import (
 	"fmt"
 
-	"github.com/containers/libpod/cmd/podman/registry"
+	"github.com/containers/libpod/v2/cmd/podman/registry"
-	"github.com/containers/libpod/pkg/domain/entities"
+	"github.com/containers/libpod/v2/pkg/domain/entities"
 	"github.com/spf13/cobra"
 )
 

cmd/podman/images/trust.go

@@ -1,9 +1,9 @@
 package images
 
 import (
-	"github.com/containers/libpod/cmd/podman/registry"
+	"github.com/containers/libpod/v2/cmd/podman/registry"
-	"github.com/containers/libpod/cmd/podman/validate"
+	"github.com/containers/libpod/v2/cmd/podman/validate"
-	"github.com/containers/libpod/pkg/domain/entities"
+	"github.com/containers/libpod/v2/pkg/domain/entities"
 	"github.com/spf13/cobra"
 )
 

cmd/podman/images/trust_set.go

@@ -1,10 +1,10 @@
 package images
 
 import (
-	"github.com/containers/libpod/cmd/podman/registry"
+	"github.com/containers/libpod/v2/cmd/podman/registry"
-	"github.com/containers/libpod/libpod/image"
+	"github.com/containers/libpod/v2/libpod/image"
-	"github.com/containers/libpod/pkg/domain/entities"
+	"github.com/containers/libpod/v2/pkg/domain/entities"
-	"github.com/containers/libpod/pkg/util"
+	"github.com/containers/libpod/v2/pkg/util"
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 )

cmd/podman/images/trust_show.go

@@ -6,8 +6,8 @@ import (
 	"text/tabwriter"
 	"text/template"
 
-	"github.com/containers/libpod/cmd/podman/registry"
+	"github.com/containers/libpod/v2/cmd/podman/registry"
-	"github.com/containers/libpod/pkg/domain/entities"
+	"github.com/containers/libpod/v2/pkg/domain/entities"
 	"github.com/spf13/cobra"
 )
 

cmd/podman/images/untag.go

@@ -1,8 +1,8 @@
 package images
 
 import (
-	"github.com/containers/libpod/cmd/podman/registry"
+	"github.com/containers/libpod/v2/cmd/podman/registry"
-	"github.com/containers/libpod/pkg/domain/entities"
+	"github.com/containers/libpod/v2/pkg/domain/entities"
 	"github.com/spf13/cobra"
 )
 

cmd/podman/inspect.go

@@ -1,9 +1,9 @@
 package main
 
 import (
-	"github.com/containers/libpod/cmd/podman/inspect"
+	"github.com/containers/libpod/v2/cmd/podman/inspect"
-	"github.com/containers/libpod/cmd/podman/registry"
+	"github.com/containers/libpod/v2/cmd/podman/registry"
-	"github.com/containers/libpod/pkg/domain/entities"
+	"github.com/containers/libpod/v2/pkg/domain/entities"
 	"github.com/spf13/cobra"
 )
 

cmd/podman/inspect/inspect.go

@@ -7,9 +7,9 @@ import (
 	"strings"
 
 	"github.com/containers/buildah/pkg/formats"
-	"github.com/containers/libpod/cmd/podman/registry"
+	"github.com/containers/libpod/v2/cmd/podman/registry"
-	"github.com/containers/libpod/cmd/podman/validate"
+	"github.com/containers/libpod/v2/cmd/podman/validate"
-	"github.com/containers/libpod/pkg/domain/entities"
+	"github.com/containers/libpod/v2/pkg/domain/entities"
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"

cmd/podman/login.go

@@ -6,9 +6,9 @@ import (
 
 	"github.com/containers/common/pkg/auth"
 	"github.com/containers/image/v5/types"
-	"github.com/containers/libpod/cmd/podman/registry"
+	"github.com/containers/libpod/v2/cmd/podman/registry"
-	"github.com/containers/libpod/pkg/domain/entities"
+	"github.com/containers/libpod/v2/pkg/domain/entities"
-	"github.com/containers/libpod/pkg/registries"
+	"github.com/containers/libpod/v2/pkg/registries"
 	"github.com/spf13/cobra"
 )
 

cmd/podman/logout.go

@@ -5,9 +5,9 @@ import (
 
 	"github.com/containers/common/pkg/auth"
 	"github.com/containers/image/v5/types"
-	"github.com/containers/libpod/cmd/podman/registry"
+	"github.com/containers/libpod/v2/cmd/podman/registry"
-	"github.com/containers/libpod/pkg/domain/entities"
+	"github.com/containers/libpod/v2/pkg/domain/entities"
-	"github.com/containers/libpod/pkg/registries"
+	"github.com/containers/libpod/v2/pkg/registries"
 	"github.com/spf13/cobra"
 )
 

cmd/podman/main.go

@@ -4,19 +4,19 @@ import (
 	"fmt"
 	"os"
 
-	_ "github.com/containers/libpod/cmd/podman/containers"
+	_ "github.com/containers/libpod/v2/cmd/podman/containers"
-	_ "github.com/containers/libpod/cmd/podman/generate"
+	_ "github.com/containers/libpod/v2/cmd/podman/generate"
-	_ "github.com/containers/libpod/cmd/podman/healthcheck"
+	_ "github.com/containers/libpod/v2/cmd/podman/healthcheck"
-	_ "github.com/containers/libpod/cmd/podman/images"
+	_ "github.com/containers/libpod/v2/cmd/podman/images"
-	_ "github.com/containers/libpod/cmd/podman/manifest"
+	_ "github.com/containers/libpod/v2/cmd/podman/manifest"
-	_ "github.com/containers/libpod/cmd/podman/networks"
+	_ "github.com/containers/libpod/v2/cmd/podman/networks"
-	_ "github.com/containers/libpod/cmd/podman/play"
+	_ "github.com/containers/libpod/v2/cmd/podman/play"
-	_ "github.com/containers/libpod/cmd/podman/pods"
+	_ "github.com/containers/libpod/v2/cmd/podman/pods"
-	"github.com/containers/libpod/cmd/podman/registry"
+	"github.com/containers/libpod/v2/cmd/podman/registry"
-	_ "github.com/containers/libpod/cmd/podman/system"
+	_ "github.com/containers/libpod/v2/cmd/podman/system"
-	_ "github.com/containers/libpod/cmd/podman/volumes"
+	_ "github.com/containers/libpod/v2/cmd/podman/volumes"
-	"github.com/containers/libpod/pkg/rootless"
+	"github.com/containers/libpod/v2/pkg/rootless"
-	"github.com/containers/libpod/pkg/terminal"
+	"github.com/containers/libpod/v2/pkg/terminal"
 	"github.com/containers/storage/pkg/reexec"
 	"github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"

cmd/podman/manifest/add.go

@@ -4,8 +4,8 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/containers/libpod/cmd/podman/registry"
+	"github.com/containers/libpod/v2/cmd/podman/registry"
-	"github.com/containers/libpod/pkg/domain/entities"
+	"github.com/containers/libpod/v2/pkg/domain/entities"
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 )

cmd/podman/manifest/annotate.go

@@ -4,8 +4,8 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/containers/libpod/cmd/podman/registry"
+	"github.com/containers/libpod/v2/cmd/podman/registry"
-	"github.com/containers/libpod/pkg/domain/entities"
+	"github.com/containers/libpod/v2/pkg/domain/entities"
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 )

cmd/podman/manifest/create.go

@@ -4,8 +4,8 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/containers/libpod/cmd/podman/registry"
+	"github.com/containers/libpod/v2/cmd/podman/registry"
-	"github.com/containers/libpod/pkg/domain/entities"
+	"github.com/containers/libpod/v2/pkg/domain/entities"
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 )

cmd/podman/manifest/inspect.go

@@ -4,8 +4,8 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/containers/libpod/cmd/podman/registry"
+	"github.com/containers/libpod/v2/cmd/podman/registry"
-	"github.com/containers/libpod/pkg/domain/entities"
+	"github.com/containers/libpod/v2/pkg/domain/entities"
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 )

cmd/podman/manifest/manifest.go

@@ -1,9 +1,9 @@
 package manifest
 
 import (
-	"github.com/containers/libpod/cmd/podman/registry"
+	"github.com/containers/libpod/v2/cmd/podman/registry"
-	"github.com/containers/libpod/cmd/podman/validate"
+	"github.com/containers/libpod/v2/cmd/podman/validate"
-	"github.com/containers/libpod/pkg/domain/entities"
+	"github.com/containers/libpod/v2/pkg/domain/entities"
 	"github.com/spf13/cobra"
 )
 

cmd/podman/manifest/push.go

@@ -3,9 +3,9 @@ package manifest
 import (
 	"github.com/containers/common/pkg/auth"
 	"github.com/containers/image/v5/types"
-	"github.com/containers/libpod/cmd/podman/registry"
+	"github.com/containers/libpod/v2/cmd/podman/registry"
-	"github.com/containers/libpod/pkg/domain/entities"
+	"github.com/containers/libpod/v2/pkg/domain/entities"
-	"github.com/containers/libpod/pkg/util"
+	"github.com/containers/libpod/v2/pkg/util"
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 )

cmd/podman/manifest/remove.go

@@ -4,8 +4,8 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/containers/libpod/cmd/podman/registry"
+	"github.com/containers/libpod/v2/cmd/podman/registry"
-	"github.com/containers/libpod/pkg/domain/entities"
+	"github.com/containers/libpod/v2/pkg/domain/entities"
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 )

cmd/podman/networks/create.go

@@ -4,10 +4,10 @@ import (
 	"fmt"
 	"net"
 
-	"github.com/containers/libpod/cmd/podman/registry"
+	"github.com/containers/libpod/v2/cmd/podman/registry"
-	"github.com/containers/libpod/libpod/define"
+	"github.com/containers/libpod/v2/libpod/define"
-	"github.com/containers/libpod/pkg/domain/entities"
+	"github.com/containers/libpod/v2/pkg/domain/entities"
-	"github.com/containers/libpod/pkg/network"
+	"github.com/containers/libpod/v2/pkg/network"
 	"github.com/spf13/cobra"
 	"github.com/spf13/pflag"
 )

cmd/podman/networks/inspect.go

@@ -8,8 +8,8 @@ import (
 	"os"
 	"strings"
 
-	"github.com/containers/libpod/cmd/podman/registry"
+	"github.com/containers/libpod/v2/cmd/podman/registry"
-	"github.com/containers/libpod/pkg/domain/entities"
+	"github.com/containers/libpod/v2/pkg/domain/entities"
 	"github.com/spf13/cobra"
 )
 

cmd/podman/networks/list.go

@@ -8,10 +8,10 @@ import (
 	"strings"
 	"text/tabwriter"
 
-	"github.com/containers/libpod/cmd/podman/registry"
+	"github.com/containers/libpod/v2/cmd/podman/registry"
-	"github.com/containers/libpod/cmd/podman/validate"
+	"github.com/containers/libpod/v2/cmd/podman/validate"
-	"github.com/containers/libpod/pkg/domain/entities"
+	"github.com/containers/libpod/v2/pkg/domain/entities"
-	"github.com/containers/libpod/pkg/network"
+	"github.com/containers/libpod/v2/pkg/network"
 	"github.com/spf13/cobra"
 	"github.com/spf13/pflag"
 )

cmd/podman/networks/network.go

@@ -1,9 +1,9 @@
 package network
 
 import (
-	"github.com/containers/libpod/cmd/podman/registry"
+	"github.com/containers/libpod/v2/cmd/podman/registry"
-	"github.com/containers/libpod/cmd/podman/validate"
+	"github.com/containers/libpod/v2/cmd/podman/validate"
-	"github.com/containers/libpod/pkg/domain/entities"
+	"github.com/containers/libpod/v2/pkg/domain/entities"
 	"github.com/spf13/cobra"
 )
 

cmd/podman/networks/rm.go

@@ -3,9 +3,9 @@ package network
 import (
 	"fmt"
 
-	"github.com/containers/libpod/cmd/podman/registry"
+	"github.com/containers/libpod/v2/cmd/podman/registry"
-	"github.com/containers/libpod/cmd/podman/utils"
+	"github.com/containers/libpod/v2/cmd/podman/utils"
-	"github.com/containers/libpod/pkg/domain/entities"
+	"github.com/containers/libpod/v2/pkg/domain/entities"
 	"github.com/spf13/cobra"
 	"github.com/spf13/pflag"
 )

cmd/podman/play/kube.go

@@ -6,10 +6,10 @@ import (
 
 	"github.com/containers/common/pkg/auth"
 	"github.com/containers/image/v5/types"
-	"github.com/containers/libpod/cmd/podman/registry"
+	"github.com/containers/libpod/v2/cmd/podman/registry"
-	"github.com/containers/libpod/cmd/podman/utils"
+	"github.com/containers/libpod/v2/cmd/podman/utils"
-	"github.com/containers/libpod/pkg/domain/entities"
+	"github.com/containers/libpod/v2/pkg/domain/entities"
-	"github.com/containers/libpod/pkg/util"
+	"github.com/containers/libpod/v2/pkg/util"
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 )

cmd/podman/play/play.go

@@ -1,9 +1,9 @@
 package pods
 
 import (
-	"github.com/containers/libpod/cmd/podman/registry"
+	"github.com/containers/libpod/v2/cmd/podman/registry"
-	"github.com/containers/libpod/cmd/podman/validate"
+	"github.com/containers/libpod/v2/cmd/podman/validate"
-	"github.com/containers/libpod/pkg/domain/entities"
+	"github.com/containers/libpod/v2/pkg/domain/entities"
 	"github.com/spf13/cobra"
 )
 

cmd/podman/pods/create.go

@@ -7,14 +7,14 @@ import (
 	"os"
 	"strings"
 
-	"github.com/containers/libpod/cmd/podman/common"
+	"github.com/containers/libpod/v2/cmd/podman/common"
-	"github.com/containers/libpod/cmd/podman/parse"
+	"github.com/containers/libpod/v2/cmd/podman/parse"
-	"github.com/containers/libpod/cmd/podman/registry"
+	"github.com/containers/libpod/v2/cmd/podman/registry"
-	"github.com/containers/libpod/cmd/podman/validate"
+	"github.com/containers/libpod/v2/cmd/podman/validate"
-	"github.com/containers/libpod/pkg/domain/entities"
+	"github.com/containers/libpod/v2/pkg/domain/entities"
-	"github.com/containers/libpod/pkg/errorhandling"
+	"github.com/containers/libpod/v2/pkg/errorhandling"
-	"github.com/containers/libpod/pkg/specgen"
+	"github.com/containers/libpod/v2/pkg/specgen"
-	"github.com/containers/libpod/pkg/util"
+	"github.com/containers/libpod/v2/pkg/util"
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"

cmd/podman/pods/exists.go

@@ -3,8 +3,8 @@ package pods
 import (
 	"context"
 
-	"github.com/containers/libpod/cmd/podman/registry"
+	"github.com/containers/libpod/v2/cmd/podman/registry"
-	"github.com/containers/libpod/pkg/domain/entities"
+	"github.com/containers/libpod/v2/pkg/domain/entities"
 	"github.com/spf13/cobra"
 )
 

cmd/podman/pods/inspect.go

@@ -5,9 +5,9 @@ import (
 	"fmt"
 
 	"github.com/containers/buildah/pkg/formats"
-	"github.com/containers/libpod/cmd/podman/registry"
+	"github.com/containers/libpod/v2/cmd/podman/registry"
-	"github.com/containers/libpod/cmd/podman/validate"
+	"github.com/containers/libpod/v2/cmd/podman/validate"
-	"github.com/containers/libpod/pkg/domain/entities"
+	"github.com/containers/libpod/v2/pkg/domain/entities"
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 )

cmd/podman/pods/kill.go

@@ -4,10 +4,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/containers/libpod/cmd/podman/registry"
+	"github.com/containers/libpod/v2/cmd/podman/registry"
-	"github.com/containers/libpod/cmd/podman/utils"
+	"github.com/containers/libpod/v2/cmd/podman/utils"
-	"github.com/containers/libpod/cmd/podman/validate"
+	"github.com/containers/libpod/v2/cmd/podman/validate"
-	"github.com/containers/libpod/pkg/domain/entities"
+	"github.com/containers/libpod/v2/pkg/domain/entities"
 	"github.com/spf13/cobra"
 )
 

cmd/podman/pods/pause.go

@@ -4,10 +4,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/containers/libpod/cmd/podman/registry"
+	"github.com/containers/libpod/v2/cmd/podman/registry"
-	"github.com/containers/libpod/cmd/podman/utils"
+	"github.com/containers/libpod/v2/cmd/podman/utils"
-	"github.com/containers/libpod/cmd/podman/validate"
+	"github.com/containers/libpod/v2/cmd/podman/validate"
-	"github.com/containers/libpod/pkg/domain/entities"
+	"github.com/containers/libpod/v2/pkg/domain/entities"
 	"github.com/spf13/cobra"
 )
 

cmd/podman/pods/pod.go

@@ -1,10 +1,10 @@
 package pods
 
 import (
-	"github.com/containers/libpod/cmd/podman/registry"
+	"github.com/containers/libpod/v2/cmd/podman/registry"
-	"github.com/containers/libpod/cmd/podman/validate"
+	"github.com/containers/libpod/v2/cmd/podman/validate"
-	"github.com/containers/libpod/pkg/domain/entities"
+	"github.com/containers/libpod/v2/pkg/domain/entities"
-	"github.com/containers/libpod/pkg/util"
+	"github.com/containers/libpod/v2/pkg/util"
 	"github.com/spf13/cobra"
 )
 

cmd/podman/pods/prune.go

@@ -7,9 +7,9 @@ import (
 	"os"
 	"strings"
 
-	"github.com/containers/libpod/cmd/podman/registry"
+	"github.com/containers/libpod/v2/cmd/podman/registry"
-	"github.com/containers/libpod/cmd/podman/utils"
+	"github.com/containers/libpod/v2/cmd/podman/utils"
-	"github.com/containers/libpod/pkg/domain/entities"
+	"github.com/containers/libpod/v2/pkg/domain/entities"
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 )

cmd/podman/pods/ps.go

@@ -11,9 +11,9 @@ import (
 	"text/template"
 	"time"
 
-	"github.com/containers/libpod/cmd/podman/registry"
+	"github.com/containers/libpod/v2/cmd/podman/registry"
-	"github.com/containers/libpod/cmd/podman/validate"
+	"github.com/containers/libpod/v2/cmd/podman/validate"
-	"github.com/containers/libpod/pkg/domain/entities"
+	"github.com/containers/libpod/v2/pkg/domain/entities"
 	"github.com/docker/go-units"
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"

cmd/podman/pods/restart.go

@@ -4,10 +4,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/containers/libpod/cmd/podman/registry"
+	"github.com/containers/libpod/v2/cmd/podman/registry"
-	"github.com/containers/libpod/cmd/podman/utils"
+	"github.com/containers/libpod/v2/cmd/podman/utils"
-	"github.com/containers/libpod/cmd/podman/validate"
+	"github.com/containers/libpod/v2/cmd/podman/validate"
-	"github.com/containers/libpod/pkg/domain/entities"
+	"github.com/containers/libpod/v2/pkg/domain/entities"
 	"github.com/spf13/cobra"
 )