diff options
author | Valentin Rothberg <rothberg@redhat.com> | 2020-07-06 15:38:20 +0200 |
---|---|---|
committer | Valentin Rothberg <rothberg@redhat.com> | 2020-07-06 15:50:12 +0200 |
commit | 8489dc43458da43d12ae37bac63753811acf96d9 (patch) | |
tree | c2dce0ff4c9f1a00f2f78da106da510c84756866 /cmd/podman/images | |
parent | 9bccb0f091a82656593a069891f143e78a8719e9 (diff) | |
download | podman-8489dc43458da43d12ae37bac63753811acf96d9.tar.gz podman-8489dc43458da43d12ae37bac63753811acf96d9.tar.bz2 podman-8489dc43458da43d12ae37bac63753811acf96d9.zip |
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>
Diffstat (limited to 'cmd/podman/images')
-rw-r--r-- | cmd/podman/images/build.go | 6 | ||||
-rw-r--r-- | cmd/podman/images/diff.go | 6 | ||||
-rw-r--r-- | cmd/podman/images/exists.go | 4 | ||||
-rw-r--r-- | cmd/podman/images/history.go | 4 | ||||
-rw-r--r-- | cmd/podman/images/image.go | 6 | ||||
-rw-r--r-- | cmd/podman/images/images.go | 4 | ||||
-rw-r--r-- | cmd/podman/images/import.go | 6 | ||||
-rw-r--r-- | cmd/podman/images/inspect.go | 6 | ||||
-rw-r--r-- | cmd/podman/images/list.go | 4 | ||||
-rw-r--r-- | cmd/podman/images/load.go | 8 | ||||
-rw-r--r-- | cmd/podman/images/prune.go | 8 | ||||
-rw-r--r-- | cmd/podman/images/pull.go | 6 | ||||
-rw-r--r-- | cmd/podman/images/push.go | 6 | ||||
-rw-r--r-- | cmd/podman/images/rm.go | 6 | ||||
-rw-r--r-- | cmd/podman/images/rmi.go | 4 | ||||
-rw-r--r-- | cmd/podman/images/save.go | 10 | ||||
-rw-r--r-- | cmd/podman/images/search.go | 6 | ||||
-rw-r--r-- | cmd/podman/images/sign.go | 4 | ||||
-rw-r--r-- | cmd/podman/images/tag.go | 4 | ||||
-rw-r--r-- | cmd/podman/images/tree.go | 4 | ||||
-rw-r--r-- | cmd/podman/images/trust.go | 6 | ||||
-rw-r--r-- | cmd/podman/images/trust_set.go | 8 | ||||
-rw-r--r-- | cmd/podman/images/trust_show.go | 4 | ||||
-rw-r--r-- | cmd/podman/images/untag.go | 4 |
24 files changed, 67 insertions, 67 deletions
diff --git a/cmd/podman/images/build.go b/cmd/podman/images/build.go index eefc488d3..3ea74b4af 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 53165543c..10a1c06ec 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 2d1974d5c..89badd035 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 a1a9e91eb..c6ef503bf 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 53be82dda..37ff491c3 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 7af2d9343..4eeed13d4 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 9b03c1383..097cb3a40 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 d7756433b..f1a2cda96 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 859489552..1bb956288 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 dbaa800a4..79a583caa 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 5d1274895..39804b2bc 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" ) |