diff options
| author | Valentin Rothberg <rothberg@redhat.com> | 2021-02-22 15:52:56 +0100 |
|---|---|---|
| committer | Valentin Rothberg <rothberg@redhat.com> | 2021-02-22 16:03:22 +0100 |
| commit | cb475b82ab759d5dd0302de8c3b78e7337a6b2e2 (patch) | |
| tree | 050f31c6e0bb2d0bb58e62acbd44c93c175e7381 /cmd/podman | |
| parent | 9a2fc376c0584379c8a7a41f46df29ad3e94d025 (diff) | |
| download | podman-cb475b82ab759d5dd0302de8c3b78e7337a6b2e2.tar.gz podman-cb475b82ab759d5dd0302de8c3b78e7337a6b2e2.tar.bz2 podman-cb475b82ab759d5dd0302de8c3b78e7337a6b2e2.zip | |
[3.0] bump go module to v3
We missed bumping the go module, so let's do it now :)
Automated go code with github.com/sirkon/go-imports-rename
Manually via vgrep podman/v2 the rest
Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
Diffstat (limited to 'cmd/podman')
149 files changed, 627 insertions, 627 deletions
diff --git a/cmd/podman/auto-update.go b/cmd/podman/auto-update.go index cf806900f..a6d990b0c 100644 --- a/cmd/podman/auto-update.go +++ b/cmd/podman/auto-update.go @@ -5,9 +5,9 @@ import ( "github.com/containers/common/pkg/auth" "github.com/containers/common/pkg/completion" - "github.com/containers/podman/v2/cmd/podman/registry" - "github.com/containers/podman/v2/pkg/domain/entities" - "github.com/containers/podman/v2/pkg/errorhandling" + "github.com/containers/podman/v3/cmd/podman/registry" + "github.com/containers/podman/v3/pkg/domain/entities" + "github.com/containers/podman/v3/pkg/errorhandling" "github.com/pkg/errors" "github.com/spf13/cobra" ) diff --git a/cmd/podman/common/completion.go b/cmd/podman/common/completion.go index 92163efde..ce4fbdaa8 100644 --- a/cmd/podman/common/completion.go +++ b/cmd/podman/common/completion.go @@ -7,14 +7,14 @@ import ( "strings" "github.com/containers/common/pkg/config" - "github.com/containers/podman/v2/cmd/podman/registry" - "github.com/containers/podman/v2/libpod" - "github.com/containers/podman/v2/libpod/define" - "github.com/containers/podman/v2/pkg/domain/entities" - "github.com/containers/podman/v2/pkg/registries" - "github.com/containers/podman/v2/pkg/rootless" - systemdGen "github.com/containers/podman/v2/pkg/systemd/generate" - "github.com/containers/podman/v2/pkg/util" + "github.com/containers/podman/v3/cmd/podman/registry" + "github.com/containers/podman/v3/libpod" + "github.com/containers/podman/v3/libpod/define" + "github.com/containers/podman/v3/pkg/domain/entities" + "github.com/containers/podman/v3/pkg/registries" + "github.com/containers/podman/v3/pkg/rootless" + systemdGen "github.com/containers/podman/v3/pkg/systemd/generate" + "github.com/containers/podman/v3/pkg/util" "github.com/spf13/cobra" ) diff --git a/cmd/podman/common/create.go b/cmd/podman/common/create.go index 3ea1a40d0..b76b68e60 100644 --- a/cmd/podman/common/create.go +++ b/cmd/podman/common/create.go @@ -5,8 +5,8 @@ import ( "github.com/containers/common/pkg/auth" "github.com/containers/common/pkg/completion" - "github.com/containers/podman/v2/cmd/podman/registry" - "github.com/containers/podman/v2/libpod/define" + "github.com/containers/podman/v3/cmd/podman/registry" + "github.com/containers/podman/v3/libpod/define" "github.com/spf13/cobra" ) diff --git a/cmd/podman/common/create_opts.go b/cmd/podman/common/create_opts.go index 5fcbda0ce..4a5d251d3 100644 --- a/cmd/podman/common/create_opts.go +++ b/cmd/podman/common/create_opts.go @@ -7,12 +7,12 @@ import ( "strconv" "strings" - "github.com/containers/podman/v2/cmd/podman/registry" - "github.com/containers/podman/v2/pkg/api/handlers" - "github.com/containers/podman/v2/pkg/cgroups" - "github.com/containers/podman/v2/pkg/domain/entities" - "github.com/containers/podman/v2/pkg/rootless" - "github.com/containers/podman/v2/pkg/specgen" + "github.com/containers/podman/v3/cmd/podman/registry" + "github.com/containers/podman/v3/pkg/api/handlers" + "github.com/containers/podman/v3/pkg/cgroups" + "github.com/containers/podman/v3/pkg/domain/entities" + "github.com/containers/podman/v3/pkg/rootless" + "github.com/containers/podman/v3/pkg/specgen" ) type ContainerCLIOpts struct { diff --git a/cmd/podman/common/createparse.go b/cmd/podman/common/createparse.go index 140518cf7..818cd0bbd 100644 --- a/cmd/podman/common/createparse.go +++ b/cmd/podman/common/createparse.go @@ -1,7 +1,7 @@ package common import ( - "github.com/containers/podman/v2/pkg/util" + "github.com/containers/podman/v3/pkg/util" "github.com/pkg/errors" ) diff --git a/cmd/podman/common/default.go b/cmd/podman/common/default.go index af64e7162..7e025c449 100644 --- a/cmd/podman/common/default.go +++ b/cmd/podman/common/default.go @@ -1,7 +1,7 @@ package common import ( - "github.com/containers/podman/v2/cmd/podman/registry" + "github.com/containers/podman/v3/cmd/podman/registry" ) var ( diff --git a/cmd/podman/common/diffChanges.go b/cmd/podman/common/diffChanges.go index 4aa485acc..7930e4f2c 100644 --- a/cmd/podman/common/diffChanges.go +++ b/cmd/podman/common/diffChanges.go @@ -4,7 +4,7 @@ import ( "fmt" "os" - "github.com/containers/podman/v2/pkg/domain/entities" + "github.com/containers/podman/v3/pkg/domain/entities" "github.com/containers/storage/pkg/archive" "github.com/pkg/errors" ) diff --git a/cmd/podman/common/netflags.go b/cmd/podman/common/netflags.go index 9cb4ed550..bc4d54de0 100644 --- a/cmd/podman/common/netflags.go +++ b/cmd/podman/common/netflags.go @@ -5,10 +5,10 @@ import ( "strings" "github.com/containers/common/pkg/completion" - "github.com/containers/podman/v2/cmd/podman/parse" - "github.com/containers/podman/v2/libpod/define" - "github.com/containers/podman/v2/pkg/domain/entities" - "github.com/containers/podman/v2/pkg/specgen" + "github.com/containers/podman/v3/cmd/podman/parse" + "github.com/containers/podman/v3/libpod/define" + "github.com/containers/podman/v3/pkg/domain/entities" + "github.com/containers/podman/v3/pkg/specgen" "github.com/pkg/errors" "github.com/spf13/cobra" ) diff --git a/cmd/podman/common/specgen.go b/cmd/podman/common/specgen.go index 4cc53a630..7cbc4aced 100644 --- a/cmd/podman/common/specgen.go +++ b/cmd/podman/common/specgen.go @@ -8,14 +8,14 @@ import ( "time" "github.com/containers/image/v5/manifest" - "github.com/containers/podman/v2/cmd/podman/parse" - "github.com/containers/podman/v2/libpod/define" - ann "github.com/containers/podman/v2/pkg/annotations" - envLib "github.com/containers/podman/v2/pkg/env" - ns "github.com/containers/podman/v2/pkg/namespaces" - "github.com/containers/podman/v2/pkg/specgen" - systemdGen "github.com/containers/podman/v2/pkg/systemd/generate" - "github.com/containers/podman/v2/pkg/util" + "github.com/containers/podman/v3/cmd/podman/parse" + "github.com/containers/podman/v3/libpod/define" + ann "github.com/containers/podman/v3/pkg/annotations" + envLib "github.com/containers/podman/v3/pkg/env" + ns "github.com/containers/podman/v3/pkg/namespaces" + "github.com/containers/podman/v3/pkg/specgen" + systemdGen "github.com/containers/podman/v3/pkg/systemd/generate" + "github.com/containers/podman/v3/pkg/util" "github.com/docker/go-units" "github.com/opencontainers/runtime-spec/specs-go" "github.com/pkg/errors" diff --git a/cmd/podman/common/util.go b/cmd/podman/common/util.go index ef30e08d3..2a8b2040c 100644 --- a/cmd/podman/common/util.go +++ b/cmd/podman/common/util.go @@ -6,7 +6,7 @@ import ( "strconv" "strings" - "github.com/containers/podman/v2/pkg/specgen" + "github.com/containers/podman/v3/pkg/specgen" "github.com/pkg/errors" "github.com/sirupsen/logrus" ) diff --git a/cmd/podman/common/volumes.go b/cmd/podman/common/volumes.go index 2a598d7a5..19a49a6f2 100644 --- a/cmd/podman/common/volumes.go +++ b/cmd/podman/common/volumes.go @@ -6,8 +6,8 @@ import ( "strings" "github.com/containers/common/pkg/parse" - "github.com/containers/podman/v2/pkg/specgen" - "github.com/containers/podman/v2/pkg/util" + "github.com/containers/podman/v3/pkg/specgen" + "github.com/containers/podman/v3/pkg/util" spec "github.com/opencontainers/runtime-spec/specs-go" "github.com/pkg/errors" ) diff --git a/cmd/podman/completion/completion.go b/cmd/podman/completion/completion.go index b615b33d0..a4ceab4b0 100644 --- a/cmd/podman/completion/completion.go +++ b/cmd/podman/completion/completion.go @@ -7,8 +7,8 @@ import ( "strings" commonComp "github.com/containers/common/pkg/completion" - "github.com/containers/podman/v2/cmd/podman/registry" - "github.com/containers/podman/v2/pkg/domain/entities" + "github.com/containers/podman/v3/cmd/podman/registry" + "github.com/containers/podman/v3/pkg/domain/entities" "github.com/spf13/cobra" ) diff --git a/cmd/podman/containers/attach.go b/cmd/podman/containers/attach.go index 7c7d780bc..dae1126a9 100644 --- a/cmd/podman/containers/attach.go +++ b/cmd/podman/containers/attach.go @@ -3,10 +3,10 @@ package containers import ( "os" - "github.com/containers/podman/v2/cmd/podman/common" - "github.com/containers/podman/v2/cmd/podman/registry" - "github.com/containers/podman/v2/cmd/podman/validate" - "github.com/containers/podman/v2/pkg/domain/entities" + "github.com/containers/podman/v3/cmd/podman/common" + "github.com/containers/podman/v3/cmd/podman/registry" + "github.com/containers/podman/v3/cmd/podman/validate" + "github.com/containers/podman/v3/pkg/domain/entities" "github.com/pkg/errors" "github.com/spf13/cobra" ) diff --git a/cmd/podman/containers/checkpoint.go b/cmd/podman/containers/checkpoint.go index 14abfd5a7..25d0eb510 100644 --- a/cmd/podman/containers/checkpoint.go +++ b/cmd/podman/containers/checkpoint.go @@ -5,12 +5,12 @@ import ( "fmt" "github.com/containers/common/pkg/completion" - "github.com/containers/podman/v2/cmd/podman/common" - "github.com/containers/podman/v2/cmd/podman/registry" - "github.com/containers/podman/v2/cmd/podman/utils" - "github.com/containers/podman/v2/cmd/podman/validate" - "github.com/containers/podman/v2/pkg/domain/entities" - "github.com/containers/podman/v2/pkg/rootless" + "github.com/containers/podman/v3/cmd/podman/common" + "github.com/containers/podman/v3/cmd/podman/registry" + "github.com/containers/podman/v3/cmd/podman/utils" + "github.com/containers/podman/v3/cmd/podman/validate" + "github.com/containers/podman/v3/pkg/domain/entities" + "github.com/containers/podman/v3/pkg/rootless" "github.com/pkg/errors" "github.com/spf13/cobra" ) diff --git a/cmd/podman/containers/cleanup.go b/cmd/podman/containers/cleanup.go index 593aaad3d..1f87725e9 100644 --- a/cmd/podman/containers/cleanup.go +++ b/cmd/podman/containers/cleanup.go @@ -4,11 +4,11 @@ import ( "fmt" "github.com/containers/common/pkg/completion" - "github.com/containers/podman/v2/cmd/podman/common" - "github.com/containers/podman/v2/cmd/podman/registry" - "github.com/containers/podman/v2/cmd/podman/utils" - "github.com/containers/podman/v2/cmd/podman/validate" - "github.com/containers/podman/v2/pkg/domain/entities" + "github.com/containers/podman/v3/cmd/podman/common" + "github.com/containers/podman/v3/cmd/podman/registry" + "github.com/containers/podman/v3/cmd/podman/utils" + "github.com/containers/podman/v3/cmd/podman/validate" + "github.com/containers/podman/v3/pkg/domain/entities" "github.com/pkg/errors" "github.com/sirupsen/logrus" "github.com/spf13/cobra" diff --git a/cmd/podman/containers/commit.go b/cmd/podman/containers/commit.go index ff06e10f7..168ded356 100644 --- a/cmd/podman/containers/commit.go +++ b/cmd/podman/containers/commit.go @@ -8,9 +8,9 @@ import ( "strings" "github.com/containers/common/pkg/completion" - "github.com/containers/podman/v2/cmd/podman/common" - "github.com/containers/podman/v2/cmd/podman/registry" - "github.com/containers/podman/v2/pkg/domain/entities" + "github.com/containers/podman/v3/cmd/podman/common" + "github.com/containers/podman/v3/cmd/podman/registry" + "github.com/containers/podman/v3/pkg/domain/entities" "github.com/pkg/errors" "github.com/spf13/cobra" ) diff --git a/cmd/podman/containers/container.go b/cmd/podman/containers/container.go index b79b7db03..c78668611 100644 --- a/cmd/podman/containers/container.go +++ b/cmd/podman/containers/container.go @@ -1,10 +1,10 @@ package containers import ( - "github.com/containers/podman/v2/cmd/podman/registry" - "github.com/containers/podman/v2/cmd/podman/validate" - "github.com/containers/podman/v2/pkg/domain/entities" - "github.com/containers/podman/v2/pkg/util" + "github.com/containers/podman/v3/cmd/podman/registry" + "github.com/containers/podman/v3/cmd/podman/validate" + "github.com/containers/podman/v3/pkg/domain/entities" + "github.com/containers/podman/v3/pkg/util" "github.com/spf13/cobra" ) diff --git a/cmd/podman/containers/cp.go b/cmd/podman/containers/cp.go index 5db05719c..d3b904412 100644 --- a/cmd/podman/containers/cp.go +++ b/cmd/podman/containers/cp.go @@ -10,11 +10,11 @@ import ( "strings" buildahCopiah "github.com/containers/buildah/copier" - "github.com/containers/podman/v2/cmd/podman/common" - "github.com/containers/podman/v2/cmd/podman/registry" - "github.com/containers/podman/v2/pkg/copy" - "github.com/containers/podman/v2/pkg/domain/entities" - "github.com/containers/podman/v2/pkg/errorhandling" + "github.com/containers/podman/v3/cmd/podman/common" + "github.com/containers/podman/v3/cmd/podman/registry" + "github.com/containers/podman/v3/pkg/copy" + "github.com/containers/podman/v3/pkg/domain/entities" + "github.com/containers/podman/v3/pkg/errorhandling" "github.com/containers/storage/pkg/archive" "github.com/containers/storage/pkg/idtools" "github.com/pkg/errors" diff --git a/cmd/podman/containers/create.go b/cmd/podman/containers/create.go index 5c6c773eb..d7507775f 100644 --- a/cmd/podman/containers/create.go +++ b/cmd/podman/containers/create.go @@ -10,13 +10,13 @@ import ( "github.com/containers/common/pkg/config" "github.com/containers/image/v5/storage" "github.com/containers/image/v5/transports/alltransports" - "github.com/containers/podman/v2/cmd/podman/common" - "github.com/containers/podman/v2/cmd/podman/registry" - "github.com/containers/podman/v2/cmd/podman/utils" - "github.com/containers/podman/v2/libpod/define" - "github.com/containers/podman/v2/pkg/domain/entities" - "github.com/containers/podman/v2/pkg/specgen" - "github.com/containers/podman/v2/pkg/util" + "github.com/containers/podman/v3/cmd/podman/common" + "github.com/containers/podman/v3/cmd/podman/registry" + "github.com/containers/podman/v3/cmd/podman/utils" + "github.com/containers/podman/v3/libpod/define" + "github.com/containers/podman/v3/pkg/domain/entities" + "github.com/containers/podman/v3/pkg/specgen" + "github.com/containers/podman/v3/pkg/util" "github.com/pkg/errors" "github.com/sirupsen/logrus" "github.com/spf13/cobra" diff --git a/cmd/podman/containers/diff.go b/cmd/podman/containers/diff.go index 4533b7159..f6f262066 100644 --- a/cmd/podman/containers/diff.go +++ b/cmd/podman/containers/diff.go @@ -2,10 +2,10 @@ package containers import ( "github.com/containers/common/pkg/report" - "github.com/containers/podman/v2/cmd/podman/common" - "github.com/containers/podman/v2/cmd/podman/registry" - "github.com/containers/podman/v2/cmd/podman/validate" - "github.com/containers/podman/v2/pkg/domain/entities" + "github.com/containers/podman/v3/cmd/podman/common" + "github.com/containers/podman/v3/cmd/podman/registry" + "github.com/containers/podman/v3/cmd/podman/validate" + "github.com/containers/podman/v3/pkg/domain/entities" "github.com/pkg/errors" "github.com/spf13/cobra" ) diff --git a/cmd/podman/containers/exec.go b/cmd/podman/containers/exec.go index 3d4918d50..15ac2b164 100644 --- a/cmd/podman/containers/exec.go +++ b/cmd/podman/containers/exec.go @@ -6,13 +6,13 @@ import ( "os" "github.com/containers/common/pkg/completion" - "github.com/containers/podman/v2/cmd/podman/common" - "github.com/containers/podman/v2/cmd/podman/registry" - "github.com/containers/podman/v2/cmd/podman/validate" - "github.com/containers/podman/v2/libpod/define" - "github.com/containers/podman/v2/pkg/domain/entities" - envLib "github.com/containers/podman/v2/pkg/env" - "github.com/containers/podman/v2/pkg/rootless" + "github.com/containers/podman/v3/cmd/podman/common" + "github.com/containers/podman/v3/cmd/podman/registry" + "github.com/containers/podman/v3/cmd/podman/validate" + "github.com/containers/podman/v3/libpod/define" + "github.com/containers/podman/v3/pkg/domain/entities" + envLib "github.com/containers/podman/v3/pkg/env" + "github.com/containers/podman/v3/pkg/rootless" "github.com/pkg/errors" "github.com/spf13/cobra" ) diff --git a/cmd/podman/containers/exists.go b/cmd/podman/containers/exists.go index 607a03023..c21b30a4b 100644 --- a/cmd/podman/containers/exists.go +++ b/cmd/podman/containers/exists.go @@ -3,9 +3,9 @@ package containers import ( "context" - "github.com/containers/podman/v2/cmd/podman/common" - "github.com/containers/podman/v2/cmd/podman/registry" - "github.com/containers/podman/v2/pkg/domain/entities" + "github.com/containers/podman/v3/cmd/podman/common" + "github.com/containers/podman/v3/cmd/podman/registry" + "github.com/containers/podman/v3/pkg/domain/entities" "github.com/spf13/cobra" ) diff --git a/cmd/podman/containers/export.go b/cmd/podman/containers/export.go index fe2da0f3a..3ea55415c 100644 --- a/cmd/podman/containers/export.go +++ b/cmd/podman/containers/export.go @@ -5,10 +5,10 @@ import ( "os" "github.com/containers/common/pkg/completion" - "github.com/containers/podman/v2/cmd/podman/common" - "github.com/containers/podman/v2/cmd/podman/parse" - "github.com/containers/podman/v2/cmd/podman/registry" - "github.com/containers/podman/v2/pkg/domain/entities" + "github.com/containers/podman/v3/cmd/podman/common" + "github.com/containers/podman/v3/cmd/podman/parse" + "github.com/containers/podman/v3/cmd/podman/registry" + "github.com/containers/podman/v3/pkg/domain/entities" "github.com/pkg/errors" "github.com/spf13/cobra" "golang.org/x/crypto/ssh/terminal" diff --git a/cmd/podman/containers/init.go b/cmd/podman/containers/init.go index 99a32bc24..e874b9cb0 100644 --- a/cmd/podman/containers/init.go +++ b/cmd/podman/containers/init.go @@ -3,11 +3,11 @@ package containers import ( "fmt" - "github.com/containers/podman/v2/cmd/podman/common" - "github.com/containers/podman/v2/cmd/podman/registry" - "github.com/containers/podman/v2/cmd/podman/utils" - "github.com/containers/podman/v2/cmd/podman/validate" - "github.com/containers/podman/v2/pkg/domain/entities" + "github.com/containers/podman/v3/cmd/podman/common" + "github.com/containers/podman/v3/cmd/podman/registry" + "github.com/containers/podman/v3/cmd/podman/utils" + "github.com/containers/podman/v3/cmd/podman/validate" + "github.com/containers/podman/v3/pkg/domain/entities" "github.com/spf13/cobra" "github.com/spf13/pflag" ) diff --git a/cmd/podman/containers/inspect.go b/cmd/podman/containers/inspect.go index e438bca95..e7921fc39 100644 --- a/cmd/podman/containers/inspect.go +++ b/cmd/podman/containers/inspect.go @@ -1,11 +1,11 @@ package containers import ( - "github.com/containers/podman/v2/cmd/podman/common" - "github.com/containers/podman/v2/cmd/podman/inspect" - "github.com/containers/podman/v2/cmd/podman/registry" - "github.com/containers/podman/v2/cmd/podman/validate" - "github.com/containers/podman/v2/pkg/domain/entities" + "github.com/containers/podman/v3/cmd/podman/common" + "github.com/containers/podman/v3/cmd/podman/inspect" + "github.com/containers/podman/v3/cmd/podman/registry" + "github.com/containers/podman/v3/cmd/podman/validate" + "github.com/containers/podman/v3/pkg/domain/entities" "github.com/spf13/cobra" ) diff --git a/cmd/podman/containers/kill.go b/cmd/podman/containers/kill.go index 36e3e5f59..6ba7b7f73 100644 --- a/cmd/podman/containers/kill.go +++ b/cmd/podman/containers/kill.go @@ -7,12 +7,12 @@ import ( "strings" "github.com/containers/common/pkg/completion" - "github.com/containers/podman/v2/cmd/podman/common" - "github.com/containers/podman/v2/cmd/podman/registry" - "github.com/containers/podman/v2/cmd/podman/utils" - "github.com/containers/podman/v2/cmd/podman/validate" - "github.com/containers/podman/v2/pkg/domain/entities" - "github.com/containers/podman/v2/pkg/signal" + "github.com/containers/podman/v3/cmd/podman/common" + "github.com/containers/podman/v3/cmd/podman/registry" + "github.com/containers/podman/v3/cmd/podman/utils" + "github.com/containers/podman/v3/cmd/podman/validate" + "github.com/containers/podman/v3/pkg/domain/entities" + "github.com/containers/podman/v3/pkg/signal" "github.com/pkg/errors" "github.com/spf13/cobra" ) diff --git a/cmd/podman/containers/list.go b/cmd/podman/containers/list.go index 834413c2c..4a903f5ea 100644 --- a/cmd/podman/containers/list.go +++ b/cmd/podman/containers/list.go @@ -2,9 +2,9 @@ package containers import ( "github.com/containers/common/pkg/completion" - "github.com/containers/podman/v2/cmd/podman/registry" - "github.com/containers/podman/v2/cmd/podman/validate" - "github.com/containers/podman/v2/pkg/domain/entities" + "github.com/containers/podman/v3/cmd/podman/registry" + "github.com/containers/podman/v3/cmd/podman/validate" + "github.com/containers/podman/v3/pkg/domain/entities" "github.com/spf13/cobra" ) diff --git a/cmd/podman/containers/logs.go b/cmd/podman/containers/logs.go index 9b562afd8..6275106cf 100644 --- a/cmd/podman/containers/logs.go +++ b/cmd/podman/containers/logs.go @@ -4,11 +4,11 @@ import ( "os" "github.com/containers/common/pkg/completion" - "github.com/containers/podman/v2/cmd/podman/common" - "github.com/containers/podman/v2/cmd/podman/registry" - "github.com/containers/podman/v2/cmd/podman/validate" - "github.com/containers/podman/v2/pkg/domain/entities" - "github.com/containers/podman/v2/pkg/util" + "github.com/containers/podman/v3/cmd/podman/common" + "github.com/containers/podman/v3/cmd/podman/registry" + "github.com/containers/podman/v3/cmd/podman/validate" + "github.com/containers/podman/v3/pkg/domain/entities" + "github.com/containers/podman/v3/pkg/util" "github.com/pkg/errors" "github.com/spf13/cobra" ) diff --git a/cmd/podman/containers/mount.go b/cmd/podman/containers/mount.go index c92b19a19..7853bfae6 100644 --- a/cmd/podman/containers/mount.go +++ b/cmd/podman/containers/mount.go @@ -7,11 +7,11 @@ import ( "text/template" "github.com/containers/common/pkg/report" - "github.com/containers/podman/v2/cmd/podman/common" - "github.com/containers/podman/v2/cmd/podman/registry" - "github.com/containers/podman/v2/cmd/podman/utils" - "github.com/containers/podman/v2/cmd/podman/validate" - "github.com/containers/podman/v2/pkg/domain/entities" + "github.com/containers/podman/v3/cmd/podman/common" + "github.com/containers/podman/v3/cmd/podman/registry" + "github.com/containers/podman/v3/cmd/podman/utils" + "github.com/containers/podman/v3/cmd/podman/validate" + "github.com/containers/podman/v3/pkg/domain/entities" "github.com/pkg/errors" "github.com/spf13/cobra" ) diff --git a/cmd/podman/containers/pause.go b/cmd/podman/containers/pause.go index 18b37adfd..a1ac00bfb 100644 --- a/cmd/podman/containers/pause.go +++ b/cmd/podman/containers/pause.go @@ -4,12 +4,12 @@ import ( "context" "fmt" - "github.com/containers/podman/v2/cmd/podman/common" - "github.com/containers/podman/v2/cmd/podman/registry" - "github.com/containers/podman/v2/cmd/podman/utils" - "github.com/containers/podman/v2/pkg/cgroups" - "github.com/containers/podman/v2/pkg/domain/entities" - "github.com/containers/podman/v2/pkg/rootless" + "github.com/containers/podman/v3/cmd/podman/common" + "github.com/containers/podman/v3/cmd/podman/registry" + "github.com/containers/podman/v3/cmd/podman/utils" + "github.com/containers/podman/v3/pkg/cgroups" + "github.com/containers/podman/v3/pkg/domain/entities" + "github.com/containers/podman/v3/pkg/rootless" "github.com/pkg/errors" "github.com/spf13/cobra" "github.com/spf13/pflag" diff --git a/cmd/podman/containers/port.go b/cmd/podman/containers/port.go index 4d3a5310d..7c9565c26 100644 --- a/cmd/podman/containers/port.go +++ b/cmd/podman/containers/port.go @@ -5,10 +5,10 @@ import ( "strconv" "strings" - "github.com/containers/podman/v2/cmd/podman/common" - "github.com/containers/podman/v2/cmd/podman/registry" - "github.com/containers/podman/v2/cmd/podman/validate" - "github.com/containers/podman/v2/pkg/domain/entities" + "github.com/containers/podman/v3/cmd/podman/common" + "github.com/containers/podman/v3/cmd/podman/registry" + "github.com/containers/podman/v3/cmd/podman/validate" + "github.com/containers/podman/v3/pkg/domain/entities" "github.com/cri-o/ocicni/pkg/ocicni" "github.com/pkg/errors" "github.com/spf13/cobra" diff --git a/cmd/podman/containers/prune.go b/cmd/podman/containers/prune.go index 50731dd21..9acf5589b 100644 --- a/cmd/podman/containers/prune.go +++ b/cmd/podman/containers/prune.go @@ -9,10 +9,10 @@ import ( "strings" "github.com/containers/common/pkg/completion" - "github.com/containers/podman/v2/cmd/podman/registry" - "github.com/containers/podman/v2/cmd/podman/utils" - "github.com/containers/podman/v2/cmd/podman/validate" - "github.com/containers/podman/v2/pkg/domain/entities" + "github.com/containers/podman/v3/cmd/podman/registry" + "github.com/containers/podman/v3/cmd/podman/utils" + "github.com/containers/podman/v3/cmd/podman/validate" + "github.com/containers/podman/v3/pkg/domain/entities" "github.com/pkg/errors" "github.com/spf13/cobra" ) diff --git a/cmd/podman/containers/ps.go b/cmd/podman/containers/ps.go index 0c6cbab42..70bfd3574 100644 --- a/cmd/podman/containers/ps.go +++ b/cmd/podman/containers/ps.go @@ -13,12 +13,12 @@ import ( tm "github.com/buger/goterm" "github.com/containers/common/pkg/completion" "github.com/containers/common/pkg/report" - "github.com/containers/podman/v2/cmd/podman/common" - "github.com/containers/podman/v2/cmd/podman/parse" - "github.com/containers/podman/v2/cmd/podman/registry" - "github.com/containers/podman/v2/cmd/podman/utils" - "github.com/containers/podman/v2/cmd/podman/validate" - "github.com/containers/podman/v2/pkg/domain/entities" + "github.com/containers/podman/v3/cmd/podman/common" + "github.com/containers/podman/v3/cmd/podman/parse" + "github.com/containers/podman/v3/cmd/podman/registry" + "github.com/containers/podman/v3/cmd/podman/utils" + "github.com/containers/podman/v3/cmd/podman/validate" + "github.com/containers/podman/v3/pkg/domain/entities" "github.com/cri-o/ocicni/pkg/ocicni" "github.com/docker/go-units" "github.com/pkg/errors" diff --git a/cmd/podman/containers/rename.go b/cmd/podman/containers/rename.go index 78bd3db83..0f4a1dde1 100644 --- a/cmd/podman/containers/rename.go +++ b/cmd/podman/containers/rename.go @@ -1,9 +1,9 @@ package containers import ( - "github.com/containers/podman/v2/cmd/podman/common" - "github.com/containers/podman/v2/cmd/podman/registry" - "github.com/containers/podman/v2/pkg/domain/entities" + "github.com/containers/podman/v3/cmd/podman/common" + "github.com/containers/podman/v3/cmd/podman/registry" + "github.com/containers/podman/v3/pkg/domain/entities" "github.com/pkg/errors" "github.com/spf13/cobra" ) diff --git a/cmd/podman/containers/restart.go b/cmd/podman/containers/restart.go index a51355194..80ffff700 100644 --- a/cmd/podman/containers/restart.go +++ b/cmd/podman/containers/restart.go @@ -5,12 +5,12 @@ import ( "fmt" "github.com/containers/common/pkg/completion" - "github.com/containers/podman/v2/cmd/podman/common" - "github.com/containers/podman/v2/cmd/podman/registry" - "github.com/containers/podman/v2/cmd/podman/utils" - "github.com/containers/podman/v2/cmd/podman/validate" - "github.com/containers/podman/v2/libpod/define" - "github.com/containers/podman/v2/pkg/domain/entities" + "github.com/containers/podman/v3/cmd/podman/common" + "github.com/containers/podman/v3/cmd/podman/registry" + "github.com/containers/podman/v3/cmd/podman/utils" + "github.com/containers/podman/v3/cmd/podman/validate" + "github.com/containers/podman/v3/libpod/define" + "github.com/containers/podman/v3/pkg/domain/entities" "github.com/pkg/errors" "github.com/spf13/cobra" ) diff --git a/cmd/podman/containers/restore.go b/cmd/podman/containers/restore.go index 61bd84219..ad530e308 100644 --- a/cmd/podman/containers/restore.go +++ b/cmd/podman/containers/restore.go @@ -5,12 +5,12 @@ import ( "fmt" "github.com/containers/common/pkg/completion" - "github.com/containers/podman/v2/cmd/podman/common" - "github.com/containers/podman/v2/cmd/podman/registry" - "github.com/containers/podman/v2/cmd/podman/utils" - "github.com/containers/podman/v2/cmd/podman/validate" - "github.com/containers/podman/v2/pkg/domain/entities" - "github.com/containers/podman/v2/pkg/rootless" + "github.com/containers/podman/v3/cmd/podman/common" + "github.com/containers/podman/v3/cmd/podman/registry" + "github.com/containers/podman/v3/cmd/podman/utils" + "github.com/containers/podman/v3/cmd/podman/validate" + "github.com/containers/podman/v3/pkg/domain/entities" + "github.com/containers/podman/v3/pkg/rootless" "github.com/pkg/errors" "github.com/spf13/cobra" ) diff --git a/cmd/podman/containers/rm.go b/cmd/podman/containers/rm.go index 884ad05f4..5822fc4b7 100644 --- a/cmd/podman/containers/rm.go +++ b/cmd/podman/containers/rm.go @@ -7,12 +7,12 @@ import ( "strings" "github.com/containers/common/pkg/completion" - "github.com/containers/podman/v2/cmd/podman/common" - "github.com/containers/podman/v2/cmd/podman/registry" - "github.com/containers/podman/v2/cmd/podman/utils" - "github.com/containers/podman/v2/cmd/podman/validate" - "github.com/containers/podman/v2/libpod/define" - "github.com/containers/podman/v2/pkg/domain/entities" + "github.com/containers/podman/v3/cmd/podman/common" + "github.com/containers/podman/v3/cmd/podman/registry" + "github.com/containers/podman/v3/cmd/podman/utils" + "github.com/containers/podman/v3/cmd/podman/validate" + "github.com/containers/podman/v3/libpod/define" + "github.com/containers/podman/v3/pkg/domain/entities" "github.com/pkg/errors" "github.com/sirupsen/logrus" "github.com/spf13/cobra" diff --git a/cmd/podman/containers/run.go b/cmd/podman/containers/run.go index 46bfb4143..83a5d7b8a 100644 --- a/cmd/podman/containers/run.go +++ b/cmd/podman/containers/run.go @@ -6,14 +6,14 @@ import ( "strings" "github.com/containers/common/pkg/completion" - "github.com/containers/podman/v2/cmd/podman/common" - "github.com/containers/podman/v2/cmd/podman/registry" - "github.com/containers/podman/v2/cmd/podman/utils" - "github.com/containers/podman/v2/libpod/define" - "github.com/containers/podman/v2/pkg/domain/entities" - "github.com/containers/podman/v2/pkg/errorhandling" - "github.com/containers/podman/v2/pkg/rootless" - "github.com/containers/podman/v2/pkg/specgen" + "github.com/containers/podman/v3/cmd/podman/common" + "github.com/containers/podman/v3/cmd/podman/registry" + "github.com/containers/podman/v3/cmd/podman/utils" + "github.com/containers/podman/v3/libpod/define" + "github.com/containers/podman/v3/pkg/domain/entities" + "github.com/containers/podman/v3/pkg/errorhandling" + "github.com/containers/podman/v3/pkg/rootless" + "github.com/containers/podman/v3/pkg/specgen" "github.com/pkg/errors" "github.com/sirupsen/logrus" "github.com/spf13/cobra" diff --git a/cmd/podman/containers/runlabel.go b/cmd/podman/containers/runlabel.go index 6ebba4935..75c2557f0 100644 --- a/cmd/podman/containers/runlabel.go +++ b/cmd/podman/containers/runlabel.go @@ -7,9 +7,9 @@ import ( "github.com/containers/common/pkg/auth" "github.com/containers/common/pkg/completion" "github.com/containers/image/v5/types" - "github.com/containers/podman/v2/cmd/podman/common" - "github.com/containers/podman/v2/cmd/podman/registry" - "github.com/containers/podman/v2/pkg/domain/entities" + "github.com/containers/podman/v3/cmd/podman/common" + "github.com/containers/podman/v3/cmd/podman/registry" + "github.com/containers/podman/v3/pkg/domain/entities" "github.com/sirupsen/logrus" "github.com/spf13/cobra" ) diff --git a/cmd/podman/containers/start.go b/cmd/podman/containers/start.go index 7e57bb576..9b358db74 100644 --- a/cmd/podman/containers/start.go +++ b/cmd/podman/containers/start.go @@ -4,12 +4,12 @@ import ( "fmt" "os" - "github.com/containers/podman/v2/cmd/podman/common" - "github.com/containers/podman/v2/cmd/podman/registry" - "github.com/containers/podman/v2/cmd/podman/utils" - "github.com/containers/podman/v2/cmd/podman/validate" - "github.com/containers/podman/v2/libpod/define" - "github.com/containers/podman/v2/pkg/domain/entities" + "github.com/containers/podman/v3/cmd/podman/common" + "github.com/containers/podman/v3/cmd/podman/registry" + "github.com/containers/podman/v3/cmd/podman/utils" + "github.com/containers/podman/v3/cmd/podman/validate" + "github.com/containers/podman/v3/libpod/define" + "github.com/containers/podman/v3/pkg/domain/entities" "github.com/pkg/errors" "github.com/spf13/cobra" ) diff --git a/cmd/podman/containers/stats.go b/cmd/podman/containers/stats.go index 1a436aaef..4c31896be 100644 --- a/cmd/podman/containers/stats.go +++ b/cmd/podman/containers/stats.go @@ -8,15 +8,15 @@ import ( tm "github.com/buger/goterm" "github.com/containers/common/pkg/report" - "github.com/containers/podman/v2/cmd/podman/common" - "github.com/containers/podman/v2/cmd/podman/parse" - "github.com/containers/podman/v2/cmd/podman/registry" - "github.com/containers/podman/v2/cmd/podman/validate" - "github.com/containers/podman/v2/libpod/define" - "github.com/containers/podman/v2/pkg/cgroups" - "github.com/containers/podman/v2/pkg/domain/entities" - "github.com/containers/podman/v2/pkg/rootless" - "github.com/containers/podman/v2/utils" + "github.com/containers/podman/v3/cmd/podman/common" + "github.com/containers/podman/v3/cmd/podman/parse" + "github.com/containers/podman/v3/cmd/podman/registry" + "github.com/containers/podman/v3/cmd/podman/validate" + "github.com/containers/podman/v3/libpod/define" + "github.com/containers/podman/v3/pkg/cgroups" + "github.com/containers/podman/v3/pkg/domain/entities" + "github.com/containers/podman/v3/pkg/rootless" + "github.com/containers/podman/v3/utils" "github.com/docker/go-units" "github.com/pkg/errors" "github.com/sirupsen/logrus" diff --git a/cmd/podman/containers/stop.go b/cmd/podman/containers/stop.go index 7338c8d98..492ae4418 100644 --- a/cmd/podman/containers/stop.go +++ b/cmd/podman/containers/stop.go @@ -7,11 +7,11 @@ import ( "strings" "github.com/containers/common/pkg/completion" - "github.com/containers/podman/v2/cmd/podman/common" - "github.com/containers/podman/v2/cmd/podman/registry" - "github.com/containers/podman/v2/cmd/podman/utils" - "github.com/containers/podman/v2/cmd/podman/validate" - "github.com/containers/podman/v2/pkg/domain/entities" + "github.com/containers/podman/v3/cmd/podman/common" + "github.com/containers/podman/v3/cmd/podman/registry" + "github.com/containers/podman/v3/cmd/podman/utils" + "github.com/containers/podman/v3/cmd/podman/validate" + "github.com/containers/podman/v3/pkg/domain/entities" "github.com/pkg/errors" "github.com/spf13/cobra" ) diff --git a/cmd/podman/containers/top.go b/cmd/podman/containers/top.go index e691f527a..03cee5d56 100644 --- a/cmd/podman/containers/top.go +++ b/cmd/podman/containers/top.go @@ -7,11 +7,11 @@ import ( "strings" "text/tabwriter" - "github.com/containers/podman/v2/cmd/podman/common" - "github.com/containers/podman/v2/cmd/podman/registry" - "github.com/containers/podman/v2/cmd/podman/validate" - "github.com/containers/podman/v2/pkg/domain/entities" - "github.com/containers/podman/v2/pkg/util" + "github.com/containers/podman/v3/cmd/podman/common" + "github.com/containers/podman/v3/cmd/podman/registry" + "github.com/containers/podman/v3/cmd/podman/validate" + "github.com/containers/podman/v3/pkg/domain/entities" + "github.com/containers/podman/v3/pkg/util" "github.com/pkg/errors" "github.com/spf13/cobra" "github.com/spf13/pflag" diff --git a/cmd/podman/containers/unmount.go b/cmd/podman/containers/unmount.go index 22e0768e3..98bbce581 100644 --- a/cmd/podman/containers/unmount.go +++ b/cmd/podman/containers/unmount.go @@ -3,11 +3,11 @@ package containers import ( "fmt" - "github.com/containers/podman/v2/cmd/podman/common" - "github.com/containers/podman/v2/cmd/podman/registry" - "github.com/containers/podman/v2/cmd/podman/utils" - "github.com/containers/podman/v2/cmd/podman/validate" - "github.com/containers/podman/v2/pkg/domain/entities" + "github.com/containers/podman/v3/cmd/podman/common" + "github.com/containers/podman/v3/cmd/podman/registry" + "github.com/containers/podman/v3/cmd/podman/utils" + "github.com/containers/podman/v3/cmd/podman/validate" + "github.com/containers/podman/v3/pkg/domain/entities" "github.com/spf13/cobra" "github.com/spf13/pflag" ) diff --git a/cmd/podman/containers/unpause.go b/cmd/podman/containers/unpause.go index 0e8b59192..0077181d7 100644 --- a/cmd/podman/containers/unpause.go +++ b/cmd/podman/containers/unpause.go @@ -4,12 +4,12 @@ import ( "context" "fmt" - "github.com/containers/podman/v2/cmd/podman/common" - "github.com/containers/podman/v2/cmd/podman/registry" - "github.com/containers/podman/v2/cmd/podman/utils" - "github.com/containers/podman/v2/pkg/cgroups" - "github.com/containers/podman/v2/pkg/domain/entities" - "github.com/containers/podman/v2/pkg/rootless" + "github.com/containers/podman/v3/cmd/podman/common" + "github.com/containers/podman/v3/cmd/podman/registry" + "github.com/containers/podman/v3/cmd/podman/utils" + "github.com/containers/podman/v3/pkg/cgroups" + "github.com/containers/podman/v3/pkg/domain/entities" + "github.com/containers/podman/v3/pkg/rootless" "github.com/pkg/errors" "github.com/spf13/cobra" "github.com/spf13/pflag" diff --git a/cmd/podman/containers/wait.go b/cmd/podman/containers/wait.go index 7831ef1c9..c01bc08b1 100644 --- a/cmd/podman/containers/wait.go +++ b/cmd/podman/containers/wait.go @@ -6,12 +6,12 @@ import ( "time" "github.com/containers/common/pkg/completion" - "github.com/containers/podman/v2/cmd/podman/common" - "github.com/containers/podman/v2/cmd/podman/registry" - "github.com/containers/podman/v2/cmd/podman/utils" - "github.com/containers/podman/v2/cmd/podman/validate" - "github.com/containers/podman/v2/libpod/define" - "github.com/containers/podman/v2/pkg/domain/entities" + "github.com/containers/podman/v3/cmd/podman/common" + "github.com/containers/podman/v3/cmd/podman/registry" + "github.com/containers/podman/v3/cmd/podman/utils" + "github.com/containers/podman/v3/cmd/podman/validate" + "github.com/containers/podman/v3/libpod/define" + "github.com/containers/podman/v3/pkg/domain/entities" "github.com/pkg/errors" "github.com/spf13/cobra" ) diff --git a/cmd/podman/diff.go b/cmd/podman/diff.go index e094e6bdd..4862d31b5 100644 --- a/cmd/podman/diff.go +++ b/cmd/podman/diff.go @@ -3,12 +3,12 @@ package main import ( "fmt" - "github.com/containers/podman/v2/cmd/podman/common" - "github.com/containers/podman/v2/cmd/podman/containers" - "github.com/containers/podman/v2/cmd/podman/images" - "github.com/containers/podman/v2/cmd/podman/registry" - "github.com/containers/podman/v2/cmd/podman/validate" - "github.com/containers/podman/v2/pkg/domain/entities" + "github.com/containers/podman/v3/cmd/podman/common" + "github.com/containers/podman/v3/cmd/podman/containers" + "github.com/containers/podman/v3/cmd/podman/images" + "github.com/containers/podman/v3/cmd/podman/registry" + "github.com/containers/podman/v3/cmd/podman/validate" + "github.com/containers/podman/v3/pkg/domain/entities" "github.com/spf13/cobra" ) diff --git a/cmd/podman/early_init_linux.go b/cmd/podman/early_init_linux.go index 4e232a0b0..268385baf 100644 --- a/cmd/podman/early_init_linux.go +++ b/cmd/podman/early_init_linux.go @@ -5,7 +5,7 @@ import ( "os" "syscall" - "github.com/containers/podman/v2/libpod/define" + "github.com/containers/podman/v3/libpod/define" "github.com/pkg/errors" ) diff --git a/cmd/podman/generate/generate.go b/cmd/podman/generate/generate.go index fa2739b20..c559b9e1b 100644 --- a/cmd/podman/generate/generate.go +++ b/cmd/podman/generate/generate.go @@ -1,10 +1,10 @@ package pods import ( - "github.com/containers/podman/v2/cmd/podman/registry" - "github.com/containers/podman/v2/cmd/podman/validate" - "github.com/containers/podman/v2/pkg/domain/entities" - "github.com/containers/podman/v2/pkg/util" + "github.com/containers/podman/v3/cmd/podman/registry" + "github.com/containers/podman/v3/cmd/podman/validate" + "github.com/containers/podman/v3/pkg/domain/entities" + "github.com/containers/podman/v3/pkg/util" "github.com/spf13/cobra" ) diff --git a/cmd/podman/generate/kube.go b/cmd/podman/generate/kube.go index cb608e7b5..90e58271f 100644 --- a/cmd/podman/generate/kube.go +++ b/cmd/podman/generate/kube.go @@ -6,10 +6,10 @@ import ( "os" "github.com/containers/common/pkg/completion" - "github.com/containers/podman/v2/cmd/podman/common" - "github.com/containers/podman/v2/cmd/podman/registry" - "github.com/containers/podman/v2/cmd/podman/utils" - "github.com/containers/podman/v2/pkg/domain/entities" + "github.com/containers/podman/v3/cmd/podman/common" + "github.com/containers/podman/v3/cmd/podman/registry" + "github.com/containers/podman/v3/cmd/podman/utils" + "github.com/containers/podman/v3/pkg/domain/entities" "github.com/pkg/errors" "github.com/spf13/cobra" ) diff --git a/cmd/podman/generate/systemd.go b/cmd/podman/generate/systemd.go index 7b2d9ebb7..913b0c7ed 100644 --- a/cmd/podman/generate/systemd.go +++ b/cmd/podman/generate/systemd.go @@ -8,10 +8,10 @@ import ( "github.com/containers/common/pkg/completion" "github.com/containers/common/pkg/report" - "github.com/containers/podman/v2/cmd/podman/common" - "github.com/containers/podman/v2/cmd/podman/registry" - "github.com/containers/podman/v2/cmd/podman/utils" - "github.com/containers/podman/v2/pkg/domain/entities" + "github.com/containers/podman/v3/cmd/podman/common" + "github.com/containers/podman/v3/cmd/podman/registry" + "github.com/containers/podman/v3/cmd/podman/utils" + "github.com/containers/podman/v3/pkg/domain/entities" "github.com/pkg/errors" "github.com/sirupsen/logrus" "github.com/spf13/cobra" diff --git a/cmd/podman/healthcheck/healthcheck.go b/cmd/podman/healthcheck/healthcheck.go index 683836ed6..4a986e171 100644 --- a/cmd/podman/healthcheck/healthcheck.go +++ b/cmd/podman/healthcheck/healthcheck.go @@ -1,9 +1,9 @@ package healthcheck import ( - "github.com/containers/podman/v2/cmd/podman/registry" - "github.com/containers/podman/v2/cmd/podman/validate" - "github.com/containers/podman/v2/pkg/domain/entities" + "github.com/containers/podman/v3/cmd/podman/registry" + "github.com/containers/podman/v3/cmd/podman/validate" + "github.com/containers/podman/v3/pkg/domain/entities" "github.com/spf13/cobra" ) diff --git a/cmd/podman/healthcheck/run.go b/cmd/podman/healthcheck/run.go index b4331d04e..50a51d172 100644 --- a/cmd/podman/healthcheck/run.go +++ b/cmd/podman/healthcheck/run.go @@ -4,9 +4,9 @@ import ( "context" "fmt" - "github.com/containers/podman/v2/cmd/podman/common" - "github.com/containers/podman/v2/cmd/podman/registry" - "github.com/containers/podman/v2/pkg/domain/entities" + "github.com/containers/podman/v3/cmd/podman/common" + "github.com/containers/podman/v3/cmd/podman/registry" + "github.com/containers/podman/v3/pkg/domain/entities" "github.com/spf13/cobra" ) diff --git a/cmd/podman/images/build.go b/cmd/podman/images/build.go index abd3ced5b..4f080c3fc 100644 --- a/cmd/podman/images/build.go +++ b/cmd/podman/images/build.go @@ -15,10 +15,10 @@ import ( "github.com/containers/common/pkg/config" encconfig "github.com/containers/ocicrypt/config" enchelpers "github.com/containers/ocicrypt/helpers" - "github.com/containers/podman/v2/cmd/podman/common" - "github.com/containers/podman/v2/cmd/podman/registry" - "github.com/containers/podman/v2/cmd/podman/utils" - "github.com/containers/podman/v2/pkg/domain/entities" + "github.com/containers/podman/v3/cmd/podman/common" + "github.com/containers/podman/v3/cmd/podman/registry" + "github.com/containers/podman/v3/cmd/podman/utils" + "github.com/containers/podman/v3/pkg/domain/entities" "github.com/docker/go-units" "github.com/pkg/errors" "github.com/sirupsen/logrus" diff --git a/cmd/podman/images/diff.go b/cmd/podman/images/diff.go index 71793c707..36b0d4e7a 100644 --- a/cmd/podman/images/diff.go +++ b/cmd/podman/images/diff.go @@ -2,9 +2,9 @@ package images import ( "github.com/containers/common/pkg/report" - "github.com/containers/podman/v2/cmd/podman/common" - "github.com/containers/podman/v2/cmd/podman/registry" - "github.com/containers/podman/v2/pkg/domain/entities" + "github.com/containers/podman/v3/cmd/podman/common" + "github.com/containers/podman/v3/cmd/podman/registry" + "github.com/containers/podman/v3/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 cb1ca0295..332510b3d 100644 --- a/cmd/podman/images/exists.go +++ b/cmd/podman/images/exists.go @@ -1,9 +1,9 @@ package images import ( - "github.com/containers/podman/v2/cmd/podman/common" - "github.com/containers/podman/v2/cmd/podman/registry" - "github.com/containers/podman/v2/pkg/domain/entities" + "github.com/containers/podman/v3/cmd/podman/common" + "github.com/containers/podman/v3/cmd/podman/registry" + "github.com/containers/podman/v3/pkg/domain/entities" "github.com/spf13/cobra" ) diff --git a/cmd/podman/images/history.go b/cmd/podman/images/history.go index af40dd73a..eaf56651f 100644 --- a/cmd/podman/images/history.go +++ b/cmd/podman/images/history.go @@ -11,10 +11,10 @@ import ( "unicode" "github.com/containers/common/pkg/report" - "github.com/containers/podman/v2/cmd/podman/common" - "github.com/containers/podman/v2/cmd/podman/parse" - "github.com/containers/podman/v2/cmd/podman/registry" - "github.com/containers/podman/v2/pkg/domain/entities" + "github.com/containers/podman/v3/cmd/podman/common" + "github.com/containers/podman/v3/cmd/podman/parse" + "github.com/containers/podman/v3/cmd/podman/registry" + "github.com/containers/podman/v3/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 abf6bf736..69563959d 100644 --- a/cmd/podman/images/image.go +++ b/cmd/podman/images/image.go @@ -1,9 +1,9 @@ package images import ( - "github.com/containers/podman/v2/cmd/podman/registry" - "github.com/containers/podman/v2/cmd/podman/validate" - "github.com/containers/podman/v2/pkg/domain/entities" + "github.com/containers/podman/v3/cmd/podman/registry" + "github.com/containers/podman/v3/cmd/podman/validate" + "github.com/containers/podman/v3/pkg/domain/entities" "github.com/spf13/cobra" ) diff --git a/cmd/podman/images/images.go b/cmd/podman/images/images.go index 499bfd2ad..17fe21911 100644 --- a/cmd/podman/images/images.go +++ b/cmd/podman/images/images.go @@ -3,8 +3,8 @@ package images import ( "strings" - "github.com/containers/podman/v2/cmd/podman/registry" - "github.com/containers/podman/v2/pkg/domain/entities" + "github.com/containers/podman/v3/cmd/podman/registry" + "github.com/containers/podman/v3/pkg/domain/entities" "github.com/spf13/cobra" ) diff --git a/cmd/podman/images/import.go b/cmd/podman/images/import.go index ac59935ad..72e0b63ba 100644 --- a/cmd/podman/images/import.go +++ b/cmd/podman/images/import.go @@ -6,10 +6,10 @@ import ( "strings" "github.com/containers/common/pkg/completion" - "github.com/containers/podman/v2/cmd/podman/common" - "github.com/containers/podman/v2/cmd/podman/parse" - "github.com/containers/podman/v2/cmd/podman/registry" - "github.com/containers/podman/v2/pkg/domain/entities" + "github.com/containers/podman/v3/cmd/podman/common" + "github.com/containers/podman/v3/cmd/podman/parse" + "github.com/containers/podman/v3/cmd/podman/registry" + "github.com/containers/podman/v3/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 488f03760..fb96286fa 100644 --- a/cmd/podman/images/inspect.go +++ b/cmd/podman/images/inspect.go @@ -1,10 +1,10 @@ package images import ( - "github.com/containers/podman/v2/cmd/podman/common" - "github.com/containers/podman/v2/cmd/podman/inspect" - "github.com/containers/podman/v2/cmd/podman/registry" - "github.com/containers/podman/v2/pkg/domain/entities" + "github.com/containers/podman/v3/cmd/podman/common" + "github.com/containers/podman/v3/cmd/podman/inspect" + "github.com/containers/podman/v3/cmd/podman/registry" + "github.com/containers/podman/v3/pkg/domain/entities" "github.com/spf13/cobra" ) diff --git a/cmd/podman/images/list.go b/cmd/podman/images/list.go index 65486e3ba..7a9a8a804 100644 --- a/cmd/podman/images/list.go +++ b/cmd/podman/images/list.go @@ -13,10 +13,10 @@ import ( "github.com/containers/common/pkg/completion" "github.com/containers/common/pkg/report" "github.com/containers/image/v5/docker/reference" - "github.com/containers/podman/v2/cmd/podman/common" - "github.com/containers/podman/v2/cmd/podman/parse" - "github.com/containers/podman/v2/cmd/podman/registry" - "github.com/containers/podman/v2/pkg/domain/entities" + "github.com/containers/podman/v3/cmd/podman/common" + "github.com/containers/podman/v3/cmd/podman/parse" + "github.com/containers/podman/v3/cmd/podman/registry" + "github.com/containers/podman/v3/pkg/domain/entities" "github.com/docker/go-units" "github.com/pkg/errors" "github.com/spf13/cobra" diff --git a/cmd/podman/images/load.go b/cmd/podman/images/load.go index 59fc6f54c..aac95dae8 100644 --- a/cmd/podman/images/load.go +++ b/cmd/podman/images/load.go @@ -9,10 +9,10 @@ import ( "strings" "github.com/containers/common/pkg/completion" - "github.com/containers/podman/v2/cmd/podman/registry" - "github.com/containers/podman/v2/cmd/podman/validate" - "github.com/containers/podman/v2/pkg/domain/entities" - "github.com/containers/podman/v2/pkg/util" + "github.com/containers/podman/v3/cmd/podman/registry" + "github.com/containers/podman/v3/cmd/podman/validate" + "github.com/containers/podman/v3/pkg/domain/entities" + "github.com/containers/podman/v3/pkg/util" "github.com/pkg/errors" "github.com/spf13/cobra" "golang.org/x/crypto/ssh/terminal" diff --git a/cmd/podman/images/mount.go b/cmd/podman/images/mount.go index 1eac59ef9..79c97006d 100644 --- a/cmd/podman/images/mount.go +++ b/cmd/podman/images/mount.go @@ -7,10 +7,10 @@ import ( "text/template" "github.com/containers/common/pkg/report" - "github.com/containers/podman/v2/cmd/podman/common" - "github.com/containers/podman/v2/cmd/podman/registry" - "github.com/containers/podman/v2/cmd/podman/utils" - "github.com/containers/podman/v2/pkg/domain/entities" + "github.com/containers/podman/v3/cmd/podman/common" + "github.com/containers/podman/v3/cmd/podman/registry" + "github.com/containers/podman/v3/cmd/podman/utils" + "github.com/containers/podman/v3/pkg/domain/entities" "github.com/pkg/errors" "github.com/spf13/cobra" ) diff --git a/cmd/podman/images/prune.go b/cmd/podman/images/prune.go index 8ded8d352..78e107a97 100644 --- a/cmd/podman/images/prune.go +++ b/cmd/podman/images/prune.go @@ -7,10 +7,10 @@ import ( "strings" "github.com/containers/common/pkg/completion" - "github.com/containers/podman/v2/cmd/podman/registry" - "github.com/containers/podman/v2/cmd/podman/utils" - "github.com/containers/podman/v2/cmd/podman/validate" - "github.com/containers/podman/v2/pkg/domain/entities" + "github.com/containers/podman/v3/cmd/podman/registry" + "github.com/containers/podman/v3/cmd/podman/utils" + "github.com/containers/podman/v3/cmd/podman/validate" + "github.com/containers/podman/v3/pkg/domain/entities" "github.com/spf13/cobra" ) diff --git a/cmd/podman/images/pull.go b/cmd/podman/images/pull.go index 3b2595757..bf0eec759 100644 --- a/cmd/podman/images/pull.go +++ b/cmd/podman/images/pull.go @@ -8,10 +8,10 @@ import ( "github.com/containers/common/pkg/auth" "github.com/containers/common/pkg/completion" "github.com/containers/image/v5/types" - "github.com/containers/podman/v2/cmd/podman/common" - "github.com/containers/podman/v2/cmd/podman/registry" - "github.com/containers/podman/v2/pkg/domain/entities" - "github.com/containers/podman/v2/pkg/util" + "github.com/containers/podman/v3/cmd/podman/common" + "github.com/containers/podman/v3/cmd/podman/registry" + "github.com/containers/podman/v3/pkg/domain/entities" + "github.com/containers/podman/v3/pkg/util" "github.com/pkg/errors" "github.com/spf13/cobra" ) diff --git a/cmd/podman/images/push.go b/cmd/podman/images/push.go index 56f618539..e0c714193 100644 --- a/cmd/podman/images/push.go +++ b/cmd/podman/images/push.go @@ -6,10 +6,10 @@ import ( "github.com/containers/common/pkg/auth" "github.com/containers/common/pkg/completion" "github.com/containers/image/v5/types" - "github.com/containers/podman/v2/cmd/podman/common" - "github.com/containers/podman/v2/cmd/podman/registry" - "github.com/containers/podman/v2/pkg/domain/entities" - "github.com/containers/podman/v2/pkg/util" + "github.com/containers/podman/v3/cmd/podman/common" + "github.com/containers/podman/v3/cmd/podman/registry" + "github.com/containers/podman/v3/pkg/domain/entities" + "github.com/containers/podman/v3/pkg/util" "github.com/spf13/cobra" ) diff --git a/cmd/podman/images/rm.go b/cmd/podman/images/rm.go index 587f08c29..2daa4743f 100644 --- a/cmd/podman/images/rm.go +++ b/cmd/podman/images/rm.go @@ -3,10 +3,10 @@ package images import ( "fmt" - "github.com/containers/podman/v2/cmd/podman/common" - "github.com/containers/podman/v2/cmd/podman/registry" - "github.com/containers/podman/v2/pkg/domain/entities" - "github.com/containers/podman/v2/pkg/errorhandling" + "github.com/containers/podman/v3/cmd/podman/common" + "github.com/containers/podman/v3/cmd/podman/registry" + "github.com/containers/podman/v3/pkg/domain/entities" + "github.com/containers/podman/v3/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 ab174d750..edd6ae96f 100644 --- a/cmd/podman/images/rmi.go +++ b/cmd/podman/images/rmi.go @@ -3,8 +3,8 @@ package images import ( "strings" - "github.com/containers/podman/v2/cmd/podman/registry" - "github.com/containers/podman/v2/pkg/domain/entities" + "github.com/containers/podman/v3/cmd/podman/registry" + "github.com/containers/podman/v3/pkg/domain/entities" "github.com/spf13/cobra" ) diff --git a/cmd/podman/images/save.go b/cmd/podman/images/save.go index 3a35c4fad..6c03fc3c6 100644 --- a/cmd/podman/images/save.go +++ b/cmd/podman/images/save.go @@ -6,12 +6,12 @@ import ( "strings" "github.com/containers/common/pkg/completion" - "github.com/containers/podman/v2/cmd/podman/common" - "github.com/containers/podman/v2/cmd/podman/parse" - "github.com/containers/podman/v2/cmd/podman/registry" - "github.com/containers/podman/v2/libpod/define" - "github.com/containers/podman/v2/pkg/domain/entities" - "github.com/containers/podman/v2/pkg/util" + "github.com/containers/podman/v3/cmd/podman/common" + "github.com/containers/podman/v3/cmd/podman/parse" + "github.com/containers/podman/v3/cmd/podman/registry" + "github.com/containers/podman/v3/libpod/define" + "github.com/containers/podman/v3/pkg/domain/entities" + "github.com/containers/podman/v3/pkg/util" "github.com/pkg/errors" "github.com/spf13/cobra" "golang.org/x/crypto/ssh/terminal" diff --git a/cmd/podman/images/search.go b/cmd/podman/images/search.go index b8274cfce..a3cfa983f 100644 --- a/cmd/podman/images/search.go +++ b/cmd/podman/images/search.go @@ -10,9 +10,9 @@ import ( "github.com/containers/common/pkg/completion" "github.com/containers/common/pkg/report" "github.com/containers/image/v5/types" - "github.com/containers/podman/v2/cmd/podman/parse" - "github.com/containers/podman/v2/cmd/podman/registry" - "github.com/containers/podman/v2/pkg/domain/entities" + "github.com/containers/podman/v3/cmd/podman/parse" + "github.com/containers/podman/v3/cmd/podman/registry" + "github.com/containers/podman/v3/pkg/domain/entities" "github.com/pkg/errors" "github.com/spf13/cobra" ) diff --git a/cmd/podman/images/sign.go b/cmd/podman/images/sign.go index 859d51d51..fcd904bb7 100644 --- a/cmd/podman/images/sign.go +++ b/cmd/podman/images/sign.go @@ -4,9 +4,9 @@ import ( "os" "github.com/containers/common/pkg/completion" - "github.com/containers/podman/v2/cmd/podman/common" - "github.com/containers/podman/v2/cmd/podman/registry" - "github.com/containers/podman/v2/pkg/domain/entities" + "github.com/containers/podman/v3/cmd/podman/common" + "github.com/containers/podman/v3/cmd/podman/registry" + "github.com/containers/podman/v3/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 157db49ca..695ca30ed 100644 --- a/cmd/podman/images/tag.go +++ b/cmd/podman/images/tag.go @@ -1,9 +1,9 @@ package images import ( - "github.com/containers/podman/v2/cmd/podman/common" - "github.com/containers/podman/v2/cmd/podman/registry" - "github.com/containers/podman/v2/pkg/domain/entities" + "github.com/containers/podman/v3/cmd/podman/common" + "github.com/containers/podman/v3/cmd/podman/registry" + "github.com/containers/podman/v3/pkg/domain/entities" "github.com/spf13/cobra" ) diff --git a/cmd/podman/images/tree.go b/cmd/podman/images/tree.go index 76c69b37e..0a659c914 100644 --- a/cmd/podman/images/tree.go +++ b/cmd/podman/images/tree.go @@ -3,9 +3,9 @@ package images import ( "fmt" - "github.com/containers/podman/v2/cmd/podman/common" - "github.com/containers/podman/v2/cmd/podman/registry" - "github.com/containers/podman/v2/pkg/domain/entities" + "github.com/containers/podman/v3/cmd/podman/common" + "github.com/containers/podman/v3/cmd/podman/registry" + "github.com/containers/podman/v3/pkg/domain/entities" "github.com/spf13/cobra" ) diff --git a/cmd/podman/images/trust.go b/cmd/podman/images/trust.go index 842540110..2c51bb5f8 100644 --- a/cmd/podman/images/trust.go +++ b/cmd/podman/images/trust.go @@ -1,9 +1,9 @@ package images import ( - "github.com/containers/podman/v2/cmd/podman/registry" - "github.com/containers/podman/v2/cmd/podman/validate" - "github.com/containers/podman/v2/pkg/domain/entities" + "github.com/containers/podman/v3/cmd/podman/registry" + "github.com/containers/podman/v3/cmd/podman/validate" + "github.com/containers/podman/v3/pkg/domain/entities" "github.com/spf13/cobra" ) diff --git a/cmd/podman/images/trust_set.go b/cmd/podman/images/trust_set.go index 1a7392f3e..6333512d9 100644 --- a/cmd/podman/images/trust_set.go +++ b/cmd/podman/images/trust_set.go @@ -2,11 +2,11 @@ package images import ( "github.com/containers/common/pkg/completion" - "github.com/containers/podman/v2/cmd/podman/common" - "github.com/containers/podman/v2/cmd/podman/registry" - "github.com/containers/podman/v2/libpod/image" - "github.com/containers/podman/v2/pkg/domain/entities" - "github.com/containers/podman/v2/pkg/util" + "github.com/containers/podman/v3/cmd/podman/common" + "github.com/containers/podman/v3/cmd/podman/registry" + "github.com/containers/podman/v3/libpod/image" + "github.com/containers/podman/v3/pkg/domain/entities" + "github.com/containers/podman/v3/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 89733a1aa..ed9aecdb7 100644 --- a/cmd/podman/images/trust_show.go +++ b/cmd/podman/images/trust_show.go @@ -6,9 +6,9 @@ import ( "text/tabwriter" "text/template" - "github.com/containers/podman/v2/cmd/podman/common" - "github.com/containers/podman/v2/cmd/podman/registry" - "github.com/containers/podman/v2/pkg/domain/entities" + "github.com/containers/podman/v3/cmd/podman/common" + "github.com/containers/podman/v3/cmd/podman/registry" + "github.com/containers/podman/v3/pkg/domain/entities" "github.com/spf13/cobra" ) diff --git a/cmd/podman/images/unmount.go b/cmd/podman/images/unmount.go index 3af959b9f..1e890c292 100644 --- a/cmd/podman/images/unmount.go +++ b/cmd/podman/images/unmount.go @@ -3,10 +3,10 @@ package images import ( "fmt" - "github.com/containers/podman/v2/cmd/podman/common" - "github.com/containers/podman/v2/cmd/podman/registry" - "github.com/containers/podman/v2/cmd/podman/utils" - "github.com/containers/podman/v2/pkg/domain/entities" + "github.com/containers/podman/v3/cmd/podman/common" + "github.com/containers/podman/v3/cmd/podman/registry" + "github.com/containers/podman/v3/cmd/podman/utils" + "github.com/containers/podman/v3/pkg/domain/entities" "github.com/pkg/errors" "github.com/spf13/cobra" "github.com/spf13/pflag" diff --git a/cmd/podman/images/untag.go b/cmd/podman/images/untag.go index 3cf62713b..4344e1847 100644 --- a/cmd/podman/images/untag.go +++ b/cmd/podman/images/untag.go @@ -1,9 +1,9 @@ package images import ( - "github.com/containers/podman/v2/cmd/podman/common" - "github.com/containers/podman/v2/cmd/podman/registry" - "github.com/containers/podman/v2/pkg/domain/entities" + "github.com/containers/podman/v3/cmd/podman/common" + "github.com/containers/podman/v3/cmd/podman/registry" + "github.com/containers/podman/v3/pkg/domain/entities" "github.com/spf13/cobra" ) diff --git a/cmd/podman/inspect.go b/cmd/podman/inspect.go index 64daae951..13417c1ab 100644 --- a/cmd/podman/inspect.go +++ b/cmd/podman/inspect.go @@ -1,10 +1,10 @@ package main import ( - "github.com/containers/podman/v2/cmd/podman/common" - "github.com/containers/podman/v2/cmd/podman/inspect" - "github.com/containers/podman/v2/cmd/podman/registry" - "github.com/containers/podman/v2/pkg/domain/entities" + "github.com/containers/podman/v3/cmd/podman/common" + "github.com/containers/podman/v3/cmd/podman/inspect" + "github.com/containers/podman/v3/cmd/podman/registry" + "github.com/containers/podman/v3/pkg/domain/entities" "github.com/spf13/cobra" ) diff --git a/cmd/podman/inspect/inspect.go b/cmd/podman/inspect/inspect.go index 7708fde3c..351684af1 100644 --- a/cmd/podman/inspect/inspect.go +++ b/cmd/podman/inspect/inspect.go @@ -12,11 +12,11 @@ import ( "github.com/containers/common/pkg/completion" "github.com/containers/common/pkg/report" - "github.com/containers/podman/v2/cmd/podman/common" - "github.com/containers/podman/v2/cmd/podman/registry" - "github.com/containers/podman/v2/cmd/podman/validate" - "github.com/containers/podman/v2/libpod/define" - "github.com/containers/podman/v2/pkg/domain/entities" + "github.com/containers/podman/v3/cmd/podman/common" + "github.com/containers/podman/v3/cmd/podman/registry" + "github.com/containers/podman/v3/cmd/podman/validate" + "github.com/containers/podman/v3/libpod/define" + "github.com/containers/podman/v3/pkg/domain/entities" "github.com/pkg/errors" "github.com/sirupsen/logrus" "github.com/spf13/cobra" diff --git a/cmd/podman/login.go b/cmd/podman/login.go index 7c8fe03dc..cd3bc9756 100644 --- a/cmd/podman/login.go +++ b/cmd/podman/login.go @@ -7,10 +7,10 @@ import ( "github.com/containers/common/pkg/auth" "github.com/containers/common/pkg/completion" "github.com/containers/image/v5/types" - "github.com/containers/podman/v2/cmd/podman/common" - "github.com/containers/podman/v2/cmd/podman/registry" - "github.com/containers/podman/v2/pkg/domain/entities" - "github.com/containers/podman/v2/pkg/registries" + "github.com/containers/podman/v3/cmd/podman/common" + "github.com/containers/podman/v3/cmd/podman/registry" + "github.com/containers/podman/v3/pkg/domain/entities" + "github.com/containers/podman/v3/pkg/registries" "github.com/spf13/cobra" ) diff --git a/cmd/podman/logout.go b/cmd/podman/logout.go index 3cb11071b..286737b12 100644 --- a/cmd/podman/logout.go +++ b/cmd/podman/logout.go @@ -6,10 +6,10 @@ import ( "github.com/containers/common/pkg/auth" "github.com/containers/common/pkg/completion" "github.com/containers/image/v5/types" - "github.com/containers/podman/v2/cmd/podman/common" - "github.com/containers/podman/v2/cmd/podman/registry" - "github.com/containers/podman/v2/pkg/domain/entities" - "github.com/containers/podman/v2/pkg/registries" + "github.com/containers/podman/v3/cmd/podman/common" + "github.com/containers/podman/v3/cmd/podman/registry" + "github.com/containers/podman/v3/pkg/domain/entities" + "github.com/containers/podman/v3/pkg/registries" "github.com/spf13/cobra" ) diff --git a/cmd/podman/main.go b/cmd/podman/main.go index f076d13f3..6351f6a65 100644 --- a/cmd/podman/main.go +++ b/cmd/podman/main.go @@ -4,21 +4,21 @@ import ( "fmt" "os" - _ "github.com/containers/podman/v2/cmd/podman/completion" - _ "github.com/containers/podman/v2/cmd/podman/containers" - _ "github.com/containers/podman/v2/cmd/podman/generate" - _ "github.com/containers/podman/v2/cmd/podman/healthcheck" - _ "github.com/containers/podman/v2/cmd/podman/images" - _ "github.com/containers/podman/v2/cmd/podman/manifest" - _ "github.com/containers/podman/v2/cmd/podman/networks" - _ "github.com/containers/podman/v2/cmd/podman/play" - _ "github.com/containers/podman/v2/cmd/podman/pods" - "github.com/containers/podman/v2/cmd/podman/registry" - _ "github.com/containers/podman/v2/cmd/podman/system" - _ "github.com/containers/podman/v2/cmd/podman/system/connection" - _ "github.com/containers/podman/v2/cmd/podman/volumes" - "github.com/containers/podman/v2/pkg/rootless" - "github.com/containers/podman/v2/pkg/terminal" + _ "github.com/containers/podman/v3/cmd/podman/completion" + _ "github.com/containers/podman/v3/cmd/podman/containers" + _ "github.com/containers/podman/v3/cmd/podman/generate" + _ "github.com/containers/podman/v3/cmd/podman/healthcheck" + _ "github.com/containers/podman/v3/cmd/podman/images" + _ "github.com/containers/podman/v3/cmd/podman/manifest" + _ "github.com/containers/podman/v3/cmd/podman/networks" + _ "github.com/containers/podman/v3/cmd/podman/play" + _ "github.com/containers/podman/v3/cmd/podman/pods" + "github.com/containers/podman/v3/cmd/podman/registry" + _ "github.com/containers/podman/v3/cmd/podman/system" + _ "github.com/containers/podman/v3/cmd/podman/system/connection" + _ "github.com/containers/podman/v3/cmd/podman/volumes" + "github.com/containers/podman/v3/pkg/rootless" + "github.com/containers/podman/v3/pkg/terminal" "github.com/containers/storage/pkg/reexec" "github.com/sirupsen/logrus" "github.com/spf13/cobra" diff --git a/cmd/podman/manifest/add.go b/cmd/podman/manifest/add.go index b33f01c10..82e155909 100644 --- a/cmd/podman/manifest/add.go +++ b/cmd/podman/manifest/add.go @@ -7,10 +7,10 @@ import ( "github.com/containers/common/pkg/auth" "github.com/containers/common/pkg/completion" "github.com/containers/image/v5/types" - "github.com/containers/podman/v2/cmd/podman/common" - "github.com/containers/podman/v2/cmd/podman/registry" - "github.com/containers/podman/v2/pkg/domain/entities" - "github.com/containers/podman/v2/pkg/util" + "github.com/containers/podman/v3/cmd/podman/common" + "github.com/containers/podman/v3/cmd/podman/registry" + "github.com/containers/podman/v3/pkg/domain/entities" + "github.com/containers/podman/v3/pkg/util" "github.com/spf13/cobra" ) diff --git a/cmd/podman/manifest/annotate.go b/cmd/podman/manifest/annotate.go index 7c4f5ad01..f5ec13bf2 100644 --- a/cmd/podman/manifest/annotate.go +++ b/cmd/podman/manifest/annotate.go @@ -5,9 +5,9 @@ import ( "fmt" "github.com/containers/common/pkg/completion" - "github.com/containers/podman/v2/cmd/podman/common" - "github.com/containers/podman/v2/cmd/podman/registry" - "github.com/containers/podman/v2/pkg/domain/entities" + "github.com/containers/podman/v3/cmd/podman/common" + "github.com/containers/podman/v3/cmd/podman/registry" + "github.com/containers/podman/v3/pkg/domain/entities" "github.com/pkg/errors" "github.com/spf13/cobra" ) diff --git a/cmd/podman/manifest/create.go b/cmd/podman/manifest/create.go index 399f9440c..a15b129d5 100644 --- a/cmd/podman/manifest/create.go +++ b/cmd/podman/manifest/create.go @@ -4,9 +4,9 @@ import ( "context" "fmt" - "github.com/containers/podman/v2/cmd/podman/common" - "github.com/containers/podman/v2/cmd/podman/registry" - "github.com/containers/podman/v2/pkg/domain/entities" + "github.com/containers/podman/v3/cmd/podman/common" + "github.com/containers/podman/v3/cmd/podman/registry" + "github.com/containers/podman/v3/pkg/domain/entities" "github.com/spf13/cobra" ) diff --git a/cmd/podman/manifest/inspect.go b/cmd/podman/manifest/inspect.go index 39fd54445..118c0ae70 100644 --- a/cmd/podman/manifest/inspect.go +++ b/cmd/podman/manifest/inspect.go @@ -4,9 +4,9 @@ import ( "context" "fmt" - "github.com/containers/podman/v2/cmd/podman/common" - "github.com/containers/podman/v2/cmd/podman/registry" - "github.com/containers/podman/v2/pkg/domain/entities" + "github.com/containers/podman/v3/cmd/podman/common" + "github.com/containers/podman/v3/cmd/podman/registry" + "github.com/containers/podman/v3/pkg/domain/entities" "github.com/spf13/cobra" ) diff --git a/cmd/podman/manifest/manifest.go b/cmd/podman/manifest/manifest.go index 990ad0e95..f67915481 100644 --- a/cmd/podman/manifest/manifest.go +++ b/cmd/podman/manifest/manifest.go @@ -1,9 +1,9 @@ package manifest import ( - "github.com/containers/podman/v2/cmd/podman/registry" - "github.com/containers/podman/v2/cmd/podman/validate" - "github.com/containers/podman/v2/pkg/domain/entities" + "github.com/containers/podman/v3/cmd/podman/registry" + "github.com/containers/podman/v3/cmd/podman/validate" + "github.com/containers/podman/v3/pkg/domain/entities" "github.com/spf13/cobra" ) diff --git a/cmd/podman/manifest/push.go b/cmd/podman/manifest/push.go index 40b45c40e..1dae5cc95 100644 --- a/cmd/podman/manifest/push.go +++ b/cmd/podman/manifest/push.go @@ -6,11 +6,11 @@ import ( "github.com/containers/common/pkg/auth" "github.com/containers/common/pkg/completion" "github.com/containers/image/v5/types" - "github.com/containers/podman/v2/cmd/podman/common" - "github.com/containers/podman/v2/cmd/podman/registry" - "github.com/containers/podman/v2/cmd/podman/utils" - "github.com/containers/podman/v2/pkg/domain/entities" - "github.com/containers/podman/v2/pkg/util" + "github.com/containers/podman/v3/cmd/podman/common" + "github.com/containers/podman/v3/cmd/podman/registry" + "github.com/containers/podman/v3/cmd/podman/utils" + "github.com/containers/podman/v3/pkg/domain/entities" + "github.com/containers/podman/v3/pkg/util" "github.com/pkg/errors" "github.com/spf13/cobra" ) diff --git a/cmd/podman/manifest/remove.go b/cmd/podman/manifest/remove.go index 170e68d3f..1d1128166 100644 --- a/cmd/podman/manifest/remove.go +++ b/cmd/podman/manifest/remove.go @@ -4,9 +4,9 @@ import ( "context" "fmt" - "github.com/containers/podman/v2/cmd/podman/common" - "github.com/containers/podman/v2/cmd/podman/registry" - "github.com/containers/podman/v2/pkg/domain/entities" + "github.com/containers/podman/v3/cmd/podman/common" + "github.com/containers/podman/v3/cmd/podman/registry" + "github.com/containers/podman/v3/pkg/domain/entities" "github.com/pkg/errors" "github.com/spf13/cobra" ) diff --git a/cmd/podman/networks/connect.go b/cmd/podman/networks/connect.go index 8afc0c7c0..9fa088b78 100644 --- a/cmd/podman/networks/connect.go +++ b/cmd/podman/networks/connect.go @@ -2,9 +2,9 @@ package network import ( "github.com/containers/common/pkg/completion" - "github.com/containers/podman/v2/cmd/podman/common" - "github.com/containers/podman/v2/cmd/podman/registry" - "github.com/containers/podman/v2/pkg/domain/entities" + "github.com/containers/podman/v3/cmd/podman/common" + "github.com/containers/podman/v3/cmd/podman/registry" + "github.com/containers/podman/v3/pkg/domain/entities" "github.com/spf13/cobra" ) diff --git a/cmd/podman/networks/create.go b/cmd/podman/networks/create.go index d1cbe253f..64ca2464a 100644 --- a/cmd/podman/networks/create.go +++ b/cmd/podman/networks/create.go @@ -5,11 +5,11 @@ import ( "net" "github.com/containers/common/pkg/completion" - "github.com/containers/podman/v2/cmd/podman/common" - "github.com/containers/podman/v2/cmd/podman/parse" - "github.com/containers/podman/v2/cmd/podman/registry" - "github.com/containers/podman/v2/libpod/define" - "github.com/containers/podman/v2/pkg/domain/entities" + "github.com/containers/podman/v3/cmd/podman/common" + "github.com/containers/podman/v3/cmd/podman/parse" + "github.com/containers/podman/v3/cmd/podman/registry" + "github.com/containers/podman/v3/libpod/define" + "github.com/containers/podman/v3/pkg/domain/entities" "github.com/pkg/errors" "github.com/spf13/cobra" ) diff --git a/cmd/podman/networks/disconnect.go b/cmd/podman/networks/disconnect.go index a30315774..26861eec6 100644 --- a/cmd/podman/networks/disconnect.go +++ b/cmd/podman/networks/disconnect.go @@ -1,9 +1,9 @@ package network import ( - "github.com/containers/podman/v2/cmd/podman/common" - "github.com/containers/podman/v2/cmd/podman/registry" - "github.com/containers/podman/v2/pkg/domain/entities" + "github.com/containers/podman/v3/cmd/podman/common" + "github.com/containers/podman/v3/cmd/podman/registry" + "github.com/containers/podman/v3/pkg/domain/entities" "github.com/spf13/cobra" "github.com/spf13/pflag" ) diff --git a/cmd/podman/networks/inspect.go b/cmd/podman/networks/inspect.go index bd9f76ea9..953f5e6e8 100644 --- a/cmd/podman/networks/inspect.go +++ b/cmd/podman/networks/inspect.go @@ -1,10 +1,10 @@ package network import ( - "github.com/containers/podman/v2/cmd/podman/common" - "github.com/containers/podman/v2/cmd/podman/inspect" - "github.com/containers/podman/v2/cmd/podman/registry" - "github.com/containers/podman/v2/pkg/domain/entities" + "github.com/containers/podman/v3/cmd/podman/common" + "github.com/containers/podman/v3/cmd/podman/inspect" + "github.com/containers/podman/v3/cmd/podman/registry" + "github.com/containers/podman/v3/pkg/domain/entities" "github.com/spf13/cobra" ) diff --git a/cmd/podman/networks/list.go b/cmd/podman/networks/list.go index 6f63e97cc..6d8d35589 100644 --- a/cmd/podman/networks/list.go +++ b/cmd/podman/networks/list.go @@ -10,12 +10,12 @@ import ( "github.com/containers/common/pkg/completion" "github.com/containers/common/pkg/report" - "github.com/containers/podman/v2/cmd/podman/common" - "github.com/containers/podman/v2/cmd/podman/parse" - "github.com/containers/podman/v2/cmd/podman/registry" - "github.com/containers/podman/v2/cmd/podman/validate" - "github.com/containers/podman/v2/libpod/network" - "github.com/containers/podman/v2/pkg/domain/entities" + "github.com/containers/podman/v3/cmd/podman/common" + "github.com/containers/podman/v3/cmd/podman/parse" + "github.com/containers/podman/v3/cmd/podman/registry" + "github.com/containers/podman/v3/cmd/podman/validate" + "github.com/containers/podman/v3/libpod/network" + "github.com/containers/podman/v3/pkg/domain/entities" "github.com/pkg/errors" "github.com/spf13/cobra" "github.com/spf13/pflag" diff --git a/cmd/podman/networks/network.go b/cmd/podman/networks/network.go index b5f9ef9fd..e729f35f3 100644 --- a/cmd/podman/networks/network.go +++ b/cmd/podman/networks/network.go @@ -1,9 +1,9 @@ package network import ( - "github.com/containers/podman/v2/cmd/podman/registry" - "github.com/containers/podman/v2/cmd/podman/validate" - "github.com/containers/podman/v2/pkg/domain/entities" + "github.com/containers/podman/v3/cmd/podman/registry" + "github.com/containers/podman/v3/cmd/podman/validate" + "github.com/containers/podman/v3/pkg/domain/entities" "github.com/spf13/cobra" ) diff --git a/cmd/podman/networks/reload.go b/cmd/podman/networks/reload.go index 16655c18c..8f2fbf011 100644 --- a/cmd/podman/networks/reload.go +++ b/cmd/podman/networks/reload.go @@ -3,11 +3,11 @@ package network import ( "fmt" - "github.com/containers/podman/v2/cmd/podman/common" - "github.com/containers/podman/v2/cmd/podman/registry" - "github.com/containers/podman/v2/cmd/podman/utils" - "github.com/containers/podman/v2/cmd/podman/validate" - "github.com/containers/podman/v2/pkg/domain/entities" + "github.com/containers/podman/v3/cmd/podman/common" + "github.com/containers/podman/v3/cmd/podman/registry" + "github.com/containers/podman/v3/cmd/podman/utils" + "github.com/containers/podman/v3/cmd/podman/validate" + "github.com/containers/podman/v3/pkg/domain/entities" "github.com/spf13/cobra" "github.com/spf13/pflag" ) diff --git a/cmd/podman/networks/rm.go b/cmd/podman/networks/rm.go index 1504d9385..1ae79b27d 100644 --- a/cmd/podman/networks/rm.go +++ b/cmd/podman/networks/rm.go @@ -4,11 +4,11 @@ import ( "fmt" "strings" - "github.com/containers/podman/v2/cmd/podman/common" - "github.com/containers/podman/v2/cmd/podman/registry" - "github.com/containers/podman/v2/cmd/podman/utils" - "github.com/containers/podman/v2/libpod/define" - "github.com/containers/podman/v2/pkg/domain/entities" + "github.com/containers/podman/v3/cmd/podman/common" + "github.com/containers/podman/v3/cmd/podman/registry" + "github.com/containers/podman/v3/cmd/podman/utils" + "github.com/containers/podman/v3/libpod/define" + "github.com/containers/podman/v3/pkg/domain/entities" "github.com/pkg/errors" "github.com/spf13/cobra" "github.com/spf13/pflag" diff --git a/cmd/podman/play/kube.go b/cmd/podman/play/kube.go index 511e208cf..5650ad1be 100644 --- a/cmd/podman/play/kube.go +++ b/cmd/podman/play/kube.go @@ -7,11 +7,11 @@ import ( "github.com/containers/common/pkg/auth" "github.com/containers/common/pkg/completion" "github.com/containers/image/v5/types" - "github.com/containers/podman/v2/cmd/podman/common" - "github.com/containers/podman/v2/cmd/podman/registry" - "github.com/containers/podman/v2/cmd/podman/utils" - "github.com/containers/podman/v2/pkg/domain/entities" - "github.com/containers/podman/v2/pkg/util" + "github.com/containers/podman/v3/cmd/podman/common" + "github.com/containers/podman/v3/cmd/podman/registry" + "github.com/containers/podman/v3/cmd/podman/utils" + "github.com/containers/podman/v3/pkg/domain/entities" + "github.com/containers/podman/v3/pkg/util" "github.com/pkg/errors" "github.com/spf13/cobra" ) diff --git a/cmd/podman/play/play.go b/cmd/podman/play/play.go index 607c99767..92f87ad80 100644 --- a/cmd/podman/play/play.go +++ b/cmd/podman/play/play.go @@ -1,9 +1,9 @@ package pods import ( - "github.com/containers/podman/v2/cmd/podman/registry" - "github.com/containers/podman/v2/cmd/podman/validate" - "github.com/containers/podman/v2/pkg/domain/entities" + "github.com/containers/podman/v3/cmd/podman/registry" + "github.com/containers/podman/v3/cmd/podman/validate" + "github.com/containers/podman/v3/pkg/domain/entities" "github.com/spf13/cobra" ) diff --git a/cmd/podman/pods/create.go b/cmd/podman/pods/create.go index 23fb323a0..5600d8794 100644 --- a/cmd/podman/pods/create.go +++ b/cmd/podman/pods/create.go @@ -8,14 +8,14 @@ import ( "strings" "github.com/containers/common/pkg/completion" - "github.com/containers/podman/v2/cmd/podman/common" - "github.com/containers/podman/v2/cmd/podman/parse" - "github.com/containers/podman/v2/cmd/podman/registry" - "github.com/containers/podman/v2/cmd/podman/validate" - "github.com/containers/podman/v2/pkg/domain/entities" - "github.com/containers/podman/v2/pkg/errorhandling" - "github.com/containers/podman/v2/pkg/specgen" - "github.com/containers/podman/v2/pkg/util" + "github.com/containers/podman/v3/cmd/podman/common" + "github.com/containers/podman/v3/cmd/podman/parse" + "github.com/containers/podman/v3/cmd/podman/registry" + "github.com/containers/podman/v3/cmd/podman/validate" + "github.com/containers/podman/v3/pkg/domain/entities" + "github.com/containers/podman/v3/pkg/errorhandling" + "github.com/containers/podman/v3/pkg/specgen" + "github.com/containers/podman/v3/pkg/util" "github.com/pkg/errors" "github.com/sirupsen/logrus" "github.com/spf13/cobra" diff --git a/cmd/podman/pods/exists.go b/cmd/podman/pods/exists.go index a5c45803e..a9ef0370b 100644 --- a/cmd/podman/pods/exists.go +++ b/cmd/podman/pods/exists.go @@ -3,9 +3,9 @@ package pods import ( "context" - "github.com/containers/podman/v2/cmd/podman/common" - "github.com/containers/podman/v2/cmd/podman/registry" - "github.com/containers/podman/v2/pkg/domain/entities" + "github.com/containers/podman/v3/cmd/podman/common" + "github.com/containers/podman/v3/cmd/podman/registry" + "github.com/containers/podman/v3/pkg/domain/entities" "github.com/spf13/cobra" ) diff --git a/cmd/podman/pods/inspect.go b/cmd/podman/pods/inspect.go index 0fbb730ce..96e007fa3 100644 --- a/cmd/podman/pods/inspect.go +++ b/cmd/podman/pods/inspect.go @@ -7,10 +7,10 @@ import ( "text/template" "github.com/containers/common/pkg/report" - "github.com/containers/podman/v2/cmd/podman/common" - "github.com/containers/podman/v2/cmd/podman/registry" - "github.com/containers/podman/v2/cmd/podman/validate" - "github.com/containers/podman/v2/pkg/domain/entities" + "github.com/containers/podman/v3/cmd/podman/common" + "github.com/containers/podman/v3/cmd/podman/registry" + "github.com/containers/podman/v3/cmd/podman/validate" + "github.com/containers/podman/v3/pkg/domain/entities" "github.com/pkg/errors" "github.com/spf13/cobra" ) diff --git a/cmd/podman/pods/kill.go b/cmd/podman/pods/kill.go index be8fd31df..17d5499c8 100644 --- a/cmd/podman/pods/kill.go +++ b/cmd/podman/pods/kill.go @@ -4,11 +4,11 @@ import ( "context" "fmt" - "github.com/containers/podman/v2/cmd/podman/common" - "github.com/containers/podman/v2/cmd/podman/registry" - "github.com/containers/podman/v2/cmd/podman/utils" - "github.com/containers/podman/v2/cmd/podman/validate" - "github.com/containers/podman/v2/pkg/domain/entities" + "github.com/containers/podman/v3/cmd/podman/common" + "github.com/containers/podman/v3/cmd/podman/registry" + "github.com/containers/podman/v3/cmd/podman/utils" + "github.com/containers/podman/v3/cmd/podman/validate" + "github.com/containers/podman/v3/pkg/domain/entities" "github.com/spf13/cobra" ) diff --git a/cmd/podman/pods/pause.go b/cmd/podman/pods/pause.go index 108893173..6624ccbd7 100644 --- a/cmd/podman/pods/pause.go +++ b/cmd/podman/pods/pause.go @@ -4,11 +4,11 @@ import ( "context" "fmt" - "github.com/containers/podman/v2/cmd/podman/common" - "github.com/containers/podman/v2/cmd/podman/registry" - "github.com/containers/podman/v2/cmd/podman/utils" - "github.com/containers/podman/v2/cmd/podman/validate" - "github.com/containers/podman/v2/pkg/domain/entities" + "github.com/containers/podman/v3/cmd/podman/common" + "github.com/containers/podman/v3/cmd/podman/registry" + "github.com/containers/podman/v3/cmd/podman/utils" + "github.com/containers/podman/v3/cmd/podman/validate" + "github.com/containers/podman/v3/pkg/domain/entities" "github.com/spf13/cobra" ) diff --git a/cmd/podman/pods/pod.go b/cmd/podman/pods/pod.go index 12448a5f1..00fb02936 100644 --- a/cmd/podman/pods/pod.go +++ b/cmd/podman/pods/pod.go @@ -1,10 +1,10 @@ package pods import ( - "github.com/containers/podman/v2/cmd/podman/registry" - "github.com/containers/podman/v2/cmd/podman/validate" - "github.com/containers/podman/v2/pkg/domain/entities" - "github.com/containers/podman/v2/pkg/util" + "github.com/containers/podman/v3/cmd/podman/registry" + "github.com/containers/podman/v3/cmd/podman/validate" + "github.com/containers/podman/v3/pkg/domain/entities" + "github.com/containers/podman/v3/pkg/util" "github.com/spf13/cobra" ) diff --git a/cmd/podman/pods/prune.go b/cmd/podman/pods/prune.go index a040a21b6..51b6bb4a9 100644 --- a/cmd/podman/pods/prune.go +++ b/cmd/podman/pods/prune.go @@ -8,10 +8,10 @@ import ( "strings" "github.com/containers/common/pkg/completion" - "github.com/containers/podman/v2/cmd/podman/registry" - "github.com/containers/podman/v2/cmd/podman/utils" - "github.com/containers/podman/v2/cmd/podman/validate" - "github.com/containers/podman/v2/pkg/domain/entities" + "github.com/containers/podman/v3/cmd/podman/registry" + "github.com/containers/podman/v3/cmd/podman/utils" + "github.com/containers/podman/v3/cmd/podman/validate" + "github.com/containers/podman/v3/pkg/domain/entities" "github.com/spf13/cobra" ) diff --git a/cmd/podman/pods/ps.go b/cmd/podman/pods/ps.go index a27ab4859..aeba80525 100644 --- a/cmd/podman/pods/ps.go +++ b/cmd/podman/pods/ps.go @@ -12,11 +12,11 @@ import ( "github.com/containers/common/pkg/completion" "github.com/containers/common/pkg/report" - "github.com/containers/podman/v2/cmd/podman/common" - "github.com/containers/podman/v2/cmd/podman/parse" - "github.com/containers/podman/v2/cmd/podman/registry" - "github.com/containers/podman/v2/cmd/podman/validate" - "github.com/containers/podman/v2/pkg/domain/entities" + "github.com/containers/podman/v3/cmd/podman/common" + "github.com/containers/podman/v3/cmd/podman/parse" + "github.com/containers/podman/v3/cmd/podman/registry" + "github.com/containers/podman/v3/cmd/podman/validate" + "github.com/containers/podman/v3/pkg/domain/entities" "github.com/docker/go-units" "github.com/pkg/errors" "github.com/spf13/cobra" diff --git a/cmd/podman/pods/restart.go b/cmd/podman/pods/restart.go index 7a4b28a45..5b9f47a5b 100644 --- a/cmd/podman/pods/restart.go +++ b/cmd/podman/pods/restart.go @@ -4,11 +4,11 @@ import ( "context" "fmt" - "github.com/containers/podman/v2/cmd/podman/common" - "github.com/containers/podman/v2/cmd/podman/registry" - "github.com/containers/podman/v2/cmd/podman/utils" - "github.com/containers/podman/v2/cmd/podman/validate" - "github.com/containers/podman/v2/pkg/domain/entities" + "github.com/containers/podman/v3/cmd/podman/common" + "github.com/containers/podman/v3/cmd/podman/registry" + "github.com/containers/podman/v3/cmd/podman/utils" + "github.com/containers/podman/v3/cmd/podman/validate" + "github.com/containers/podman/v3/pkg/domain/entities" "github.com/spf13/cobra" ) diff --git a/cmd/podman/pods/rm.go b/cmd/podman/pods/rm.go index 109f18b78..333e4eb9f 100644 --- a/cmd/podman/pods/rm.go +++ b/cmd/podman/pods/rm.go @@ -6,12 +6,12 @@ import ( "strings" "github.com/containers/common/pkg/completion" - "github.com/containers/podman/v2/cmd/podman/common" - "github.com/containers/podman/v2/cmd/podman/registry" - "github.com/containers/podman/v2/cmd/podman/utils" - "github.com/containers/podman/v2/cmd/podman/validate" - "github.com/containers/podman/v2/libpod/define" - "github.com/containers/podman/v2/pkg/domain/entities" + "github.com/containers/podman/v3/cmd/podman/common" + "github.com/containers/podman/v3/cmd/podman/registry" + "github.com/containers/podman/v3/cmd/podman/utils" + "github.com/containers/podman/v3/cmd/podman/validate" + "github.com/containers/podman/v3/libpod/define" + "github.com/containers/podman/v3/pkg/domain/entities" "github.com/pkg/errors" "github.com/spf13/cobra" ) diff --git a/cmd/podman/pods/start.go b/cmd/podman/pods/start.go index 7cd5c64d9..f6dca854e 100644 --- a/cmd/podman/pods/start.go +++ b/cmd/podman/pods/start.go @@ -5,11 +5,11 @@ import ( "fmt" "github.com/containers/common/pkg/completion" - "github.com/containers/podman/v2/cmd/podman/common" - "github.com/containers/podman/v2/cmd/podman/registry" - "github.com/containers/podman/v2/cmd/podman/utils" - "github.com/containers/podman/v2/cmd/podman/validate" - "github.com/containers/podman/v2/pkg/domain/entities" + "github.com/containers/podman/v3/cmd/podman/common" + "github.com/containers/podman/v3/cmd/podman/registry" + "github.com/containers/podman/v3/cmd/podman/utils" + "github.com/containers/podman/v3/cmd/podman/validate" + "github.com/containers/podman/v3/pkg/domain/entities" "github.com/spf13/cobra" ) diff --git a/cmd/podman/pods/stats.go b/cmd/podman/pods/stats.go index 5f79fa016..e336b864e 100644 --- a/cmd/podman/pods/stats.go +++ b/cmd/podman/pods/stats.go @@ -10,11 +10,11 @@ import ( "github.com/buger/goterm" "github.com/containers/common/pkg/report" - "github.com/containers/podman/v2/cmd/podman/common" - "github.com/containers/podman/v2/cmd/podman/parse" - "github.com/containers/podman/v2/cmd/podman/registry" - "github.com/containers/podman/v2/cmd/podman/validate" - "github.com/containers/podman/v2/pkg/domain/entities" + "github.com/containers/podman/v3/cmd/podman/common" + "github.com/containers/podman/v3/cmd/podman/parse" + "github.com/containers/podman/v3/cmd/podman/registry" + "github.com/containers/podman/v3/cmd/podman/validate" + "github.com/containers/podman/v3/pkg/domain/entities" "github.com/spf13/cobra" ) diff --git a/cmd/podman/pods/stop.go b/cmd/podman/pods/stop.go index d03364028..a9a16b39c 100644 --- a/cmd/podman/pods/stop.go +++ b/cmd/podman/pods/stop.go @@ -5,11 +5,11 @@ import ( "fmt" "github.com/containers/common/pkg/completion" - "github.com/containers/podman/v2/cmd/podman/common" - "github.com/containers/podman/v2/cmd/podman/registry" - "github.com/containers/podman/v2/cmd/podman/utils" - "github.com/containers/podman/v2/cmd/podman/validate" - "github.com/containers/podman/v2/pkg/domain/entities" + "github.com/containers/podman/v3/cmd/podman/common" + "github.com/containers/podman/v3/cmd/podman/registry" + "github.com/containers/podman/v3/cmd/podman/utils" + "github.com/containers/podman/v3/cmd/podman/validate" + "github.com/containers/podman/v3/pkg/domain/entities" "github.com/spf13/cobra" ) diff --git a/cmd/podman/pods/top.go b/cmd/podman/pods/top.go index 829882080..be8aab761 100644 --- a/cmd/podman/pods/top.go +++ b/cmd/podman/pods/top.go @@ -7,11 +7,11 @@ import ( "strings" "text/tabwriter" - "github.com/containers/podman/v2/cmd/podman/common" - "github.com/containers/podman/v2/cmd/podman/registry" - "github.com/containers/podman/v2/cmd/podman/validate" - "github.com/containers/podman/v2/pkg/domain/entities" - "github.com/containers/podman/v2/pkg/util" + "github.com/containers/podman/v3/cmd/podman/common" + "github.com/containers/podman/v3/cmd/podman/registry" + "github.com/containers/podman/v3/cmd/podman/validate" + "github.com/containers/podman/v3/pkg/domain/entities" + "github.com/containers/podman/v3/pkg/util" "github.com/pkg/errors" "github.com/spf13/cobra" ) diff --git a/cmd/podman/pods/unpause.go b/cmd/podman/pods/unpause.go index 499faec37..859ac8ac2 100644 --- a/cmd/podman/pods/unpause.go +++ b/cmd/podman/pods/unpause.go @@ -4,11 +4,11 @@ import ( "context" "fmt" - "github.com/containers/podman/v2/cmd/podman/common" - "github.com/containers/podman/v2/cmd/podman/registry" - "github.com/containers/podman/v2/cmd/podman/utils" - "github.com/containers/podman/v2/cmd/podman/validate" - "github.com/containers/podman/v2/pkg/domain/entities" + "github.com/containers/podman/v3/cmd/podman/common" + "github.com/containers/podman/v3/cmd/podman/registry" + "github.com/containers/podman/v3/cmd/podman/utils" + "github.com/containers/podman/v3/cmd/podman/validate" + "github.com/containers/podman/v3/pkg/domain/entities" "github.com/spf13/cobra" ) diff --git a/cmd/podman/registry/config.go b/cmd/podman/registry/config.go index 0e29d5cd9..3ce6e3899 100644 --- a/cmd/podman/registry/config.go +++ b/cmd/podman/registry/config.go @@ -8,9 +8,9 @@ import ( "sync" "github.com/containers/common/pkg/config" - "github.com/containers/podman/v2/pkg/domain/entities" - "github.com/containers/podman/v2/pkg/rootless" - "github.com/containers/podman/v2/pkg/util" + "github.com/containers/podman/v3/pkg/domain/entities" + "github.com/containers/podman/v3/pkg/rootless" + "github.com/containers/podman/v3/pkg/util" "github.com/pkg/errors" ) diff --git a/cmd/podman/registry/registry.go b/cmd/podman/registry/registry.go index 481ed810f..0b1d9293a 100644 --- a/cmd/podman/registry/registry.go +++ b/cmd/podman/registry/registry.go @@ -4,10 +4,10 @@ import ( "context" "path/filepath" - "github.com/containers/podman/v2/pkg/domain/entities" - "github.com/containers/podman/v2/pkg/domain/infra" - "github.com/containers/podman/v2/pkg/rootless" - "github.com/containers/podman/v2/pkg/util" + "github.com/containers/podman/v3/pkg/domain/entities" + "github.com/containers/podman/v3/pkg/domain/infra" + "github.com/containers/podman/v3/pkg/rootless" + "github.com/containers/podman/v3/pkg/util" "github.com/sirupsen/logrus" "github.com/spf13/cobra" ) diff --git a/cmd/podman/registry/remote.go b/cmd/podman/registry/remote.go index 6e9b1fdfc..b5da98bd4 100644 --- a/cmd/podman/registry/remote.go +++ b/cmd/podman/registry/remote.go @@ -4,7 +4,7 @@ import ( "os" "sync" - "github.com/containers/podman/v2/pkg/domain/entities" + "github.com/containers/podman/v3/pkg/domain/entities" "github.com/spf13/cobra" "github.com/spf13/pflag" ) diff --git a/cmd/podman/root.go b/cmd/podman/root.go index 1f613a4c5..874573bb9 100644 --- a/cmd/podman/root.go +++ b/cmd/podman/root.go @@ -10,15 +10,15 @@ import ( "github.com/containers/common/pkg/completion" "github.com/containers/common/pkg/config" - "github.com/containers/podman/v2/cmd/podman/common" - "github.com/containers/podman/v2/cmd/podman/registry" - "github.com/containers/podman/v2/cmd/podman/validate" - "github.com/containers/podman/v2/libpod/define" - "github.com/containers/podman/v2/pkg/domain/entities" - "github.com/containers/podman/v2/pkg/parallel" - "github.com/containers/podman/v2/pkg/rootless" - "github.com/containers/podman/v2/pkg/tracing" - "github.com/containers/podman/v2/version" + "github.com/containers/podman/v3/cmd/podman/common" + "github.com/containers/podman/v3/cmd/podman/registry" + "github.com/containers/podman/v3/cmd/podman/validate" + "github.com/containers/podman/v3/libpod/define" + "github.com/containers/podman/v3/pkg/domain/entities" + "github.com/containers/podman/v3/pkg/parallel" + "github.com/containers/podman/v3/pkg/rootless" + "github.com/containers/podman/v3/pkg/tracing" + "github.com/containers/podman/v3/version" "github.com/opentracing/opentracing-go" "github.com/pkg/errors" "github.com/sirupsen/logrus" diff --git a/cmd/podman/root_test.go b/cmd/podman/root_test.go index 0473128df..f2826a304 100644 --- a/cmd/podman/root_test.go +++ b/cmd/podman/root_test.go @@ -5,7 +5,7 @@ import ( "strings" "testing" - "github.com/containers/podman/v2/libpod/define" + "github.com/containers/podman/v3/libpod/define" "github.com/pkg/errors" ) diff --git a/cmd/podman/shell_completion_test.go b/cmd/podman/shell_completion_test.go index 3f6f56fbe..9bd821d8d 100644 --- a/cmd/podman/shell_completion_test.go +++ b/cmd/podman/shell_completion_test.go @@ -6,7 +6,7 @@ function set. (except boolean, hidden and deprecated flags) Shell completion functions are defined in: - - "github.com/containers/podman/v2/cmd/podman/common/completion.go" + - "github.com/containers/podman/v3/cmd/podman/common/completion.go" - "github.com/containers/common/pkg/completion" and are called Autocomplete... diff --git a/cmd/podman/system/connection.go b/cmd/podman/system/connection.go index b6c18217e..dbdda8cf9 100644 --- a/cmd/podman/system/connection.go +++ b/cmd/podman/system/connection.go @@ -1,9 +1,9 @@ package system import ( - "github.com/containers/podman/v2/cmd/podman/registry" - "github.com/containers/podman/v2/cmd/podman/validate" - "github.com/containers/podman/v2/pkg/domain/entities" + "github.com/containers/podman/v3/cmd/podman/registry" + "github.com/containers/podman/v3/cmd/podman/validate" + "github.com/containers/podman/v3/pkg/domain/entities" "github.com/spf13/cobra" ) diff --git a/cmd/podman/system/connection/add.go b/cmd/podman/system/connection/add.go index da5f652c8..89d28849c 100644 --- a/cmd/podman/system/connection/add.go +++ b/cmd/podman/system/connection/add.go @@ -12,11 +12,11 @@ import ( "github.com/containers/common/pkg/completion" "github.com/containers/common/pkg/config" - "github.com/containers/podman/v2/cmd/podman/registry" - "github.com/containers/podman/v2/cmd/podman/system" - "github.com/containers/podman/v2/libpod/define" - "github.com/containers/podman/v2/pkg/domain/entities" - "github.com/containers/podman/v2/pkg/terminal" + "github.com/containers/podman/v3/cmd/podman/registry" + "github.com/containers/podman/v3/cmd/podman/system" + "github.com/containers/podman/v3/libpod/define" + "github.com/containers/podman/v3/pkg/domain/entities" + "github.com/containers/podman/v3/pkg/terminal" "github.com/pkg/errors" "github.com/sirupsen/logrus" "github.com/spf13/cobra" diff --git a/cmd/podman/system/connection/default.go b/cmd/podman/system/connection/default.go index e2ae6ae7f..073bdbc3f 100644 --- a/cmd/podman/system/connection/default.go +++ b/cmd/podman/system/connection/default.go @@ -4,10 +4,10 @@ import ( "fmt" "github.com/containers/common/pkg/config" - "github.com/containers/podman/v2/cmd/podman/common" - "github.com/containers/podman/v2/cmd/podman/registry" - "github.com/containers/podman/v2/cmd/podman/system" - "github.com/containers/podman/v2/pkg/domain/entities" + "github.com/containers/podman/v3/cmd/podman/common" + "github.com/containers/podman/v3/cmd/podman/registry" + "github.com/containers/podman/v3/cmd/podman/system" + "github.com/containers/podman/v3/pkg/domain/entities" "github.com/spf13/cobra" ) diff --git a/cmd/podman/system/connection/list.go b/cmd/podman/system/connection/list.go index b434559b4..fe7026ae3 100644 --- a/cmd/podman/system/connection/list.go +++ b/cmd/podman/system/connection/list.go @@ -7,10 +7,10 @@ import ( "github.com/containers/common/pkg/completion" "github.com/containers/common/pkg/config" - "github.com/containers/podman/v2/cmd/podman/registry" - "github.com/containers/podman/v2/cmd/podman/system" - "github.com/containers/podman/v2/cmd/podman/validate" - "github.com/containers/podman/v2/pkg/domain/entities" + "github.com/containers/podman/v3/cmd/podman/registry" + "github.com/containers/podman/v3/cmd/podman/system" + "github.com/containers/podman/v3/cmd/podman/validate" + "github.com/containers/podman/v3/pkg/domain/entities" "github.com/spf13/cobra" ) diff --git a/cmd/podman/system/connection/remove.go b/cmd/podman/system/connection/remove.go index 429325f50..4acaa36a9 100644 --- a/cmd/podman/system/connection/remove.go +++ b/cmd/podman/system/connection/remove.go @@ -2,10 +2,10 @@ package connection import ( "github.com/containers/common/pkg/config" - "github.com/containers/podman/v2/cmd/podman/common" - "github.com/containers/podman/v2/cmd/podman/registry" - "github.com/containers/podman/v2/cmd/podman/system" - "github.com/containers/podman/v2/pkg/domain/entities" + "github.com/containers/podman/v3/cmd/podman/common" + "github.com/containers/podman/v3/cmd/podman/registry" + "github.com/containers/podman/v3/cmd/podman/system" + "github.com/containers/podman/v3/pkg/domain/entities" "github.com/spf13/cobra" ) diff --git a/cmd/podman/system/connection/rename.go b/cmd/podman/system/connection/rename.go index 7ab94d49a..7713c2b09 100644 --- a/cmd/podman/system/connection/rename.go +++ b/cmd/podman/system/connection/rename.go @@ -4,10 +4,10 @@ import ( "fmt" "github.com/containers/common/pkg/config" - "github.com/containers/podman/v2/cmd/podman/common" - "github.com/containers/podman/v2/cmd/podman/registry" - "github.com/containers/podman/v2/cmd/podman/system" - "github.com/containers/podman/v2/pkg/domain/entities" + "github.com/containers/podman/v3/cmd/podman/common" + "github.com/containers/podman/v3/cmd/podman/registry" + "github.com/containers/podman/v3/cmd/podman/system" + "github.com/containers/podman/v3/pkg/domain/entities" "github.com/spf13/cobra" ) diff --git a/cmd/podman/system/df.go b/cmd/podman/system/df.go index 68b244e35..5e179a82d 100644 --- a/cmd/podman/system/df.go +++ b/cmd/podman/system/df.go @@ -10,10 +10,10 @@ import ( "github.com/containers/common/pkg/completion" "github.com/containers/common/pkg/report" - "github.com/containers/podman/v2/cmd/podman/parse" - "github.com/containers/podman/v2/cmd/podman/registry" - "github.com/containers/podman/v2/cmd/podman/validate" - "github.com/containers/podman/v2/pkg/domain/entities" + "github.com/containers/podman/v3/cmd/podman/parse" + "github.com/containers/podman/v3/cmd/podman/registry" + "github.com/containers/podman/v3/cmd/podman/validate" + "github.com/containers/podman/v3/pkg/domain/entities" "github.com/docker/go-units" "github.com/spf13/cobra" ) diff --git a/cmd/podman/system/events.go b/cmd/podman/system/events.go index d2aefab67..0f52282a9 100644 --- a/cmd/podman/system/events.go +++ b/cmd/podman/system/events.go @@ -8,11 +8,11 @@ import ( "github.com/containers/common/pkg/completion" "github.com/containers/common/pkg/report" - "github.com/containers/podman/v2/cmd/podman/common" - "github.com/containers/podman/v2/cmd/podman/registry" - "github.com/containers/podman/v2/cmd/podman/validate" - "github.com/containers/podman/v2/libpod/events" - "github.com/containers/podman/v2/pkg/domain/entities" + "github.com/containers/podman/v3/cmd/podman/common" + "github.com/containers/podman/v3/cmd/podman/registry" + "github.com/containers/podman/v3/cmd/podman/validate" + "github.com/containers/podman/v3/libpod/events" + "github.com/containers/podman/v3/pkg/domain/entities" "github.com/spf13/cobra" ) diff --git a/cmd/podman/system/info.go b/cmd/podman/system/info.go index 17aeb2940..2babd49c8 100644 --- a/cmd/podman/system/info.go +++ b/cmd/podman/system/info.go @@ -7,10 +7,10 @@ import ( "github.com/containers/common/pkg/completion" "github.com/containers/common/pkg/report" - "github.com/containers/podman/v2/cmd/podman/common" - "github.com/containers/podman/v2/cmd/podman/registry" - "github.com/containers/podman/v2/cmd/podman/validate" - "github.com/containers/podman/v2/pkg/domain/entities" + "github.com/containers/podman/v3/cmd/podman/common" + "github.com/containers/podman/v3/cmd/podman/registry" + "github.com/containers/podman/v3/cmd/podman/validate" + "github.com/containers/podman/v3/pkg/domain/entities" "github.com/ghodss/yaml" "github.com/spf13/cobra" ) diff --git a/cmd/podman/system/migrate.go b/cmd/podman/system/migrate.go index 234a49e4b..892d60a38 100644 --- a/cmd/podman/system/migrate.go +++ b/cmd/podman/system/migrate.go @@ -7,10 +7,10 @@ import ( "os" "github.com/containers/common/pkg/completion" - "github.com/containers/podman/v2/cmd/podman/registry" - "github.com/containers/podman/v2/cmd/podman/validate" - "github.com/containers/podman/v2/pkg/domain/entities" - "github.com/containers/podman/v2/pkg/domain/infra" + "github.com/containers/podman/v3/cmd/podman/registry" + "github.com/containers/podman/v3/cmd/podman/validate" + "github.com/containers/podman/v3/pkg/domain/entities" + "github.com/containers/podman/v3/pkg/domain/infra" "github.com/spf13/cobra" ) diff --git a/cmd/podman/system/prune.go b/cmd/podman/system/prune.go index 7ec08366e..dcb3316f0 100644 --- a/cmd/podman/system/prune.go +++ b/cmd/podman/system/prune.go @@ -8,11 +8,11 @@ import ( "strings" "github.com/containers/common/pkg/completion" - "github.com/containers/podman/v2/cmd/podman/registry" - "github.com/containers/podman/v2/cmd/podman/utils" - "github.com/containers/podman/v2/cmd/podman/validate" - "github.com/containers/podman/v2/pkg/domain/entities" - dfilters "github.com/containers/podman/v2/pkg/domain/filters" + "github.com/containers/podman/v3/cmd/podman/registry" + "github.com/containers/podman/v3/cmd/podman/utils" + "github.com/containers/podman/v3/cmd/podman/validate" + "github.com/containers/podman/v3/pkg/domain/entities" + dfilters "github.com/containers/podman/v3/pkg/domain/filters" "github.com/docker/go-units" "github.com/spf13/cobra" ) diff --git a/cmd/podman/system/renumber.go b/cmd/podman/system/renumber.go index 37f9a5865..91c49333a 100644 --- a/cmd/podman/system/renumber.go +++ b/cmd/podman/system/renumber.go @@ -7,10 +7,10 @@ import ( "os" "github.com/containers/common/pkg/completion" - "github.com/containers/podman/v2/cmd/podman/registry" - "github.com/containers/podman/v2/cmd/podman/validate" - "github.com/containers/podman/v2/pkg/domain/entities" - "github.com/containers/podman/v2/pkg/domain/infra" + "github.com/containers/podman/v3/cmd/podman/registry" + "github.com/containers/podman/v3/cmd/podman/validate" + "github.com/containers/podman/v3/pkg/domain/entities" + "github.com/containers/podman/v3/pkg/domain/infra" "github.com/spf13/cobra" ) diff --git a/cmd/podman/system/reset.go b/cmd/podman/system/reset.go index 97f4fba28..6f2f873dd 100644 --- a/cmd/podman/system/reset.go +++ b/cmd/podman/system/reset.go @@ -9,10 +9,10 @@ import ( "strings" "github.com/containers/common/pkg/completion" - "github.com/containers/podman/v2/cmd/podman/registry" - "github.com/containers/podman/v2/cmd/podman/validate" - "github.com/containers/podman/v2/pkg/domain/entities" - "github.com/containers/podman/v2/pkg/domain/infra" + "github.com/containers/podman/v3/cmd/podman/registry" + "github.com/containers/podman/v3/cmd/podman/validate" + "github.com/containers/podman/v3/pkg/domain/entities" + "github.com/containers/podman/v3/pkg/domain/infra" "github.com/sirupsen/logrus" "github.com/spf13/cobra" ) diff --git a/cmd/podman/system/service.go b/cmd/podman/system/service.go index f5760e172..1e1cdbd12 100644 --- a/cmd/podman/system/service.go +++ b/cmd/podman/system/service.go @@ -10,12 +10,12 @@ import ( "time" "github.com/containers/common/pkg/completion" - "github.com/containers/podman/v2/cmd/podman/common" - "github.com/containers/podman/v2/cmd/podman/registry" - "github.com/containers/podman/v2/pkg/domain/entities" - "github.com/containers/podman/v2/pkg/rootless" - "github.com/containers/podman/v2/pkg/systemd" - "github.com/containers/podman/v2/pkg/util" + "github.com/containers/podman/v3/cmd/podman/common" + "github.com/containers/podman/v3/cmd/podman/registry" + "github.com/containers/podman/v3/pkg/domain/entities" + "github.com/containers/podman/v3/pkg/rootless" + "github.com/containers/podman/v3/pkg/systemd" + "github.com/containers/podman/v3/pkg/util" "github.com/sirupsen/logrus" "github.com/spf13/cobra" "github.com/spf13/pflag" diff --git a/cmd/podman/system/service_abi.go b/cmd/podman/system/service_abi.go index ed35fbb04..0e96e1fbb 100644 --- a/cmd/podman/system/service_abi.go +++ b/cmd/podman/system/service_abi.go @@ -8,9 +8,9 @@ import ( "os" "strings" - api "github.com/containers/podman/v2/pkg/api/server" - "github.com/containers/podman/v2/pkg/domain/entities" - "github.com/containers/podman/v2/pkg/domain/infra" + api "github.com/containers/podman/v3/pkg/api/server" + "github.com/containers/podman/v3/pkg/domain/entities" + "github.com/containers/podman/v3/pkg/domain/infra" "github.com/pkg/errors" "github.com/sirupsen/logrus" "github.com/spf13/pflag" diff --git a/cmd/podman/system/system.go b/cmd/podman/system/system.go index 388905035..ab06c3ae0 100644 --- a/cmd/podman/system/system.go +++ b/cmd/podman/system/system.go @@ -1,9 +1,9 @@ package system import ( - "github.com/containers/podman/v2/cmd/podman/registry" - "github.com/containers/podman/v2/cmd/podman/validate" - "github.com/containers/podman/v2/pkg/domain/entities" + "github.com/containers/podman/v3/cmd/podman/registry" + "github.com/containers/podman/v3/cmd/podman/validate" + "github.com/containers/podman/v3/pkg/domain/entities" "github.com/spf13/cobra" ) diff --git a/cmd/podman/system/unshare.go b/cmd/podman/system/unshare.go index 364852979..5e6ff569b 100644 --- a/cmd/podman/system/unshare.go +++ b/cmd/podman/system/unshare.go @@ -4,9 +4,9 @@ import ( "os" "github.com/containers/common/pkg/completion" - "github.com/containers/podman/v2/cmd/podman/registry" - "github.com/containers/podman/v2/pkg/domain/entities" - "github.com/containers/podman/v2/pkg/rootless" + "github.com/containers/podman/v3/cmd/podman/registry" + "github.com/containers/podman/v3/pkg/domain/entities" + "github.com/containers/podman/v3/pkg/rootless" "github.com/pkg/errors" "github.com/spf13/cobra" ) diff --git a/cmd/podman/system/version.go b/cmd/podman/system/version.go index cb7206b8a..dfb10c080 100644 --- a/cmd/podman/system/version.go +++ b/cmd/podman/system/version.go @@ -10,11 +10,11 @@ import ( "github.com/containers/common/pkg/completion" "github.com/containers/common/pkg/report" - "github.com/containers/podman/v2/cmd/podman/common" - "github.com/containers/podman/v2/cmd/podman/registry" - "github.com/containers/podman/v2/cmd/podman/validate" - "github.com/containers/podman/v2/libpod/define" - "github.com/containers/podman/v2/pkg/domain/entities" + "github.com/containers/podman/v3/cmd/podman/common" + "github.com/containers/podman/v3/cmd/podman/registry" + "github.com/containers/podman/v3/cmd/podman/validate" + "github.com/containers/podman/v3/libpod/define" + "github.com/containers/podman/v3/pkg/domain/entities" "github.com/spf13/cobra" ) diff --git a/cmd/podman/utils/utils.go b/cmd/podman/utils/utils.go index f42243f69..e38c9d49c 100644 --- a/cmd/podman/utils/utils.go +++ b/cmd/podman/utils/utils.go @@ -4,8 +4,8 @@ import ( "fmt" "os" - "github.com/containers/podman/v2/pkg/domain/entities" - "github.com/containers/podman/v2/pkg/domain/entities/reports" + "github.com/containers/podman/v3/pkg/domain/entities" + "github.com/containers/podman/v3/pkg/domain/entities/reports" ) // IsDir returns true if the specified path refers to a directory. diff --git a/cmd/podman/validate/args.go b/cmd/podman/validate/args.go index ab6460e93..c00813369 100644 --- a/cmd/podman/validate/args.go +++ b/cmd/podman/validate/args.go @@ -4,7 +4,7 @@ import ( "fmt" "strconv" - "github.com/containers/podman/v2/cmd/podman/registry" + "github.com/containers/podman/v3/cmd/podman/registry" "github.com/pkg/errors" "github.com/spf13/cobra" ) diff --git a/cmd/podman/validate/latest.go b/cmd/podman/validate/latest.go index c9bff798a..8937074b5 100644 --- a/cmd/podman/validate/latest.go +++ b/cmd/podman/validate/latest.go @@ -1,7 +1,7 @@ package validate import ( - "github.com/containers/podman/v2/cmd/podman/registry" + "github.com/containers/podman/v3/cmd/podman/registry" "github.com/spf13/cobra" ) diff --git a/cmd/podman/volumes/create.go b/cmd/podman/volumes/create.go index 8de343a24..1820260a4 100644 --- a/cmd/podman/volumes/create.go +++ b/cmd/podman/volumes/create.go @@ -5,9 +5,9 @@ import ( "fmt" "github.com/containers/common/pkg/completion" - "github.com/containers/podman/v2/cmd/podman/parse" - "github.com/containers/podman/v2/cmd/podman/registry" - "github.com/containers/podman/v2/pkg/domain/entities" + "github.com/containers/podman/v3/cmd/podman/parse" + "github.com/containers/podman/v3/cmd/podman/registry" + "github.com/containers/podman/v3/pkg/domain/entities" "github.com/pkg/errors" "github.com/spf13/cobra" ) diff --git a/cmd/podman/volumes/inspect.go b/cmd/podman/volumes/inspect.go index b5094224c..91269e3d1 100644 --- a/cmd/podman/volumes/inspect.go +++ b/cmd/podman/volumes/inspect.go @@ -1,10 +1,10 @@ package volumes import ( - "github.com/containers/podman/v2/cmd/podman/common" - "github.com/containers/podman/v2/cmd/podman/inspect" - "github.com/containers/podman/v2/cmd/podman/registry" - "github.com/containers/podman/v2/pkg/domain/entities" + "github.com/containers/podman/v3/cmd/podman/common" + "github.com/containers/podman/v3/cmd/podman/inspect" + "github.com/containers/podman/v3/cmd/podman/registry" + "github.com/containers/podman/v3/pkg/domain/entities" "github.com/pkg/errors" "github.com/spf13/cobra" ) diff --git a/cmd/podman/volumes/list.go b/cmd/podman/volumes/list.go index 7e54de38a..e04f452d4 100644 --- a/cmd/podman/volumes/list.go +++ b/cmd/podman/volumes/list.go @@ -10,11 +10,11 @@ import ( "github.com/containers/common/pkg/completion" "github.com/containers/common/pkg/report" - "github.com/containers/podman/v2/cmd/podman/common" - "github.com/containers/podman/v2/cmd/podman/parse" - "github.com/containers/podman/v2/cmd/podman/registry" - "github.com/containers/podman/v2/cmd/podman/validate" - "github.com/containers/podman/v2/pkg/domain/entities" + "github.com/containers/podman/v3/cmd/podman/common" + "github.com/containers/podman/v3/cmd/podman/parse" + "github.com/containers/podman/v3/cmd/podman/registry" + "github.com/containers/podman/v3/cmd/podman/validate" + "github.com/containers/podman/v3/pkg/domain/entities" "github.com/pkg/errors" "github.com/spf13/cobra" ) diff --git a/cmd/podman/volumes/prune.go b/cmd/podman/volumes/prune.go index 0f3ba9ef6..c8c64f79c 100644 --- a/cmd/podman/volumes/prune.go +++ b/cmd/podman/volumes/prune.go @@ -8,12 +8,12 @@ import ( "strings" "github.com/containers/common/pkg/completion" - "github.com/containers/podman/v2/cmd/podman/common" - "github.com/containers/podman/v2/cmd/podman/registry" - "github.com/containers/podman/v2/cmd/podman/utils" - "github.com/containers/podman/v2/cmd/podman/validate" - "github.com/containers/podman/v2/pkg/domain/entities" - "github.com/containers/podman/v2/pkg/domain/filters" + "github.com/containers/podman/v3/cmd/podman/common" + "github.com/containers/podman/v3/cmd/podman/registry" + "github.com/containers/podman/v3/cmd/podman/utils" + "github.com/containers/podman/v3/cmd/podman/validate" + "github.com/containers/podman/v3/pkg/domain/entities" + "github.com/containers/podman/v3/pkg/domain/filters" "github.com/spf13/cobra" ) diff --git a/cmd/podman/volumes/rm.go b/cmd/podman/volumes/rm.go index 49f7b619e..e149e398c 100644 --- a/cmd/podman/volumes/rm.go +++ b/cmd/podman/volumes/rm.go @@ -5,11 +5,11 @@ import ( "fmt" "strings" - "github.com/containers/podman/v2/cmd/podman/common" - "github.com/containers/podman/v2/cmd/podman/registry" - "github.com/containers/podman/v2/cmd/podman/utils" - "github.com/containers/podman/v2/libpod/define" - "github.com/containers/podman/v2/pkg/domain/entities" + "github.com/containers/podman/v3/cmd/podman/common" + "github.com/containers/podman/v3/cmd/podman/registry" + "github.com/containers/podman/v3/cmd/podman/utils" + "github.com/containers/podman/v3/libpod/define" + "github.com/containers/podman/v3/pkg/domain/entities" "github.com/pkg/errors" "github.com/spf13/cobra" ) diff --git a/cmd/podman/volumes/volume.go b/cmd/podman/volumes/volume.go index cd7a1a642..7786d5dc3 100644 --- a/cmd/podman/volumes/volume.go +++ b/cmd/podman/volumes/volume.go @@ -1,9 +1,9 @@ package volumes import ( - "github.com/containers/podman/v2/cmd/podman/registry" - "github.com/containers/podman/v2/cmd/podman/validate" - "github.com/containers/podman/v2/pkg/domain/entities" + "github.com/containers/podman/v3/cmd/podman/registry" + "github.com/containers/podman/v3/cmd/podman/validate" + "github.com/containers/podman/v3/pkg/domain/entities" "github.com/spf13/cobra" ) |