Merge pull request #6865 from vrothberg/2.0-v2-module

[2.0] move go module to v2

24 files changed, 67 insertions, 67 deletions

diff --git a/cmd/podman/images/build.go b/cmd/podman/images/build.go
index 23bfcab79..40a9a8e7f 100644
--- a/cmd/podman/images/build.go
+++ b/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/cmd/podman/utils"
-	"github.com/containers/libpod/pkg/domain/entities"
+	"github.com/containers/libpod/v2/cmd/podman/registry"
+	"github.com/containers/libpod/v2/cmd/podman/utils"
+	"github.com/containers/libpod/v2/pkg/domain/entities"
 	"github.com/docker/go-units"
 	"github.com/opencontainers/runtime-spec/specs-go"
 	"github.com/pkg/errors"
diff --git a/cmd/podman/images/diff.go b/cmd/podman/images/diff.go
index c24f98369..cd674ee9c 100644
--- a/cmd/podman/images/diff.go
+++ b/cmd/podman/images/diff.go
@@ -1,9 +1,9 @@
 package images
 
 import (
-	"github.com/containers/libpod/cmd/podman/registry"
-	"github.com/containers/libpod/cmd/podman/report"
-	"github.com/containers/libpod/pkg/domain/entities"
+	"github.com/containers/libpod/v2/cmd/podman/registry"
+	"github.com/containers/libpod/v2/cmd/podman/report"
+	"github.com/containers/libpod/v2/pkg/domain/entities"
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 	"github.com/spf13/pflag"
diff --git a/cmd/podman/images/exists.go b/cmd/podman/images/exists.go
index 13191113f..7e05ea8f7 100644
--- a/cmd/podman/images/exists.go
+++ b/cmd/podman/images/exists.go
@@ -1,8 +1,8 @@
 package images
 
 import (
-	"github.com/containers/libpod/cmd/podman/registry"
-	"github.com/containers/libpod/pkg/domain/entities"
+	"github.com/containers/libpod/v2/cmd/podman/registry"
+	"github.com/containers/libpod/v2/pkg/domain/entities"
 	"github.com/spf13/cobra"
 )
 
diff --git a/cmd/podman/images/history.go b/cmd/podman/images/history.go
index ea4b9983f..3732e6e03 100644
--- a/cmd/podman/images/history.go
+++ b/cmd/podman/images/history.go
@@ -10,8 +10,8 @@ import (
 	"time"
 	"unicode"
 
-	"github.com/containers/libpod/cmd/podman/registry"
-	"github.com/containers/libpod/pkg/domain/entities"
+	"github.com/containers/libpod/v2/cmd/podman/registry"
+	"github.com/containers/libpod/v2/pkg/domain/entities"
 	"github.com/docker/go-units"
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
diff --git a/cmd/podman/images/image.go b/cmd/podman/images/image.go
index ebef126c0..85c1afc0e 100644
--- a/cmd/podman/images/image.go
+++ b/cmd/podman/images/image.go
@@ -1,9 +1,9 @@
 package images
 
 import (
-	"github.com/containers/libpod/cmd/podman/registry"
-	"github.com/containers/libpod/cmd/podman/validate"
-	"github.com/containers/libpod/pkg/domain/entities"
+	"github.com/containers/libpod/v2/cmd/podman/registry"
+	"github.com/containers/libpod/v2/cmd/podman/validate"
+	"github.com/containers/libpod/v2/pkg/domain/entities"
 	"github.com/spf13/cobra"
 )
 
diff --git a/cmd/podman/images/images.go b/cmd/podman/images/images.go
index 96ef344bf..0a77946c7 100644
--- a/cmd/podman/images/images.go
+++ b/cmd/podman/images/images.go
@@ -3,8 +3,8 @@ package images
 import (
 	"strings"
 
-	"github.com/containers/libpod/cmd/podman/registry"
-	"github.com/containers/libpod/pkg/domain/entities"
+	"github.com/containers/libpod/v2/cmd/podman/registry"
+	"github.com/containers/libpod/v2/pkg/domain/entities"
 	"github.com/spf13/cobra"
 )
 
diff --git a/cmd/podman/images/import.go b/cmd/podman/images/import.go
index 0e16128ce..6b4b4f6b6 100644
--- a/cmd/podman/images/import.go
+++ b/cmd/podman/images/import.go
@@ -4,9 +4,9 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/containers/libpod/cmd/podman/parse"
-	"github.com/containers/libpod/cmd/podman/registry"
-	"github.com/containers/libpod/pkg/domain/entities"
+	"github.com/containers/libpod/v2/cmd/podman/parse"
+	"github.com/containers/libpod/v2/cmd/podman/registry"
+	"github.com/containers/libpod/v2/pkg/domain/entities"
 	"github.com/hashicorp/go-multierror"
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
diff --git a/cmd/podman/images/inspect.go b/cmd/podman/images/inspect.go
index f6a10ba44..a16345622 100644
--- a/cmd/podman/images/inspect.go
+++ b/cmd/podman/images/inspect.go
@@ -1,9 +1,9 @@
 package images
 
 import (
-	"github.com/containers/libpod/cmd/podman/inspect"
-	"github.com/containers/libpod/cmd/podman/registry"
-	"github.com/containers/libpod/pkg/domain/entities"
+	"github.com/containers/libpod/v2/cmd/podman/inspect"
+	"github.com/containers/libpod/v2/cmd/podman/registry"
+	"github.com/containers/libpod/v2/pkg/domain/entities"
 	"github.com/spf13/cobra"
 )
 
diff --git a/cmd/podman/images/list.go b/cmd/podman/images/list.go
index b7a8b8911..8d50986d5 100644
--- a/cmd/podman/images/list.go
+++ b/cmd/podman/images/list.go
@@ -11,8 +11,8 @@ import (
 	"time"
 	"unicode"
 
-	"github.com/containers/libpod/cmd/podman/registry"
-	"github.com/containers/libpod/pkg/domain/entities"
+	"github.com/containers/libpod/v2/cmd/podman/registry"
+	"github.com/containers/libpod/v2/pkg/domain/entities"
 	"github.com/docker/go-units"
 	"github.com/spf13/cobra"
 	"github.com/spf13/pflag"
diff --git a/cmd/podman/images/load.go b/cmd/podman/images/load.go
index 115e9a070..df7baae22 100644
--- a/cmd/podman/images/load.go
+++ b/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/cmd/podman/registry"
-	"github.com/containers/libpod/pkg/domain/entities"
-	"github.com/containers/libpod/pkg/util"
+	"github.com/containers/libpod/v2/cmd/podman/parse"
+	"github.com/containers/libpod/v2/cmd/podman/registry"
+	"github.com/containers/libpod/v2/pkg/domain/entities"
+	"github.com/containers/libpod/v2/pkg/util"
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 	"github.com/spf13/pflag"
diff --git a/cmd/podman/images/prune.go b/cmd/podman/images/prune.go
index 676382a99..002453907 100644
--- a/cmd/podman/images/prune.go
+++ b/cmd/podman/images/prune.go
@@ -6,10 +6,10 @@ import (
 	"os"
 	"strings"
 
-	"github.com/containers/libpod/cmd/podman/registry"
-	"github.com/containers/libpod/cmd/podman/utils"
-	"github.com/containers/libpod/cmd/podman/validate"
-	"github.com/containers/libpod/pkg/domain/entities"
+	"github.com/containers/libpod/v2/cmd/podman/registry"
+	"github.com/containers/libpod/v2/cmd/podman/utils"
+	"github.com/containers/libpod/v2/cmd/podman/validate"
+	"github.com/containers/libpod/v2/pkg/domain/entities"
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 )
diff --git a/cmd/podman/images/pull.go b/cmd/podman/images/pull.go
index 9e137b5d6..83bb186df 100644
--- a/cmd/podman/images/pull.go
+++ b/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/pkg/domain/entities"
-	"github.com/containers/libpod/pkg/util"
+	"github.com/containers/libpod/v2/cmd/podman/registry"
+	"github.com/containers/libpod/v2/pkg/domain/entities"
+	"github.com/containers/libpod/v2/pkg/util"
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 	"github.com/spf13/pflag"
diff --git a/cmd/podman/images/push.go b/cmd/podman/images/push.go
index a1614dc7a..fd91ab0ab 100644
--- a/cmd/podman/images/push.go
+++ b/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/pkg/domain/entities"
-	"github.com/containers/libpod/pkg/util"
+	"github.com/containers/libpod/v2/cmd/podman/registry"
+	"github.com/containers/libpod/v2/pkg/domain/entities"
+	"github.com/containers/libpod/v2/pkg/util"
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 	"github.com/spf13/pflag"
diff --git a/cmd/podman/images/rm.go b/cmd/podman/images/rm.go
index 4b9920532..c14c256fc 100644
--- a/cmd/podman/images/rm.go
+++ b/cmd/podman/images/rm.go
@@ -3,9 +3,9 @@ package images
 import (
 	"fmt"
 
-	"github.com/containers/libpod/cmd/podman/registry"
-	"github.com/containers/libpod/pkg/domain/entities"
-	"github.com/containers/libpod/pkg/errorhandling"
+	"github.com/containers/libpod/v2/cmd/podman/registry"
+	"github.com/containers/libpod/v2/pkg/domain/entities"
+	"github.com/containers/libpod/v2/pkg/errorhandling"
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 	"github.com/spf13/pflag"
diff --git a/cmd/podman/images/rmi.go b/cmd/podman/images/rmi.go
index 8e1759ef4..8e70906ce 100644
--- a/cmd/podman/images/rmi.go
+++ b/cmd/podman/images/rmi.go
@@ -3,8 +3,8 @@ package images
 import (
 	"strings"
 
-	"github.com/containers/libpod/cmd/podman/registry"
-	"github.com/containers/libpod/pkg/domain/entities"
+	"github.com/containers/libpod/v2/cmd/podman/registry"
+	"github.com/containers/libpod/v2/pkg/domain/entities"
 	"github.com/spf13/cobra"
 )
 
diff --git a/cmd/podman/images/save.go b/cmd/podman/images/save.go
index 56953e41c..f84d97b17 100644
--- a/cmd/podman/images/save.go
+++ b/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/cmd/podman/registry"
-	"github.com/containers/libpod/pkg/domain/entities"
-	"github.com/containers/libpod/pkg/util"
+	"github.com/containers/libpod/v2/cmd/podman/parse"
+	"github.com/containers/libpod/v2/cmd/podman/registry"
+	"github.com/containers/libpod/v2/pkg/domain/entities"
+	"github.com/containers/libpod/v2/pkg/util"
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 	"github.com/spf13/pflag"
diff --git a/cmd/podman/images/search.go b/cmd/podman/images/search.go
index ccac7e3fe..7c5bd890d 100644
--- a/cmd/podman/images/search.go
+++ b/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/pkg/domain/entities"
-	"github.com/containers/libpod/pkg/util/camelcase"
+	"github.com/containers/libpod/v2/cmd/podman/registry"
+	"github.com/containers/libpod/v2/pkg/domain/entities"
+	"github.com/containers/libpod/v2/pkg/util/camelcase"
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 	"github.com/spf13/pflag"
diff --git a/cmd/podman/images/sign.go b/cmd/podman/images/sign.go
index bd9cf2ea7..9115342ed 100644
--- a/cmd/podman/images/sign.go
+++ b/cmd/podman/images/sign.go
@@ -3,8 +3,8 @@ package images
 import (
 	"os"
 
-	"github.com/containers/libpod/cmd/podman/registry"
-	"github.com/containers/libpod/pkg/domain/entities"
+	"github.com/containers/libpod/v2/cmd/podman/registry"
+	"github.com/containers/libpod/v2/pkg/domain/entities"
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 )
diff --git a/cmd/podman/images/tag.go b/cmd/podman/images/tag.go
index dae3416c4..4aa2aa181 100644
--- a/cmd/podman/images/tag.go
+++ b/cmd/podman/images/tag.go
@@ -1,8 +1,8 @@
 package images
 
 import (
-	"github.com/containers/libpod/cmd/podman/registry"
-	"github.com/containers/libpod/pkg/domain/entities"
+	"github.com/containers/libpod/v2/cmd/podman/registry"
+	"github.com/containers/libpod/v2/pkg/domain/entities"
 	"github.com/spf13/cobra"
 )
 
diff --git a/cmd/podman/images/tree.go b/cmd/podman/images/tree.go
index 5e82e9dea..f229cfa29 100644
--- a/cmd/podman/images/tree.go
+++ b/cmd/podman/images/tree.go
@@ -3,8 +3,8 @@ package images
 import (
 	"fmt"
 
-	"github.com/containers/libpod/cmd/podman/registry"
-	"github.com/containers/libpod/pkg/domain/entities"
+	"github.com/containers/libpod/v2/cmd/podman/registry"
+	"github.com/containers/libpod/v2/pkg/domain/entities"
 	"github.com/spf13/cobra"
 )
 
diff --git a/cmd/podman/images/trust.go b/cmd/podman/images/trust.go
index 88a567871..9fc8c1f07 100644
--- a/cmd/podman/images/trust.go
+++ b/cmd/podman/images/trust.go
@@ -1,9 +1,9 @@
 package images
 
 import (
-	"github.com/containers/libpod/cmd/podman/registry"
-	"github.com/containers/libpod/cmd/podman/validate"
-	"github.com/containers/libpod/pkg/domain/entities"
+	"github.com/containers/libpod/v2/cmd/podman/registry"
+	"github.com/containers/libpod/v2/cmd/podman/validate"
+	"github.com/containers/libpod/v2/pkg/domain/entities"
 	"github.com/spf13/cobra"
 )
 
diff --git a/cmd/podman/images/trust_set.go b/cmd/podman/images/trust_set.go
index 5868f5546..71b77f961 100644
--- a/cmd/podman/images/trust_set.go
+++ b/cmd/podman/images/trust_set.go
@@ -1,10 +1,10 @@
 package images
 
 import (
-	"github.com/containers/libpod/cmd/podman/registry"
-	"github.com/containers/libpod/libpod/image"
-	"github.com/containers/libpod/pkg/domain/entities"
-	"github.com/containers/libpod/pkg/util"
+	"github.com/containers/libpod/v2/cmd/podman/registry"
+	"github.com/containers/libpod/v2/libpod/image"
+	"github.com/containers/libpod/v2/pkg/domain/entities"
+	"github.com/containers/libpod/v2/pkg/util"
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 )
diff --git a/cmd/podman/images/trust_show.go b/cmd/podman/images/trust_show.go
index 23ee6c709..8f3ab3cad 100644
--- a/cmd/podman/images/trust_show.go
+++ b/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/pkg/domain/entities"
+	"github.com/containers/libpod/v2/cmd/podman/registry"
+	"github.com/containers/libpod/v2/pkg/domain/entities"
 	"github.com/spf13/cobra"
 )
 
diff --git a/cmd/podman/images/untag.go b/cmd/podman/images/untag.go
index 266a3f115..9e4e36c74 100644
--- a/cmd/podman/images/untag.go
+++ b/cmd/podman/images/untag.go
@@ -1,8 +1,8 @@
 package images
 
 import (
-	"github.com/containers/libpod/cmd/podman/registry"
-	"github.com/containers/libpod/pkg/domain/entities"
+	"github.com/containers/libpod/v2/cmd/podman/registry"
+	"github.com/containers/libpod/v2/pkg/domain/entities"
 	"github.com/spf13/cobra"
 )