From a5e37ad2805b2594339e0d5d41da0e0cc37e4f4a Mon Sep 17 00:00:00 2001 From: Daniel J Walsh Date: Tue, 28 Jul 2020 08:23:45 -0400 Subject: Switch all references to github.com/containers/libpod -> podman Signed-off-by: Daniel J Walsh --- cmd/podman/README.md | 20 ++++++++++---------- cmd/podman/auto-update.go | 6 +++--- cmd/podman/common/create.go | 4 ++-- cmd/podman/common/create_opts.go | 2 +- cmd/podman/common/createparse.go | 2 +- cmd/podman/common/default.go | 2 +- cmd/podman/common/netflags.go | 8 ++++---- cmd/podman/common/specgen.go | 16 ++++++++-------- cmd/podman/common/util.go | 2 +- cmd/podman/common/volumes.go | 4 ++-- cmd/podman/containers/attach.go | 6 +++--- cmd/podman/containers/checkpoint.go | 10 +++++----- cmd/podman/containers/cleanup.go | 8 ++++---- cmd/podman/containers/commit.go | 4 ++-- cmd/podman/containers/container.go | 8 ++++---- cmd/podman/containers/cp.go | 8 ++++---- cmd/podman/containers/create.go | 16 ++++++++-------- cmd/podman/containers/diff.go | 8 ++++---- cmd/podman/containers/exec.go | 10 +++++----- cmd/podman/containers/exists.go | 4 ++-- cmd/podman/containers/export.go | 6 +++--- cmd/podman/containers/init.go | 8 ++++---- cmd/podman/containers/inspect.go | 8 ++++---- cmd/podman/containers/kill.go | 10 +++++----- cmd/podman/containers/list.go | 6 +++--- cmd/podman/containers/logs.go | 8 ++++---- cmd/podman/containers/mount.go | 8 ++++---- cmd/podman/containers/pause.go | 8 ++++---- cmd/podman/containers/port.go | 6 +++--- cmd/podman/containers/prune.go | 6 +++--- cmd/podman/containers/ps.go | 6 +++--- cmd/podman/containers/restart.go | 10 +++++----- cmd/podman/containers/restore.go | 10 +++++----- cmd/podman/containers/rm.go | 10 +++++----- cmd/podman/containers/run.go | 16 ++++++++-------- cmd/podman/containers/runlabel.go | 4 ++-- cmd/podman/containers/start.go | 10 +++++----- cmd/podman/containers/stats.go | 14 +++++++------- cmd/podman/containers/stop.go | 8 ++++---- cmd/podman/containers/top.go | 8 ++++---- cmd/podman/containers/unmount.go | 8 ++++---- cmd/podman/containers/unpause.go | 8 ++++---- cmd/podman/containers/wait.go | 10 +++++----- cmd/podman/diff.go | 10 +++++----- cmd/podman/early_init_linux.go | 2 +- cmd/podman/generate/generate.go | 8 ++++---- cmd/podman/generate/kube.go | 6 +++--- cmd/podman/generate/systemd.go | 6 +++--- cmd/podman/healthcheck/healthcheck.go | 6 +++--- cmd/podman/healthcheck/run.go | 4 ++-- cmd/podman/images/build.go | 6 +++--- cmd/podman/images/diff.go | 6 +++--- cmd/podman/images/exists.go | 4 ++-- cmd/podman/images/history.go | 4 ++-- cmd/podman/images/image.go | 6 +++--- cmd/podman/images/images.go | 4 ++-- cmd/podman/images/import.go | 6 +++--- cmd/podman/images/inspect.go | 6 +++--- cmd/podman/images/list.go | 4 ++-- cmd/podman/images/load.go | 8 ++++---- cmd/podman/images/prune.go | 8 ++++---- cmd/podman/images/pull.go | 6 +++--- cmd/podman/images/push.go | 6 +++--- cmd/podman/images/rm.go | 6 +++--- cmd/podman/images/rmi.go | 4 ++-- cmd/podman/images/save.go | 10 +++++----- cmd/podman/images/search.go | 6 +++--- cmd/podman/images/sign.go | 4 ++-- cmd/podman/images/tag.go | 4 ++-- cmd/podman/images/tree.go | 4 ++-- cmd/podman/images/trust.go | 6 +++--- cmd/podman/images/trust_set.go | 8 ++++---- cmd/podman/images/trust_show.go | 4 ++-- cmd/podman/images/untag.go | 4 ++-- cmd/podman/inspect.go | 6 +++--- cmd/podman/inspect/inspect.go | 6 +++--- cmd/podman/login.go | 6 +++--- cmd/podman/logout.go | 6 +++--- cmd/podman/main.go | 28 ++++++++++++++-------------- cmd/podman/manifest/add.go | 4 ++-- cmd/podman/manifest/annotate.go | 4 ++-- cmd/podman/manifest/create.go | 4 ++-- cmd/podman/manifest/inspect.go | 4 ++-- cmd/podman/manifest/manifest.go | 6 +++--- cmd/podman/manifest/push.go | 6 +++--- cmd/podman/manifest/remove.go | 4 ++-- cmd/podman/networks/create.go | 8 ++++---- cmd/podman/networks/inspect.go | 4 ++-- cmd/podman/networks/list.go | 8 ++++---- cmd/podman/networks/network.go | 6 +++--- cmd/podman/networks/rm.go | 6 +++--- cmd/podman/play/kube.go | 8 ++++---- cmd/podman/play/play.go | 6 +++--- cmd/podman/pods/create.go | 16 ++++++++-------- cmd/podman/pods/exists.go | 4 ++-- cmd/podman/pods/inspect.go | 6 +++--- cmd/podman/pods/kill.go | 8 ++++---- cmd/podman/pods/pause.go | 8 ++++---- cmd/podman/pods/pod.go | 8 ++++---- cmd/podman/pods/prune.go | 6 +++--- cmd/podman/pods/ps.go | 6 +++--- cmd/podman/pods/restart.go | 8 ++++---- cmd/podman/pods/rm.go | 10 +++++----- cmd/podman/pods/start.go | 10 +++++----- cmd/podman/pods/stats.go | 8 ++++---- cmd/podman/pods/stop.go | 10 +++++----- cmd/podman/pods/top.go | 8 ++++---- cmd/podman/pods/unpause.go | 8 ++++---- cmd/podman/registry/config.go | 6 +++--- cmd/podman/registry/registry.go | 8 ++++---- cmd/podman/registry/remote.go | 2 +- cmd/podman/report/diff.go | 2 +- cmd/podman/report/report.go | 2 +- cmd/podman/root.go | 14 +++++++------- cmd/podman/system/connection.go | 6 +++--- cmd/podman/system/connection/add.go | 10 +++++----- cmd/podman/system/connection/default.go | 6 +++--- cmd/podman/system/connection/list.go | 8 ++++---- cmd/podman/system/connection/remove.go | 6 +++--- cmd/podman/system/connection/rename.go | 6 +++--- cmd/podman/system/df.go | 6 +++--- cmd/podman/system/events.go | 8 ++++---- cmd/podman/system/info.go | 8 ++++---- cmd/podman/system/migrate.go | 8 ++++---- cmd/podman/system/prune.go | 8 ++++---- cmd/podman/system/renumber.go | 8 ++++---- cmd/podman/system/reset.go | 8 ++++---- cmd/podman/system/service.go | 10 +++++----- cmd/podman/system/service_abi.go | 6 +++--- cmd/podman/system/system.go | 6 +++--- cmd/podman/system/unshare.go | 6 +++--- cmd/podman/system/varlink.go | 4 ++-- cmd/podman/system/version.go | 10 +++++----- cmd/podman/utils/utils.go | 2 +- cmd/podman/validate/latest.go | 2 +- cmd/podman/volumes/create.go | 6 +++--- cmd/podman/volumes/inspect.go | 4 ++-- cmd/podman/volumes/list.go | 6 +++--- cmd/podman/volumes/prune.go | 8 ++++---- cmd/podman/volumes/rm.go | 6 +++--- cmd/podman/volumes/volume.go | 6 +++--- 141 files changed, 493 insertions(+), 493 deletions(-) (limited to 'cmd/podman') diff --git a/cmd/podman/README.md b/cmd/podman/README.md index da92d0216..260c9bcfc 100644 --- a/cmd/podman/README.md +++ b/cmd/podman/README.md @@ -12,16 +12,16 @@ See items below for details on building, installing, contributing to Podman: ## Adding a new command `podman manifest` ```shell script -$ mkdir -p $GOPATH/src/github.com/containers/libpod/cmd/podmanV2/manifests +$ mkdir -p $GOPATH/src/github.com/containers/podman/cmd/podmanV2/manifests ``` -Create the file ```$GOPATH/src/github.com/containers/libpod/cmd/podmanV2/manifests/manifest.go``` +Create the file ```$GOPATH/src/github.com/containers/podman/cmd/podmanV2/manifests/manifest.go``` ```go package manifests import ( - "github.com/containers/libpod/cmd/podman/registry" - "github.com/containers/libpod/cmd/podman/validate" - "github.com/containers/libpod/pkg/domain/entities" + "github.com/containers/podman/cmd/podman/registry" + "github.com/containers/podman/cmd/podman/validate" + "github.com/containers/podman/pkg/domain/entities" "github.com/spf13/cobra" ) @@ -47,21 +47,21 @@ func init() { }) } ``` -To "wire" in the `manifest` command, edit the file ```$GOPATH/src/github.com/containers/libpod/cmd/podmanV2/main.go``` to add: +To "wire" in the `manifest` command, edit the file ```$GOPATH/src/github.com/containers/podman/cmd/podmanV2/main.go``` to add: ```go package main -import _ "github.com/containers/libpod/cmd/podman/manifests" +import _ "github.com/containers/podman/cmd/podman/manifests" ``` ## Adding a new sub command `podman manifests list` -Create the file ```$GOPATH/src/github.com/containers/libpod/cmd/podmanV2/manifests/inspect.go``` +Create the file ```$GOPATH/src/github.com/containers/podman/cmd/podmanV2/manifests/inspect.go``` ```go package manifests import ( - "github.com/containers/libpod/cmd/podman/registry" - "github.com/containers/libpod/pkg/domain/entities" + "github.com/containers/podman/cmd/podman/registry" + "github.com/containers/podman/pkg/domain/entities" "github.com/spf13/cobra" ) diff --git a/cmd/podman/auto-update.go b/cmd/podman/auto-update.go index a12eeb6cb..8e17b49e0 100644 --- a/cmd/podman/auto-update.go +++ b/cmd/podman/auto-update.go @@ -4,9 +4,9 @@ import ( "fmt" "github.com/containers/common/pkg/auth" - "github.com/containers/libpod/v2/cmd/podman/registry" - "github.com/containers/libpod/v2/pkg/domain/entities" - "github.com/containers/libpod/v2/pkg/errorhandling" + "github.com/containers/podman/v2/cmd/podman/registry" + "github.com/containers/podman/v2/pkg/domain/entities" + "github.com/containers/podman/v2/pkg/errorhandling" "github.com/pkg/errors" "github.com/spf13/cobra" ) diff --git a/cmd/podman/common/create.go b/cmd/podman/common/create.go index e248e621f..e96b6a8d6 100644 --- a/cmd/podman/common/create.go +++ b/cmd/podman/common/create.go @@ -5,8 +5,8 @@ import ( "os" "github.com/containers/common/pkg/auth" - "github.com/containers/libpod/v2/cmd/podman/registry" - "github.com/containers/libpod/v2/libpod/define" + "github.com/containers/podman/v2/cmd/podman/registry" + "github.com/containers/podman/v2/libpod/define" "github.com/spf13/pflag" ) diff --git a/cmd/podman/common/create_opts.go b/cmd/podman/common/create_opts.go index 2bea8b0b4..3802c37b0 100644 --- a/cmd/podman/common/create_opts.go +++ b/cmd/podman/common/create_opts.go @@ -1,6 +1,6 @@ package common -import "github.com/containers/libpod/v2/pkg/domain/entities" +import "github.com/containers/podman/v2/pkg/domain/entities" type ContainerCLIOpts struct { Annotation []string diff --git a/cmd/podman/common/createparse.go b/cmd/podman/common/createparse.go index 7f10d578e..059f9050f 100644 --- a/cmd/podman/common/createparse.go +++ b/cmd/podman/common/createparse.go @@ -1,7 +1,7 @@ package common import ( - "github.com/containers/libpod/v2/pkg/util" + "github.com/containers/podman/v2/pkg/util" "github.com/pkg/errors" ) diff --git a/cmd/podman/common/default.go b/cmd/podman/common/default.go index b4fd2f604..af64e7162 100644 --- a/cmd/podman/common/default.go +++ b/cmd/podman/common/default.go @@ -1,7 +1,7 @@ package common import ( - "github.com/containers/libpod/v2/cmd/podman/registry" + "github.com/containers/podman/v2/cmd/podman/registry" ) var ( diff --git a/cmd/podman/common/netflags.go b/cmd/podman/common/netflags.go index 82a82b310..1b8297c36 100644 --- a/cmd/podman/common/netflags.go +++ b/cmd/podman/common/netflags.go @@ -4,10 +4,10 @@ import ( "net" "strings" - "github.com/containers/libpod/v2/cmd/podman/parse" - "github.com/containers/libpod/v2/libpod/define" - "github.com/containers/libpod/v2/pkg/domain/entities" - "github.com/containers/libpod/v2/pkg/specgen" + "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/pkg/errors" "github.com/spf13/cobra" "github.com/spf13/pflag" diff --git a/cmd/podman/common/specgen.go b/cmd/podman/common/specgen.go index e694317cc..07c88efea 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/libpod/v2/cmd/podman/parse" - "github.com/containers/libpod/v2/libpod/define" - ann "github.com/containers/libpod/v2/pkg/annotations" - envLib "github.com/containers/libpod/v2/pkg/env" - ns "github.com/containers/libpod/v2/pkg/namespaces" - "github.com/containers/libpod/v2/pkg/specgen" - systemdGen "github.com/containers/libpod/v2/pkg/systemd/generate" - "github.com/containers/libpod/v2/pkg/util" + "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/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 e21e349d9..41432c6f0 100644 --- a/cmd/podman/common/util.go +++ b/cmd/podman/common/util.go @@ -6,7 +6,7 @@ import ( "strconv" "strings" - "github.com/containers/libpod/v2/pkg/specgen" + "github.com/containers/podman/v2/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 47a6f3c35..3b8f7ec6e 100644 --- a/cmd/podman/common/volumes.go +++ b/cmd/podman/common/volumes.go @@ -6,8 +6,8 @@ import ( "strings" "github.com/containers/buildah/pkg/parse" - "github.com/containers/libpod/v2/pkg/specgen" - "github.com/containers/libpod/v2/pkg/util" + "github.com/containers/podman/v2/pkg/specgen" + "github.com/containers/podman/v2/pkg/util" spec "github.com/opencontainers/runtime-spec/specs-go" "github.com/pkg/errors" "github.com/sirupsen/logrus" diff --git a/cmd/podman/containers/attach.go b/cmd/podman/containers/attach.go index eca9e0787..cfe7df441 100644 --- a/cmd/podman/containers/attach.go +++ b/cmd/podman/containers/attach.go @@ -3,9 +3,9 @@ package containers import ( "os" - "github.com/containers/libpod/v2/cmd/podman/registry" - "github.com/containers/libpod/v2/cmd/podman/validate" - "github.com/containers/libpod/v2/pkg/domain/entities" + "github.com/containers/podman/v2/cmd/podman/registry" + "github.com/containers/podman/v2/cmd/podman/validate" + "github.com/containers/podman/v2/pkg/domain/entities" "github.com/pkg/errors" "github.com/spf13/cobra" "github.com/spf13/pflag" diff --git a/cmd/podman/containers/checkpoint.go b/cmd/podman/containers/checkpoint.go index 683437000..284393dc0 100644 --- a/cmd/podman/containers/checkpoint.go +++ b/cmd/podman/containers/checkpoint.go @@ -4,11 +4,11 @@ import ( "context" "fmt" - "github.com/containers/libpod/v2/cmd/podman/registry" - "github.com/containers/libpod/v2/cmd/podman/utils" - "github.com/containers/libpod/v2/cmd/podman/validate" - "github.com/containers/libpod/v2/pkg/domain/entities" - "github.com/containers/libpod/v2/pkg/rootless" + "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/pkg/errors" "github.com/spf13/cobra" ) diff --git a/cmd/podman/containers/cleanup.go b/cmd/podman/containers/cleanup.go index 5dea77b7a..7913f5a10 100644 --- a/cmd/podman/containers/cleanup.go +++ b/cmd/podman/containers/cleanup.go @@ -3,10 +3,10 @@ package containers import ( "fmt" - "github.com/containers/libpod/v2/cmd/podman/registry" - "github.com/containers/libpod/v2/cmd/podman/utils" - "github.com/containers/libpod/v2/cmd/podman/validate" - "github.com/containers/libpod/v2/pkg/domain/entities" + "github.com/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/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 d2aa32e45..31294c66d 100644 --- a/cmd/podman/containers/commit.go +++ b/cmd/podman/containers/commit.go @@ -7,8 +7,8 @@ import ( "os" "strings" - "github.com/containers/libpod/v2/cmd/podman/registry" - "github.com/containers/libpod/v2/pkg/domain/entities" + "github.com/containers/podman/v2/cmd/podman/registry" + "github.com/containers/podman/v2/pkg/domain/entities" "github.com/pkg/errors" "github.com/spf13/cobra" "github.com/spf13/pflag" diff --git a/cmd/podman/containers/container.go b/cmd/podman/containers/container.go index f51baa936..b79b7db03 100644 --- a/cmd/podman/containers/container.go +++ b/cmd/podman/containers/container.go @@ -1,10 +1,10 @@ package containers import ( - "github.com/containers/libpod/v2/cmd/podman/registry" - "github.com/containers/libpod/v2/cmd/podman/validate" - "github.com/containers/libpod/v2/pkg/domain/entities" - "github.com/containers/libpod/v2/pkg/util" + "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/spf13/cobra" ) diff --git a/cmd/podman/containers/cp.go b/cmd/podman/containers/cp.go index 290128761..28a18e83e 100644 --- a/cmd/podman/containers/cp.go +++ b/cmd/podman/containers/cp.go @@ -1,10 +1,10 @@ package containers import ( - "github.com/containers/libpod/v2/cmd/podman/registry" - "github.com/containers/libpod/v2/pkg/cgroups" - "github.com/containers/libpod/v2/pkg/domain/entities" - "github.com/containers/libpod/v2/pkg/rootless" + "github.com/containers/podman/v2/cmd/podman/registry" + "github.com/containers/podman/v2/pkg/cgroups" + "github.com/containers/podman/v2/pkg/domain/entities" + "github.com/containers/podman/v2/pkg/rootless" "github.com/sirupsen/logrus" "github.com/spf13/cobra" "github.com/spf13/pflag" diff --git a/cmd/podman/containers/create.go b/cmd/podman/containers/create.go index 9c9edb14f..dcbc52b56 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/libpod/v2/cmd/podman/common" - "github.com/containers/libpod/v2/cmd/podman/registry" - "github.com/containers/libpod/v2/libpod/define" - "github.com/containers/libpod/v2/pkg/domain/entities" - "github.com/containers/libpod/v2/pkg/errorhandling" - "github.com/containers/libpod/v2/pkg/specgen" - "github.com/containers/libpod/v2/pkg/util" + "github.com/containers/podman/v2/cmd/podman/common" + "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/errorhandling" + "github.com/containers/podman/v2/pkg/specgen" + "github.com/containers/podman/v2/pkg/util" "github.com/pkg/errors" "github.com/sirupsen/logrus" "github.com/spf13/cobra" @@ -221,7 +221,7 @@ func createInit(c *cobra.Command) error { } // Docker-compatibility: the "-h" flag for run/create is reserved for - // the hostname (see https://github.com/containers/libpod/issues/1367). + // the hostname (see https://github.com/containers/podman/issues/1367). return nil } diff --git a/cmd/podman/containers/diff.go b/cmd/podman/containers/diff.go index f39b22ede..227c13f4c 100644 --- a/cmd/podman/containers/diff.go +++ b/cmd/podman/containers/diff.go @@ -1,10 +1,10 @@ package containers import ( - "github.com/containers/libpod/v2/cmd/podman/registry" - "github.com/containers/libpod/v2/cmd/podman/report" - "github.com/containers/libpod/v2/cmd/podman/validate" - "github.com/containers/libpod/v2/pkg/domain/entities" + "github.com/containers/podman/v2/cmd/podman/registry" + "github.com/containers/podman/v2/cmd/podman/report" + "github.com/containers/podman/v2/cmd/podman/validate" + "github.com/containers/podman/v2/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 e0fc740b5..da450054f 100644 --- a/cmd/podman/containers/exec.go +++ b/cmd/podman/containers/exec.go @@ -5,11 +5,11 @@ import ( "fmt" "os" - "github.com/containers/libpod/v2/cmd/podman/registry" - "github.com/containers/libpod/v2/cmd/podman/validate" - "github.com/containers/libpod/v2/libpod/define" - "github.com/containers/libpod/v2/pkg/domain/entities" - envLib "github.com/containers/libpod/v2/pkg/env" + "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/pkg/errors" "github.com/spf13/cobra" "github.com/spf13/pflag" diff --git a/cmd/podman/containers/exists.go b/cmd/podman/containers/exists.go index 1f7c05122..283f6df18 100644 --- a/cmd/podman/containers/exists.go +++ b/cmd/podman/containers/exists.go @@ -3,8 +3,8 @@ package containers import ( "context" - "github.com/containers/libpod/v2/cmd/podman/registry" - "github.com/containers/libpod/v2/pkg/domain/entities" + "github.com/containers/podman/v2/cmd/podman/registry" + "github.com/containers/podman/v2/pkg/domain/entities" "github.com/spf13/cobra" ) diff --git a/cmd/podman/containers/export.go b/cmd/podman/containers/export.go index 4a9b7f38b..1a59b7fff 100644 --- a/cmd/podman/containers/export.go +++ b/cmd/podman/containers/export.go @@ -4,9 +4,9 @@ import ( "context" "os" - "github.com/containers/libpod/v2/cmd/podman/parse" - "github.com/containers/libpod/v2/cmd/podman/registry" - "github.com/containers/libpod/v2/pkg/domain/entities" + "github.com/containers/podman/v2/cmd/podman/parse" + "github.com/containers/podman/v2/cmd/podman/registry" + "github.com/containers/podman/v2/pkg/domain/entities" "github.com/pkg/errors" "github.com/spf13/cobra" "github.com/spf13/pflag" diff --git a/cmd/podman/containers/init.go b/cmd/podman/containers/init.go index 98f69fa4b..5a826bc59 100644 --- a/cmd/podman/containers/init.go +++ b/cmd/podman/containers/init.go @@ -3,10 +3,10 @@ package containers import ( "fmt" - "github.com/containers/libpod/v2/cmd/podman/registry" - "github.com/containers/libpod/v2/cmd/podman/utils" - "github.com/containers/libpod/v2/cmd/podman/validate" - "github.com/containers/libpod/v2/pkg/domain/entities" + "github.com/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/spf13/cobra" "github.com/spf13/pflag" ) diff --git a/cmd/podman/containers/inspect.go b/cmd/podman/containers/inspect.go index c0d1d5c79..1c208b513 100644 --- a/cmd/podman/containers/inspect.go +++ b/cmd/podman/containers/inspect.go @@ -1,10 +1,10 @@ package containers import ( - "github.com/containers/libpod/v2/cmd/podman/inspect" - "github.com/containers/libpod/v2/cmd/podman/registry" - "github.com/containers/libpod/v2/cmd/podman/validate" - "github.com/containers/libpod/v2/pkg/domain/entities" + "github.com/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/spf13/cobra" ) diff --git a/cmd/podman/containers/kill.go b/cmd/podman/containers/kill.go index da60fcf52..a4d536098 100644 --- a/cmd/podman/containers/kill.go +++ b/cmd/podman/containers/kill.go @@ -5,11 +5,11 @@ import ( "errors" "fmt" - "github.com/containers/libpod/v2/cmd/podman/registry" - "github.com/containers/libpod/v2/cmd/podman/utils" - "github.com/containers/libpod/v2/cmd/podman/validate" - "github.com/containers/libpod/v2/pkg/domain/entities" - "github.com/containers/libpod/v2/pkg/signal" + "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/spf13/cobra" "github.com/spf13/pflag" ) diff --git a/cmd/podman/containers/list.go b/cmd/podman/containers/list.go index 2d107d51d..daf03a51b 100644 --- a/cmd/podman/containers/list.go +++ b/cmd/podman/containers/list.go @@ -1,9 +1,9 @@ package containers import ( - "github.com/containers/libpod/v2/cmd/podman/registry" - "github.com/containers/libpod/v2/cmd/podman/validate" - "github.com/containers/libpod/v2/pkg/domain/entities" + "github.com/containers/podman/v2/cmd/podman/registry" + "github.com/containers/podman/v2/cmd/podman/validate" + "github.com/containers/podman/v2/pkg/domain/entities" "github.com/spf13/cobra" ) diff --git a/cmd/podman/containers/logs.go b/cmd/podman/containers/logs.go index 966998877..21c00505f 100644 --- a/cmd/podman/containers/logs.go +++ b/cmd/podman/containers/logs.go @@ -3,10 +3,10 @@ package containers import ( "os" - "github.com/containers/libpod/v2/cmd/podman/registry" - "github.com/containers/libpod/v2/cmd/podman/validate" - "github.com/containers/libpod/v2/pkg/domain/entities" - "github.com/containers/libpod/v2/pkg/util" + "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/pkg/errors" "github.com/spf13/cobra" "github.com/spf13/pflag" diff --git a/cmd/podman/containers/mount.go b/cmd/podman/containers/mount.go index b578daa49..1c358f4a2 100644 --- a/cmd/podman/containers/mount.go +++ b/cmd/podman/containers/mount.go @@ -6,10 +6,10 @@ import ( "text/tabwriter" "text/template" - "github.com/containers/libpod/v2/cmd/podman/registry" - "github.com/containers/libpod/v2/cmd/podman/utils" - "github.com/containers/libpod/v2/cmd/podman/validate" - "github.com/containers/libpod/v2/pkg/domain/entities" + "github.com/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/pkg/errors" "github.com/spf13/cobra" "github.com/spf13/pflag" diff --git a/cmd/podman/containers/pause.go b/cmd/podman/containers/pause.go index 33d6ff06f..c2218bc44 100644 --- a/cmd/podman/containers/pause.go +++ b/cmd/podman/containers/pause.go @@ -4,10 +4,10 @@ import ( "context" "fmt" - "github.com/containers/libpod/v2/cmd/podman/registry" - "github.com/containers/libpod/v2/cmd/podman/utils" - "github.com/containers/libpod/v2/pkg/domain/entities" - "github.com/containers/libpod/v2/pkg/rootless" + "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/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 7c0d8f5f6..347f06bba 100644 --- a/cmd/podman/containers/port.go +++ b/cmd/podman/containers/port.go @@ -5,9 +5,9 @@ import ( "strconv" "strings" - "github.com/containers/libpod/v2/cmd/podman/registry" - "github.com/containers/libpod/v2/cmd/podman/validate" - "github.com/containers/libpod/v2/pkg/domain/entities" + "github.com/containers/podman/v2/cmd/podman/registry" + "github.com/containers/podman/v2/cmd/podman/validate" + "github.com/containers/podman/v2/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 65e023b39..90dea2b45 100644 --- a/cmd/podman/containers/prune.go +++ b/cmd/podman/containers/prune.go @@ -8,9 +8,9 @@ import ( "os" "strings" - "github.com/containers/libpod/v2/cmd/podman/registry" - "github.com/containers/libpod/v2/cmd/podman/utils" - "github.com/containers/libpod/v2/pkg/domain/entities" + "github.com/containers/podman/v2/cmd/podman/registry" + "github.com/containers/podman/v2/cmd/podman/utils" + "github.com/containers/podman/v2/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 7c84cbae1..34fa4fab5 100644 --- a/cmd/podman/containers/ps.go +++ b/cmd/podman/containers/ps.go @@ -12,9 +12,9 @@ import ( tm "github.com/buger/goterm" "github.com/containers/buildah/pkg/formats" - "github.com/containers/libpod/v2/cmd/podman/registry" - "github.com/containers/libpod/v2/cmd/podman/validate" - "github.com/containers/libpod/v2/pkg/domain/entities" + "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/cri-o/ocicni/pkg/ocicni" "github.com/docker/go-units" "github.com/pkg/errors" diff --git a/cmd/podman/containers/restart.go b/cmd/podman/containers/restart.go index 393b003a9..d02097f0e 100644 --- a/cmd/podman/containers/restart.go +++ b/cmd/podman/containers/restart.go @@ -4,11 +4,11 @@ import ( "context" "fmt" - "github.com/containers/libpod/v2/cmd/podman/registry" - "github.com/containers/libpod/v2/cmd/podman/utils" - "github.com/containers/libpod/v2/cmd/podman/validate" - "github.com/containers/libpod/v2/libpod/define" - "github.com/containers/libpod/v2/pkg/domain/entities" + "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/pkg/errors" "github.com/spf13/cobra" "github.com/spf13/pflag" diff --git a/cmd/podman/containers/restore.go b/cmd/podman/containers/restore.go index e9e0ad6fc..413bcbc87 100644 --- a/cmd/podman/containers/restore.go +++ b/cmd/podman/containers/restore.go @@ -4,11 +4,11 @@ import ( "context" "fmt" - "github.com/containers/libpod/v2/cmd/podman/registry" - "github.com/containers/libpod/v2/cmd/podman/utils" - "github.com/containers/libpod/v2/cmd/podman/validate" - "github.com/containers/libpod/v2/pkg/domain/entities" - "github.com/containers/libpod/v2/pkg/rootless" + "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/pkg/errors" "github.com/spf13/cobra" ) diff --git a/cmd/podman/containers/rm.go b/cmd/podman/containers/rm.go index 427e1e72c..8d0c7920f 100644 --- a/cmd/podman/containers/rm.go +++ b/cmd/podman/containers/rm.go @@ -5,11 +5,11 @@ import ( "fmt" "strings" - "github.com/containers/libpod/v2/cmd/podman/registry" - "github.com/containers/libpod/v2/cmd/podman/utils" - "github.com/containers/libpod/v2/cmd/podman/validate" - "github.com/containers/libpod/v2/libpod/define" - "github.com/containers/libpod/v2/pkg/domain/entities" + "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/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 17a5c6d97..646c52645 100644 --- a/cmd/podman/containers/run.go +++ b/cmd/podman/containers/run.go @@ -6,14 +6,14 @@ import ( "strconv" "strings" - "github.com/containers/libpod/v2/cmd/podman/common" - "github.com/containers/libpod/v2/cmd/podman/registry" - "github.com/containers/libpod/v2/libpod/define" - "github.com/containers/libpod/v2/pkg/domain/entities" - "github.com/containers/libpod/v2/pkg/errorhandling" - "github.com/containers/libpod/v2/pkg/rootless" - "github.com/containers/libpod/v2/pkg/specgen" - "github.com/containers/libpod/v2/pkg/util" + "github.com/containers/podman/v2/cmd/podman/common" + "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/errorhandling" + "github.com/containers/podman/v2/pkg/rootless" + "github.com/containers/podman/v2/pkg/specgen" + "github.com/containers/podman/v2/pkg/util" "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 c962f6c3b..81eec2a42 100644 --- a/cmd/podman/containers/runlabel.go +++ b/cmd/podman/containers/runlabel.go @@ -6,8 +6,8 @@ import ( "github.com/containers/common/pkg/auth" "github.com/containers/image/v5/types" - "github.com/containers/libpod/v2/cmd/podman/registry" - "github.com/containers/libpod/v2/pkg/domain/entities" + "github.com/containers/podman/v2/cmd/podman/registry" + "github.com/containers/podman/v2/pkg/domain/entities" "github.com/pkg/errors" "github.com/sirupsen/logrus" "github.com/spf13/cobra" diff --git a/cmd/podman/containers/start.go b/cmd/podman/containers/start.go index 8f9984421..05fdfc780 100644 --- a/cmd/podman/containers/start.go +++ b/cmd/podman/containers/start.go @@ -4,11 +4,11 @@ import ( "fmt" "os" - "github.com/containers/libpod/v2/cmd/podman/registry" - "github.com/containers/libpod/v2/cmd/podman/utils" - "github.com/containers/libpod/v2/cmd/podman/validate" - "github.com/containers/libpod/v2/libpod/define" - "github.com/containers/libpod/v2/pkg/domain/entities" + "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/pkg/errors" "github.com/spf13/cobra" "github.com/spf13/pflag" diff --git a/cmd/podman/containers/stats.go b/cmd/podman/containers/stats.go index 86674cfc9..2b4c46647 100644 --- a/cmd/podman/containers/stats.go +++ b/cmd/podman/containers/stats.go @@ -9,13 +9,13 @@ import ( "text/template" tm "github.com/buger/goterm" - "github.com/containers/libpod/v2/cmd/podman/registry" - "github.com/containers/libpod/v2/cmd/podman/validate" - "github.com/containers/libpod/v2/libpod/define" - "github.com/containers/libpod/v2/pkg/cgroups" - "github.com/containers/libpod/v2/pkg/domain/entities" - "github.com/containers/libpod/v2/pkg/rootless" - "github.com/containers/libpod/v2/utils" + "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/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 7959918a8..1c0a5efe4 100644 --- a/cmd/podman/containers/stop.go +++ b/cmd/podman/containers/stop.go @@ -4,10 +4,10 @@ import ( "context" "fmt" - "github.com/containers/libpod/v2/cmd/podman/registry" - "github.com/containers/libpod/v2/cmd/podman/utils" - "github.com/containers/libpod/v2/cmd/podman/validate" - "github.com/containers/libpod/v2/pkg/domain/entities" + "github.com/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/spf13/cobra" "github.com/spf13/pflag" ) diff --git a/cmd/podman/containers/top.go b/cmd/podman/containers/top.go index c3f411be7..f2632d57a 100644 --- a/cmd/podman/containers/top.go +++ b/cmd/podman/containers/top.go @@ -7,10 +7,10 @@ import ( "strings" "text/tabwriter" - "github.com/containers/libpod/v2/cmd/podman/registry" - "github.com/containers/libpod/v2/cmd/podman/validate" - "github.com/containers/libpod/v2/pkg/domain/entities" - "github.com/containers/libpod/v2/pkg/util" + "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/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 6556a6510..424d4cedc 100644 --- a/cmd/podman/containers/unmount.go +++ b/cmd/podman/containers/unmount.go @@ -3,10 +3,10 @@ package containers import ( "fmt" - "github.com/containers/libpod/v2/cmd/podman/registry" - "github.com/containers/libpod/v2/cmd/podman/utils" - "github.com/containers/libpod/v2/cmd/podman/validate" - "github.com/containers/libpod/v2/pkg/domain/entities" + "github.com/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/spf13/cobra" "github.com/spf13/pflag" ) diff --git a/cmd/podman/containers/unpause.go b/cmd/podman/containers/unpause.go index 9d4437afb..50113669c 100644 --- a/cmd/podman/containers/unpause.go +++ b/cmd/podman/containers/unpause.go @@ -4,10 +4,10 @@ import ( "context" "fmt" - "github.com/containers/libpod/v2/cmd/podman/registry" - "github.com/containers/libpod/v2/cmd/podman/utils" - "github.com/containers/libpod/v2/pkg/domain/entities" - "github.com/containers/libpod/v2/pkg/rootless" + "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/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 c30bfe405..74ee6073a 100644 --- a/cmd/podman/containers/wait.go +++ b/cmd/podman/containers/wait.go @@ -5,11 +5,11 @@ import ( "fmt" "time" - "github.com/containers/libpod/v2/cmd/podman/registry" - "github.com/containers/libpod/v2/cmd/podman/utils" - "github.com/containers/libpod/v2/cmd/podman/validate" - "github.com/containers/libpod/v2/libpod/define" - "github.com/containers/libpod/v2/pkg/domain/entities" + "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/pkg/errors" "github.com/spf13/cobra" "github.com/spf13/pflag" diff --git a/cmd/podman/diff.go b/cmd/podman/diff.go index cdd908cf1..51a04bf46 100644 --- a/cmd/podman/diff.go +++ b/cmd/podman/diff.go @@ -3,11 +3,11 @@ package main import ( "fmt" - "github.com/containers/libpod/v2/cmd/podman/containers" - "github.com/containers/libpod/v2/cmd/podman/images" - "github.com/containers/libpod/v2/cmd/podman/registry" - "github.com/containers/libpod/v2/cmd/podman/validate" - "github.com/containers/libpod/v2/pkg/domain/entities" + "github.com/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/spf13/cobra" ) diff --git a/cmd/podman/early_init_linux.go b/cmd/podman/early_init_linux.go index b43450a7f..e2893ff69 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/libpod/v2/libpod/define" + "github.com/containers/podman/v2/libpod/define" "github.com/pkg/errors" ) diff --git a/cmd/podman/generate/generate.go b/cmd/podman/generate/generate.go index d85d93347..fa2739b20 100644 --- a/cmd/podman/generate/generate.go +++ b/cmd/podman/generate/generate.go @@ -1,10 +1,10 @@ package pods import ( - "github.com/containers/libpod/v2/cmd/podman/registry" - "github.com/containers/libpod/v2/cmd/podman/validate" - "github.com/containers/libpod/v2/pkg/domain/entities" - "github.com/containers/libpod/v2/pkg/util" + "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/spf13/cobra" ) diff --git a/cmd/podman/generate/kube.go b/cmd/podman/generate/kube.go index 56ddfbe97..2f63ba590 100644 --- a/cmd/podman/generate/kube.go +++ b/cmd/podman/generate/kube.go @@ -5,9 +5,9 @@ import ( "io/ioutil" "os" - "github.com/containers/libpod/v2/cmd/podman/registry" - "github.com/containers/libpod/v2/cmd/podman/utils" - "github.com/containers/libpod/v2/pkg/domain/entities" + "github.com/containers/podman/v2/cmd/podman/registry" + "github.com/containers/podman/v2/cmd/podman/utils" + "github.com/containers/podman/v2/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 5f319f21b..851a104bc 100644 --- a/cmd/podman/generate/systemd.go +++ b/cmd/podman/generate/systemd.go @@ -3,9 +3,9 @@ package pods import ( "fmt" - "github.com/containers/libpod/v2/cmd/podman/registry" - "github.com/containers/libpod/v2/cmd/podman/utils" - "github.com/containers/libpod/v2/pkg/domain/entities" + "github.com/containers/podman/v2/cmd/podman/registry" + "github.com/containers/podman/v2/cmd/podman/utils" + "github.com/containers/podman/v2/pkg/domain/entities" "github.com/spf13/cobra" ) diff --git a/cmd/podman/healthcheck/healthcheck.go b/cmd/podman/healthcheck/healthcheck.go index fdf40e872..683836ed6 100644 --- a/cmd/podman/healthcheck/healthcheck.go +++ b/cmd/podman/healthcheck/healthcheck.go @@ -1,9 +1,9 @@ package healthcheck import ( - "github.com/containers/libpod/v2/cmd/podman/registry" - "github.com/containers/libpod/v2/cmd/podman/validate" - "github.com/containers/libpod/v2/pkg/domain/entities" + "github.com/containers/podman/v2/cmd/podman/registry" + "github.com/containers/podman/v2/cmd/podman/validate" + "github.com/containers/podman/v2/pkg/domain/entities" "github.com/spf13/cobra" ) diff --git a/cmd/podman/healthcheck/run.go b/cmd/podman/healthcheck/run.go index d6a429080..6d7f0b548 100644 --- a/cmd/podman/healthcheck/run.go +++ b/cmd/podman/healthcheck/run.go @@ -4,8 +4,8 @@ import ( "context" "fmt" - "github.com/containers/libpod/v2/cmd/podman/registry" - "github.com/containers/libpod/v2/pkg/domain/entities" + "github.com/containers/podman/v2/cmd/podman/registry" + "github.com/containers/podman/v2/pkg/domain/entities" "github.com/spf13/cobra" ) diff --git a/cmd/podman/images/build.go b/cmd/podman/images/build.go index 3ea74b4af..de750d892 100644 --- a/cmd/podman/images/build.go +++ b/cmd/podman/images/build.go @@ -10,9 +10,9 @@ import ( buildahCLI "github.com/containers/buildah/pkg/cli" "github.com/containers/buildah/pkg/parse" "github.com/containers/common/pkg/config" - "github.com/containers/libpod/v2/cmd/podman/registry" - "github.com/containers/libpod/v2/cmd/podman/utils" - "github.com/containers/libpod/v2/pkg/domain/entities" + "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/docker/go-units" "github.com/opencontainers/runtime-spec/specs-go" "github.com/pkg/errors" diff --git a/cmd/podman/images/diff.go b/cmd/podman/images/diff.go index 10a1c06ec..26147345e 100644 --- a/cmd/podman/images/diff.go +++ b/cmd/podman/images/diff.go @@ -1,9 +1,9 @@ package images import ( - "github.com/containers/libpod/v2/cmd/podman/registry" - "github.com/containers/libpod/v2/cmd/podman/report" - "github.com/containers/libpod/v2/pkg/domain/entities" + "github.com/containers/podman/v2/cmd/podman/registry" + "github.com/containers/podman/v2/cmd/podman/report" + "github.com/containers/podman/v2/pkg/domain/entities" "github.com/pkg/errors" "github.com/spf13/cobra" "github.com/spf13/pflag" diff --git a/cmd/podman/images/exists.go b/cmd/podman/images/exists.go index 7e05ea8f7..31bdc791e 100644 --- a/cmd/podman/images/exists.go +++ b/cmd/podman/images/exists.go @@ -1,8 +1,8 @@ package images import ( - "github.com/containers/libpod/v2/cmd/podman/registry" - "github.com/containers/libpod/v2/pkg/domain/entities" + "github.com/containers/podman/v2/cmd/podman/registry" + "github.com/containers/podman/v2/pkg/domain/entities" "github.com/spf13/cobra" ) diff --git a/cmd/podman/images/history.go b/cmd/podman/images/history.go index 3732e6e03..ef5b4be26 100644 --- a/cmd/podman/images/history.go +++ b/cmd/podman/images/history.go @@ -10,8 +10,8 @@ import ( "time" "unicode" - "github.com/containers/libpod/v2/cmd/podman/registry" - "github.com/containers/libpod/v2/pkg/domain/entities" + "github.com/containers/podman/v2/cmd/podman/registry" + "github.com/containers/podman/v2/pkg/domain/entities" "github.com/docker/go-units" "github.com/pkg/errors" "github.com/spf13/cobra" diff --git a/cmd/podman/images/image.go b/cmd/podman/images/image.go index 89badd035..abf6bf736 100644 --- a/cmd/podman/images/image.go +++ b/cmd/podman/images/image.go @@ -1,9 +1,9 @@ package images import ( - "github.com/containers/libpod/v2/cmd/podman/registry" - "github.com/containers/libpod/v2/cmd/podman/validate" - "github.com/containers/libpod/v2/pkg/domain/entities" + "github.com/containers/podman/v2/cmd/podman/registry" + "github.com/containers/podman/v2/cmd/podman/validate" + "github.com/containers/podman/v2/pkg/domain/entities" "github.com/spf13/cobra" ) diff --git a/cmd/podman/images/images.go b/cmd/podman/images/images.go index 0a77946c7..14ea01047 100644 --- a/cmd/podman/images/images.go +++ b/cmd/podman/images/images.go @@ -3,8 +3,8 @@ package images import ( "strings" - "github.com/containers/libpod/v2/cmd/podman/registry" - "github.com/containers/libpod/v2/pkg/domain/entities" + "github.com/containers/podman/v2/cmd/podman/registry" + "github.com/containers/podman/v2/pkg/domain/entities" "github.com/spf13/cobra" ) diff --git a/cmd/podman/images/import.go b/cmd/podman/images/import.go index 6b4b4f6b6..e605ddfc6 100644 --- a/cmd/podman/images/import.go +++ b/cmd/podman/images/import.go @@ -4,9 +4,9 @@ import ( "context" "fmt" - "github.com/containers/libpod/v2/cmd/podman/parse" - "github.com/containers/libpod/v2/cmd/podman/registry" - "github.com/containers/libpod/v2/pkg/domain/entities" + "github.com/containers/podman/v2/cmd/podman/parse" + "github.com/containers/podman/v2/cmd/podman/registry" + "github.com/containers/podman/v2/pkg/domain/entities" "github.com/hashicorp/go-multierror" "github.com/pkg/errors" "github.com/spf13/cobra" diff --git a/cmd/podman/images/inspect.go b/cmd/podman/images/inspect.go index c6ef503bf..065dfaed2 100644 --- a/cmd/podman/images/inspect.go +++ b/cmd/podman/images/inspect.go @@ -1,9 +1,9 @@ package images import ( - "github.com/containers/libpod/v2/cmd/podman/inspect" - "github.com/containers/libpod/v2/cmd/podman/registry" - "github.com/containers/libpod/v2/pkg/domain/entities" + "github.com/containers/podman/v2/cmd/podman/inspect" + "github.com/containers/podman/v2/cmd/podman/registry" + "github.com/containers/podman/v2/pkg/domain/entities" "github.com/spf13/cobra" ) diff --git a/cmd/podman/images/list.go b/cmd/podman/images/list.go index a85157dd4..4552901f7 100644 --- a/cmd/podman/images/list.go +++ b/cmd/podman/images/list.go @@ -11,8 +11,8 @@ import ( "unicode" "github.com/containers/image/v5/docker/reference" - "github.com/containers/libpod/v2/cmd/podman/registry" - "github.com/containers/libpod/v2/pkg/domain/entities" + "github.com/containers/podman/v2/cmd/podman/registry" + "github.com/containers/podman/v2/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 df7baae22..cc8e71814 100644 --- a/cmd/podman/images/load.go +++ b/cmd/podman/images/load.go @@ -9,10 +9,10 @@ import ( "strings" "github.com/containers/image/v5/docker/reference" - "github.com/containers/libpod/v2/cmd/podman/parse" - "github.com/containers/libpod/v2/cmd/podman/registry" - "github.com/containers/libpod/v2/pkg/domain/entities" - "github.com/containers/libpod/v2/pkg/util" + "github.com/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/v2/pkg/util" "github.com/pkg/errors" "github.com/spf13/cobra" "github.com/spf13/pflag" diff --git a/cmd/podman/images/prune.go b/cmd/podman/images/prune.go index 002453907..8dc203ead 100644 --- a/cmd/podman/images/prune.go +++ b/cmd/podman/images/prune.go @@ -6,10 +6,10 @@ import ( "os" "strings" - "github.com/containers/libpod/v2/cmd/podman/registry" - "github.com/containers/libpod/v2/cmd/podman/utils" - "github.com/containers/libpod/v2/cmd/podman/validate" - "github.com/containers/libpod/v2/pkg/domain/entities" + "github.com/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/pkg/errors" "github.com/spf13/cobra" ) diff --git a/cmd/podman/images/pull.go b/cmd/podman/images/pull.go index c10a351d8..4deaecbf5 100644 --- a/cmd/podman/images/pull.go +++ b/cmd/podman/images/pull.go @@ -6,9 +6,9 @@ import ( "github.com/containers/common/pkg/auth" "github.com/containers/image/v5/types" - "github.com/containers/libpod/v2/cmd/podman/registry" - "github.com/containers/libpod/v2/pkg/domain/entities" - "github.com/containers/libpod/v2/pkg/util" + "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/pkg/errors" "github.com/spf13/cobra" "github.com/spf13/pflag" diff --git a/cmd/podman/images/push.go b/cmd/podman/images/push.go index 480b5e0f0..2943cccc9 100644 --- a/cmd/podman/images/push.go +++ b/cmd/podman/images/push.go @@ -5,9 +5,9 @@ import ( "github.com/containers/common/pkg/auth" "github.com/containers/image/v5/types" - "github.com/containers/libpod/v2/cmd/podman/registry" - "github.com/containers/libpod/v2/pkg/domain/entities" - "github.com/containers/libpod/v2/pkg/util" + "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/pkg/errors" "github.com/spf13/cobra" "github.com/spf13/pflag" diff --git a/cmd/podman/images/rm.go b/cmd/podman/images/rm.go index c14c256fc..f6e52a49e 100644 --- a/cmd/podman/images/rm.go +++ b/cmd/podman/images/rm.go @@ -3,9 +3,9 @@ package images import ( "fmt" - "github.com/containers/libpod/v2/cmd/podman/registry" - "github.com/containers/libpod/v2/pkg/domain/entities" - "github.com/containers/libpod/v2/pkg/errorhandling" + "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/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 8e70906ce..520847890 100644 --- a/cmd/podman/images/rmi.go +++ b/cmd/podman/images/rmi.go @@ -3,8 +3,8 @@ package images import ( "strings" - "github.com/containers/libpod/v2/cmd/podman/registry" - "github.com/containers/libpod/v2/pkg/domain/entities" + "github.com/containers/podman/v2/cmd/podman/registry" + "github.com/containers/podman/v2/pkg/domain/entities" "github.com/spf13/cobra" ) diff --git a/cmd/podman/images/save.go b/cmd/podman/images/save.go index 097cb3a40..024045b9d 100644 --- a/cmd/podman/images/save.go +++ b/cmd/podman/images/save.go @@ -5,12 +5,12 @@ import ( "os" "strings" - "github.com/containers/libpod/v2/libpod/define" + "github.com/containers/podman/v2/libpod/define" - "github.com/containers/libpod/v2/cmd/podman/parse" - "github.com/containers/libpod/v2/cmd/podman/registry" - "github.com/containers/libpod/v2/pkg/domain/entities" - "github.com/containers/libpod/v2/pkg/util" + "github.com/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/v2/pkg/util" "github.com/pkg/errors" "github.com/spf13/cobra" "github.com/spf13/pflag" diff --git a/cmd/podman/images/search.go b/cmd/podman/images/search.go index f1a2cda96..c7f16a838 100644 --- a/cmd/podman/images/search.go +++ b/cmd/podman/images/search.go @@ -8,9 +8,9 @@ import ( "github.com/containers/buildah/pkg/formats" "github.com/containers/common/pkg/auth" "github.com/containers/image/v5/types" - "github.com/containers/libpod/v2/cmd/podman/registry" - "github.com/containers/libpod/v2/pkg/domain/entities" - "github.com/containers/libpod/v2/pkg/util/camelcase" + "github.com/containers/podman/v2/cmd/podman/registry" + "github.com/containers/podman/v2/pkg/domain/entities" + "github.com/containers/podman/v2/pkg/util/camelcase" "github.com/pkg/errors" "github.com/spf13/cobra" "github.com/spf13/pflag" diff --git a/cmd/podman/images/sign.go b/cmd/podman/images/sign.go index 9115342ed..e331a64df 100644 --- a/cmd/podman/images/sign.go +++ b/cmd/podman/images/sign.go @@ -3,8 +3,8 @@ package images import ( "os" - "github.com/containers/libpod/v2/cmd/podman/registry" - "github.com/containers/libpod/v2/pkg/domain/entities" + "github.com/containers/podman/v2/cmd/podman/registry" + "github.com/containers/podman/v2/pkg/domain/entities" "github.com/pkg/errors" "github.com/spf13/cobra" ) diff --git a/cmd/podman/images/tag.go b/cmd/podman/images/tag.go index 1bb956288..be7f84588 100644 --- a/cmd/podman/images/tag.go +++ b/cmd/podman/images/tag.go @@ -1,8 +1,8 @@ package images import ( - "github.com/containers/libpod/v2/cmd/podman/registry" - "github.com/containers/libpod/v2/pkg/domain/entities" + "github.com/containers/podman/v2/cmd/podman/registry" + "github.com/containers/podman/v2/pkg/domain/entities" "github.com/spf13/cobra" ) diff --git a/cmd/podman/images/tree.go b/cmd/podman/images/tree.go index f229cfa29..0b79c2a4b 100644 --- a/cmd/podman/images/tree.go +++ b/cmd/podman/images/tree.go @@ -3,8 +3,8 @@ package images import ( "fmt" - "github.com/containers/libpod/v2/cmd/podman/registry" - "github.com/containers/libpod/v2/pkg/domain/entities" + "github.com/containers/podman/v2/cmd/podman/registry" + "github.com/containers/podman/v2/pkg/domain/entities" "github.com/spf13/cobra" ) diff --git a/cmd/podman/images/trust.go b/cmd/podman/images/trust.go index 9fc8c1f07..842540110 100644 --- a/cmd/podman/images/trust.go +++ b/cmd/podman/images/trust.go @@ -1,9 +1,9 @@ package images import ( - "github.com/containers/libpod/v2/cmd/podman/registry" - "github.com/containers/libpod/v2/cmd/podman/validate" - "github.com/containers/libpod/v2/pkg/domain/entities" + "github.com/containers/podman/v2/cmd/podman/registry" + "github.com/containers/podman/v2/cmd/podman/validate" + "github.com/containers/podman/v2/pkg/domain/entities" "github.com/spf13/cobra" ) diff --git a/cmd/podman/images/trust_set.go b/cmd/podman/images/trust_set.go index 71b77f961..878ffeea6 100644 --- a/cmd/podman/images/trust_set.go +++ b/cmd/podman/images/trust_set.go @@ -1,10 +1,10 @@ package images import ( - "github.com/containers/libpod/v2/cmd/podman/registry" - "github.com/containers/libpod/v2/libpod/image" - "github.com/containers/libpod/v2/pkg/domain/entities" - "github.com/containers/libpod/v2/pkg/util" + "github.com/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/pkg/errors" "github.com/spf13/cobra" ) diff --git a/cmd/podman/images/trust_show.go b/cmd/podman/images/trust_show.go index 79a583caa..d968f6d80 100644 --- a/cmd/podman/images/trust_show.go +++ b/cmd/podman/images/trust_show.go @@ -6,8 +6,8 @@ import ( "text/tabwriter" "text/template" - "github.com/containers/libpod/v2/cmd/podman/registry" - "github.com/containers/libpod/v2/pkg/domain/entities" + "github.com/containers/podman/v2/cmd/podman/registry" + "github.com/containers/podman/v2/pkg/domain/entities" "github.com/spf13/cobra" ) diff --git a/cmd/podman/images/untag.go b/cmd/podman/images/untag.go index 39804b2bc..da749c8a5 100644 --- a/cmd/podman/images/untag.go +++ b/cmd/podman/images/untag.go @@ -1,8 +1,8 @@ package images import ( - "github.com/containers/libpod/v2/cmd/podman/registry" - "github.com/containers/libpod/v2/pkg/domain/entities" + "github.com/containers/podman/v2/cmd/podman/registry" + "github.com/containers/podman/v2/pkg/domain/entities" "github.com/spf13/cobra" ) diff --git a/cmd/podman/inspect.go b/cmd/podman/inspect.go index 42f6ccea3..85050a497 100644 --- a/cmd/podman/inspect.go +++ b/cmd/podman/inspect.go @@ -1,9 +1,9 @@ package main import ( - "github.com/containers/libpod/v2/cmd/podman/inspect" - "github.com/containers/libpod/v2/cmd/podman/registry" - "github.com/containers/libpod/v2/pkg/domain/entities" + "github.com/containers/podman/v2/cmd/podman/inspect" + "github.com/containers/podman/v2/cmd/podman/registry" + "github.com/containers/podman/v2/pkg/domain/entities" "github.com/spf13/cobra" ) diff --git a/cmd/podman/inspect/inspect.go b/cmd/podman/inspect/inspect.go index 6fcca597b..13c6544bb 100644 --- a/cmd/podman/inspect/inspect.go +++ b/cmd/podman/inspect/inspect.go @@ -7,9 +7,9 @@ import ( "strings" "github.com/containers/buildah/pkg/formats" - "github.com/containers/libpod/v2/cmd/podman/registry" - "github.com/containers/libpod/v2/cmd/podman/validate" - "github.com/containers/libpod/v2/pkg/domain/entities" + "github.com/containers/podman/v2/cmd/podman/registry" + "github.com/containers/podman/v2/cmd/podman/validate" + "github.com/containers/podman/v2/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 2239d61b9..1556b0dcf 100644 --- a/cmd/podman/login.go +++ b/cmd/podman/login.go @@ -6,9 +6,9 @@ import ( "github.com/containers/common/pkg/auth" "github.com/containers/image/v5/types" - "github.com/containers/libpod/v2/cmd/podman/registry" - "github.com/containers/libpod/v2/pkg/domain/entities" - "github.com/containers/libpod/v2/pkg/registries" + "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/spf13/cobra" ) diff --git a/cmd/podman/logout.go b/cmd/podman/logout.go index b38f92749..1c6fdfb2a 100644 --- a/cmd/podman/logout.go +++ b/cmd/podman/logout.go @@ -5,9 +5,9 @@ import ( "github.com/containers/common/pkg/auth" "github.com/containers/image/v5/types" - "github.com/containers/libpod/v2/cmd/podman/registry" - "github.com/containers/libpod/v2/pkg/domain/entities" - "github.com/containers/libpod/v2/pkg/registries" + "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/spf13/cobra" ) diff --git a/cmd/podman/main.go b/cmd/podman/main.go index d0e89c2f5..007a8716c 100644 --- a/cmd/podman/main.go +++ b/cmd/podman/main.go @@ -4,20 +4,20 @@ import ( "fmt" "os" - _ "github.com/containers/libpod/v2/cmd/podman/containers" - _ "github.com/containers/libpod/v2/cmd/podman/generate" - _ "github.com/containers/libpod/v2/cmd/podman/healthcheck" - _ "github.com/containers/libpod/v2/cmd/podman/images" - _ "github.com/containers/libpod/v2/cmd/podman/manifest" - _ "github.com/containers/libpod/v2/cmd/podman/networks" - _ "github.com/containers/libpod/v2/cmd/podman/play" - _ "github.com/containers/libpod/v2/cmd/podman/pods" - "github.com/containers/libpod/v2/cmd/podman/registry" - _ "github.com/containers/libpod/v2/cmd/podman/system" - _ "github.com/containers/libpod/v2/cmd/podman/system/connection" - _ "github.com/containers/libpod/v2/cmd/podman/volumes" - "github.com/containers/libpod/v2/pkg/rootless" - "github.com/containers/libpod/v2/pkg/terminal" + _ "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/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 a9947d805..ca633263d 100644 --- a/cmd/podman/manifest/add.go +++ b/cmd/podman/manifest/add.go @@ -4,8 +4,8 @@ import ( "context" "fmt" - "github.com/containers/libpod/v2/cmd/podman/registry" - "github.com/containers/libpod/v2/pkg/domain/entities" + "github.com/containers/podman/v2/cmd/podman/registry" + "github.com/containers/podman/v2/pkg/domain/entities" "github.com/pkg/errors" "github.com/spf13/cobra" ) diff --git a/cmd/podman/manifest/annotate.go b/cmd/podman/manifest/annotate.go index 779c33edc..1b720aa39 100644 --- a/cmd/podman/manifest/annotate.go +++ b/cmd/podman/manifest/annotate.go @@ -4,8 +4,8 @@ import ( "context" "fmt" - "github.com/containers/libpod/v2/cmd/podman/registry" - "github.com/containers/libpod/v2/pkg/domain/entities" + "github.com/containers/podman/v2/cmd/podman/registry" + "github.com/containers/podman/v2/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 a05cae7f6..b5352d24f 100644 --- a/cmd/podman/manifest/create.go +++ b/cmd/podman/manifest/create.go @@ -4,8 +4,8 @@ import ( "context" "fmt" - "github.com/containers/libpod/v2/cmd/podman/registry" - "github.com/containers/libpod/v2/pkg/domain/entities" + "github.com/containers/podman/v2/cmd/podman/registry" + "github.com/containers/podman/v2/pkg/domain/entities" "github.com/pkg/errors" "github.com/spf13/cobra" ) diff --git a/cmd/podman/manifest/inspect.go b/cmd/podman/manifest/inspect.go index 0ab8f7a7c..19396ceb3 100644 --- a/cmd/podman/manifest/inspect.go +++ b/cmd/podman/manifest/inspect.go @@ -4,8 +4,8 @@ import ( "context" "fmt" - "github.com/containers/libpod/v2/cmd/podman/registry" - "github.com/containers/libpod/v2/pkg/domain/entities" + "github.com/containers/podman/v2/cmd/podman/registry" + "github.com/containers/podman/v2/pkg/domain/entities" "github.com/pkg/errors" "github.com/spf13/cobra" ) diff --git a/cmd/podman/manifest/manifest.go b/cmd/podman/manifest/manifest.go index f992705c1..c3bcdc8c7 100644 --- a/cmd/podman/manifest/manifest.go +++ b/cmd/podman/manifest/manifest.go @@ -1,9 +1,9 @@ package manifest import ( - "github.com/containers/libpod/v2/cmd/podman/registry" - "github.com/containers/libpod/v2/cmd/podman/validate" - "github.com/containers/libpod/v2/pkg/domain/entities" + "github.com/containers/podman/v2/cmd/podman/registry" + "github.com/containers/podman/v2/cmd/podman/validate" + "github.com/containers/podman/v2/pkg/domain/entities" "github.com/spf13/cobra" ) diff --git a/cmd/podman/manifest/push.go b/cmd/podman/manifest/push.go index d1eb37ae5..b43e4531a 100644 --- a/cmd/podman/manifest/push.go +++ b/cmd/podman/manifest/push.go @@ -3,9 +3,9 @@ package manifest import ( "github.com/containers/common/pkg/auth" "github.com/containers/image/v5/types" - "github.com/containers/libpod/v2/cmd/podman/registry" - "github.com/containers/libpod/v2/pkg/domain/entities" - "github.com/containers/libpod/v2/pkg/util" + "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/pkg/errors" "github.com/spf13/cobra" ) diff --git a/cmd/podman/manifest/remove.go b/cmd/podman/manifest/remove.go index a77cd04c7..677d45484 100644 --- a/cmd/podman/manifest/remove.go +++ b/cmd/podman/manifest/remove.go @@ -4,8 +4,8 @@ import ( "context" "fmt" - "github.com/containers/libpod/v2/cmd/podman/registry" - "github.com/containers/libpod/v2/pkg/domain/entities" + "github.com/containers/podman/v2/cmd/podman/registry" + "github.com/containers/podman/v2/pkg/domain/entities" "github.com/pkg/errors" "github.com/spf13/cobra" ) diff --git a/cmd/podman/networks/create.go b/cmd/podman/networks/create.go index f208fad7c..dabf6f0d2 100644 --- a/cmd/podman/networks/create.go +++ b/cmd/podman/networks/create.go @@ -4,10 +4,10 @@ import ( "fmt" "net" - "github.com/containers/libpod/v2/cmd/podman/registry" - "github.com/containers/libpod/v2/libpod/define" - "github.com/containers/libpod/v2/pkg/domain/entities" - "github.com/containers/libpod/v2/pkg/network" + "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/network" "github.com/spf13/cobra" "github.com/spf13/pflag" ) diff --git a/cmd/podman/networks/inspect.go b/cmd/podman/networks/inspect.go index bfbb09cb8..f00d6b63c 100644 --- a/cmd/podman/networks/inspect.go +++ b/cmd/podman/networks/inspect.go @@ -8,8 +8,8 @@ import ( "strings" "text/template" - "github.com/containers/libpod/v2/cmd/podman/registry" - "github.com/containers/libpod/v2/pkg/domain/entities" + "github.com/containers/podman/v2/cmd/podman/registry" + "github.com/containers/podman/v2/pkg/domain/entities" "github.com/spf13/cobra" ) diff --git a/cmd/podman/networks/list.go b/cmd/podman/networks/list.go index 105bd25c6..3a2651cbc 100644 --- a/cmd/podman/networks/list.go +++ b/cmd/podman/networks/list.go @@ -8,10 +8,10 @@ import ( "text/tabwriter" "text/template" - "github.com/containers/libpod/v2/cmd/podman/registry" - "github.com/containers/libpod/v2/cmd/podman/validate" - "github.com/containers/libpod/v2/pkg/domain/entities" - "github.com/containers/libpod/v2/pkg/network" + "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/network" "github.com/spf13/cobra" "github.com/spf13/pflag" ) diff --git a/cmd/podman/networks/network.go b/cmd/podman/networks/network.go index 953e4678c..b5f9ef9fd 100644 --- a/cmd/podman/networks/network.go +++ b/cmd/podman/networks/network.go @@ -1,9 +1,9 @@ package network import ( - "github.com/containers/libpod/v2/cmd/podman/registry" - "github.com/containers/libpod/v2/cmd/podman/validate" - "github.com/containers/libpod/v2/pkg/domain/entities" + "github.com/containers/podman/v2/cmd/podman/registry" + "github.com/containers/podman/v2/cmd/podman/validate" + "github.com/containers/podman/v2/pkg/domain/entities" "github.com/spf13/cobra" ) diff --git a/cmd/podman/networks/rm.go b/cmd/podman/networks/rm.go index 230da88a6..dfbb5d081 100644 --- a/cmd/podman/networks/rm.go +++ b/cmd/podman/networks/rm.go @@ -3,9 +3,9 @@ package network import ( "fmt" - "github.com/containers/libpod/v2/cmd/podman/registry" - "github.com/containers/libpod/v2/cmd/podman/utils" - "github.com/containers/libpod/v2/pkg/domain/entities" + "github.com/containers/podman/v2/cmd/podman/registry" + "github.com/containers/podman/v2/cmd/podman/utils" + "github.com/containers/podman/v2/pkg/domain/entities" "github.com/spf13/cobra" "github.com/spf13/pflag" ) diff --git a/cmd/podman/play/kube.go b/cmd/podman/play/kube.go index 9bd5c10db..54a6d0677 100644 --- a/cmd/podman/play/kube.go +++ b/cmd/podman/play/kube.go @@ -6,10 +6,10 @@ import ( "github.com/containers/common/pkg/auth" "github.com/containers/image/v5/types" - "github.com/containers/libpod/v2/cmd/podman/registry" - "github.com/containers/libpod/v2/cmd/podman/utils" - "github.com/containers/libpod/v2/pkg/domain/entities" - "github.com/containers/libpod/v2/pkg/util" + "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/pkg/errors" "github.com/spf13/cobra" ) diff --git a/cmd/podman/play/play.go b/cmd/podman/play/play.go index eb8873595..607c99767 100644 --- a/cmd/podman/play/play.go +++ b/cmd/podman/play/play.go @@ -1,9 +1,9 @@ package pods import ( - "github.com/containers/libpod/v2/cmd/podman/registry" - "github.com/containers/libpod/v2/cmd/podman/validate" - "github.com/containers/libpod/v2/pkg/domain/entities" + "github.com/containers/podman/v2/cmd/podman/registry" + "github.com/containers/podman/v2/cmd/podman/validate" + "github.com/containers/podman/v2/pkg/domain/entities" "github.com/spf13/cobra" ) diff --git a/cmd/podman/pods/create.go b/cmd/podman/pods/create.go index d57a2f2f7..603ddcaca 100644 --- a/cmd/podman/pods/create.go +++ b/cmd/podman/pods/create.go @@ -7,14 +7,14 @@ import ( "os" "strings" - "github.com/containers/libpod/v2/cmd/podman/common" - "github.com/containers/libpod/v2/cmd/podman/parse" - "github.com/containers/libpod/v2/cmd/podman/registry" - "github.com/containers/libpod/v2/cmd/podman/validate" - "github.com/containers/libpod/v2/pkg/domain/entities" - "github.com/containers/libpod/v2/pkg/errorhandling" - "github.com/containers/libpod/v2/pkg/specgen" - "github.com/containers/libpod/v2/pkg/util" + "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/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 599b6abe2..cdaf2a707 100644 --- a/cmd/podman/pods/exists.go +++ b/cmd/podman/pods/exists.go @@ -3,8 +3,8 @@ package pods import ( "context" - "github.com/containers/libpod/v2/cmd/podman/registry" - "github.com/containers/libpod/v2/pkg/domain/entities" + "github.com/containers/podman/v2/cmd/podman/registry" + "github.com/containers/podman/v2/pkg/domain/entities" "github.com/spf13/cobra" ) diff --git a/cmd/podman/pods/inspect.go b/cmd/podman/pods/inspect.go index e21c7a74b..8f5aa6062 100644 --- a/cmd/podman/pods/inspect.go +++ b/cmd/podman/pods/inspect.go @@ -5,9 +5,9 @@ import ( "fmt" "github.com/containers/buildah/pkg/formats" - "github.com/containers/libpod/v2/cmd/podman/registry" - "github.com/containers/libpod/v2/cmd/podman/validate" - "github.com/containers/libpod/v2/pkg/domain/entities" + "github.com/containers/podman/v2/cmd/podman/registry" + "github.com/containers/podman/v2/cmd/podman/validate" + "github.com/containers/podman/v2/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 2f4930897..d666d7537 100644 --- a/cmd/podman/pods/kill.go +++ b/cmd/podman/pods/kill.go @@ -4,10 +4,10 @@ import ( "context" "fmt" - "github.com/containers/libpod/v2/cmd/podman/registry" - "github.com/containers/libpod/v2/cmd/podman/utils" - "github.com/containers/libpod/v2/cmd/podman/validate" - "github.com/containers/libpod/v2/pkg/domain/entities" + "github.com/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/spf13/cobra" ) diff --git a/cmd/podman/pods/pause.go b/cmd/podman/pods/pause.go index f79d88973..591378983 100644 --- a/cmd/podman/pods/pause.go +++ b/cmd/podman/pods/pause.go @@ -4,10 +4,10 @@ import ( "context" "fmt" - "github.com/containers/libpod/v2/cmd/podman/registry" - "github.com/containers/libpod/v2/cmd/podman/utils" - "github.com/containers/libpod/v2/cmd/podman/validate" - "github.com/containers/libpod/v2/pkg/domain/entities" + "github.com/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/spf13/cobra" ) diff --git a/cmd/podman/pods/pod.go b/cmd/podman/pods/pod.go index fff5ea615..12448a5f1 100644 --- a/cmd/podman/pods/pod.go +++ b/cmd/podman/pods/pod.go @@ -1,10 +1,10 @@ package pods import ( - "github.com/containers/libpod/v2/cmd/podman/registry" - "github.com/containers/libpod/v2/cmd/podman/validate" - "github.com/containers/libpod/v2/pkg/domain/entities" - "github.com/containers/libpod/v2/pkg/util" + "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/spf13/cobra" ) diff --git a/cmd/podman/pods/prune.go b/cmd/podman/pods/prune.go index ee97e13f1..a7347ede5 100644 --- a/cmd/podman/pods/prune.go +++ b/cmd/podman/pods/prune.go @@ -7,9 +7,9 @@ import ( "os" "strings" - "github.com/containers/libpod/v2/cmd/podman/registry" - "github.com/containers/libpod/v2/cmd/podman/utils" - "github.com/containers/libpod/v2/pkg/domain/entities" + "github.com/containers/podman/v2/cmd/podman/registry" + "github.com/containers/podman/v2/cmd/podman/utils" + "github.com/containers/podman/v2/pkg/domain/entities" "github.com/pkg/errors" "github.com/spf13/cobra" ) diff --git a/cmd/podman/pods/ps.go b/cmd/podman/pods/ps.go index 7a1221480..97e528c7c 100644 --- a/cmd/podman/pods/ps.go +++ b/cmd/podman/pods/ps.go @@ -11,9 +11,9 @@ import ( "text/template" "time" - "github.com/containers/libpod/v2/cmd/podman/registry" - "github.com/containers/libpod/v2/cmd/podman/validate" - "github.com/containers/libpod/v2/pkg/domain/entities" + "github.com/containers/podman/v2/cmd/podman/registry" + "github.com/containers/podman/v2/cmd/podman/validate" + "github.com/containers/podman/v2/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 77d9f62d4..11e8b4ebc 100644 --- a/cmd/podman/pods/restart.go +++ b/cmd/podman/pods/restart.go @@ -4,10 +4,10 @@ import ( "context" "fmt" - "github.com/containers/libpod/v2/cmd/podman/registry" - "github.com/containers/libpod/v2/cmd/podman/utils" - "github.com/containers/libpod/v2/cmd/podman/validate" - "github.com/containers/libpod/v2/pkg/domain/entities" + "github.com/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/spf13/cobra" ) diff --git a/cmd/podman/pods/rm.go b/cmd/podman/pods/rm.go index 3e07b31e9..0bb35e1ca 100644 --- a/cmd/podman/pods/rm.go +++ b/cmd/podman/pods/rm.go @@ -4,11 +4,11 @@ import ( "context" "fmt" - "github.com/containers/libpod/v2/cmd/podman/common" - "github.com/containers/libpod/v2/cmd/podman/registry" - "github.com/containers/libpod/v2/cmd/podman/utils" - "github.com/containers/libpod/v2/cmd/podman/validate" - "github.com/containers/libpod/v2/pkg/domain/entities" + "github.com/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/spf13/cobra" ) diff --git a/cmd/podman/pods/start.go b/cmd/podman/pods/start.go index 586737fb2..e2ca3fd41 100644 --- a/cmd/podman/pods/start.go +++ b/cmd/podman/pods/start.go @@ -4,11 +4,11 @@ import ( "context" "fmt" - "github.com/containers/libpod/v2/cmd/podman/common" - "github.com/containers/libpod/v2/cmd/podman/registry" - "github.com/containers/libpod/v2/cmd/podman/utils" - "github.com/containers/libpod/v2/cmd/podman/validate" - "github.com/containers/libpod/v2/pkg/domain/entities" + "github.com/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/spf13/cobra" ) diff --git a/cmd/podman/pods/stats.go b/cmd/podman/pods/stats.go index 930a6d15c..1d916dbfa 100644 --- a/cmd/podman/pods/stats.go +++ b/cmd/podman/pods/stats.go @@ -12,10 +12,10 @@ import ( "github.com/buger/goterm" "github.com/containers/buildah/pkg/formats" - "github.com/containers/libpod/v2/cmd/podman/registry" - "github.com/containers/libpod/v2/cmd/podman/validate" - "github.com/containers/libpod/v2/pkg/domain/entities" - "github.com/containers/libpod/v2/pkg/util/camelcase" + "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/camelcase" "github.com/spf13/cobra" ) diff --git a/cmd/podman/pods/stop.go b/cmd/podman/pods/stop.go index 84190fd08..20c3f59bf 100644 --- a/cmd/podman/pods/stop.go +++ b/cmd/podman/pods/stop.go @@ -4,11 +4,11 @@ import ( "context" "fmt" - "github.com/containers/libpod/v2/cmd/podman/common" - "github.com/containers/libpod/v2/cmd/podman/registry" - "github.com/containers/libpod/v2/cmd/podman/utils" - "github.com/containers/libpod/v2/cmd/podman/validate" - "github.com/containers/libpod/v2/pkg/domain/entities" + "github.com/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/spf13/cobra" ) diff --git a/cmd/podman/pods/top.go b/cmd/podman/pods/top.go index 7e5f4e321..9877db404 100644 --- a/cmd/podman/pods/top.go +++ b/cmd/podman/pods/top.go @@ -7,10 +7,10 @@ import ( "strings" "text/tabwriter" - "github.com/containers/libpod/v2/cmd/podman/registry" - "github.com/containers/libpod/v2/cmd/podman/validate" - "github.com/containers/libpod/v2/pkg/domain/entities" - "github.com/containers/libpod/v2/pkg/util" + "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/pkg/errors" "github.com/spf13/cobra" ) diff --git a/cmd/podman/pods/unpause.go b/cmd/podman/pods/unpause.go index f96f3481c..8474da57e 100644 --- a/cmd/podman/pods/unpause.go +++ b/cmd/podman/pods/unpause.go @@ -4,10 +4,10 @@ import ( "context" "fmt" - "github.com/containers/libpod/v2/cmd/podman/registry" - "github.com/containers/libpod/v2/cmd/podman/utils" - "github.com/containers/libpod/v2/cmd/podman/validate" - "github.com/containers/libpod/v2/pkg/domain/entities" + "github.com/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/spf13/cobra" ) diff --git a/cmd/podman/registry/config.go b/cmd/podman/registry/config.go index a62a41c12..f8f045fb3 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/libpod/v2/pkg/domain/entities" - "github.com/containers/libpod/v2/pkg/rootless" - "github.com/containers/libpod/v2/pkg/util" + "github.com/containers/podman/v2/pkg/domain/entities" + "github.com/containers/podman/v2/pkg/rootless" + "github.com/containers/podman/v2/pkg/util" "github.com/pkg/errors" ) diff --git a/cmd/podman/registry/registry.go b/cmd/podman/registry/registry.go index d93b3e633..1e439613c 100644 --- a/cmd/podman/registry/registry.go +++ b/cmd/podman/registry/registry.go @@ -4,10 +4,10 @@ import ( "context" "path/filepath" - "github.com/containers/libpod/v2/pkg/domain/entities" - "github.com/containers/libpod/v2/pkg/domain/infra" - "github.com/containers/libpod/v2/pkg/rootless" - "github.com/containers/libpod/v2/pkg/util" + "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/sirupsen/logrus" "github.com/spf13/cobra" ) diff --git a/cmd/podman/registry/remote.go b/cmd/podman/registry/remote.go index 006a1b900..7dbdd3824 100644 --- a/cmd/podman/registry/remote.go +++ b/cmd/podman/registry/remote.go @@ -4,7 +4,7 @@ import ( "os" "sync" - "github.com/containers/libpod/v2/pkg/domain/entities" + "github.com/containers/podman/v2/pkg/domain/entities" "github.com/spf13/cobra" ) diff --git a/cmd/podman/report/diff.go b/cmd/podman/report/diff.go index d044774a6..edd324bfe 100644 --- a/cmd/podman/report/diff.go +++ b/cmd/podman/report/diff.go @@ -4,7 +4,7 @@ import ( "fmt" "os" - "github.com/containers/libpod/v2/pkg/domain/entities" + "github.com/containers/podman/v2/pkg/domain/entities" "github.com/containers/storage/pkg/archive" "github.com/pkg/errors" ) diff --git a/cmd/podman/report/report.go b/cmd/podman/report/report.go index b8b1536fd..2c4f2e1fd 100644 --- a/cmd/podman/report/report.go +++ b/cmd/podman/report/report.go @@ -1,6 +1,6 @@ package report -import "github.com/containers/libpod/v2/cmd/podman/registry" +import "github.com/containers/podman/v2/cmd/podman/registry" // Pull in configured json library var json = registry.JSONLibrary() diff --git a/cmd/podman/root.go b/cmd/podman/root.go index e9f1ff710..9e9011dc9 100644 --- a/cmd/podman/root.go +++ b/cmd/podman/root.go @@ -10,13 +10,13 @@ import ( "strings" "github.com/containers/common/pkg/config" - "github.com/containers/libpod/v2/cmd/podman/registry" - "github.com/containers/libpod/v2/cmd/podman/validate" - "github.com/containers/libpod/v2/pkg/domain/entities" - "github.com/containers/libpod/v2/pkg/parallel" - "github.com/containers/libpod/v2/pkg/rootless" - "github.com/containers/libpod/v2/pkg/tracing" - "github.com/containers/libpod/v2/version" + "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/parallel" + "github.com/containers/podman/v2/pkg/rootless" + "github.com/containers/podman/v2/pkg/tracing" + "github.com/containers/podman/v2/version" "github.com/opentracing/opentracing-go" "github.com/pkg/errors" "github.com/sirupsen/logrus" diff --git a/cmd/podman/system/connection.go b/cmd/podman/system/connection.go index b1c538803..b6c18217e 100644 --- a/cmd/podman/system/connection.go +++ b/cmd/podman/system/connection.go @@ -1,9 +1,9 @@ package system import ( - "github.com/containers/libpod/v2/cmd/podman/registry" - "github.com/containers/libpod/v2/cmd/podman/validate" - "github.com/containers/libpod/v2/pkg/domain/entities" + "github.com/containers/podman/v2/cmd/podman/registry" + "github.com/containers/podman/v2/cmd/podman/validate" + "github.com/containers/podman/v2/pkg/domain/entities" "github.com/spf13/cobra" ) diff --git a/cmd/podman/system/connection/add.go b/cmd/podman/system/connection/add.go index 7522eb190..89cea10ca 100644 --- a/cmd/podman/system/connection/add.go +++ b/cmd/podman/system/connection/add.go @@ -11,11 +11,11 @@ import ( "regexp" "github.com/containers/common/pkg/config" - "github.com/containers/libpod/v2/cmd/podman/registry" - "github.com/containers/libpod/v2/cmd/podman/system" - "github.com/containers/libpod/v2/libpod/define" - "github.com/containers/libpod/v2/pkg/domain/entities" - "github.com/containers/libpod/v2/pkg/terminal" + "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/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 b85343dc2..eafcf37b2 100644 --- a/cmd/podman/system/connection/default.go +++ b/cmd/podman/system/connection/default.go @@ -4,9 +4,9 @@ import ( "fmt" "github.com/containers/common/pkg/config" - "github.com/containers/libpod/v2/cmd/podman/registry" - "github.com/containers/libpod/v2/cmd/podman/system" - "github.com/containers/libpod/v2/pkg/domain/entities" + "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/spf13/cobra" ) diff --git a/cmd/podman/system/connection/list.go b/cmd/podman/system/connection/list.go index c0a9087f5..6d3d85d11 100644 --- a/cmd/podman/system/connection/list.go +++ b/cmd/podman/system/connection/list.go @@ -6,10 +6,10 @@ import ( "text/template" "github.com/containers/common/pkg/config" - "github.com/containers/libpod/v2/cmd/podman/registry" - "github.com/containers/libpod/v2/cmd/podman/system" - "github.com/containers/libpod/v2/cmd/podman/validate" - "github.com/containers/libpod/v2/pkg/domain/entities" + "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/spf13/cobra" ) diff --git a/cmd/podman/system/connection/remove.go b/cmd/podman/system/connection/remove.go index a2ca66c8d..58674efb6 100644 --- a/cmd/podman/system/connection/remove.go +++ b/cmd/podman/system/connection/remove.go @@ -2,9 +2,9 @@ package connection import ( "github.com/containers/common/pkg/config" - "github.com/containers/libpod/v2/cmd/podman/registry" - "github.com/containers/libpod/v2/cmd/podman/system" - "github.com/containers/libpod/v2/pkg/domain/entities" + "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/spf13/cobra" ) diff --git a/cmd/podman/system/connection/rename.go b/cmd/podman/system/connection/rename.go index d6cd55c31..bb2ca262a 100644 --- a/cmd/podman/system/connection/rename.go +++ b/cmd/podman/system/connection/rename.go @@ -4,9 +4,9 @@ import ( "fmt" "github.com/containers/common/pkg/config" - "github.com/containers/libpod/v2/cmd/podman/registry" - "github.com/containers/libpod/v2/cmd/podman/system" - "github.com/containers/libpod/v2/pkg/domain/entities" + "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/spf13/cobra" ) diff --git a/cmd/podman/system/df.go b/cmd/podman/system/df.go index a242c4f66..a320eb5c7 100644 --- a/cmd/podman/system/df.go +++ b/cmd/podman/system/df.go @@ -9,9 +9,9 @@ import ( "text/template" "time" - "github.com/containers/libpod/v2/cmd/podman/registry" - "github.com/containers/libpod/v2/cmd/podman/validate" - "github.com/containers/libpod/v2/pkg/domain/entities" + "github.com/containers/podman/v2/cmd/podman/registry" + "github.com/containers/podman/v2/cmd/podman/validate" + "github.com/containers/podman/v2/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 0a46a4042..04e948f30 100644 --- a/cmd/podman/system/events.go +++ b/cmd/podman/system/events.go @@ -8,10 +8,10 @@ import ( "text/template" "github.com/containers/buildah/pkg/formats" - "github.com/containers/libpod/v2/cmd/podman/registry" - "github.com/containers/libpod/v2/cmd/podman/validate" - "github.com/containers/libpod/v2/libpod/events" - "github.com/containers/libpod/v2/pkg/domain/entities" + "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/pkg/errors" "github.com/spf13/cobra" ) diff --git a/cmd/podman/system/info.go b/cmd/podman/system/info.go index 410b3455a..3e3c99488 100644 --- a/cmd/podman/system/info.go +++ b/cmd/podman/system/info.go @@ -5,10 +5,10 @@ import ( "os" "text/template" - "github.com/containers/libpod/v2/cmd/podman/parse" - "github.com/containers/libpod/v2/cmd/podman/registry" - "github.com/containers/libpod/v2/cmd/podman/validate" - "github.com/containers/libpod/v2/pkg/domain/entities" + "github.com/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/ghodss/yaml" "github.com/spf13/cobra" "github.com/spf13/pflag" diff --git a/cmd/podman/system/migrate.go b/cmd/podman/system/migrate.go index cb67ae760..018701fc9 100644 --- a/cmd/podman/system/migrate.go +++ b/cmd/podman/system/migrate.go @@ -6,10 +6,10 @@ import ( "fmt" "os" - "github.com/containers/libpod/v2/cmd/podman/registry" - "github.com/containers/libpod/v2/cmd/podman/validate" - "github.com/containers/libpod/v2/pkg/domain/entities" - "github.com/containers/libpod/v2/pkg/domain/infra" + "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/spf13/cobra" ) diff --git a/cmd/podman/system/prune.go b/cmd/podman/system/prune.go index 26b2a704f..f34df3698 100644 --- a/cmd/podman/system/prune.go +++ b/cmd/podman/system/prune.go @@ -7,10 +7,10 @@ import ( "os" "strings" - "github.com/containers/libpod/v2/cmd/podman/registry" - "github.com/containers/libpod/v2/cmd/podman/utils" - "github.com/containers/libpod/v2/cmd/podman/validate" - "github.com/containers/libpod/v2/pkg/domain/entities" + "github.com/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/pkg/errors" "github.com/spf13/cobra" ) diff --git a/cmd/podman/system/renumber.go b/cmd/podman/system/renumber.go index 7cec5b986..1631ab093 100644 --- a/cmd/podman/system/renumber.go +++ b/cmd/podman/system/renumber.go @@ -6,10 +6,10 @@ import ( "fmt" "os" - "github.com/containers/libpod/v2/cmd/podman/registry" - "github.com/containers/libpod/v2/cmd/podman/validate" - "github.com/containers/libpod/v2/pkg/domain/entities" - "github.com/containers/libpod/v2/pkg/domain/infra" + "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/spf13/cobra" ) diff --git a/cmd/podman/system/reset.go b/cmd/podman/system/reset.go index 9b4493391..a7a42ea58 100644 --- a/cmd/podman/system/reset.go +++ b/cmd/podman/system/reset.go @@ -8,10 +8,10 @@ import ( "os" "strings" - "github.com/containers/libpod/v2/cmd/podman/registry" - "github.com/containers/libpod/v2/cmd/podman/validate" - "github.com/containers/libpod/v2/pkg/domain/entities" - "github.com/containers/libpod/v2/pkg/domain/infra" + "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/pkg/errors" "github.com/spf13/cobra" ) diff --git a/cmd/podman/system/service.go b/cmd/podman/system/service.go index 312fcda19..2d511f0ec 100644 --- a/cmd/podman/system/service.go +++ b/cmd/podman/system/service.go @@ -9,11 +9,11 @@ import ( "syscall" "time" - "github.com/containers/libpod/v2/cmd/podman/registry" - "github.com/containers/libpod/v2/pkg/domain/entities" - "github.com/containers/libpod/v2/pkg/rootless" - "github.com/containers/libpod/v2/pkg/systemd" - "github.com/containers/libpod/v2/pkg/util" + "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/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 4baa0f6bf..6c6dd42a4 100644 --- a/cmd/podman/system/service_abi.go +++ b/cmd/podman/system/service_abi.go @@ -7,9 +7,9 @@ import ( "net" "strings" - api "github.com/containers/libpod/v2/pkg/api/server" - "github.com/containers/libpod/v2/pkg/domain/entities" - "github.com/containers/libpod/v2/pkg/domain/infra" + 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" "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 2dd6cf774..388905035 100644 --- a/cmd/podman/system/system.go +++ b/cmd/podman/system/system.go @@ -1,9 +1,9 @@ package system import ( - "github.com/containers/libpod/v2/cmd/podman/registry" - "github.com/containers/libpod/v2/cmd/podman/validate" - "github.com/containers/libpod/v2/pkg/domain/entities" + "github.com/containers/podman/v2/cmd/podman/registry" + "github.com/containers/podman/v2/cmd/podman/validate" + "github.com/containers/podman/v2/pkg/domain/entities" "github.com/spf13/cobra" ) diff --git a/cmd/podman/system/unshare.go b/cmd/podman/system/unshare.go index bd6540e4b..2d0113779 100644 --- a/cmd/podman/system/unshare.go +++ b/cmd/podman/system/unshare.go @@ -3,9 +3,9 @@ package system import ( "os" - "github.com/containers/libpod/v2/cmd/podman/registry" - "github.com/containers/libpod/v2/pkg/domain/entities" - "github.com/containers/libpod/v2/pkg/rootless" + "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/pkg/errors" "github.com/spf13/cobra" ) diff --git a/cmd/podman/system/varlink.go b/cmd/podman/system/varlink.go index e5d83180e..57e7e4ba6 100644 --- a/cmd/podman/system/varlink.go +++ b/cmd/podman/system/varlink.go @@ -5,8 +5,8 @@ package system import ( "time" - "github.com/containers/libpod/v2/cmd/podman/registry" - "github.com/containers/libpod/v2/pkg/domain/entities" + "github.com/containers/podman/v2/cmd/podman/registry" + "github.com/containers/podman/v2/pkg/domain/entities" "github.com/spf13/cobra" ) diff --git a/cmd/podman/system/version.go b/cmd/podman/system/version.go index 9b70bc9f4..edc860d0e 100644 --- a/cmd/podman/system/version.go +++ b/cmd/podman/system/version.go @@ -8,11 +8,11 @@ import ( "text/tabwriter" "github.com/containers/buildah/pkg/formats" - "github.com/containers/libpod/v2/cmd/podman/parse" - "github.com/containers/libpod/v2/cmd/podman/registry" - "github.com/containers/libpod/v2/cmd/podman/validate" - "github.com/containers/libpod/v2/libpod/define" - "github.com/containers/libpod/v2/pkg/domain/entities" + "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/domain/entities" "github.com/spf13/cobra" ) diff --git a/cmd/podman/utils/utils.go b/cmd/podman/utils/utils.go index 029ed526e..1c9e4d786 100644 --- a/cmd/podman/utils/utils.go +++ b/cmd/podman/utils/utils.go @@ -4,7 +4,7 @@ import ( "fmt" "os" - "github.com/containers/libpod/v2/pkg/domain/entities" + "github.com/containers/podman/v2/pkg/domain/entities" ) // IsDir returns true if the specified path refers to a directory. diff --git a/cmd/podman/validate/latest.go b/cmd/podman/validate/latest.go index 0ebed7227..5c76fe847 100644 --- a/cmd/podman/validate/latest.go +++ b/cmd/podman/validate/latest.go @@ -1,7 +1,7 @@ package validate import ( - "github.com/containers/libpod/v2/cmd/podman/registry" + "github.com/containers/podman/v2/cmd/podman/registry" "github.com/spf13/cobra" ) diff --git a/cmd/podman/volumes/create.go b/cmd/podman/volumes/create.go index 2710014ef..934a552dc 100644 --- a/cmd/podman/volumes/create.go +++ b/cmd/podman/volumes/create.go @@ -4,9 +4,9 @@ import ( "context" "fmt" - "github.com/containers/libpod/v2/cmd/podman/parse" - "github.com/containers/libpod/v2/cmd/podman/registry" - "github.com/containers/libpod/v2/pkg/domain/entities" + "github.com/containers/podman/v2/cmd/podman/parse" + "github.com/containers/podman/v2/cmd/podman/registry" + "github.com/containers/podman/v2/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 235137fc7..ce24ac4e5 100644 --- a/cmd/podman/volumes/inspect.go +++ b/cmd/podman/volumes/inspect.go @@ -7,8 +7,8 @@ import ( "text/template" "github.com/containers/buildah/pkg/formats" - "github.com/containers/libpod/v2/cmd/podman/registry" - "github.com/containers/libpod/v2/pkg/domain/entities" + "github.com/containers/podman/v2/cmd/podman/registry" + "github.com/containers/podman/v2/pkg/domain/entities" "github.com/pkg/errors" "github.com/spf13/cobra" "golang.org/x/net/context" diff --git a/cmd/podman/volumes/list.go b/cmd/podman/volumes/list.go index 804b9f319..d198e51a7 100644 --- a/cmd/podman/volumes/list.go +++ b/cmd/podman/volumes/list.go @@ -9,9 +9,9 @@ import ( "text/tabwriter" "text/template" - "github.com/containers/libpod/v2/cmd/podman/registry" - "github.com/containers/libpod/v2/cmd/podman/validate" - "github.com/containers/libpod/v2/pkg/domain/entities" + "github.com/containers/podman/v2/cmd/podman/registry" + "github.com/containers/podman/v2/cmd/podman/validate" + "github.com/containers/podman/v2/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 330488e0d..95b47b726 100644 --- a/cmd/podman/volumes/prune.go +++ b/cmd/podman/volumes/prune.go @@ -7,10 +7,10 @@ import ( "os" "strings" - "github.com/containers/libpod/v2/cmd/podman/registry" - "github.com/containers/libpod/v2/cmd/podman/utils" - "github.com/containers/libpod/v2/cmd/podman/validate" - "github.com/containers/libpod/v2/pkg/domain/entities" + "github.com/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/pkg/errors" "github.com/spf13/cobra" ) diff --git a/cmd/podman/volumes/rm.go b/cmd/podman/volumes/rm.go index 2636ad1a2..5b23eb5e6 100644 --- a/cmd/podman/volumes/rm.go +++ b/cmd/podman/volumes/rm.go @@ -4,9 +4,9 @@ import ( "context" "fmt" - "github.com/containers/libpod/v2/cmd/podman/registry" - "github.com/containers/libpod/v2/cmd/podman/utils" - "github.com/containers/libpod/v2/pkg/domain/entities" + "github.com/containers/podman/v2/cmd/podman/registry" + "github.com/containers/podman/v2/cmd/podman/utils" + "github.com/containers/podman/v2/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 3ef20a027..cd7a1a642 100644 --- a/cmd/podman/volumes/volume.go +++ b/cmd/podman/volumes/volume.go @@ -1,9 +1,9 @@ package volumes import ( - "github.com/containers/libpod/v2/cmd/podman/registry" - "github.com/containers/libpod/v2/cmd/podman/validate" - "github.com/containers/libpod/v2/pkg/domain/entities" + "github.com/containers/podman/v2/cmd/podman/registry" + "github.com/containers/podman/v2/cmd/podman/validate" + "github.com/containers/podman/v2/pkg/domain/entities" "github.com/spf13/cobra" ) -- cgit v1.2.3-54-g00ecf