diff options
Diffstat (limited to 'pkg')
239 files changed, 705 insertions, 705 deletions
diff --git a/pkg/api/handlers/compat/changes.go b/pkg/api/handlers/compat/changes.go index 44faf8e84..a5851ecfc 100644 --- a/pkg/api/handlers/compat/changes.go +++ b/pkg/api/handlers/compat/changes.go @@ -3,8 +3,8 @@ package compat import ( "net/http" - "github.com/containers/libpod/v2/libpod" - "github.com/containers/libpod/v2/pkg/api/handlers/utils" + "github.com/containers/podman/v2/libpod" + "github.com/containers/podman/v2/pkg/api/handlers/utils" ) func Changes(w http.ResponseWriter, r *http.Request) { diff --git a/pkg/api/handlers/compat/containers.go b/pkg/api/handlers/compat/containers.go index 52b925d3c..6943b15ff 100644 --- a/pkg/api/handlers/compat/containers.go +++ b/pkg/api/handlers/compat/containers.go @@ -6,11 +6,11 @@ import ( "net/http" "strings" - "github.com/containers/libpod/v2/libpod" - "github.com/containers/libpod/v2/libpod/define" - "github.com/containers/libpod/v2/pkg/api/handlers" - "github.com/containers/libpod/v2/pkg/api/handlers/utils" - "github.com/containers/libpod/v2/pkg/signal" + "github.com/containers/podman/v2/libpod" + "github.com/containers/podman/v2/libpod/define" + "github.com/containers/podman/v2/pkg/api/handlers" + "github.com/containers/podman/v2/pkg/api/handlers/utils" + "github.com/containers/podman/v2/pkg/signal" "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/container" "github.com/docker/go-connections/nat" diff --git a/pkg/api/handlers/compat/containers_archive.go b/pkg/api/handlers/compat/containers_archive.go index 1225b541e..293a17e0f 100644 --- a/pkg/api/handlers/compat/containers_archive.go +++ b/pkg/api/handlers/compat/containers_archive.go @@ -4,7 +4,7 @@ import ( "errors" "net/http" - "github.com/containers/libpod/v2/pkg/api/handlers/utils" + "github.com/containers/podman/v2/pkg/api/handlers/utils" ) func Archive(w http.ResponseWriter, r *http.Request) { diff --git a/pkg/api/handlers/compat/containers_attach.go b/pkg/api/handlers/compat/containers_attach.go index 71586fca4..2d63ac56d 100644 --- a/pkg/api/handlers/compat/containers_attach.go +++ b/pkg/api/handlers/compat/containers_attach.go @@ -8,10 +8,10 @@ import ( "net/http" "strings" - "github.com/containers/libpod/v2/libpod" - "github.com/containers/libpod/v2/libpod/define" - "github.com/containers/libpod/v2/pkg/api/handlers/utils" - "github.com/containers/libpod/v2/pkg/api/server/idletracker" + "github.com/containers/podman/v2/libpod" + "github.com/containers/podman/v2/libpod/define" + "github.com/containers/podman/v2/pkg/api/handlers/utils" + "github.com/containers/podman/v2/pkg/api/server/idletracker" "github.com/gorilla/schema" "github.com/pkg/errors" "github.com/sirupsen/logrus" diff --git a/pkg/api/handlers/compat/containers_create.go b/pkg/api/handlers/compat/containers_create.go index cbcda474a..8238d2d93 100644 --- a/pkg/api/handlers/compat/containers_create.go +++ b/pkg/api/handlers/compat/containers_create.go @@ -8,14 +8,14 @@ import ( "strings" "github.com/containers/common/pkg/config" - "github.com/containers/libpod/v2/libpod" - "github.com/containers/libpod/v2/libpod/define" - image2 "github.com/containers/libpod/v2/libpod/image" - "github.com/containers/libpod/v2/pkg/api/handlers" - "github.com/containers/libpod/v2/pkg/api/handlers/utils" - "github.com/containers/libpod/v2/pkg/namespaces" - "github.com/containers/libpod/v2/pkg/signal" - createconfig "github.com/containers/libpod/v2/pkg/spec" + "github.com/containers/podman/v2/libpod" + "github.com/containers/podman/v2/libpod/define" + image2 "github.com/containers/podman/v2/libpod/image" + "github.com/containers/podman/v2/pkg/api/handlers" + "github.com/containers/podman/v2/pkg/api/handlers/utils" + "github.com/containers/podman/v2/pkg/namespaces" + "github.com/containers/podman/v2/pkg/signal" + createconfig "github.com/containers/podman/v2/pkg/spec" "github.com/containers/storage" "github.com/gorilla/schema" "github.com/pkg/errors" diff --git a/pkg/api/handlers/compat/containers_export.go b/pkg/api/handlers/compat/containers_export.go index 35ef797c0..500daa9cd 100644 --- a/pkg/api/handlers/compat/containers_export.go +++ b/pkg/api/handlers/compat/containers_export.go @@ -5,8 +5,8 @@ import ( "net/http" "os" - "github.com/containers/libpod/v2/libpod" - "github.com/containers/libpod/v2/pkg/api/handlers/utils" + "github.com/containers/podman/v2/libpod" + "github.com/containers/podman/v2/pkg/api/handlers/utils" "github.com/pkg/errors" ) diff --git a/pkg/api/handlers/compat/containers_logs.go b/pkg/api/handlers/compat/containers_logs.go index 30ee030e8..f6d4a518e 100644 --- a/pkg/api/handlers/compat/containers_logs.go +++ b/pkg/api/handlers/compat/containers_logs.go @@ -10,10 +10,10 @@ import ( "sync" "time" - "github.com/containers/libpod/v2/libpod" - "github.com/containers/libpod/v2/libpod/logs" - "github.com/containers/libpod/v2/pkg/api/handlers/utils" - "github.com/containers/libpod/v2/pkg/util" + "github.com/containers/podman/v2/libpod" + "github.com/containers/podman/v2/libpod/logs" + "github.com/containers/podman/v2/pkg/api/handlers/utils" + "github.com/containers/podman/v2/pkg/util" "github.com/gorilla/schema" "github.com/pkg/errors" log "github.com/sirupsen/logrus" diff --git a/pkg/api/handlers/compat/containers_pause.go b/pkg/api/handlers/compat/containers_pause.go index 5e7d78607..8712969c0 100644 --- a/pkg/api/handlers/compat/containers_pause.go +++ b/pkg/api/handlers/compat/containers_pause.go @@ -3,8 +3,8 @@ package compat import ( "net/http" - "github.com/containers/libpod/v2/libpod" - "github.com/containers/libpod/v2/pkg/api/handlers/utils" + "github.com/containers/podman/v2/libpod" + "github.com/containers/podman/v2/pkg/api/handlers/utils" ) func PauseContainer(w http.ResponseWriter, r *http.Request) { diff --git a/pkg/api/handlers/compat/containers_prune.go b/pkg/api/handlers/compat/containers_prune.go index 63ffed0f1..689ed8724 100644 --- a/pkg/api/handlers/compat/containers_prune.go +++ b/pkg/api/handlers/compat/containers_prune.go @@ -3,10 +3,10 @@ package compat import ( "net/http" - "github.com/containers/libpod/v2/libpod" - lpfilters "github.com/containers/libpod/v2/libpod/filters" - "github.com/containers/libpod/v2/pkg/api/handlers/utils" - "github.com/containers/libpod/v2/pkg/domain/entities" + "github.com/containers/podman/v2/libpod" + lpfilters "github.com/containers/podman/v2/libpod/filters" + "github.com/containers/podman/v2/pkg/api/handlers/utils" + "github.com/containers/podman/v2/pkg/domain/entities" "github.com/docker/docker/api/types" "github.com/gorilla/schema" "github.com/pkg/errors" diff --git a/pkg/api/handlers/compat/containers_restart.go b/pkg/api/handlers/compat/containers_restart.go index 97f453baa..83de2ee88 100644 --- a/pkg/api/handlers/compat/containers_restart.go +++ b/pkg/api/handlers/compat/containers_restart.go @@ -3,8 +3,8 @@ package compat import ( "net/http" - "github.com/containers/libpod/v2/libpod" - "github.com/containers/libpod/v2/pkg/api/handlers/utils" + "github.com/containers/podman/v2/libpod" + "github.com/containers/podman/v2/pkg/api/handlers/utils" "github.com/gorilla/schema" "github.com/pkg/errors" ) diff --git a/pkg/api/handlers/compat/containers_start.go b/pkg/api/handlers/compat/containers_start.go index 111c572aa..6236b1357 100644 --- a/pkg/api/handlers/compat/containers_start.go +++ b/pkg/api/handlers/compat/containers_start.go @@ -5,9 +5,9 @@ import ( "github.com/sirupsen/logrus" - "github.com/containers/libpod/v2/libpod" - "github.com/containers/libpod/v2/libpod/define" - "github.com/containers/libpod/v2/pkg/api/handlers/utils" + "github.com/containers/podman/v2/libpod" + "github.com/containers/podman/v2/libpod/define" + "github.com/containers/podman/v2/pkg/api/handlers/utils" "github.com/gorilla/schema" ) diff --git a/pkg/api/handlers/compat/containers_stats.go b/pkg/api/handlers/compat/containers_stats.go index 2cfe140c8..3d7d49ad3 100644 --- a/pkg/api/handlers/compat/containers_stats.go +++ b/pkg/api/handlers/compat/containers_stats.go @@ -5,10 +5,10 @@ import ( "net/http" "time" - "github.com/containers/libpod/v2/libpod" - "github.com/containers/libpod/v2/libpod/define" - "github.com/containers/libpod/v2/pkg/api/handlers/utils" - "github.com/containers/libpod/v2/pkg/cgroups" + "github.com/containers/podman/v2/libpod" + "github.com/containers/podman/v2/libpod/define" + "github.com/containers/podman/v2/pkg/api/handlers/utils" + "github.com/containers/podman/v2/pkg/cgroups" docker "github.com/docker/docker/api/types" "github.com/gorilla/schema" "github.com/pkg/errors" diff --git a/pkg/api/handlers/compat/containers_stop.go b/pkg/api/handlers/compat/containers_stop.go index bbfa248a1..9d3425837 100644 --- a/pkg/api/handlers/compat/containers_stop.go +++ b/pkg/api/handlers/compat/containers_stop.go @@ -3,9 +3,9 @@ package compat import ( "net/http" - "github.com/containers/libpod/v2/libpod" - "github.com/containers/libpod/v2/libpod/define" - "github.com/containers/libpod/v2/pkg/api/handlers/utils" + "github.com/containers/podman/v2/libpod" + "github.com/containers/podman/v2/libpod/define" + "github.com/containers/podman/v2/pkg/api/handlers/utils" "github.com/gorilla/schema" "github.com/pkg/errors" ) diff --git a/pkg/api/handlers/compat/containers_top.go b/pkg/api/handlers/compat/containers_top.go index 9b45fbcf5..528dc279c 100644 --- a/pkg/api/handlers/compat/containers_top.go +++ b/pkg/api/handlers/compat/containers_top.go @@ -4,9 +4,9 @@ import ( "net/http" "strings" - "github.com/containers/libpod/v2/libpod" - "github.com/containers/libpod/v2/pkg/api/handlers" - "github.com/containers/libpod/v2/pkg/api/handlers/utils" + "github.com/containers/podman/v2/libpod" + "github.com/containers/podman/v2/pkg/api/handlers" + "github.com/containers/podman/v2/pkg/api/handlers/utils" "github.com/gorilla/schema" "github.com/pkg/errors" ) diff --git a/pkg/api/handlers/compat/containers_unpause.go b/pkg/api/handlers/compat/containers_unpause.go index 67b4f219a..f87b95b64 100644 --- a/pkg/api/handlers/compat/containers_unpause.go +++ b/pkg/api/handlers/compat/containers_unpause.go @@ -3,8 +3,8 @@ package compat import ( "net/http" - "github.com/containers/libpod/v2/libpod" - "github.com/containers/libpod/v2/pkg/api/handlers/utils" + "github.com/containers/podman/v2/libpod" + "github.com/containers/podman/v2/pkg/api/handlers/utils" ) func UnpauseContainer(w http.ResponseWriter, r *http.Request) { diff --git a/pkg/api/handlers/compat/events.go b/pkg/api/handlers/compat/events.go index 8c4ad575b..61f895c29 100644 --- a/pkg/api/handlers/compat/events.go +++ b/pkg/api/handlers/compat/events.go @@ -6,10 +6,10 @@ import ( "net/http" "sync" - "github.com/containers/libpod/v2/libpod" - "github.com/containers/libpod/v2/libpod/events" - "github.com/containers/libpod/v2/pkg/api/handlers/utils" - "github.com/containers/libpod/v2/pkg/domain/entities" + "github.com/containers/podman/v2/libpod" + "github.com/containers/podman/v2/libpod/events" + "github.com/containers/podman/v2/pkg/api/handlers/utils" + "github.com/containers/podman/v2/pkg/domain/entities" "github.com/gorilla/schema" jsoniter "github.com/json-iterator/go" "github.com/pkg/errors" diff --git a/pkg/api/handlers/compat/exec.go b/pkg/api/handlers/compat/exec.go index a3b8cb573..7a62a2b58 100644 --- a/pkg/api/handlers/compat/exec.go +++ b/pkg/api/handlers/compat/exec.go @@ -6,11 +6,11 @@ import ( "net/http" "strings" - "github.com/containers/libpod/v2/libpod" - "github.com/containers/libpod/v2/libpod/define" - "github.com/containers/libpod/v2/pkg/api/handlers" - "github.com/containers/libpod/v2/pkg/api/handlers/utils" - "github.com/containers/libpod/v2/pkg/specgen/generate" + "github.com/containers/podman/v2/libpod" + "github.com/containers/podman/v2/libpod/define" + "github.com/containers/podman/v2/pkg/api/handlers" + "github.com/containers/podman/v2/pkg/api/handlers/utils" + "github.com/containers/podman/v2/pkg/specgen/generate" "github.com/gorilla/mux" "github.com/pkg/errors" "github.com/sirupsen/logrus" diff --git a/pkg/api/handlers/compat/images.go b/pkg/api/handlers/compat/images.go index 94feb5920..6872dd780 100644 --- a/pkg/api/handlers/compat/images.go +++ b/pkg/api/handlers/compat/images.go @@ -11,13 +11,13 @@ import ( "github.com/containers/buildah" "github.com/containers/image/v5/manifest" - "github.com/containers/libpod/v2/libpod" - image2 "github.com/containers/libpod/v2/libpod/image" - "github.com/containers/libpod/v2/pkg/api/handlers" - "github.com/containers/libpod/v2/pkg/api/handlers/utils" - "github.com/containers/libpod/v2/pkg/auth" - "github.com/containers/libpod/v2/pkg/domain/entities" - "github.com/containers/libpod/v2/pkg/util" + "github.com/containers/podman/v2/libpod" + image2 "github.com/containers/podman/v2/libpod/image" + "github.com/containers/podman/v2/pkg/api/handlers" + "github.com/containers/podman/v2/pkg/api/handlers/utils" + "github.com/containers/podman/v2/pkg/auth" + "github.com/containers/podman/v2/pkg/domain/entities" + "github.com/containers/podman/v2/pkg/util" "github.com/docker/docker/api/types" "github.com/gorilla/schema" "github.com/pkg/errors" diff --git a/pkg/api/handlers/compat/images_build.go b/pkg/api/handlers/compat/images_build.go index 8ac5b80c1..3005063a7 100644 --- a/pkg/api/handlers/compat/images_build.go +++ b/pkg/api/handlers/compat/images_build.go @@ -15,9 +15,9 @@ import ( "github.com/containers/buildah" "github.com/containers/buildah/imagebuildah" - "github.com/containers/libpod/v2/libpod" - "github.com/containers/libpod/v2/pkg/api/handlers" - "github.com/containers/libpod/v2/pkg/api/handlers/utils" + "github.com/containers/podman/v2/libpod" + "github.com/containers/podman/v2/pkg/api/handlers" + "github.com/containers/podman/v2/pkg/api/handlers/utils" "github.com/containers/storage/pkg/archive" "github.com/gorilla/schema" ) diff --git a/pkg/api/handlers/compat/images_history.go b/pkg/api/handlers/compat/images_history.go index 33902362f..380aa13c8 100644 --- a/pkg/api/handlers/compat/images_history.go +++ b/pkg/api/handlers/compat/images_history.go @@ -3,9 +3,9 @@ package compat import ( "net/http" - "github.com/containers/libpod/v2/libpod" - "github.com/containers/libpod/v2/pkg/api/handlers" - "github.com/containers/libpod/v2/pkg/api/handlers/utils" + "github.com/containers/podman/v2/libpod" + "github.com/containers/podman/v2/pkg/api/handlers" + "github.com/containers/podman/v2/pkg/api/handlers/utils" "github.com/pkg/errors" ) diff --git a/pkg/api/handlers/compat/images_push.go b/pkg/api/handlers/compat/images_push.go index c73bbb8d6..e69a2212a 100644 --- a/pkg/api/handlers/compat/images_push.go +++ b/pkg/api/handlers/compat/images_push.go @@ -6,10 +6,10 @@ import ( "os" "strings" - "github.com/containers/libpod/v2/libpod" - "github.com/containers/libpod/v2/libpod/image" - "github.com/containers/libpod/v2/pkg/api/handlers/utils" - "github.com/containers/libpod/v2/pkg/auth" + "github.com/containers/podman/v2/libpod" + "github.com/containers/podman/v2/libpod/image" + "github.com/containers/podman/v2/pkg/api/handlers/utils" + "github.com/containers/podman/v2/pkg/auth" "github.com/gorilla/schema" "github.com/pkg/errors" ) diff --git a/pkg/api/handlers/compat/images_remove.go b/pkg/api/handlers/compat/images_remove.go index 367cab9e1..07a0517d7 100644 --- a/pkg/api/handlers/compat/images_remove.go +++ b/pkg/api/handlers/compat/images_remove.go @@ -3,8 +3,8 @@ package compat import ( "net/http" - "github.com/containers/libpod/v2/libpod" - "github.com/containers/libpod/v2/pkg/api/handlers/utils" + "github.com/containers/podman/v2/libpod" + "github.com/containers/podman/v2/pkg/api/handlers/utils" "github.com/gorilla/schema" "github.com/pkg/errors" ) diff --git a/pkg/api/handlers/compat/images_search.go b/pkg/api/handlers/compat/images_search.go index c8e37b214..be98e4752 100644 --- a/pkg/api/handlers/compat/images_search.go +++ b/pkg/api/handlers/compat/images_search.go @@ -5,8 +5,8 @@ import ( "strconv" "github.com/containers/image/v5/types" - "github.com/containers/libpod/v2/libpod/image" - "github.com/containers/libpod/v2/pkg/api/handlers/utils" + "github.com/containers/podman/v2/libpod/image" + "github.com/containers/podman/v2/pkg/api/handlers/utils" "github.com/gorilla/schema" "github.com/pkg/errors" ) diff --git a/pkg/api/handlers/compat/images_tag.go b/pkg/api/handlers/compat/images_tag.go index 0ac11c7f5..913a59342 100644 --- a/pkg/api/handlers/compat/images_tag.go +++ b/pkg/api/handlers/compat/images_tag.go @@ -4,8 +4,8 @@ import ( "fmt" "net/http" - "github.com/containers/libpod/v2/libpod" - "github.com/containers/libpod/v2/pkg/api/handlers/utils" + "github.com/containers/podman/v2/libpod" + "github.com/containers/podman/v2/pkg/api/handlers/utils" "github.com/pkg/errors" ) diff --git a/pkg/api/handlers/compat/info.go b/pkg/api/handlers/compat/info.go index 6c44393cc..ca932e06a 100644 --- a/pkg/api/handlers/compat/info.go +++ b/pkg/api/handlers/compat/info.go @@ -11,11 +11,11 @@ import ( "github.com/containers/common/pkg/config" "github.com/containers/common/pkg/sysinfo" - "github.com/containers/libpod/v2/libpod" - "github.com/containers/libpod/v2/libpod/define" - "github.com/containers/libpod/v2/pkg/api/handlers" - "github.com/containers/libpod/v2/pkg/api/handlers/utils" - "github.com/containers/libpod/v2/pkg/rootless" + "github.com/containers/podman/v2/libpod" + "github.com/containers/podman/v2/libpod/define" + "github.com/containers/podman/v2/pkg/api/handlers" + "github.com/containers/podman/v2/pkg/api/handlers/utils" + "github.com/containers/podman/v2/pkg/rootless" docker "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/swarm" "github.com/google/uuid" diff --git a/pkg/api/handlers/compat/networks.go b/pkg/api/handlers/compat/networks.go index 2e11c0edb..1e80cc91d 100644 --- a/pkg/api/handlers/compat/networks.go +++ b/pkg/api/handlers/compat/networks.go @@ -9,11 +9,11 @@ import ( "time" "github.com/containernetworking/cni/libcni" - "github.com/containers/libpod/v2/libpod" - "github.com/containers/libpod/v2/pkg/api/handlers/utils" - "github.com/containers/libpod/v2/pkg/domain/entities" - "github.com/containers/libpod/v2/pkg/domain/infra/abi" - "github.com/containers/libpod/v2/pkg/network" + "github.com/containers/podman/v2/libpod" + "github.com/containers/podman/v2/pkg/api/handlers/utils" + "github.com/containers/podman/v2/pkg/domain/entities" + "github.com/containers/podman/v2/pkg/domain/infra/abi" + "github.com/containers/podman/v2/pkg/network" "github.com/docker/docker/api/types" dockerNetwork "github.com/docker/docker/api/types/network" "github.com/gorilla/schema" diff --git a/pkg/api/handlers/compat/ping.go b/pkg/api/handlers/compat/ping.go index b7cc0246e..eb7eed5b6 100644 --- a/pkg/api/handlers/compat/ping.go +++ b/pkg/api/handlers/compat/ping.go @@ -5,7 +5,7 @@ import ( "net/http" "github.com/containers/buildah" - "github.com/containers/libpod/v2/pkg/api/handlers/utils" + "github.com/containers/podman/v2/pkg/api/handlers/utils" ) // Ping returns headers to client about the service diff --git a/pkg/api/handlers/compat/resize.go b/pkg/api/handlers/compat/resize.go index 7caff3d40..3f5360546 100644 --- a/pkg/api/handlers/compat/resize.go +++ b/pkg/api/handlers/compat/resize.go @@ -5,9 +5,9 @@ import ( "net/http" "strings" - "github.com/containers/libpod/v2/libpod" - "github.com/containers/libpod/v2/libpod/define" - "github.com/containers/libpod/v2/pkg/api/handlers/utils" + "github.com/containers/podman/v2/libpod" + "github.com/containers/podman/v2/libpod/define" + "github.com/containers/podman/v2/pkg/api/handlers/utils" "github.com/gorilla/mux" "github.com/gorilla/schema" "github.com/pkg/errors" diff --git a/pkg/api/handlers/compat/swagger.go b/pkg/api/handlers/compat/swagger.go index c59d25c5a..371d02388 100644 --- a/pkg/api/handlers/compat/swagger.go +++ b/pkg/api/handlers/compat/swagger.go @@ -1,7 +1,7 @@ package compat import ( - "github.com/containers/libpod/v2/pkg/domain/entities" + "github.com/containers/podman/v2/pkg/domain/entities" "github.com/containers/storage/pkg/archive" "github.com/docker/docker/api/types" ) diff --git a/pkg/api/handlers/compat/system.go b/pkg/api/handlers/compat/system.go index 4f2692e2a..322bfa7ed 100644 --- a/pkg/api/handlers/compat/system.go +++ b/pkg/api/handlers/compat/system.go @@ -3,8 +3,8 @@ package compat import ( "net/http" - "github.com/containers/libpod/v2/pkg/api/handlers" - "github.com/containers/libpod/v2/pkg/api/handlers/utils" + "github.com/containers/podman/v2/pkg/api/handlers" + "github.com/containers/podman/v2/pkg/api/handlers/utils" docker "github.com/docker/docker/api/types" ) diff --git a/pkg/api/handlers/compat/unsupported.go b/pkg/api/handlers/compat/unsupported.go index 9db0c3feb..659c15328 100644 --- a/pkg/api/handlers/compat/unsupported.go +++ b/pkg/api/handlers/compat/unsupported.go @@ -4,9 +4,9 @@ import ( "fmt" "net/http" - "github.com/containers/libpod/v2/pkg/domain/entities" + "github.com/containers/podman/v2/pkg/domain/entities" - "github.com/containers/libpod/v2/pkg/api/handlers/utils" + "github.com/containers/podman/v2/pkg/api/handlers/utils" log "github.com/sirupsen/logrus" ) diff --git a/pkg/api/handlers/compat/version.go b/pkg/api/handlers/compat/version.go index 6dd0cec2c..e12c7cefa 100644 --- a/pkg/api/handlers/compat/version.go +++ b/pkg/api/handlers/compat/version.go @@ -6,10 +6,10 @@ import ( goRuntime "runtime" "time" - "github.com/containers/libpod/v2/libpod" - "github.com/containers/libpod/v2/libpod/define" - "github.com/containers/libpod/v2/pkg/api/handlers/utils" - "github.com/containers/libpod/v2/pkg/domain/entities" + "github.com/containers/podman/v2/libpod" + "github.com/containers/podman/v2/libpod/define" + "github.com/containers/podman/v2/pkg/api/handlers/utils" + "github.com/containers/podman/v2/pkg/domain/entities" docker "github.com/docker/docker/api/types" "github.com/pkg/errors" ) diff --git a/pkg/api/handlers/compat/volumes.go b/pkg/api/handlers/compat/volumes.go index 4b5d94730..976c52acb 100644 --- a/pkg/api/handlers/compat/volumes.go +++ b/pkg/api/handlers/compat/volumes.go @@ -5,11 +5,11 @@ import ( "net/http" "time" - "github.com/containers/libpod/v2/libpod" - "github.com/containers/libpod/v2/libpod/define" - "github.com/containers/libpod/v2/pkg/api/handlers/utils" - "github.com/containers/libpod/v2/pkg/domain/filters" - "github.com/containers/libpod/v2/pkg/domain/infra/abi/parse" + "github.com/containers/podman/v2/libpod" + "github.com/containers/podman/v2/libpod/define" + "github.com/containers/podman/v2/pkg/api/handlers/utils" + "github.com/containers/podman/v2/pkg/domain/filters" + "github.com/containers/podman/v2/pkg/domain/infra/abi/parse" docker_api_types "github.com/docker/docker/api/types" docker_api_types_volume "github.com/docker/docker/api/types/volume" "github.com/gorilla/schema" diff --git a/pkg/api/handlers/decoder.go b/pkg/api/handlers/decoder.go index 8fcb794f2..54087168a 100644 --- a/pkg/api/handlers/decoder.go +++ b/pkg/api/handlers/decoder.go @@ -6,7 +6,7 @@ import ( "syscall" "time" - "github.com/containers/libpod/v2/pkg/util" + "github.com/containers/podman/v2/pkg/util" "github.com/gorilla/schema" "github.com/sirupsen/logrus" ) diff --git a/pkg/api/handlers/libpod/containers.go b/pkg/api/handlers/libpod/containers.go index 008bff8c5..864775fe4 100644 --- a/pkg/api/handlers/libpod/containers.go +++ b/pkg/api/handlers/libpod/containers.go @@ -6,12 +6,12 @@ import ( "os" "strconv" - "github.com/containers/libpod/v2/libpod" - "github.com/containers/libpod/v2/libpod/define" - "github.com/containers/libpod/v2/pkg/api/handlers/compat" - "github.com/containers/libpod/v2/pkg/api/handlers/utils" - "github.com/containers/libpod/v2/pkg/domain/entities" - "github.com/containers/libpod/v2/pkg/ps" + "github.com/containers/podman/v2/libpod" + "github.com/containers/podman/v2/libpod/define" + "github.com/containers/podman/v2/pkg/api/handlers/compat" + "github.com/containers/podman/v2/pkg/api/handlers/utils" + "github.com/containers/podman/v2/pkg/domain/entities" + "github.com/containers/podman/v2/pkg/ps" "github.com/gorilla/schema" "github.com/pkg/errors" "github.com/sirupsen/logrus" @@ -57,7 +57,7 @@ func ListContainers(w http.ResponseWriter, r *http.Request) { // Support `last` as an alias for `limit`. While Podman uses --last in // the CLI, the API is using `limit`. As we first used `last` in the // API as well, we decided to go with aliasing to prevent any - // regression. See github.com/containers/libpod/issues/6413. + // regression. See github.com/containers/podman/issues/6413. if _, found := r.URL.Query()["last"]; found { logrus.Info("List containers: received `last` parameter - overwriting `limit`") limit = query.Last diff --git a/pkg/api/handlers/libpod/containers_create.go b/pkg/api/handlers/libpod/containers_create.go index 2d9ffecce..d8bb535ff 100644 --- a/pkg/api/handlers/libpod/containers_create.go +++ b/pkg/api/handlers/libpod/containers_create.go @@ -5,11 +5,11 @@ import ( "encoding/json" "net/http" - "github.com/containers/libpod/v2/libpod" - "github.com/containers/libpod/v2/pkg/api/handlers/utils" - "github.com/containers/libpod/v2/pkg/domain/entities" - "github.com/containers/libpod/v2/pkg/specgen" - "github.com/containers/libpod/v2/pkg/specgen/generate" + "github.com/containers/podman/v2/libpod" + "github.com/containers/podman/v2/pkg/api/handlers/utils" + "github.com/containers/podman/v2/pkg/domain/entities" + "github.com/containers/podman/v2/pkg/specgen" + "github.com/containers/podman/v2/pkg/specgen/generate" "github.com/pkg/errors" ) diff --git a/pkg/api/handlers/libpod/copy.go b/pkg/api/handlers/libpod/copy.go index 045d87576..b7c508342 100644 --- a/pkg/api/handlers/libpod/copy.go +++ b/pkg/api/handlers/libpod/copy.go @@ -3,7 +3,7 @@ package libpod import ( "net/http" - "github.com/containers/libpod/v2/pkg/api/handlers/utils" + "github.com/containers/podman/v2/pkg/api/handlers/utils" "github.com/pkg/errors" ) diff --git a/pkg/api/handlers/libpod/generate.go b/pkg/api/handlers/libpod/generate.go index 63dfcbf90..966874a2b 100644 --- a/pkg/api/handlers/libpod/generate.go +++ b/pkg/api/handlers/libpod/generate.go @@ -3,10 +3,10 @@ package libpod import ( "net/http" - "github.com/containers/libpod/v2/libpod" - "github.com/containers/libpod/v2/pkg/api/handlers/utils" - "github.com/containers/libpod/v2/pkg/domain/entities" - "github.com/containers/libpod/v2/pkg/domain/infra/abi" + "github.com/containers/podman/v2/libpod" + "github.com/containers/podman/v2/pkg/api/handlers/utils" + "github.com/containers/podman/v2/pkg/domain/entities" + "github.com/containers/podman/v2/pkg/domain/infra/abi" "github.com/gorilla/schema" "github.com/pkg/errors" ) diff --git a/pkg/api/handlers/libpod/healthcheck.go b/pkg/api/handlers/libpod/healthcheck.go index 93fd68403..4649b1a71 100644 --- a/pkg/api/handlers/libpod/healthcheck.go +++ b/pkg/api/handlers/libpod/healthcheck.go @@ -3,9 +3,9 @@ package libpod import ( "net/http" - "github.com/containers/libpod/v2/libpod" - "github.com/containers/libpod/v2/libpod/define" - "github.com/containers/libpod/v2/pkg/api/handlers/utils" + "github.com/containers/podman/v2/libpod" + "github.com/containers/podman/v2/libpod/define" + "github.com/containers/podman/v2/pkg/api/handlers/utils" ) func RunHealthCheck(w http.ResponseWriter, r *http.Request) { diff --git a/pkg/api/handlers/libpod/images.go b/pkg/api/handlers/libpod/images.go index b21c3b8f7..3421f0836 100644 --- a/pkg/api/handlers/libpod/images.go +++ b/pkg/api/handlers/libpod/images.go @@ -15,18 +15,18 @@ import ( "github.com/containers/image/v5/docker/reference" "github.com/containers/image/v5/manifest" "github.com/containers/image/v5/types" - "github.com/containers/libpod/v2/libpod" - "github.com/containers/libpod/v2/libpod/define" - "github.com/containers/libpod/v2/libpod/image" - image2 "github.com/containers/libpod/v2/libpod/image" - "github.com/containers/libpod/v2/pkg/api/handlers" - "github.com/containers/libpod/v2/pkg/api/handlers/utils" - "github.com/containers/libpod/v2/pkg/auth" - "github.com/containers/libpod/v2/pkg/domain/entities" - "github.com/containers/libpod/v2/pkg/domain/infra/abi" - "github.com/containers/libpod/v2/pkg/errorhandling" - "github.com/containers/libpod/v2/pkg/util" - utils2 "github.com/containers/libpod/v2/utils" + "github.com/containers/podman/v2/libpod" + "github.com/containers/podman/v2/libpod/define" + "github.com/containers/podman/v2/libpod/image" + image2 "github.com/containers/podman/v2/libpod/image" + "github.com/containers/podman/v2/pkg/api/handlers" + "github.com/containers/podman/v2/pkg/api/handlers/utils" + "github.com/containers/podman/v2/pkg/auth" + "github.com/containers/podman/v2/pkg/domain/entities" + "github.com/containers/podman/v2/pkg/domain/infra/abi" + "github.com/containers/podman/v2/pkg/errorhandling" + "github.com/containers/podman/v2/pkg/util" + utils2 "github.com/containers/podman/v2/utils" "github.com/gorilla/schema" "github.com/pkg/errors" "github.com/sirupsen/logrus" diff --git a/pkg/api/handlers/libpod/info.go b/pkg/api/handlers/libpod/info.go index 9cdc08597..683ae3dad 100644 --- a/pkg/api/handlers/libpod/info.go +++ b/pkg/api/handlers/libpod/info.go @@ -3,8 +3,8 @@ package libpod import ( "net/http" - "github.com/containers/libpod/v2/libpod" - "github.com/containers/libpod/v2/pkg/api/handlers/utils" + "github.com/containers/podman/v2/libpod" + "github.com/containers/podman/v2/pkg/api/handlers/utils" ) func GetInfo(w http.ResponseWriter, r *http.Request) { diff --git a/pkg/api/handlers/libpod/manifests.go b/pkg/api/handlers/libpod/manifests.go index 24769b316..8e65248e2 100644 --- a/pkg/api/handlers/libpod/manifests.go +++ b/pkg/api/handlers/libpod/manifests.go @@ -7,10 +7,10 @@ import ( "github.com/containers/buildah/manifests" copy2 "github.com/containers/image/v5/copy" "github.com/containers/image/v5/transports/alltransports" - "github.com/containers/libpod/v2/libpod" - "github.com/containers/libpod/v2/libpod/image" - "github.com/containers/libpod/v2/pkg/api/handlers" - "github.com/containers/libpod/v2/pkg/api/handlers/utils" + "github.com/containers/podman/v2/libpod" + "github.com/containers/podman/v2/libpod/image" + "github.com/containers/podman/v2/pkg/api/handlers" + "github.com/containers/podman/v2/pkg/api/handlers/utils" "github.com/gorilla/schema" "github.com/opencontainers/go-digest" "github.com/pkg/errors" diff --git a/pkg/api/handlers/libpod/networks.go b/pkg/api/handlers/libpod/networks.go index 12409bf50..9237a41ce 100644 --- a/pkg/api/handlers/libpod/networks.go +++ b/pkg/api/handlers/libpod/networks.go @@ -4,11 +4,11 @@ import ( "encoding/json" "net/http" - "github.com/containers/libpod/v2/libpod" - "github.com/containers/libpod/v2/pkg/api/handlers/utils" - "github.com/containers/libpod/v2/pkg/domain/entities" - "github.com/containers/libpod/v2/pkg/domain/infra/abi" - "github.com/containers/libpod/v2/pkg/network" + "github.com/containers/podman/v2/libpod" + "github.com/containers/podman/v2/pkg/api/handlers/utils" + "github.com/containers/podman/v2/pkg/domain/entities" + "github.com/containers/podman/v2/pkg/domain/infra/abi" + "github.com/containers/podman/v2/pkg/network" "github.com/gorilla/schema" "github.com/pkg/errors" ) diff --git a/pkg/api/handlers/libpod/play.go b/pkg/api/handlers/libpod/play.go index fcb56b130..59f78da8c 100644 --- a/pkg/api/handlers/libpod/play.go +++ b/pkg/api/handlers/libpod/play.go @@ -7,11 +7,11 @@ import ( "os" "github.com/containers/image/v5/types" - "github.com/containers/libpod/v2/libpod" - "github.com/containers/libpod/v2/pkg/api/handlers/utils" - "github.com/containers/libpod/v2/pkg/auth" - "github.com/containers/libpod/v2/pkg/domain/entities" - "github.com/containers/libpod/v2/pkg/domain/infra/abi" + "github.com/containers/podman/v2/libpod" + "github.com/containers/podman/v2/pkg/api/handlers/utils" + "github.com/containers/podman/v2/pkg/auth" + "github.com/containers/podman/v2/pkg/domain/entities" + "github.com/containers/podman/v2/pkg/domain/infra/abi" "github.com/gorilla/schema" "github.com/pkg/errors" ) diff --git a/pkg/api/handlers/libpod/pods.go b/pkg/api/handlers/libpod/pods.go index dee5a7d33..10e0d4ce9 100644 --- a/pkg/api/handlers/libpod/pods.go +++ b/pkg/api/handlers/libpod/pods.go @@ -6,15 +6,15 @@ import ( "net/http" "strings" - "github.com/containers/libpod/v2/libpod" - "github.com/containers/libpod/v2/libpod/define" - "github.com/containers/libpod/v2/pkg/api/handlers" - "github.com/containers/libpod/v2/pkg/api/handlers/utils" - "github.com/containers/libpod/v2/pkg/domain/entities" - "github.com/containers/libpod/v2/pkg/domain/infra/abi" - "github.com/containers/libpod/v2/pkg/specgen" - "github.com/containers/libpod/v2/pkg/specgen/generate" - "github.com/containers/libpod/v2/pkg/util" + "github.com/containers/podman/v2/libpod" + "github.com/containers/podman/v2/libpod/define" + "github.com/containers/podman/v2/pkg/api/handlers" + "github.com/containers/podman/v2/pkg/api/handlers/utils" + "github.com/containers/podman/v2/pkg/domain/entities" + "github.com/containers/podman/v2/pkg/domain/infra/abi" + "github.com/containers/podman/v2/pkg/specgen" + "github.com/containers/podman/v2/pkg/specgen/generate" + "github.com/containers/podman/v2/pkg/util" "github.com/gorilla/schema" "github.com/pkg/errors" "github.com/sirupsen/logrus" diff --git a/pkg/api/handlers/libpod/swagger.go b/pkg/api/handlers/libpod/swagger.go index 21f5c1e59..c6e95f382 100644 --- a/pkg/api/handlers/libpod/swagger.go +++ b/pkg/api/handlers/libpod/swagger.go @@ -5,9 +5,9 @@ import ( "os" "github.com/containers/image/v5/manifest" - "github.com/containers/libpod/v2/libpod/define" - "github.com/containers/libpod/v2/pkg/api/handlers/utils" - "github.com/containers/libpod/v2/pkg/domain/entities" + "github.com/containers/podman/v2/libpod/define" + "github.com/containers/podman/v2/pkg/api/handlers/utils" + "github.com/containers/podman/v2/pkg/domain/entities" "github.com/pkg/errors" ) diff --git a/pkg/api/handlers/libpod/system.go b/pkg/api/handlers/libpod/system.go index c09480bd1..2827fbe20 100644 --- a/pkg/api/handlers/libpod/system.go +++ b/pkg/api/handlers/libpod/system.go @@ -3,11 +3,11 @@ package libpod import ( "net/http" - "github.com/containers/libpod/v2/libpod" - "github.com/containers/libpod/v2/pkg/api/handlers/compat" - "github.com/containers/libpod/v2/pkg/api/handlers/utils" - "github.com/containers/libpod/v2/pkg/domain/entities" - "github.com/containers/libpod/v2/pkg/domain/infra/abi" + "github.com/containers/podman/v2/libpod" + "github.com/containers/podman/v2/pkg/api/handlers/compat" + "github.com/containers/podman/v2/pkg/api/handlers/utils" + "github.com/containers/podman/v2/pkg/domain/entities" + "github.com/containers/podman/v2/pkg/domain/infra/abi" "github.com/gorilla/schema" "github.com/pkg/errors" ) diff --git a/pkg/api/handlers/libpod/volumes.go b/pkg/api/handlers/libpod/volumes.go index 0d83218e3..d87e79c21 100644 --- a/pkg/api/handlers/libpod/volumes.go +++ b/pkg/api/handlers/libpod/volumes.go @@ -4,12 +4,12 @@ import ( "encoding/json" "net/http" - "github.com/containers/libpod/v2/libpod" - "github.com/containers/libpod/v2/libpod/define" - "github.com/containers/libpod/v2/pkg/api/handlers/utils" - "github.com/containers/libpod/v2/pkg/domain/entities" - "github.com/containers/libpod/v2/pkg/domain/filters" - "github.com/containers/libpod/v2/pkg/domain/infra/abi/parse" + "github.com/containers/podman/v2/libpod" + "github.com/containers/podman/v2/libpod/define" + "github.com/containers/podman/v2/pkg/api/handlers/utils" + "github.com/containers/podman/v2/pkg/domain/entities" + "github.com/containers/podman/v2/pkg/domain/filters" + "github.com/containers/podman/v2/pkg/domain/infra/abi/parse" "github.com/gorilla/schema" "github.com/pkg/errors" ) diff --git a/pkg/api/handlers/swagger/swagger.go b/pkg/api/handlers/swagger/swagger.go index e35c4e9e3..22670d795 100644 --- a/pkg/api/handlers/swagger/swagger.go +++ b/pkg/api/handlers/swagger/swagger.go @@ -1,12 +1,12 @@ package swagger import ( - "github.com/containers/libpod/v2/libpod" - "github.com/containers/libpod/v2/libpod/define" - "github.com/containers/libpod/v2/libpod/image" - "github.com/containers/libpod/v2/pkg/api/handlers" - "github.com/containers/libpod/v2/pkg/domain/entities" - "github.com/containers/libpod/v2/pkg/inspect" + "github.com/containers/podman/v2/libpod" + "github.com/containers/podman/v2/libpod/define" + "github.com/containers/podman/v2/libpod/image" + "github.com/containers/podman/v2/pkg/api/handlers" + "github.com/containers/podman/v2/pkg/domain/entities" + "github.com/containers/podman/v2/pkg/inspect" "github.com/docker/docker/api/types" ) diff --git a/pkg/api/handlers/types.go b/pkg/api/handlers/types.go index 9c3c35c5f..a17f5df56 100644 --- a/pkg/api/handlers/types.go +++ b/pkg/api/handlers/types.go @@ -7,8 +7,8 @@ import ( "time" "github.com/containers/image/v5/manifest" - libpodImage "github.com/containers/libpod/v2/libpod/image" - "github.com/containers/libpod/v2/pkg/domain/entities" + libpodImage "github.com/containers/podman/v2/libpod/image" + "github.com/containers/podman/v2/pkg/domain/entities" docker "github.com/docker/docker/api/types" dockerContainer "github.com/docker/docker/api/types/container" dockerNetwork "github.com/docker/docker/api/types/network" diff --git a/pkg/api/handlers/utils/containers.go b/pkg/api/handlers/utils/containers.go index 2c040526b..b6613fdfd 100644 --- a/pkg/api/handlers/utils/containers.go +++ b/pkg/api/handlers/utils/containers.go @@ -5,10 +5,10 @@ import ( "net/http" "time" - "github.com/containers/libpod/v2/libpod" - "github.com/containers/libpod/v2/libpod/define" - "github.com/containers/libpod/v2/pkg/domain/entities" - createconfig "github.com/containers/libpod/v2/pkg/spec" + "github.com/containers/podman/v2/libpod" + "github.com/containers/podman/v2/libpod/define" + "github.com/containers/podman/v2/pkg/domain/entities" + createconfig "github.com/containers/podman/v2/pkg/spec" "github.com/gorilla/schema" "github.com/pkg/errors" ) diff --git a/pkg/api/handlers/utils/errors.go b/pkg/api/handlers/utils/errors.go index 00d09ac11..5a99529c6 100644 --- a/pkg/api/handlers/utils/errors.go +++ b/pkg/api/handlers/utils/errors.go @@ -4,8 +4,8 @@ import ( "fmt" "net/http" - "github.com/containers/libpod/v2/libpod/define" - "github.com/containers/libpod/v2/pkg/domain/entities" + "github.com/containers/podman/v2/libpod/define" + "github.com/containers/podman/v2/pkg/domain/entities" "github.com/pkg/errors" log "github.com/sirupsen/logrus" ) diff --git a/pkg/api/handlers/utils/images.go b/pkg/api/handlers/utils/images.go index bf981b547..28b1dda38 100644 --- a/pkg/api/handlers/utils/images.go +++ b/pkg/api/handlers/utils/images.go @@ -9,8 +9,8 @@ import ( "github.com/containers/image/v5/storage" "github.com/containers/image/v5/transports/alltransports" "github.com/containers/image/v5/types" - "github.com/containers/libpod/v2/libpod" - "github.com/containers/libpod/v2/libpod/image" + "github.com/containers/podman/v2/libpod" + "github.com/containers/podman/v2/libpod/image" "github.com/gorilla/schema" "github.com/pkg/errors" ) diff --git a/pkg/api/handlers/utils/pods.go b/pkg/api/handlers/utils/pods.go index efad02dd9..8276fb55e 100644 --- a/pkg/api/handlers/utils/pods.go +++ b/pkg/api/handlers/utils/pods.go @@ -3,9 +3,9 @@ package utils import ( "net/http" - "github.com/containers/libpod/v2/libpod" - lpfilters "github.com/containers/libpod/v2/libpod/filters" - "github.com/containers/libpod/v2/pkg/domain/entities" + "github.com/containers/podman/v2/libpod" + lpfilters "github.com/containers/podman/v2/libpod/filters" + "github.com/containers/podman/v2/pkg/domain/entities" "github.com/gorilla/schema" ) diff --git a/pkg/api/server/handler_api.go b/pkg/api/server/handler_api.go index 53fe8952b..e47b66bb4 100644 --- a/pkg/api/server/handler_api.go +++ b/pkg/api/server/handler_api.go @@ -6,7 +6,7 @@ import ( "net/http" "runtime" - "github.com/containers/libpod/v2/pkg/api/handlers/utils" + "github.com/containers/podman/v2/pkg/api/handlers/utils" log "github.com/sirupsen/logrus" ) diff --git a/pkg/api/server/register_archive.go b/pkg/api/server/register_archive.go index 4aeb7462e..5931c2fc9 100644 --- a/pkg/api/server/register_archive.go +++ b/pkg/api/server/register_archive.go @@ -3,8 +3,8 @@ package server import ( "net/http" - "github.com/containers/libpod/v2/pkg/api/handlers/compat" - "github.com/containers/libpod/v2/pkg/api/handlers/libpod" + "github.com/containers/podman/v2/pkg/api/handlers/compat" + "github.com/containers/podman/v2/pkg/api/handlers/libpod" "github.com/gorilla/mux" ) diff --git a/pkg/api/server/register_auth.go b/pkg/api/server/register_auth.go index 1bf23d2eb..0eaa83737 100644 --- a/pkg/api/server/register_auth.go +++ b/pkg/api/server/register_auth.go @@ -1,7 +1,7 @@ package server import ( - "github.com/containers/libpod/v2/pkg/api/handlers/compat" + "github.com/containers/podman/v2/pkg/api/handlers/compat" "github.com/gorilla/mux" ) diff --git a/pkg/api/server/register_containers.go b/pkg/api/server/register_containers.go index 18ff2f423..edc1ee3c8 100644 --- a/pkg/api/server/register_containers.go +++ b/pkg/api/server/register_containers.go @@ -3,8 +3,8 @@ package server import ( "net/http" - "github.com/containers/libpod/v2/pkg/api/handlers/compat" - "github.com/containers/libpod/v2/pkg/api/handlers/libpod" + "github.com/containers/podman/v2/pkg/api/handlers/compat" + "github.com/containers/podman/v2/pkg/api/handlers/libpod" "github.com/gorilla/mux" ) diff --git a/pkg/api/server/register_distribution.go b/pkg/api/server/register_distribution.go index 73ef2e85b..201d380d0 100644 --- a/pkg/api/server/register_distribution.go +++ b/pkg/api/server/register_distribution.go @@ -1,7 +1,7 @@ package server import ( - "github.com/containers/libpod/v2/pkg/api/handlers/compat" + "github.com/containers/podman/v2/pkg/api/handlers/compat" "github.com/gorilla/mux" ) diff --git a/pkg/api/server/register_events.go b/pkg/api/server/register_events.go index 72aabe496..4b7c645b0 100644 --- a/pkg/api/server/register_events.go +++ b/pkg/api/server/register_events.go @@ -3,7 +3,7 @@ package server import ( "net/http" - "github.com/containers/libpod/v2/pkg/api/handlers/compat" + "github.com/containers/podman/v2/pkg/api/handlers/compat" "github.com/gorilla/mux" ) diff --git a/pkg/api/server/register_exec.go b/pkg/api/server/register_exec.go index be6cbf9bc..05fb2aee2 100644 --- a/pkg/api/server/register_exec.go +++ b/pkg/api/server/register_exec.go @@ -3,7 +3,7 @@ package server import ( "net/http" - "github.com/containers/libpod/v2/pkg/api/handlers/compat" + "github.com/containers/podman/v2/pkg/api/handlers/compat" "github.com/gorilla/mux" ) diff --git a/pkg/api/server/register_generate.go b/pkg/api/server/register_generate.go index a1ab3f727..7db8ee387 100644 --- a/pkg/api/server/register_generate.go +++ b/pkg/api/server/register_generate.go @@ -3,7 +3,7 @@ package server import ( "net/http" - "github.com/containers/libpod/v2/pkg/api/handlers/libpod" + "github.com/containers/podman/v2/pkg/api/handlers/libpod" "github.com/gorilla/mux" ) diff --git a/pkg/api/server/register_healthcheck.go b/pkg/api/server/register_healthcheck.go index 9059fdba7..8c9876232 100644 --- a/pkg/api/server/register_healthcheck.go +++ b/pkg/api/server/register_healthcheck.go @@ -3,7 +3,7 @@ package server import ( "net/http" - "github.com/containers/libpod/v2/pkg/api/handlers/libpod" + "github.com/containers/podman/v2/pkg/api/handlers/libpod" "github.com/gorilla/mux" ) diff --git a/pkg/api/server/register_images.go b/pkg/api/server/register_images.go index 3c15c82d5..7f060d098 100644 --- a/pkg/api/server/register_images.go +++ b/pkg/api/server/register_images.go @@ -3,8 +3,8 @@ package server import ( "net/http" - "github.com/containers/libpod/v2/pkg/api/handlers/compat" - "github.com/containers/libpod/v2/pkg/api/handlers/libpod" + "github.com/containers/podman/v2/pkg/api/handlers/compat" + "github.com/containers/podman/v2/pkg/api/handlers/libpod" "github.com/gorilla/mux" ) diff --git a/pkg/api/server/register_info.go b/pkg/api/server/register_info.go index 28e7e6e53..a1dc9511d 100644 --- a/pkg/api/server/register_info.go +++ b/pkg/api/server/register_info.go @@ -3,8 +3,8 @@ package server import ( "net/http" - "github.com/containers/libpod/v2/pkg/api/handlers/compat" - "github.com/containers/libpod/v2/pkg/api/handlers/libpod" + "github.com/containers/podman/v2/pkg/api/handlers/compat" + "github.com/containers/podman/v2/pkg/api/handlers/libpod" "github.com/gorilla/mux" ) diff --git a/pkg/api/server/register_manifest.go b/pkg/api/server/register_manifest.go index 91e820dca..5e7d94538 100644 --- a/pkg/api/server/register_manifest.go +++ b/pkg/api/server/register_manifest.go @@ -3,7 +3,7 @@ package server import ( "net/http" - "github.com/containers/libpod/v2/pkg/api/handlers/libpod" + "github.com/containers/podman/v2/pkg/api/handlers/libpod" "github.com/gorilla/mux" ) diff --git a/pkg/api/server/register_monitor.go b/pkg/api/server/register_monitor.go index 9a76ebac2..5db20667e 100644 --- a/pkg/api/server/register_monitor.go +++ b/pkg/api/server/register_monitor.go @@ -1,7 +1,7 @@ package server import ( - "github.com/containers/libpod/v2/pkg/api/handlers/compat" + "github.com/containers/podman/v2/pkg/api/handlers/compat" "github.com/gorilla/mux" ) diff --git a/pkg/api/server/register_networks.go b/pkg/api/server/register_networks.go index 3a45ee458..7918ad4a2 100644 --- a/pkg/api/server/register_networks.go +++ b/pkg/api/server/register_networks.go @@ -3,8 +3,8 @@ package server import ( "net/http" - "github.com/containers/libpod/v2/pkg/api/handlers/compat" - "github.com/containers/libpod/v2/pkg/api/handlers/libpod" + "github.com/containers/podman/v2/pkg/api/handlers/compat" + "github.com/containers/podman/v2/pkg/api/handlers/libpod" "github.com/gorilla/mux" ) diff --git a/pkg/api/server/register_ping.go b/pkg/api/server/register_ping.go index 70e88ee00..4a8d2c768 100644 --- a/pkg/api/server/register_ping.go +++ b/pkg/api/server/register_ping.go @@ -3,7 +3,7 @@ package server import ( "net/http" - "github.com/containers/libpod/v2/pkg/api/handlers/compat" + "github.com/containers/podman/v2/pkg/api/handlers/compat" "github.com/gorilla/mux" ) diff --git a/pkg/api/server/register_play.go b/pkg/api/server/register_play.go index 049be39de..a96f61099 100644 --- a/pkg/api/server/register_play.go +++ b/pkg/api/server/register_play.go @@ -3,7 +3,7 @@ package server import ( "net/http" - "github.com/containers/libpod/v2/pkg/api/handlers/libpod" + "github.com/containers/podman/v2/pkg/api/handlers/libpod" "github.com/gorilla/mux" ) diff --git a/pkg/api/server/register_plugins.go b/pkg/api/server/register_plugins.go index c21564b5c..6600c1bbd 100644 --- a/pkg/api/server/register_plugins.go +++ b/pkg/api/server/register_plugins.go @@ -1,7 +1,7 @@ package server import ( - "github.com/containers/libpod/v2/pkg/api/handlers/compat" + "github.com/containers/podman/v2/pkg/api/handlers/compat" "github.com/gorilla/mux" ) diff --git a/pkg/api/server/register_pods.go b/pkg/api/server/register_pods.go index d5a286442..105de4ee7 100644 --- a/pkg/api/server/register_pods.go +++ b/pkg/api/server/register_pods.go @@ -3,7 +3,7 @@ package server import ( "net/http" - "github.com/containers/libpod/v2/pkg/api/handlers/libpod" + "github.com/containers/podman/v2/pkg/api/handlers/libpod" "github.com/gorilla/mux" ) diff --git a/pkg/api/server/register_swagger.go b/pkg/api/server/register_swagger.go index bf68fda3c..4237540f8 100644 --- a/pkg/api/server/register_swagger.go +++ b/pkg/api/server/register_swagger.go @@ -3,7 +3,7 @@ package server import ( "net/http" - "github.com/containers/libpod/v2/pkg/api/handlers/libpod" + "github.com/containers/podman/v2/pkg/api/handlers/libpod" "github.com/gorilla/mux" ) diff --git a/pkg/api/server/register_swarm.go b/pkg/api/server/register_swarm.go index d1048bb8c..1f3166dcb 100644 --- a/pkg/api/server/register_swarm.go +++ b/pkg/api/server/register_swarm.go @@ -4,7 +4,7 @@ import ( "errors" "net/http" - "github.com/containers/libpod/v2/pkg/api/handlers/utils" + "github.com/containers/podman/v2/pkg/api/handlers/utils" "github.com/gorilla/mux" "github.com/sirupsen/logrus" ) diff --git a/pkg/api/server/register_system.go b/pkg/api/server/register_system.go index ef88cda09..524cdecd9 100644 --- a/pkg/api/server/register_system.go +++ b/pkg/api/server/register_system.go @@ -3,8 +3,8 @@ package server import ( "net/http" - "github.com/containers/libpod/v2/pkg/api/handlers/compat" - "github.com/containers/libpod/v2/pkg/api/handlers/libpod" + "github.com/containers/podman/v2/pkg/api/handlers/compat" + "github.com/containers/podman/v2/pkg/api/handlers/libpod" "github.com/gorilla/mux" ) diff --git a/pkg/api/server/register_version.go b/pkg/api/server/register_version.go index 38d27849c..cf49c0fa9 100644 --- a/pkg/api/server/register_version.go +++ b/pkg/api/server/register_version.go @@ -3,7 +3,7 @@ package server import ( "net/http" - "github.com/containers/libpod/v2/pkg/api/handlers/compat" + "github.com/containers/podman/v2/pkg/api/handlers/compat" "github.com/gorilla/mux" ) diff --git a/pkg/api/server/register_volumes.go b/pkg/api/server/register_volumes.go index 72f0f4249..b509a332a 100644 --- a/pkg/api/server/register_volumes.go +++ b/pkg/api/server/register_volumes.go @@ -3,8 +3,8 @@ package server import ( "net/http" - "github.com/containers/libpod/v2/pkg/api/handlers/compat" - "github.com/containers/libpod/v2/pkg/api/handlers/libpod" + "github.com/containers/podman/v2/pkg/api/handlers/compat" + "github.com/containers/podman/v2/pkg/api/handlers/libpod" "github.com/gorilla/mux" ) diff --git a/pkg/api/server/server.go b/pkg/api/server/server.go index 1c6007745..18b48a3f6 100644 --- a/pkg/api/server/server.go +++ b/pkg/api/server/server.go @@ -13,9 +13,9 @@ import ( "syscall" "time" - "github.com/containers/libpod/v2/libpod" - "github.com/containers/libpod/v2/pkg/api/handlers" - "github.com/containers/libpod/v2/pkg/api/server/idletracker" + "github.com/containers/podman/v2/libpod" + "github.com/containers/podman/v2/pkg/api/handlers" + "github.com/containers/podman/v2/pkg/api/server/idletracker" "github.com/coreos/go-systemd/v22/activation" "github.com/gorilla/mux" "github.com/gorilla/schema" diff --git a/pkg/api/server/swagger.go b/pkg/api/server/swagger.go index 26e8b22c2..6d349bb7d 100644 --- a/pkg/api/server/swagger.go +++ b/pkg/api/server/swagger.go @@ -1,9 +1,9 @@ package server import ( - "github.com/containers/libpod/v2/libpod" - "github.com/containers/libpod/v2/libpod/define" - "github.com/containers/libpod/v2/pkg/domain/entities" + "github.com/containers/podman/v2/libpod" + "github.com/containers/podman/v2/libpod/define" + "github.com/containers/podman/v2/pkg/domain/entities" ) // No such image diff --git a/pkg/autoupdate/autoupdate.go b/pkg/autoupdate/autoupdate.go index 9f4116a0d..44709f291 100644 --- a/pkg/autoupdate/autoupdate.go +++ b/pkg/autoupdate/autoupdate.go @@ -9,12 +9,12 @@ import ( "github.com/containers/image/v5/docker/reference" "github.com/containers/image/v5/manifest" "github.com/containers/image/v5/transports/alltransports" - "github.com/containers/libpod/v2/libpod" - "github.com/containers/libpod/v2/libpod/define" - "github.com/containers/libpod/v2/libpod/image" - "github.com/containers/libpod/v2/pkg/systemd" - systemdGen "github.com/containers/libpod/v2/pkg/systemd/generate" - "github.com/containers/libpod/v2/pkg/util" + "github.com/containers/podman/v2/libpod" + "github.com/containers/podman/v2/libpod/define" + "github.com/containers/podman/v2/libpod/image" + "github.com/containers/podman/v2/pkg/systemd" + systemdGen "github.com/containers/podman/v2/pkg/systemd/generate" + "github.com/containers/podman/v2/pkg/util" "github.com/pkg/errors" "github.com/sirupsen/logrus" ) @@ -261,7 +261,7 @@ func newerImageAvailable(runtime *libpod.Runtime, img *image.Image, origName str // We need to account for the arch that the image uses. It seems // common on ARM to tweak this option to pull the correct image. See - // github.com/containers/libpod/issues/6613. + // github.com/containers/podman/issues/6613. sys.ArchitectureChoice = data.Architecture remoteImg, err := remoteRef.NewImage(context.Background(), sys) diff --git a/pkg/bindings/connection.go b/pkg/bindings/connection.go index 4fed48237..e820e1c8b 100644 --- a/pkg/bindings/connection.go +++ b/pkg/bindings/connection.go @@ -13,7 +13,7 @@ import ( "time" "github.com/blang/semver" - "github.com/containers/libpod/v2/pkg/terminal" + "github.com/containers/podman/v2/pkg/terminal" jsoniter "github.com/json-iterator/go" "github.com/pkg/errors" "github.com/sirupsen/logrus" diff --git a/pkg/bindings/containers/attach.go b/pkg/bindings/containers/attach.go index 297563688..c035b6391 100644 --- a/pkg/bindings/containers/attach.go +++ b/pkg/bindings/containers/attach.go @@ -15,10 +15,10 @@ import ( "strconv" "time" - "github.com/containers/libpod/v2/libpod/define" - "github.com/containers/libpod/v2/pkg/bindings" - sig "github.com/containers/libpod/v2/pkg/signal" - "github.com/containers/libpod/v2/utils" + "github.com/containers/podman/v2/libpod/define" + "github.com/containers/podman/v2/pkg/bindings" + sig "github.com/containers/podman/v2/pkg/signal" + "github.com/containers/podman/v2/utils" "github.com/pkg/errors" "github.com/sirupsen/logrus" "golang.org/x/crypto/ssh/terminal" diff --git a/pkg/bindings/containers/checkpoint.go b/pkg/bindings/containers/checkpoint.go index 451f2ab52..f466f8a34 100644 --- a/pkg/bindings/containers/checkpoint.go +++ b/pkg/bindings/containers/checkpoint.go @@ -6,8 +6,8 @@ import ( "net/url" "strconv" - "github.com/containers/libpod/v2/pkg/bindings" - "github.com/containers/libpod/v2/pkg/domain/entities" + "github.com/containers/podman/v2/pkg/bindings" + "github.com/containers/podman/v2/pkg/domain/entities" ) // Checkpoint checkpoints the given container (identified by nameOrID). All additional diff --git a/pkg/bindings/containers/commit.go b/pkg/bindings/containers/commit.go index 039dfe460..9ab4456a3 100644 --- a/pkg/bindings/containers/commit.go +++ b/pkg/bindings/containers/commit.go @@ -6,8 +6,8 @@ import ( "net/url" "strconv" - "github.com/containers/libpod/v2/pkg/api/handlers" - "github.com/containers/libpod/v2/pkg/bindings" + "github.com/containers/podman/v2/pkg/api/handlers" + "github.com/containers/podman/v2/pkg/bindings" ) // Commit creates a container image from a container. The container is defined by nameOrID. Use diff --git a/pkg/bindings/containers/containers.go b/pkg/bindings/containers/containers.go index 41df2d52f..9e6dbef19 100644 --- a/pkg/bindings/containers/containers.go +++ b/pkg/bindings/containers/containers.go @@ -8,10 +8,10 @@ import ( "strconv" "strings" - "github.com/containers/libpod/v2/libpod/define" - "github.com/containers/libpod/v2/pkg/api/handlers" - "github.com/containers/libpod/v2/pkg/bindings" - "github.com/containers/libpod/v2/pkg/domain/entities" + "github.com/containers/podman/v2/libpod/define" + "github.com/containers/podman/v2/pkg/api/handlers" + "github.com/containers/podman/v2/pkg/bindings" + "github.com/containers/podman/v2/pkg/domain/entities" "github.com/pkg/errors" ) diff --git a/pkg/bindings/containers/create.go b/pkg/bindings/containers/create.go index 2c719c530..5c29ec577 100644 --- a/pkg/bindings/containers/create.go +++ b/pkg/bindings/containers/create.go @@ -5,9 +5,9 @@ import ( "net/http" "strings" - "github.com/containers/libpod/v2/pkg/bindings" - "github.com/containers/libpod/v2/pkg/domain/entities" - "github.com/containers/libpod/v2/pkg/specgen" + "github.com/containers/podman/v2/pkg/bindings" + "github.com/containers/podman/v2/pkg/domain/entities" + "github.com/containers/podman/v2/pkg/specgen" jsoniter "github.com/json-iterator/go" ) diff --git a/pkg/bindings/containers/diff.go b/pkg/bindings/containers/diff.go index fcdd4aadd..1478bd940 100644 --- a/pkg/bindings/containers/diff.go +++ b/pkg/bindings/containers/diff.go @@ -4,7 +4,7 @@ import ( "context" "net/http" - "github.com/containers/libpod/v2/pkg/bindings" + "github.com/containers/podman/v2/pkg/bindings" "github.com/containers/storage/pkg/archive" ) diff --git a/pkg/bindings/containers/exec.go b/pkg/bindings/containers/exec.go index e4b1f61f0..e080077c8 100644 --- a/pkg/bindings/containers/exec.go +++ b/pkg/bindings/containers/exec.go @@ -6,9 +6,9 @@ import ( "net/http" "strings" - "github.com/containers/libpod/v2/libpod/define" - "github.com/containers/libpod/v2/pkg/api/handlers" - "github.com/containers/libpod/v2/pkg/bindings" + "github.com/containers/podman/v2/libpod/define" + "github.com/containers/podman/v2/pkg/api/handlers" + "github.com/containers/podman/v2/pkg/bindings" jsoniter "github.com/json-iterator/go" "github.com/pkg/errors" "github.com/sirupsen/logrus" diff --git a/pkg/bindings/containers/healthcheck.go b/pkg/bindings/containers/healthcheck.go index 084e63f89..9de6ffbe0 100644 --- a/pkg/bindings/containers/healthcheck.go +++ b/pkg/bindings/containers/healthcheck.go @@ -4,8 +4,8 @@ import ( "context" "net/http" - "github.com/containers/libpod/v2/libpod/define" - "github.com/containers/libpod/v2/pkg/bindings" + "github.com/containers/podman/v2/libpod/define" + "github.com/containers/podman/v2/pkg/bindings" ) // RunHealthCheck executes the container's healthcheck and returns the health status of the diff --git a/pkg/bindings/containers/logs.go b/pkg/bindings/containers/logs.go index 5f2ccb20a..750a6dbe1 100644 --- a/pkg/bindings/containers/logs.go +++ b/pkg/bindings/containers/logs.go @@ -9,7 +9,7 @@ import ( "net/url" "strconv" - "github.com/containers/libpod/v2/pkg/bindings" + "github.com/containers/podman/v2/pkg/bindings" "github.com/pkg/errors" ) diff --git a/pkg/bindings/containers/mount.go b/pkg/bindings/containers/mount.go index 5f2f8e13c..4c2e0c188 100644 --- a/pkg/bindings/containers/mount.go +++ b/pkg/bindings/containers/mount.go @@ -4,7 +4,7 @@ import ( "context" "net/http" - "github.com/containers/libpod/v2/pkg/bindings" + "github.com/containers/podman/v2/pkg/bindings" ) // Mount mounts an existing container to the filesystem. It returns the path diff --git a/pkg/bindings/errors.go b/pkg/bindings/errors.go index 7ee5bbb12..603299389 100644 --- a/pkg/bindings/errors.go +++ b/pkg/bindings/errors.go @@ -4,7 +4,7 @@ import ( "encoding/json" "io/ioutil" - "github.com/containers/libpod/v2/pkg/domain/entities" + "github.com/containers/podman/v2/pkg/domain/entities" "github.com/pkg/errors" ) diff --git a/pkg/bindings/generate/generate.go b/pkg/bindings/generate/generate.go index 832507d8b..b02221765 100644 --- a/pkg/bindings/generate/generate.go +++ b/pkg/bindings/generate/generate.go @@ -6,8 +6,8 @@ import ( "net/url" "strconv" - "github.com/containers/libpod/v2/pkg/bindings" - "github.com/containers/libpod/v2/pkg/domain/entities" + "github.com/containers/podman/v2/pkg/bindings" + "github.com/containers/podman/v2/pkg/domain/entities" ) func Kube(ctx context.Context, nameOrID string, options entities.GenerateKubeOptions) (*entities.GenerateKubeReport, error) { diff --git a/pkg/bindings/images/diff.go b/pkg/bindings/images/diff.go index c0e8d741a..10d50b0fd 100644 --- a/pkg/bindings/images/diff.go +++ b/pkg/bindings/images/diff.go @@ -4,7 +4,7 @@ import ( "context" "net/http" - "github.com/containers/libpod/v2/pkg/bindings" + "github.com/containers/podman/v2/pkg/bindings" "github.com/containers/storage/pkg/archive" ) diff --git a/pkg/bindings/images/images.go b/pkg/bindings/images/images.go index 15936d86b..fc8c9996e 100644 --- a/pkg/bindings/images/images.go +++ b/pkg/bindings/images/images.go @@ -11,10 +11,10 @@ import ( "github.com/containers/buildah" "github.com/containers/image/v5/types" - "github.com/containers/libpod/v2/pkg/api/handlers" - "github.com/containers/libpod/v2/pkg/auth" - "github.com/containers/libpod/v2/pkg/bindings" - "github.com/containers/libpod/v2/pkg/domain/entities" + "github.com/containers/podman/v2/pkg/api/handlers" + "github.com/containers/podman/v2/pkg/auth" + "github.com/containers/podman/v2/pkg/bindings" + "github.com/containers/podman/v2/pkg/domain/entities" "github.com/docker/go-units" jsoniter "github.com/json-iterator/go" "github.com/pkg/errors" diff --git a/pkg/bindings/images/rm.go b/pkg/bindings/images/rm.go index f46d30065..9685b75e4 100644 --- a/pkg/bindings/images/rm.go +++ b/pkg/bindings/images/rm.go @@ -6,10 +6,10 @@ import ( "net/url" "strconv" - "github.com/containers/libpod/v2/pkg/api/handlers" - "github.com/containers/libpod/v2/pkg/bindings" - "github.com/containers/libpod/v2/pkg/domain/entities" - "github.com/containers/libpod/v2/pkg/errorhandling" + "github.com/containers/podman/v2/pkg/api/handlers" + "github.com/containers/podman/v2/pkg/bindings" + "github.com/containers/podman/v2/pkg/domain/entities" + "github.com/containers/podman/v2/pkg/errorhandling" ) // BachtRemove removes a batch of images from the local storage. diff --git a/pkg/bindings/manifests/manifests.go b/pkg/bindings/manifests/manifests.go index feeb8d3f7..0330b13e2 100644 --- a/pkg/bindings/manifests/manifests.go +++ b/pkg/bindings/manifests/manifests.go @@ -9,9 +9,9 @@ import ( "strings" "github.com/containers/image/v5/manifest" - "github.com/containers/libpod/v2/libpod/image" - "github.com/containers/libpod/v2/pkg/api/handlers" - "github.com/containers/libpod/v2/pkg/bindings" + "github.com/containers/podman/v2/libpod/image" + "github.com/containers/podman/v2/pkg/api/handlers" + "github.com/containers/podman/v2/pkg/bindings" jsoniter "github.com/json-iterator/go" ) diff --git a/pkg/bindings/network/network.go b/pkg/bindings/network/network.go index 35030bdb6..fd1111282 100644 --- a/pkg/bindings/network/network.go +++ b/pkg/bindings/network/network.go @@ -7,8 +7,8 @@ import ( "strconv" "strings" - "github.com/containers/libpod/v2/pkg/bindings" - "github.com/containers/libpod/v2/pkg/domain/entities" + "github.com/containers/podman/v2/pkg/bindings" + "github.com/containers/podman/v2/pkg/domain/entities" jsoniter "github.com/json-iterator/go" ) diff --git a/pkg/bindings/play/play.go b/pkg/bindings/play/play.go index 5ed755a32..32f9bb4a9 100644 --- a/pkg/bindings/play/play.go +++ b/pkg/bindings/play/play.go @@ -8,9 +8,9 @@ import ( "strconv" "github.com/containers/image/v5/types" - "github.com/containers/libpod/v2/pkg/auth" - "github.com/containers/libpod/v2/pkg/bindings" - "github.com/containers/libpod/v2/pkg/domain/entities" + "github.com/containers/podman/v2/pkg/auth" + "github.com/containers/podman/v2/pkg/bindings" + "github.com/containers/podman/v2/pkg/domain/entities" ) func Kube(ctx context.Context, path string, options entities.PlayKubeOptions) (*entities.PlayKubeReport, error) { diff --git a/pkg/bindings/pods/pods.go b/pkg/bindings/pods/pods.go index cc9c98c3c..c3f98eaab 100644 --- a/pkg/bindings/pods/pods.go +++ b/pkg/bindings/pods/pods.go @@ -8,10 +8,10 @@ import ( "strconv" "strings" - "github.com/containers/libpod/v2/pkg/api/handlers" - "github.com/containers/libpod/v2/pkg/bindings" - "github.com/containers/libpod/v2/pkg/domain/entities" - "github.com/containers/libpod/v2/pkg/specgen" + "github.com/containers/podman/v2/pkg/api/handlers" + "github.com/containers/podman/v2/pkg/bindings" + "github.com/containers/podman/v2/pkg/domain/entities" + "github.com/containers/podman/v2/pkg/specgen" jsoniter "github.com/json-iterator/go" ) diff --git a/pkg/bindings/system/info.go b/pkg/bindings/system/info.go index 492662374..79ee5cada 100644 --- a/pkg/bindings/system/info.go +++ b/pkg/bindings/system/info.go @@ -4,8 +4,8 @@ import ( "context" "net/http" - "github.com/containers/libpod/v2/libpod/define" - "github.com/containers/libpod/v2/pkg/bindings" + "github.com/containers/podman/v2/libpod/define" + "github.com/containers/podman/v2/pkg/bindings" ) // Info returns information about the libpod environment and its stores diff --git a/pkg/bindings/system/system.go b/pkg/bindings/system/system.go index b26fad017..e995770ba 100644 --- a/pkg/bindings/system/system.go +++ b/pkg/bindings/system/system.go @@ -10,9 +10,9 @@ import ( "strconv" "time" - "github.com/containers/libpod/v2/libpod/define" - "github.com/containers/libpod/v2/pkg/bindings" - "github.com/containers/libpod/v2/pkg/domain/entities" + "github.com/containers/podman/v2/libpod/define" + "github.com/containers/podman/v2/pkg/bindings" + "github.com/containers/podman/v2/pkg/domain/entities" "github.com/pkg/errors" "github.com/sirupsen/logrus" ) diff --git a/pkg/bindings/test/attach_test.go b/pkg/bindings/test/attach_test.go index dcc6b5f8e..12e51e734 100644 --- a/pkg/bindings/test/attach_test.go +++ b/pkg/bindings/test/attach_test.go @@ -5,10 +5,10 @@ import ( "fmt" "time" - "github.com/containers/libpod/v2/libpod/define" - "github.com/containers/libpod/v2/pkg/bindings" - "github.com/containers/libpod/v2/pkg/bindings/containers" - "github.com/containers/libpod/v2/pkg/specgen" + "github.com/containers/podman/v2/libpod/define" + "github.com/containers/podman/v2/pkg/bindings" + "github.com/containers/podman/v2/pkg/bindings/containers" + "github.com/containers/podman/v2/pkg/specgen" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" "github.com/onsi/gomega/gexec" diff --git a/pkg/bindings/test/auth_test.go b/pkg/bindings/test/auth_test.go index 6a5c2e831..4565b82b0 100644 --- a/pkg/bindings/test/auth_test.go +++ b/pkg/bindings/test/auth_test.go @@ -7,9 +7,9 @@ import ( "github.com/containers/common/pkg/auth" "github.com/containers/image/v5/types" - podmanRegistry "github.com/containers/libpod/v2/hack/podman-registry-go" - "github.com/containers/libpod/v2/pkg/bindings/images" - "github.com/containers/libpod/v2/pkg/domain/entities" + podmanRegistry "github.com/containers/podman/v2/hack/podman-registry-go" + "github.com/containers/podman/v2/pkg/bindings/images" + "github.com/containers/podman/v2/pkg/domain/entities" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" "github.com/onsi/gomega/gexec" diff --git a/pkg/bindings/test/common_test.go b/pkg/bindings/test/common_test.go index 831ecfd31..9dff2985f 100644 --- a/pkg/bindings/test/common_test.go +++ b/pkg/bindings/test/common_test.go @@ -9,10 +9,10 @@ import ( "path/filepath" "strings" - "github.com/containers/libpod/v2/libpod/define" - . "github.com/containers/libpod/v2/pkg/bindings" - "github.com/containers/libpod/v2/pkg/bindings/containers" - "github.com/containers/libpod/v2/pkg/specgen" + "github.com/containers/podman/v2/libpod/define" + . "github.com/containers/podman/v2/pkg/bindings" + "github.com/containers/podman/v2/pkg/bindings/containers" + "github.com/containers/podman/v2/pkg/specgen" "github.com/onsi/ginkgo" "github.com/onsi/gomega/gexec" "github.com/pkg/errors" diff --git a/pkg/bindings/test/containers_test.go b/pkg/bindings/test/containers_test.go index 4b2c78353..c1a01c280 100644 --- a/pkg/bindings/test/containers_test.go +++ b/pkg/bindings/test/containers_test.go @@ -6,11 +6,11 @@ import ( "strings" "time" - "github.com/containers/libpod/v2/libpod/define" - "github.com/containers/libpod/v2/pkg/bindings" - "github.com/containers/libpod/v2/pkg/bindings/containers" - "github.com/containers/libpod/v2/pkg/specgen" - "github.com/containers/libpod/v2/test/utils" + "github.com/containers/podman/v2/libpod/define" + "github.com/containers/podman/v2/pkg/bindings" + "github.com/containers/podman/v2/pkg/bindings/containers" + "github.com/containers/podman/v2/pkg/specgen" + "github.com/containers/podman/v2/test/utils" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" "github.com/onsi/gomega/gexec" @@ -187,7 +187,7 @@ var _ = Describe("Podman containers ", func() { osVer, err := strconv.Atoi(host.Version) Expect(err).To(BeNil()) if host.Distribution == "fedora" && osVer >= 31 { - Skip("FIXME: https://github.com/containers/libpod/issues/5325") + Skip("FIXME: https://github.com/containers/podman/issues/5325") } // Removing a paused container with force should work diff --git a/pkg/bindings/test/create_test.go b/pkg/bindings/test/create_test.go index 7fb69ddb7..fd9ce23ca 100644 --- a/pkg/bindings/test/create_test.go +++ b/pkg/bindings/test/create_test.go @@ -3,8 +3,8 @@ package test_bindings import ( "time" - "github.com/containers/libpod/v2/pkg/bindings/containers" - "github.com/containers/libpod/v2/pkg/specgen" + "github.com/containers/podman/v2/pkg/bindings/containers" + "github.com/containers/podman/v2/pkg/specgen" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" "github.com/onsi/gomega/gexec" diff --git a/pkg/bindings/test/exec_test.go b/pkg/bindings/test/exec_test.go index e8cd32404..e3d90b9ea 100644 --- a/pkg/bindings/test/exec_test.go +++ b/pkg/bindings/test/exec_test.go @@ -3,9 +3,9 @@ package test_bindings import ( "time" - "github.com/containers/libpod/v2/pkg/api/handlers" - "github.com/containers/libpod/v2/pkg/bindings" - "github.com/containers/libpod/v2/pkg/bindings/containers" + "github.com/containers/podman/v2/pkg/api/handlers" + "github.com/containers/podman/v2/pkg/bindings" + "github.com/containers/podman/v2/pkg/bindings/containers" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" "github.com/onsi/gomega/gexec" diff --git a/pkg/bindings/test/images_test.go b/pkg/bindings/test/images_test.go index c4f84f756..e0dd28d7a 100644 --- a/pkg/bindings/test/images_test.go +++ b/pkg/bindings/test/images_test.go @@ -6,10 +6,10 @@ import ( "path/filepath" "time" - "github.com/containers/libpod/v2/pkg/bindings" - "github.com/containers/libpod/v2/pkg/bindings/containers" - "github.com/containers/libpod/v2/pkg/bindings/images" - "github.com/containers/libpod/v2/pkg/domain/entities" + "github.com/containers/podman/v2/pkg/bindings" + "github.com/containers/podman/v2/pkg/bindings/containers" + "github.com/containers/podman/v2/pkg/bindings/images" + "github.com/containers/podman/v2/pkg/domain/entities" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" "github.com/onsi/gomega/gexec" diff --git a/pkg/bindings/test/info_test.go b/pkg/bindings/test/info_test.go index d7a6e0e8a..6cd5d6724 100644 --- a/pkg/bindings/test/info_test.go +++ b/pkg/bindings/test/info_test.go @@ -4,10 +4,10 @@ import ( "runtime" "time" - "github.com/containers/libpod/v2/pkg/bindings/containers" - "github.com/containers/libpod/v2/pkg/bindings/images" - "github.com/containers/libpod/v2/pkg/bindings/system" - "github.com/containers/libpod/v2/pkg/specgen" + "github.com/containers/podman/v2/pkg/bindings/containers" + "github.com/containers/podman/v2/pkg/bindings/images" + "github.com/containers/podman/v2/pkg/bindings/system" + "github.com/containers/podman/v2/pkg/specgen" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" "github.com/onsi/gomega/gexec" diff --git a/pkg/bindings/test/manifests_test.go b/pkg/bindings/test/manifests_test.go index ddb549061..55fc4cb0d 100644 --- a/pkg/bindings/test/manifests_test.go +++ b/pkg/bindings/test/manifests_test.go @@ -4,10 +4,10 @@ import ( "net/http" "time" - "github.com/containers/libpod/v2/libpod/image" - "github.com/containers/libpod/v2/pkg/bindings" - "github.com/containers/libpod/v2/pkg/bindings/images" - "github.com/containers/libpod/v2/pkg/bindings/manifests" + "github.com/containers/podman/v2/libpod/image" + "github.com/containers/podman/v2/pkg/bindings" + "github.com/containers/podman/v2/pkg/bindings/images" + "github.com/containers/podman/v2/pkg/bindings/manifests" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" "github.com/onsi/gomega/gexec" diff --git a/pkg/bindings/test/pods_test.go b/pkg/bindings/test/pods_test.go index 2ad6f38c1..27f648384 100644 --- a/pkg/bindings/test/pods_test.go +++ b/pkg/bindings/test/pods_test.go @@ -5,10 +5,10 @@ import ( "strings" "time" - "github.com/containers/libpod/v2/libpod/define" - "github.com/containers/libpod/v2/pkg/bindings" - "github.com/containers/libpod/v2/pkg/bindings/pods" - "github.com/containers/libpod/v2/pkg/specgen" + "github.com/containers/podman/v2/libpod/define" + "github.com/containers/podman/v2/pkg/bindings" + "github.com/containers/podman/v2/pkg/bindings/pods" + "github.com/containers/podman/v2/pkg/specgen" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" "github.com/onsi/gomega/gexec" diff --git a/pkg/bindings/test/system_test.go b/pkg/bindings/test/system_test.go index 430184f4a..2b2fa9b7c 100644 --- a/pkg/bindings/test/system_test.go +++ b/pkg/bindings/test/system_test.go @@ -4,12 +4,12 @@ import ( "sync" "time" - "github.com/containers/libpod/v2/pkg/bindings" - "github.com/containers/libpod/v2/pkg/bindings/containers" - "github.com/containers/libpod/v2/pkg/bindings/pods" - "github.com/containers/libpod/v2/pkg/bindings/system" - "github.com/containers/libpod/v2/pkg/bindings/volumes" - "github.com/containers/libpod/v2/pkg/domain/entities" + "github.com/containers/podman/v2/pkg/bindings" + "github.com/containers/podman/v2/pkg/bindings/containers" + "github.com/containers/podman/v2/pkg/bindings/pods" + "github.com/containers/podman/v2/pkg/bindings/system" + "github.com/containers/podman/v2/pkg/bindings/volumes" + "github.com/containers/podman/v2/pkg/domain/entities" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" "github.com/onsi/gomega/gexec" diff --git a/pkg/bindings/test/volumes_test.go b/pkg/bindings/test/volumes_test.go index efc02a0d4..dc90d4d00 100644 --- a/pkg/bindings/test/volumes_test.go +++ b/pkg/bindings/test/volumes_test.go @@ -6,10 +6,10 @@ import ( "net/http" "time" - "github.com/containers/libpod/v2/pkg/bindings" - "github.com/containers/libpod/v2/pkg/bindings/containers" - "github.com/containers/libpod/v2/pkg/bindings/volumes" - "github.com/containers/libpod/v2/pkg/domain/entities" + "github.com/containers/podman/v2/pkg/bindings" + "github.com/containers/podman/v2/pkg/bindings/containers" + "github.com/containers/podman/v2/pkg/bindings/volumes" + "github.com/containers/podman/v2/pkg/domain/entities" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" "github.com/onsi/gomega/gexec" diff --git a/pkg/bindings/volumes/volumes.go b/pkg/bindings/volumes/volumes.go index 8a8961959..00f1e5720 100644 --- a/pkg/bindings/volumes/volumes.go +++ b/pkg/bindings/volumes/volumes.go @@ -7,8 +7,8 @@ import ( "strconv" "strings" - "github.com/containers/libpod/v2/pkg/bindings" - "github.com/containers/libpod/v2/pkg/domain/entities" + "github.com/containers/podman/v2/pkg/bindings" + "github.com/containers/podman/v2/pkg/domain/entities" jsoniter "github.com/json-iterator/go" ) diff --git a/pkg/cgroups/cgroups.go b/pkg/cgroups/cgroups.go index a8dfd7f77..f23787bd4 100644 --- a/pkg/cgroups/cgroups.go +++ b/pkg/cgroups/cgroups.go @@ -10,7 +10,7 @@ import ( "strconv" "strings" - "github.com/containers/libpod/v2/pkg/rootless" + "github.com/containers/podman/v2/pkg/rootless" systemdDbus "github.com/coreos/go-systemd/v22/dbus" "github.com/godbus/dbus/v5" spec "github.com/opencontainers/runtime-spec/specs-go" diff --git a/pkg/checkpoint/checkpoint_restore.go b/pkg/checkpoint/checkpoint_restore.go index bc2e7cde0..2a73efe36 100644 --- a/pkg/checkpoint/checkpoint_restore.go +++ b/pkg/checkpoint/checkpoint_restore.go @@ -6,10 +6,10 @@ import ( "os" "path/filepath" - "github.com/containers/libpod/v2/libpod" - "github.com/containers/libpod/v2/libpod/image" - "github.com/containers/libpod/v2/pkg/errorhandling" - "github.com/containers/libpod/v2/pkg/util" + "github.com/containers/podman/v2/libpod" + "github.com/containers/podman/v2/libpod/image" + "github.com/containers/podman/v2/pkg/errorhandling" + "github.com/containers/podman/v2/pkg/util" "github.com/containers/storage/pkg/archive" jsoniter "github.com/json-iterator/go" spec "github.com/opencontainers/runtime-spec/specs-go" diff --git a/pkg/domain/entities/container_ps.go b/pkg/domain/entities/container_ps.go index b6f9e6892..50dd4933b 100644 --- a/pkg/domain/entities/container_ps.go +++ b/pkg/domain/entities/container_ps.go @@ -4,7 +4,7 @@ import ( "sort" "strings" - "github.com/containers/libpod/v2/pkg/ps/define" + "github.com/containers/podman/v2/pkg/ps/define" "github.com/cri-o/ocicni/pkg/ocicni" "github.com/pkg/errors" ) diff --git a/pkg/domain/entities/containers.go b/pkg/domain/entities/containers.go index dc9a67008..c8894300b 100644 --- a/pkg/domain/entities/containers.go +++ b/pkg/domain/entities/containers.go @@ -7,8 +7,8 @@ import ( "time" "github.com/containers/image/v5/types" - "github.com/containers/libpod/v2/libpod/define" - "github.com/containers/libpod/v2/pkg/specgen" + "github.com/containers/podman/v2/libpod/define" + "github.com/containers/podman/v2/pkg/specgen" "github.com/cri-o/ocicni/pkg/ocicni" ) diff --git a/pkg/domain/entities/engine_container.go b/pkg/domain/entities/engine_container.go index f8c72da58..6c85c9267 100644 --- a/pkg/domain/entities/engine_container.go +++ b/pkg/domain/entities/engine_container.go @@ -4,8 +4,8 @@ import ( "context" "github.com/containers/common/pkg/config" - "github.com/containers/libpod/v2/libpod/define" - "github.com/containers/libpod/v2/pkg/specgen" + "github.com/containers/podman/v2/libpod/define" + "github.com/containers/podman/v2/pkg/specgen" "github.com/spf13/cobra" ) diff --git a/pkg/domain/entities/events.go b/pkg/domain/entities/events.go index 05c8be34e..f4f3b705f 100644 --- a/pkg/domain/entities/events.go +++ b/pkg/domain/entities/events.go @@ -4,7 +4,7 @@ import ( "strconv" "time" - libpodEvents "github.com/containers/libpod/v2/libpod/events" + libpodEvents "github.com/containers/podman/v2/libpod/events" dockerEvents "github.com/docker/docker/api/types/events" ) diff --git a/pkg/domain/entities/images.go b/pkg/domain/entities/images.go index 25b3a70f2..b38facfb5 100644 --- a/pkg/domain/entities/images.go +++ b/pkg/domain/entities/images.go @@ -5,8 +5,8 @@ import ( "github.com/containers/image/v5/manifest" "github.com/containers/image/v5/types" - "github.com/containers/libpod/v2/pkg/inspect" - "github.com/containers/libpod/v2/pkg/trust" + "github.com/containers/podman/v2/pkg/inspect" + "github.com/containers/podman/v2/pkg/trust" docker "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/container" "github.com/opencontainers/go-digest" diff --git a/pkg/domain/entities/pods.go b/pkg/domain/entities/pods.go index 9e9b834ef..7b38dbd87 100644 --- a/pkg/domain/entities/pods.go +++ b/pkg/domain/entities/pods.go @@ -5,8 +5,8 @@ import ( "strings" "time" - "github.com/containers/libpod/v2/libpod/define" - "github.com/containers/libpod/v2/pkg/specgen" + "github.com/containers/podman/v2/libpod/define" + "github.com/containers/podman/v2/pkg/specgen" ) type PodKillOptions struct { diff --git a/pkg/domain/entities/system.go b/pkg/domain/entities/system.go index 09446cffe..af355b0af 100644 --- a/pkg/domain/entities/system.go +++ b/pkg/domain/entities/system.go @@ -3,7 +3,7 @@ package entities import ( "time" - "github.com/containers/libpod/v2/libpod/define" + "github.com/containers/podman/v2/libpod/define" "github.com/docker/docker/api/types" "github.com/spf13/cobra" ) diff --git a/pkg/domain/entities/types.go b/pkg/domain/entities/types.go index b313e5f8b..5fdd8afcb 100644 --- a/pkg/domain/entities/types.go +++ b/pkg/domain/entities/types.go @@ -5,8 +5,8 @@ import ( "net" "github.com/containers/buildah/imagebuildah" - "github.com/containers/libpod/v2/libpod/events" - "github.com/containers/libpod/v2/pkg/specgen" + "github.com/containers/podman/v2/libpod/events" + "github.com/containers/podman/v2/pkg/specgen" "github.com/containers/storage/pkg/archive" ) diff --git a/pkg/domain/filters/volumes.go b/pkg/domain/filters/volumes.go index 052bf0f4b..7819d3cdf 100644 --- a/pkg/domain/filters/volumes.go +++ b/pkg/domain/filters/volumes.go @@ -3,7 +3,7 @@ package filters import ( "strings" - "github.com/containers/libpod/v2/libpod" + "github.com/containers/podman/v2/libpod" "github.com/pkg/errors" ) diff --git a/pkg/domain/infra/abi/auto-update.go b/pkg/domain/infra/abi/auto-update.go index 7bbcde359..e8e2fa185 100644 --- a/pkg/domain/infra/abi/auto-update.go +++ b/pkg/domain/infra/abi/auto-update.go @@ -3,8 +3,8 @@ package abi import ( "context" - "github.com/containers/libpod/v2/pkg/autoupdate" - "github.com/containers/libpod/v2/pkg/domain/entities" + "github.com/containers/podman/v2/pkg/autoupdate" + "github.com/containers/podman/v2/pkg/domain/entities" ) func (ic *ContainerEngine) AutoUpdate(ctx context.Context, options entities.AutoUpdateOptions) (*entities.AutoUpdateReport, []error) { diff --git a/pkg/domain/infra/abi/containers.go b/pkg/domain/infra/abi/containers.go index 8909f831d..3fee5d394 100644 --- a/pkg/domain/infra/abi/containers.go +++ b/pkg/domain/infra/abi/containers.go @@ -13,22 +13,22 @@ import ( "github.com/containers/buildah" "github.com/containers/common/pkg/config" "github.com/containers/image/v5/manifest" - "github.com/containers/libpod/v2/libpod" - "github.com/containers/libpod/v2/libpod/define" - "github.com/containers/libpod/v2/libpod/events" - lpfilters "github.com/containers/libpod/v2/libpod/filters" - "github.com/containers/libpod/v2/libpod/image" - "github.com/containers/libpod/v2/libpod/logs" - "github.com/containers/libpod/v2/pkg/cgroups" - "github.com/containers/libpod/v2/pkg/checkpoint" - "github.com/containers/libpod/v2/pkg/domain/entities" - "github.com/containers/libpod/v2/pkg/domain/infra/abi/terminal" - "github.com/containers/libpod/v2/pkg/parallel" - "github.com/containers/libpod/v2/pkg/ps" - "github.com/containers/libpod/v2/pkg/rootless" - "github.com/containers/libpod/v2/pkg/signal" - "github.com/containers/libpod/v2/pkg/specgen" - "github.com/containers/libpod/v2/pkg/specgen/generate" + "github.com/containers/podman/v2/libpod" + "github.com/containers/podman/v2/libpod/define" + "github.com/containers/podman/v2/libpod/events" + lpfilters "github.com/containers/podman/v2/libpod/filters" + "github.com/containers/podman/v2/libpod/image" + "github.com/containers/podman/v2/libpod/logs" + "github.com/containers/podman/v2/pkg/cgroups" + "github.com/containers/podman/v2/pkg/checkpoint" + "github.com/containers/podman/v2/pkg/domain/entities" + "github.com/containers/podman/v2/pkg/domain/infra/abi/terminal" + "github.com/containers/podman/v2/pkg/parallel" + "github.com/containers/podman/v2/pkg/ps" + "github.com/containers/podman/v2/pkg/rootless" + "github.com/containers/podman/v2/pkg/signal" + "github.com/containers/podman/v2/pkg/specgen" + "github.com/containers/podman/v2/pkg/specgen/generate" "github.com/containers/storage" "github.com/pkg/errors" "github.com/sirupsen/logrus" diff --git a/pkg/domain/infra/abi/containers_runlabel.go b/pkg/domain/infra/abi/containers_runlabel.go index 2e7d23d7e..ab2316d47 100644 --- a/pkg/domain/infra/abi/containers_runlabel.go +++ b/pkg/domain/infra/abi/containers_runlabel.go @@ -8,12 +8,12 @@ import ( "strings" "github.com/containers/image/v5/types" - "github.com/containers/libpod/v2/libpod/define" - "github.com/containers/libpod/v2/libpod/image" - "github.com/containers/libpod/v2/pkg/domain/entities" - envLib "github.com/containers/libpod/v2/pkg/env" - "github.com/containers/libpod/v2/pkg/util" - "github.com/containers/libpod/v2/utils" + "github.com/containers/podman/v2/libpod/define" + "github.com/containers/podman/v2/libpod/image" + "github.com/containers/podman/v2/pkg/domain/entities" + envLib "github.com/containers/podman/v2/pkg/env" + "github.com/containers/podman/v2/pkg/util" + "github.com/containers/podman/v2/utils" "github.com/google/shlex" "github.com/pkg/errors" "github.com/sirupsen/logrus" diff --git a/pkg/domain/infra/abi/cp.go b/pkg/domain/infra/abi/cp.go index baed4df7a..0cd2ac8ca 100644 --- a/pkg/domain/infra/abi/cp.go +++ b/pkg/domain/infra/abi/cp.go @@ -11,9 +11,9 @@ import ( "github.com/containers/buildah/pkg/chrootuser" "github.com/containers/buildah/util" - "github.com/containers/libpod/v2/libpod" - "github.com/containers/libpod/v2/libpod/define" - "github.com/containers/libpod/v2/pkg/domain/entities" + "github.com/containers/podman/v2/libpod" + "github.com/containers/podman/v2/libpod/define" + "github.com/containers/podman/v2/pkg/domain/entities" "github.com/containers/storage" "github.com/containers/storage/pkg/chrootarchive" "github.com/containers/storage/pkg/idtools" diff --git a/pkg/domain/infra/abi/events.go b/pkg/domain/infra/abi/events.go index 7a8185445..fa57543bf 100644 --- a/pkg/domain/infra/abi/events.go +++ b/pkg/domain/infra/abi/events.go @@ -3,8 +3,8 @@ package abi import ( "context" - "github.com/containers/libpod/v2/libpod/events" - "github.com/containers/libpod/v2/pkg/domain/entities" + "github.com/containers/podman/v2/libpod/events" + "github.com/containers/podman/v2/pkg/domain/entities" ) func (ic *ContainerEngine) Events(ctx context.Context, opts entities.EventsOptions) error { diff --git a/pkg/domain/infra/abi/generate.go b/pkg/domain/infra/abi/generate.go index 560be988b..93c4ede49 100644 --- a/pkg/domain/infra/abi/generate.go +++ b/pkg/domain/infra/abi/generate.go @@ -5,10 +5,10 @@ import ( "context" "fmt" - "github.com/containers/libpod/v2/libpod" - "github.com/containers/libpod/v2/libpod/define" - "github.com/containers/libpod/v2/pkg/domain/entities" - "github.com/containers/libpod/v2/pkg/systemd/generate" + "github.com/containers/podman/v2/libpod" + "github.com/containers/podman/v2/libpod/define" + "github.com/containers/podman/v2/pkg/domain/entities" + "github.com/containers/podman/v2/pkg/systemd/generate" "github.com/ghodss/yaml" "github.com/pkg/errors" k8sAPI "k8s.io/api/core/v1" diff --git a/pkg/domain/infra/abi/healthcheck.go b/pkg/domain/infra/abi/healthcheck.go index 4d834550f..49b709f39 100644 --- a/pkg/domain/infra/abi/healthcheck.go +++ b/pkg/domain/infra/abi/healthcheck.go @@ -3,8 +3,8 @@ package abi import ( "context" - "github.com/containers/libpod/v2/libpod/define" - "github.com/containers/libpod/v2/pkg/domain/entities" + "github.com/containers/podman/v2/libpod/define" + "github.com/containers/podman/v2/pkg/domain/entities" ) func (ic *ContainerEngine) HealthCheckRun(ctx context.Context, nameOrID string, options entities.HealthCheckOptions) (*define.HealthCheckResults, error) { diff --git a/pkg/domain/infra/abi/images.go b/pkg/domain/infra/abi/images.go index 3393275b8..e2fe8a5e6 100644 --- a/pkg/domain/infra/abi/images.go +++ b/pkg/domain/infra/abi/images.go @@ -11,7 +11,7 @@ import ( "strconv" "strings" - "github.com/containers/libpod/v2/pkg/rootless" + "github.com/containers/podman/v2/pkg/rootless" "github.com/containers/common/pkg/config" "github.com/containers/image/v5/docker" @@ -22,13 +22,13 @@ import ( "github.com/containers/image/v5/transports" "github.com/containers/image/v5/transports/alltransports" "github.com/containers/image/v5/types" - "github.com/containers/libpod/v2/libpod/define" - "github.com/containers/libpod/v2/libpod/image" - libpodImage "github.com/containers/libpod/v2/libpod/image" - "github.com/containers/libpod/v2/pkg/domain/entities" - domainUtils "github.com/containers/libpod/v2/pkg/domain/utils" - "github.com/containers/libpod/v2/pkg/trust" - "github.com/containers/libpod/v2/pkg/util" + "github.com/containers/podman/v2/libpod/define" + "github.com/containers/podman/v2/libpod/image" + libpodImage "github.com/containers/podman/v2/libpod/image" + "github.com/containers/podman/v2/pkg/domain/entities" + domainUtils "github.com/containers/podman/v2/pkg/domain/utils" + "github.com/containers/podman/v2/pkg/trust" + "github.com/containers/podman/v2/pkg/util" "github.com/containers/storage" imgspecv1 "github.com/opencontainers/image-spec/specs-go/v1" "github.com/pkg/errors" diff --git a/pkg/domain/infra/abi/images_list.go b/pkg/domain/infra/abi/images_list.go index dda572ca8..11e2ddb39 100644 --- a/pkg/domain/infra/abi/images_list.go +++ b/pkg/domain/infra/abi/images_list.go @@ -3,8 +3,8 @@ package abi import ( "context" - libpodImage "github.com/containers/libpod/v2/libpod/image" - "github.com/containers/libpod/v2/pkg/domain/entities" + libpodImage "github.com/containers/podman/v2/libpod/image" + "github.com/containers/podman/v2/pkg/domain/entities" ) func (ir *ImageEngine) List(ctx context.Context, opts entities.ImageListOptions) ([]*entities.ImageSummary, error) { diff --git a/pkg/domain/infra/abi/manifest.go b/pkg/domain/infra/abi/manifest.go index c2905b316..6f3c6b902 100644 --- a/pkg/domain/infra/abi/manifest.go +++ b/pkg/domain/infra/abi/manifest.go @@ -17,9 +17,9 @@ import ( "github.com/containers/image/v5/manifest" "github.com/containers/image/v5/transports/alltransports" "github.com/containers/image/v5/types" - libpodImage "github.com/containers/libpod/v2/libpod/image" - "github.com/containers/libpod/v2/pkg/domain/entities" - "github.com/containers/libpod/v2/pkg/util" + libpodImage "github.com/containers/podman/v2/libpod/image" + "github.com/containers/podman/v2/pkg/domain/entities" + "github.com/containers/podman/v2/pkg/util" "github.com/opencontainers/go-digest" imgspecv1 "github.com/opencontainers/image-spec/specs-go/v1" diff --git a/pkg/domain/infra/abi/network.go b/pkg/domain/infra/abi/network.go index 26383129c..0183a90d8 100644 --- a/pkg/domain/infra/abi/network.go +++ b/pkg/domain/infra/abi/network.go @@ -10,10 +10,10 @@ import ( "github.com/containernetworking/cni/libcni" cniversion "github.com/containernetworking/cni/pkg/version" - "github.com/containers/libpod/v2/libpod" - "github.com/containers/libpod/v2/pkg/domain/entities" - "github.com/containers/libpod/v2/pkg/network" - "github.com/containers/libpod/v2/pkg/util" + "github.com/containers/podman/v2/libpod" + "github.com/containers/podman/v2/pkg/domain/entities" + "github.com/containers/podman/v2/pkg/network" + "github.com/containers/podman/v2/pkg/util" "github.com/pkg/errors" ) diff --git a/pkg/domain/infra/abi/parse/parse.go b/pkg/domain/infra/abi/parse/parse.go index fc10e138c..37568ea11 100644 --- a/pkg/domain/infra/abi/parse/parse.go +++ b/pkg/domain/infra/abi/parse/parse.go @@ -4,8 +4,8 @@ import ( "strconv" "strings" - "github.com/containers/libpod/v2/libpod" - "github.com/containers/libpod/v2/libpod/define" + "github.com/containers/podman/v2/libpod" + "github.com/containers/podman/v2/libpod/define" "github.com/pkg/errors" "github.com/sirupsen/logrus" ) diff --git a/pkg/domain/infra/abi/play.go b/pkg/domain/infra/abi/play.go index 52a62a25d..4ebc37cda 100644 --- a/pkg/domain/infra/abi/play.go +++ b/pkg/domain/infra/abi/play.go @@ -11,15 +11,15 @@ import ( "github.com/containers/buildah/pkg/parse" "github.com/containers/image/v5/types" - "github.com/containers/libpod/v2/libpod" - "github.com/containers/libpod/v2/libpod/image" - ann "github.com/containers/libpod/v2/pkg/annotations" - "github.com/containers/libpod/v2/pkg/domain/entities" - envLib "github.com/containers/libpod/v2/pkg/env" - ns "github.com/containers/libpod/v2/pkg/namespaces" - createconfig "github.com/containers/libpod/v2/pkg/spec" - "github.com/containers/libpod/v2/pkg/specgen/generate" - "github.com/containers/libpod/v2/pkg/util" + "github.com/containers/podman/v2/libpod" + "github.com/containers/podman/v2/libpod/image" + ann "github.com/containers/podman/v2/pkg/annotations" + "github.com/containers/podman/v2/pkg/domain/entities" + envLib "github.com/containers/podman/v2/pkg/env" + ns "github.com/containers/podman/v2/pkg/namespaces" + createconfig "github.com/containers/podman/v2/pkg/spec" + "github.com/containers/podman/v2/pkg/specgen/generate" + "github.com/containers/podman/v2/pkg/util" "github.com/containers/storage" "github.com/cri-o/ocicni/pkg/ocicni" "github.com/docker/distribution/reference" diff --git a/pkg/domain/infra/abi/pods.go b/pkg/domain/infra/abi/pods.go index d1f465362..747da9fd4 100644 --- a/pkg/domain/infra/abi/pods.go +++ b/pkg/domain/infra/abi/pods.go @@ -3,13 +3,13 @@ package abi import ( "context" - "github.com/containers/libpod/v2/libpod" - "github.com/containers/libpod/v2/libpod/define" - lpfilters "github.com/containers/libpod/v2/libpod/filters" - "github.com/containers/libpod/v2/pkg/domain/entities" - "github.com/containers/libpod/v2/pkg/signal" - "github.com/containers/libpod/v2/pkg/specgen" - "github.com/containers/libpod/v2/pkg/specgen/generate" + "github.com/containers/podman/v2/libpod" + "github.com/containers/podman/v2/libpod/define" + lpfilters "github.com/containers/podman/v2/libpod/filters" + "github.com/containers/podman/v2/pkg/domain/entities" + "github.com/containers/podman/v2/pkg/signal" + "github.com/containers/podman/v2/pkg/specgen" + "github.com/containers/podman/v2/pkg/specgen/generate" "github.com/pkg/errors" "github.com/sirupsen/logrus" ) diff --git a/pkg/domain/infra/abi/pods_stats.go b/pkg/domain/infra/abi/pods_stats.go index 4cab6bea6..16c10710a 100644 --- a/pkg/domain/infra/abi/pods_stats.go +++ b/pkg/domain/infra/abi/pods_stats.go @@ -4,11 +4,11 @@ import ( "context" "fmt" - "github.com/containers/libpod/v2/libpod" - "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/libpod" + "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" ) diff --git a/pkg/domain/infra/abi/runtime.go b/pkg/domain/infra/abi/runtime.go index 9fc089b41..3eab16479 100644 --- a/pkg/domain/infra/abi/runtime.go +++ b/pkg/domain/infra/abi/runtime.go @@ -3,7 +3,7 @@ package abi import ( "sync" - "github.com/containers/libpod/v2/libpod" + "github.com/containers/podman/v2/libpod" ) // Image-related runtime linked against libpod library diff --git a/pkg/domain/infra/abi/system.go b/pkg/domain/infra/abi/system.go index 9727f1d4e..71fe478fd 100644 --- a/pkg/domain/infra/abi/system.go +++ b/pkg/domain/infra/abi/system.go @@ -10,12 +10,12 @@ import ( "strconv" "github.com/containers/common/pkg/config" - "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/pkg/util" - "github.com/containers/libpod/v2/utils" + "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/pkg/util" + "github.com/containers/podman/v2/utils" "github.com/docker/distribution/reference" "github.com/pkg/errors" "github.com/sirupsen/logrus" diff --git a/pkg/domain/infra/abi/system_novalink.go b/pkg/domain/infra/abi/system_novalink.go index 34c1c0463..3518e9db6 100644 --- a/pkg/domain/infra/abi/system_novalink.go +++ b/pkg/domain/infra/abi/system_novalink.go @@ -5,7 +5,7 @@ package abi import ( "context" - "github.com/containers/libpod/v2/pkg/domain/entities" + "github.com/containers/podman/v2/pkg/domain/entities" "github.com/pkg/errors" ) diff --git a/pkg/domain/infra/abi/system_varlink.go b/pkg/domain/infra/abi/system_varlink.go index 25722986d..d0a5c5407 100644 --- a/pkg/domain/infra/abi/system_varlink.go +++ b/pkg/domain/infra/abi/system_varlink.go @@ -5,10 +5,10 @@ package abi import ( "context" - "github.com/containers/libpod/v2/pkg/domain/entities" - iopodman "github.com/containers/libpod/v2/pkg/varlink" - iopodmanAPI "github.com/containers/libpod/v2/pkg/varlinkapi" - "github.com/containers/libpod/v2/version" + "github.com/containers/podman/v2/pkg/domain/entities" + iopodman "github.com/containers/podman/v2/pkg/varlink" + iopodmanAPI "github.com/containers/podman/v2/pkg/varlinkapi" + "github.com/containers/podman/v2/version" "github.com/pkg/errors" "github.com/sirupsen/logrus" "github.com/varlink/go/varlink" @@ -23,7 +23,7 @@ func (ic *ContainerEngine) VarlinkService(_ context.Context, opts entities.Servi "Atomic", "podman", version.Version, - "https://github.com/containers/libpod", + "https://github.com/containers/podman", ) if err != nil { return errors.Wrapf(err, "unable to create new varlink service") diff --git a/pkg/domain/infra/abi/terminal/sigproxy_linux.go b/pkg/domain/infra/abi/terminal/sigproxy_linux.go index 973efbc0e..f484e926c 100644 --- a/pkg/domain/infra/abi/terminal/sigproxy_linux.go +++ b/pkg/domain/infra/abi/terminal/sigproxy_linux.go @@ -4,8 +4,8 @@ import ( "os" "syscall" - "github.com/containers/libpod/v2/libpod" - "github.com/containers/libpod/v2/pkg/signal" + "github.com/containers/podman/v2/libpod" + "github.com/containers/podman/v2/pkg/signal" "github.com/sirupsen/logrus" ) @@ -22,7 +22,7 @@ func ProxySignals(ctr *libpod.Container) { // intended for the podman command itself. // SIGURG was added because of golang 1.14 and its preemptive changes // causing more signals to "show up". - // https://github.com/containers/libpod/issues/5483 + // https://github.com/containers/podman/issues/5483 if s == syscall.SIGCHLD || s == syscall.SIGPIPE || s == syscall.SIGURG { continue } diff --git a/pkg/domain/infra/abi/terminal/terminal.go b/pkg/domain/infra/abi/terminal/terminal.go index bd78729e7..0b6e57f49 100644 --- a/pkg/domain/infra/abi/terminal/terminal.go +++ b/pkg/domain/infra/abi/terminal/terminal.go @@ -5,7 +5,7 @@ import ( "os" "os/signal" - lsignal "github.com/containers/libpod/v2/pkg/signal" + lsignal "github.com/containers/podman/v2/pkg/signal" "github.com/docker/docker/pkg/term" "github.com/pkg/errors" "github.com/sirupsen/logrus" diff --git a/pkg/domain/infra/abi/terminal/terminal_linux.go b/pkg/domain/infra/abi/terminal/terminal_linux.go index 5575c6d11..8886625a6 100644 --- a/pkg/domain/infra/abi/terminal/terminal_linux.go +++ b/pkg/domain/infra/abi/terminal/terminal_linux.go @@ -6,8 +6,8 @@ import ( "fmt" "os" - "github.com/containers/libpod/v2/libpod" - "github.com/containers/libpod/v2/libpod/define" + "github.com/containers/podman/v2/libpod" + "github.com/containers/podman/v2/libpod/define" "github.com/pkg/errors" "github.com/sirupsen/logrus" "golang.org/x/crypto/ssh/terminal" diff --git a/pkg/domain/infra/abi/trust.go b/pkg/domain/infra/abi/trust.go index 44165c6f7..c697722ee 100644 --- a/pkg/domain/infra/abi/trust.go +++ b/pkg/domain/infra/abi/trust.go @@ -7,8 +7,8 @@ import ( "os" "strings" - "github.com/containers/libpod/v2/pkg/domain/entities" - "github.com/containers/libpod/v2/pkg/trust" + "github.com/containers/podman/v2/pkg/domain/entities" + "github.com/containers/podman/v2/pkg/trust" "github.com/pkg/errors" "github.com/sirupsen/logrus" ) diff --git a/pkg/domain/infra/abi/volumes.go b/pkg/domain/infra/abi/volumes.go index 8db89899e..340f00953 100644 --- a/pkg/domain/infra/abi/volumes.go +++ b/pkg/domain/infra/abi/volumes.go @@ -3,10 +3,10 @@ package abi import ( "context" - "github.com/containers/libpod/v2/libpod" - "github.com/containers/libpod/v2/pkg/domain/entities" - "github.com/containers/libpod/v2/pkg/domain/filters" - "github.com/containers/libpod/v2/pkg/domain/infra/abi/parse" + "github.com/containers/podman/v2/libpod" + "github.com/containers/podman/v2/pkg/domain/entities" + "github.com/containers/podman/v2/pkg/domain/filters" + "github.com/containers/podman/v2/pkg/domain/infra/abi/parse" "github.com/pkg/errors" ) diff --git a/pkg/domain/infra/runtime_abi.go b/pkg/domain/infra/runtime_abi.go index bf9de362d..3a64cb72a 100644 --- a/pkg/domain/infra/runtime_abi.go +++ b/pkg/domain/infra/runtime_abi.go @@ -6,11 +6,11 @@ import ( "context" "fmt" - "github.com/containers/libpod/v2/libpod" - "github.com/containers/libpod/v2/pkg/bindings" - "github.com/containers/libpod/v2/pkg/domain/entities" - "github.com/containers/libpod/v2/pkg/domain/infra/abi" - "github.com/containers/libpod/v2/pkg/domain/infra/tunnel" + "github.com/containers/podman/v2/libpod" + "github.com/containers/podman/v2/pkg/bindings" + "github.com/containers/podman/v2/pkg/domain/entities" + "github.com/containers/podman/v2/pkg/domain/infra/abi" + "github.com/containers/podman/v2/pkg/domain/infra/tunnel" ) // NewContainerEngine factory provides a libpod runtime for container-related operations diff --git a/pkg/domain/infra/runtime_abi_unsupported.go b/pkg/domain/infra/runtime_abi_unsupported.go index 01cc904de..bac552b1e 100644 --- a/pkg/domain/infra/runtime_abi_unsupported.go +++ b/pkg/domain/infra/runtime_abi_unsupported.go @@ -5,7 +5,7 @@ package infra import ( "errors" - "github.com/containers/libpod/v2/pkg/domain/entities" + "github.com/containers/podman/v2/pkg/domain/entities" ) // NewSystemEngine factory provides a libpod runtime for specialized system operations diff --git a/pkg/domain/infra/runtime_libpod.go b/pkg/domain/infra/runtime_libpod.go index 7b6591fd8..a88347e24 100644 --- a/pkg/domain/infra/runtime_libpod.go +++ b/pkg/domain/infra/runtime_libpod.go @@ -8,11 +8,11 @@ import ( "os" "sync" - "github.com/containers/libpod/v2/libpod" - "github.com/containers/libpod/v2/pkg/cgroups" - "github.com/containers/libpod/v2/pkg/domain/entities" - "github.com/containers/libpod/v2/pkg/namespaces" - "github.com/containers/libpod/v2/pkg/rootless" + "github.com/containers/podman/v2/libpod" + "github.com/containers/podman/v2/pkg/cgroups" + "github.com/containers/podman/v2/pkg/domain/entities" + "github.com/containers/podman/v2/pkg/namespaces" + "github.com/containers/podman/v2/pkg/rootless" "github.com/containers/storage" "github.com/containers/storage/pkg/idtools" "github.com/pkg/errors" diff --git a/pkg/domain/infra/runtime_proxy.go b/pkg/domain/infra/runtime_proxy.go index bce8d1e2a..897dbbfc0 100644 --- a/pkg/domain/infra/runtime_proxy.go +++ b/pkg/domain/infra/runtime_proxy.go @@ -5,8 +5,8 @@ package infra import ( "context" - "github.com/containers/libpod/v2/pkg/domain/entities" - "github.com/containers/libpod/v2/pkg/domain/infra/abi" + "github.com/containers/podman/v2/pkg/domain/entities" + "github.com/containers/podman/v2/pkg/domain/infra/abi" flag "github.com/spf13/pflag" ) diff --git a/pkg/domain/infra/runtime_tunnel.go b/pkg/domain/infra/runtime_tunnel.go index fe45b0418..6c85e837e 100644 --- a/pkg/domain/infra/runtime_tunnel.go +++ b/pkg/domain/infra/runtime_tunnel.go @@ -6,9 +6,9 @@ import ( "context" "fmt" - "github.com/containers/libpod/v2/pkg/bindings" - "github.com/containers/libpod/v2/pkg/domain/entities" - "github.com/containers/libpod/v2/pkg/domain/infra/tunnel" + "github.com/containers/podman/v2/pkg/bindings" + "github.com/containers/podman/v2/pkg/domain/entities" + "github.com/containers/podman/v2/pkg/domain/infra/tunnel" ) func NewContainerEngine(facts *entities.PodmanConfig) (entities.ContainerEngine, error) { diff --git a/pkg/domain/infra/tunnel/auto-update.go b/pkg/domain/infra/tunnel/auto-update.go index 0aaceaabd..0ebd07588 100644 --- a/pkg/domain/infra/tunnel/auto-update.go +++ b/pkg/domain/infra/tunnel/auto-update.go @@ -3,7 +3,7 @@ package tunnel import ( "context" - "github.com/containers/libpod/v2/pkg/domain/entities" + "github.com/containers/podman/v2/pkg/domain/entities" "github.com/pkg/errors" ) diff --git a/pkg/domain/infra/tunnel/containers.go b/pkg/domain/infra/tunnel/containers.go index 4ee709e37..1fad67b86 100644 --- a/pkg/domain/infra/tunnel/containers.go +++ b/pkg/domain/infra/tunnel/containers.go @@ -12,12 +12,12 @@ import ( "github.com/containers/common/pkg/config" "github.com/containers/image/v5/docker/reference" - "github.com/containers/libpod/v2/libpod/define" - "github.com/containers/libpod/v2/pkg/api/handlers" - "github.com/containers/libpod/v2/pkg/bindings" - "github.com/containers/libpod/v2/pkg/bindings/containers" - "github.com/containers/libpod/v2/pkg/domain/entities" - "github.com/containers/libpod/v2/pkg/specgen" + "github.com/containers/podman/v2/libpod/define" + "github.com/containers/podman/v2/pkg/api/handlers" + "github.com/containers/podman/v2/pkg/bindings" + "github.com/containers/podman/v2/pkg/bindings/containers" + "github.com/containers/podman/v2/pkg/domain/entities" + "github.com/containers/podman/v2/pkg/specgen" "github.com/pkg/errors" "github.com/sirupsen/logrus" ) diff --git a/pkg/domain/infra/tunnel/events.go b/pkg/domain/infra/tunnel/events.go index 03a5e9f6a..e6f4834b9 100644 --- a/pkg/domain/infra/tunnel/events.go +++ b/pkg/domain/infra/tunnel/events.go @@ -4,8 +4,8 @@ import ( "context" "strings" - "github.com/containers/libpod/v2/pkg/bindings/system" - "github.com/containers/libpod/v2/pkg/domain/entities" + "github.com/containers/podman/v2/pkg/bindings/system" + "github.com/containers/podman/v2/pkg/domain/entities" "github.com/pkg/errors" ) diff --git a/pkg/domain/infra/tunnel/generate.go b/pkg/domain/infra/tunnel/generate.go index 1f6e35142..c7d5cd9e2 100644 --- a/pkg/domain/infra/tunnel/generate.go +++ b/pkg/domain/infra/tunnel/generate.go @@ -3,8 +3,8 @@ package tunnel import ( "context" - "github.com/containers/libpod/v2/pkg/bindings/generate" - "github.com/containers/libpod/v2/pkg/domain/entities" + "github.com/containers/podman/v2/pkg/bindings/generate" + "github.com/containers/podman/v2/pkg/domain/entities" "github.com/pkg/errors" ) diff --git a/pkg/domain/infra/tunnel/healthcheck.go b/pkg/domain/infra/tunnel/healthcheck.go index f3dbf9803..ac28712ce 100644 --- a/pkg/domain/infra/tunnel/healthcheck.go +++ b/pkg/domain/infra/tunnel/healthcheck.go @@ -3,9 +3,9 @@ package tunnel import ( "context" - "github.com/containers/libpod/v2/libpod/define" - "github.com/containers/libpod/v2/pkg/bindings/containers" - "github.com/containers/libpod/v2/pkg/domain/entities" + "github.com/containers/podman/v2/libpod/define" + "github.com/containers/podman/v2/pkg/bindings/containers" + "github.com/containers/podman/v2/pkg/domain/entities" ) func (ic *ContainerEngine) HealthCheckRun(ctx context.Context, nameOrID string, options entities.HealthCheckOptions) (*define.HealthCheckResults, error) { diff --git a/pkg/domain/infra/tunnel/helpers.go b/pkg/domain/infra/tunnel/helpers.go index 9974c4d1d..91a49cd02 100644 --- a/pkg/domain/infra/tunnel/helpers.go +++ b/pkg/domain/infra/tunnel/helpers.go @@ -4,12 +4,12 @@ import ( "context" "strings" - "github.com/containers/libpod/v2/libpod/define" - "github.com/containers/libpod/v2/pkg/bindings" - "github.com/containers/libpod/v2/pkg/bindings/containers" - "github.com/containers/libpod/v2/pkg/bindings/pods" - "github.com/containers/libpod/v2/pkg/domain/entities" - "github.com/containers/libpod/v2/pkg/util" + "github.com/containers/podman/v2/libpod/define" + "github.com/containers/podman/v2/pkg/bindings" + "github.com/containers/podman/v2/pkg/bindings/containers" + "github.com/containers/podman/v2/pkg/bindings/pods" + "github.com/containers/podman/v2/pkg/domain/entities" + "github.com/containers/podman/v2/pkg/util" "github.com/pkg/errors" ) diff --git a/pkg/domain/infra/tunnel/images.go b/pkg/domain/infra/tunnel/images.go index bfe5fbec3..6407724b5 100644 --- a/pkg/domain/infra/tunnel/images.go +++ b/pkg/domain/infra/tunnel/images.go @@ -12,11 +12,11 @@ import ( "github.com/containers/common/pkg/config" "github.com/containers/image/v5/docker/reference" - "github.com/containers/libpod/v2/pkg/bindings" - images "github.com/containers/libpod/v2/pkg/bindings/images" - "github.com/containers/libpod/v2/pkg/domain/entities" - "github.com/containers/libpod/v2/pkg/domain/utils" - utils2 "github.com/containers/libpod/v2/utils" + "github.com/containers/podman/v2/pkg/bindings" + images "github.com/containers/podman/v2/pkg/bindings/images" + "github.com/containers/podman/v2/pkg/domain/entities" + "github.com/containers/podman/v2/pkg/domain/utils" + utils2 "github.com/containers/podman/v2/utils" "github.com/containers/storage/pkg/archive" "github.com/pkg/errors" "github.com/sirupsen/logrus" diff --git a/pkg/domain/infra/tunnel/manifest.go b/pkg/domain/infra/tunnel/manifest.go index a7447221c..a09b502b4 100644 --- a/pkg/domain/infra/tunnel/manifest.go +++ b/pkg/domain/infra/tunnel/manifest.go @@ -6,9 +6,9 @@ import ( "fmt" "strings" - "github.com/containers/libpod/v2/libpod/image" - "github.com/containers/libpod/v2/pkg/bindings/manifests" - "github.com/containers/libpod/v2/pkg/domain/entities" + "github.com/containers/podman/v2/libpod/image" + "github.com/containers/podman/v2/pkg/bindings/manifests" + "github.com/containers/podman/v2/pkg/domain/entities" "github.com/pkg/errors" ) diff --git a/pkg/domain/infra/tunnel/network.go b/pkg/domain/infra/tunnel/network.go index b25ef0b14..2b197cac0 100644 --- a/pkg/domain/infra/tunnel/network.go +++ b/pkg/domain/infra/tunnel/network.go @@ -3,8 +3,8 @@ package tunnel import ( "context" - "github.com/containers/libpod/v2/pkg/bindings/network" - "github.com/containers/libpod/v2/pkg/domain/entities" + "github.com/containers/podman/v2/pkg/bindings/network" + "github.com/containers/podman/v2/pkg/domain/entities" ) func (ic *ContainerEngine) NetworkList(ctx context.Context, options entities.NetworkListOptions) ([]*entities.NetworkListReport, error) { diff --git a/pkg/domain/infra/tunnel/play.go b/pkg/domain/infra/tunnel/play.go index 8a532af42..26f23093b 100644 --- a/pkg/domain/infra/tunnel/play.go +++ b/pkg/domain/infra/tunnel/play.go @@ -3,8 +3,8 @@ package tunnel import ( "context" - "github.com/containers/libpod/v2/pkg/bindings/play" - "github.com/containers/libpod/v2/pkg/domain/entities" + "github.com/containers/podman/v2/pkg/bindings/play" + "github.com/containers/podman/v2/pkg/domain/entities" ) func (ic *ContainerEngine) PlayKube(ctx context.Context, path string, options entities.PlayKubeOptions) (*entities.PlayKubeReport, error) { diff --git a/pkg/domain/infra/tunnel/pods.go b/pkg/domain/infra/tunnel/pods.go index edfda48f5..ee4978787 100644 --- a/pkg/domain/infra/tunnel/pods.go +++ b/pkg/domain/infra/tunnel/pods.go @@ -3,11 +3,11 @@ package tunnel import ( "context" - "github.com/containers/libpod/v2/libpod/define" - "github.com/containers/libpod/v2/pkg/bindings/pods" - "github.com/containers/libpod/v2/pkg/domain/entities" - "github.com/containers/libpod/v2/pkg/specgen" - "github.com/containers/libpod/v2/pkg/util" + "github.com/containers/podman/v2/libpod/define" + "github.com/containers/podman/v2/pkg/bindings/pods" + "github.com/containers/podman/v2/pkg/domain/entities" + "github.com/containers/podman/v2/pkg/specgen" + "github.com/containers/podman/v2/pkg/util" "github.com/pkg/errors" ) diff --git a/pkg/domain/infra/tunnel/system.go b/pkg/domain/infra/tunnel/system.go index f128ab526..c276e15c5 100644 --- a/pkg/domain/infra/tunnel/system.go +++ b/pkg/domain/infra/tunnel/system.go @@ -4,9 +4,9 @@ import ( "context" "errors" - "github.com/containers/libpod/v2/libpod/define" - "github.com/containers/libpod/v2/pkg/bindings/system" - "github.com/containers/libpod/v2/pkg/domain/entities" + "github.com/containers/podman/v2/libpod/define" + "github.com/containers/podman/v2/pkg/bindings/system" + "github.com/containers/podman/v2/pkg/domain/entities" "github.com/spf13/cobra" ) diff --git a/pkg/domain/infra/tunnel/trust.go b/pkg/domain/infra/tunnel/trust.go index bcd186e31..cf0faaf67 100644 --- a/pkg/domain/infra/tunnel/trust.go +++ b/pkg/domain/infra/tunnel/trust.go @@ -4,7 +4,7 @@ import ( "context" "errors" - "github.com/containers/libpod/v2/pkg/domain/entities" + "github.com/containers/podman/v2/pkg/domain/entities" ) func (ir *ImageEngine) ShowTrust(ctx context.Context, args []string, options entities.ShowTrustOptions) (*entities.ShowTrustReport, error) { diff --git a/pkg/domain/infra/tunnel/volumes.go b/pkg/domain/infra/tunnel/volumes.go index e8cf2ae5a..ee2786330 100644 --- a/pkg/domain/infra/tunnel/volumes.go +++ b/pkg/domain/infra/tunnel/volumes.go @@ -3,8 +3,8 @@ package tunnel import ( "context" - "github.com/containers/libpod/v2/pkg/bindings/volumes" - "github.com/containers/libpod/v2/pkg/domain/entities" + "github.com/containers/podman/v2/pkg/bindings/volumes" + "github.com/containers/podman/v2/pkg/domain/entities" ) func (ic *ContainerEngine) VolumeCreate(ctx context.Context, opts entities.VolumeCreateOptions) (*entities.IDOrNameResponse, error) { diff --git a/pkg/hooks/0.1.0/hook.go b/pkg/hooks/0.1.0/hook.go index 872b56c7d..97eec8bb1 100644 --- a/pkg/hooks/0.1.0/hook.go +++ b/pkg/hooks/0.1.0/hook.go @@ -6,7 +6,7 @@ import ( "errors" "strings" - current "github.com/containers/libpod/v2/pkg/hooks/1.0.0" + current "github.com/containers/podman/v2/pkg/hooks/1.0.0" rspec "github.com/opencontainers/runtime-spec/specs-go" ) diff --git a/pkg/hooks/0.1.0/hook_test.go b/pkg/hooks/0.1.0/hook_test.go index 53c7f18a7..dcc083f97 100644 --- a/pkg/hooks/0.1.0/hook_test.go +++ b/pkg/hooks/0.1.0/hook_test.go @@ -3,7 +3,7 @@ package hook import ( "testing" - current "github.com/containers/libpod/v2/pkg/hooks/1.0.0" + current "github.com/containers/podman/v2/pkg/hooks/1.0.0" rspec "github.com/opencontainers/runtime-spec/specs-go" "github.com/stretchr/testify/assert" ) diff --git a/pkg/hooks/hooks.go b/pkg/hooks/hooks.go index fa6a3e128..2a12eceac 100644 --- a/pkg/hooks/hooks.go +++ b/pkg/hooks/hooks.go @@ -9,7 +9,7 @@ import ( "strings" "sync" - current "github.com/containers/libpod/v2/pkg/hooks/1.0.0" + current "github.com/containers/podman/v2/pkg/hooks/1.0.0" rspec "github.com/opencontainers/runtime-spec/specs-go" "github.com/pkg/errors" "github.com/sirupsen/logrus" diff --git a/pkg/hooks/hooks_test.go b/pkg/hooks/hooks_test.go index b9be45fda..a2a110cf5 100644 --- a/pkg/hooks/hooks_test.go +++ b/pkg/hooks/hooks_test.go @@ -9,7 +9,7 @@ import ( "runtime" "testing" - current "github.com/containers/libpod/v2/pkg/hooks/1.0.0" + current "github.com/containers/podman/v2/pkg/hooks/1.0.0" rspec "github.com/opencontainers/runtime-spec/specs-go" "github.com/stretchr/testify/assert" ) diff --git a/pkg/hooks/monitor.go b/pkg/hooks/monitor.go index cfec02c72..5fa93c93a 100644 --- a/pkg/hooks/monitor.go +++ b/pkg/hooks/monitor.go @@ -3,7 +3,7 @@ package hooks import ( "context" - current "github.com/containers/libpod/v2/pkg/hooks/1.0.0" + current "github.com/containers/podman/v2/pkg/hooks/1.0.0" "github.com/fsnotify/fsnotify" "github.com/sirupsen/logrus" ) diff --git a/pkg/hooks/read.go b/pkg/hooks/read.go index 905496f7e..fec37bc6a 100644 --- a/pkg/hooks/read.go +++ b/pkg/hooks/read.go @@ -8,8 +8,8 @@ import ( "path/filepath" "strings" - old "github.com/containers/libpod/v2/pkg/hooks/0.1.0" - current "github.com/containers/libpod/v2/pkg/hooks/1.0.0" + old "github.com/containers/podman/v2/pkg/hooks/0.1.0" + current "github.com/containers/podman/v2/pkg/hooks/1.0.0" "github.com/pkg/errors" "github.com/sirupsen/logrus" ) diff --git a/pkg/hooks/read_test.go b/pkg/hooks/read_test.go index 29b2bea9d..ef145f0eb 100644 --- a/pkg/hooks/read_test.go +++ b/pkg/hooks/read_test.go @@ -7,7 +7,7 @@ import ( "path/filepath" "testing" - current "github.com/containers/libpod/v2/pkg/hooks/1.0.0" + current "github.com/containers/podman/v2/pkg/hooks/1.0.0" rspec "github.com/opencontainers/runtime-spec/specs-go" "github.com/stretchr/testify/assert" ) diff --git a/pkg/inspect/inspect.go b/pkg/inspect/inspect.go index 1d95a4dd6..27bff46a0 100644 --- a/pkg/inspect/inspect.go +++ b/pkg/inspect/inspect.go @@ -4,7 +4,7 @@ import ( "time" "github.com/containers/image/v5/manifest" - "github.com/containers/libpod/v2/libpod/driver" + "github.com/containers/podman/v2/libpod/driver" "github.com/opencontainers/go-digest" v1 "github.com/opencontainers/image-spec/specs-go/v1" ) diff --git a/pkg/netns/netns_linux.go b/pkg/netns/netns_linux.go index a90099b0e..ff5691203 100644 --- a/pkg/netns/netns_linux.go +++ b/pkg/netns/netns_linux.go @@ -29,8 +29,8 @@ import ( "sync" "github.com/containernetworking/plugins/pkg/ns" - "github.com/containers/libpod/v2/pkg/rootless" - "github.com/containers/libpod/v2/pkg/util" + "github.com/containers/podman/v2/pkg/rootless" + "github.com/containers/podman/v2/pkg/util" "github.com/sirupsen/logrus" "golang.org/x/sys/unix" ) diff --git a/pkg/network/devices.go b/pkg/network/devices.go index e45cc317e..a5d23fae4 100644 --- a/pkg/network/devices.go +++ b/pkg/network/devices.go @@ -5,8 +5,8 @@ import ( "os/exec" "github.com/containers/common/pkg/config" - "github.com/containers/libpod/v2/pkg/util" - "github.com/containers/libpod/v2/utils" + "github.com/containers/podman/v2/pkg/util" + "github.com/containers/podman/v2/utils" "github.com/sirupsen/logrus" ) diff --git a/pkg/network/network.go b/pkg/network/network.go index cbebb0be8..6c84c8a8a 100644 --- a/pkg/network/network.go +++ b/pkg/network/network.go @@ -8,7 +8,7 @@ import ( "github.com/containernetworking/cni/pkg/types" "github.com/containernetworking/plugins/plugins/ipam/host-local/backend/allocator" "github.com/containers/common/pkg/config" - "github.com/containers/libpod/v2/pkg/util" + "github.com/containers/podman/v2/pkg/util" "github.com/pkg/errors" "github.com/sirupsen/logrus" ) diff --git a/pkg/parallel/parallel_linux.go b/pkg/parallel/parallel_linux.go index b80989d41..442db1502 100644 --- a/pkg/parallel/parallel_linux.go +++ b/pkg/parallel/parallel_linux.go @@ -4,7 +4,7 @@ import ( "context" "sync" - "github.com/containers/libpod/v2/libpod" + "github.com/containers/podman/v2/libpod" "github.com/pkg/errors" "github.com/sirupsen/logrus" ) diff --git a/pkg/ps/ps.go b/pkg/ps/ps.go index 2b81311af..8163d7247 100644 --- a/pkg/ps/ps.go +++ b/pkg/ps/ps.go @@ -9,11 +9,11 @@ import ( "strings" "time" - "github.com/containers/libpod/v2/libpod" - "github.com/containers/libpod/v2/libpod/define" - lpfilters "github.com/containers/libpod/v2/libpod/filters" - "github.com/containers/libpod/v2/pkg/domain/entities" - psdefine "github.com/containers/libpod/v2/pkg/ps/define" + "github.com/containers/podman/v2/libpod" + "github.com/containers/podman/v2/libpod/define" + lpfilters "github.com/containers/podman/v2/libpod/filters" + "github.com/containers/podman/v2/pkg/domain/entities" + psdefine "github.com/containers/podman/v2/pkg/ps/define" "github.com/pkg/errors" "github.com/sirupsen/logrus" ) diff --git a/pkg/registrar/registrar_test.go b/pkg/registrar/registrar_test.go index 3a9b3af87..4b13b9365 100644 --- a/pkg/registrar/registrar_test.go +++ b/pkg/registrar/registrar_test.go @@ -3,8 +3,8 @@ package registrar_test import ( "testing" - "github.com/containers/libpod/v2/pkg/registrar" - . "github.com/containers/libpod/v2/test/framework" + "github.com/containers/podman/v2/pkg/registrar" + . "github.com/containers/podman/v2/test/framework" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" ) diff --git a/pkg/registries/registries.go b/pkg/registries/registries.go index ab7accd5e..5dff25c7d 100644 --- a/pkg/registries/registries.go +++ b/pkg/registries/registries.go @@ -6,7 +6,7 @@ import ( "github.com/containers/image/v5/pkg/sysregistriesv2" "github.com/containers/image/v5/types" - "github.com/containers/libpod/v2/pkg/rootless" + "github.com/containers/podman/v2/pkg/rootless" "github.com/pkg/errors" ) diff --git a/pkg/resolvconf/resolvconf.go b/pkg/resolvconf/resolvconf.go index 45625b7a9..27564439e 100644 --- a/pkg/resolvconf/resolvconf.go +++ b/pkg/resolvconf/resolvconf.go @@ -9,7 +9,7 @@ import ( "strings" "sync" - "github.com/containers/libpod/v2/pkg/resolvconf/dns" + "github.com/containers/podman/v2/pkg/resolvconf/dns" "github.com/containers/storage/pkg/ioutils" "github.com/sirupsen/logrus" ) diff --git a/pkg/rootless/rootless_linux.go b/pkg/rootless/rootless_linux.go index 2e580347d..b1f200cc2 100644 --- a/pkg/rootless/rootless_linux.go +++ b/pkg/rootless/rootless_linux.go @@ -16,7 +16,7 @@ import ( "sync" "unsafe" - "github.com/containers/libpod/v2/pkg/errorhandling" + "github.com/containers/podman/v2/pkg/errorhandling" "github.com/containers/storage/pkg/idtools" "github.com/pkg/errors" "github.com/sirupsen/logrus" diff --git a/pkg/spec/config_linux.go b/pkg/spec/config_linux.go index 34cf9695c..d03663f12 100644 --- a/pkg/spec/config_linux.go +++ b/pkg/spec/config_linux.go @@ -10,7 +10,7 @@ import ( "strconv" "strings" - "github.com/containers/libpod/v2/pkg/rootless" + "github.com/containers/podman/v2/pkg/rootless" "github.com/opencontainers/runc/libcontainer/configs" "github.com/opencontainers/runc/libcontainer/devices" spec "github.com/opencontainers/runtime-spec/specs-go" diff --git a/pkg/spec/config_linux_cgo.go b/pkg/spec/config_linux_cgo.go index 20f0e980c..186a3a788 100644 --- a/pkg/spec/config_linux_cgo.go +++ b/pkg/spec/config_linux_cgo.go @@ -5,7 +5,7 @@ package createconfig import ( "io/ioutil" - "github.com/containers/libpod/v2/pkg/seccomp" + "github.com/containers/podman/v2/pkg/seccomp" spec "github.com/opencontainers/runtime-spec/specs-go" "github.com/pkg/errors" goSeccomp "github.com/seccomp/containers-golang" diff --git a/pkg/spec/containerconfig.go b/pkg/spec/containerconfig.go index c0010471f..f11d85b7e 100644 --- a/pkg/spec/containerconfig.go +++ b/pkg/spec/containerconfig.go @@ -1,8 +1,8 @@ package createconfig import ( - "github.com/containers/libpod/v2/libpod" - "github.com/containers/libpod/v2/libpod/define" + "github.com/containers/podman/v2/libpod" + "github.com/containers/podman/v2/libpod/define" spec "github.com/opencontainers/runtime-spec/specs-go" "github.com/pkg/errors" "github.com/sirupsen/logrus" diff --git a/pkg/spec/createconfig.go b/pkg/spec/createconfig.go index 55c3238d2..40f9bc029 100644 --- a/pkg/spec/createconfig.go +++ b/pkg/spec/createconfig.go @@ -8,10 +8,10 @@ import ( "syscall" "github.com/containers/image/v5/manifest" - "github.com/containers/libpod/v2/libpod" - "github.com/containers/libpod/v2/libpod/define" - "github.com/containers/libpod/v2/pkg/namespaces" - "github.com/containers/libpod/v2/pkg/seccomp" + "github.com/containers/podman/v2/libpod" + "github.com/containers/podman/v2/libpod/define" + "github.com/containers/podman/v2/pkg/namespaces" + "github.com/containers/podman/v2/pkg/seccomp" "github.com/containers/storage" "github.com/docker/go-connections/nat" spec "github.com/opencontainers/runtime-spec/specs-go" diff --git a/pkg/spec/namespaces.go b/pkg/spec/namespaces.go index dd89e17a6..8f98a9786 100644 --- a/pkg/spec/namespaces.go +++ b/pkg/spec/namespaces.go @@ -6,9 +6,9 @@ import ( "strconv" "strings" - "github.com/containers/libpod/v2/libpod" - "github.com/containers/libpod/v2/libpod/define" - "github.com/containers/libpod/v2/pkg/cgroups" + "github.com/containers/podman/v2/libpod" + "github.com/containers/podman/v2/libpod/define" + "github.com/containers/podman/v2/pkg/cgroups" "github.com/cri-o/ocicni/pkg/ocicni" "github.com/docker/go-connections/nat" spec "github.com/opencontainers/runtime-spec/specs-go" diff --git a/pkg/spec/security.go b/pkg/spec/security.go index 63bd4d372..fc908b49d 100644 --- a/pkg/spec/security.go +++ b/pkg/spec/security.go @@ -5,9 +5,9 @@ import ( "strings" "github.com/containers/common/pkg/capabilities" - "github.com/containers/libpod/v2/libpod" - "github.com/containers/libpod/v2/libpod/define" - "github.com/containers/libpod/v2/pkg/util" + "github.com/containers/podman/v2/libpod" + "github.com/containers/podman/v2/libpod/define" + "github.com/containers/podman/v2/pkg/util" "github.com/opencontainers/runtime-tools/generate" "github.com/opencontainers/selinux/go-selinux/label" "github.com/pkg/errors" diff --git a/pkg/spec/spec.go b/pkg/spec/spec.go index b974772d5..c7a838d4c 100644 --- a/pkg/spec/spec.go +++ b/pkg/spec/spec.go @@ -6,12 +6,12 @@ import ( "github.com/containers/common/pkg/capabilities" cconfig "github.com/containers/common/pkg/config" "github.com/containers/common/pkg/sysinfo" - "github.com/containers/libpod/v2/libpod" - "github.com/containers/libpod/v2/libpod/define" - "github.com/containers/libpod/v2/pkg/cgroups" - "github.com/containers/libpod/v2/pkg/env" - "github.com/containers/libpod/v2/pkg/rootless" - "github.com/containers/libpod/v2/pkg/util" + "github.com/containers/podman/v2/libpod" + "github.com/containers/podman/v2/libpod/define" + "github.com/containers/podman/v2/pkg/cgroups" + "github.com/containers/podman/v2/pkg/env" + "github.com/containers/podman/v2/pkg/rootless" + "github.com/containers/podman/v2/pkg/util" "github.com/docker/go-units" "github.com/opencontainers/runc/libcontainer/user" spec "github.com/opencontainers/runtime-spec/specs-go" diff --git a/pkg/spec/spec_test.go b/pkg/spec/spec_test.go index 50d7e5914..d01102fa2 100644 --- a/pkg/spec/spec_test.go +++ b/pkg/spec/spec_test.go @@ -5,8 +5,8 @@ import ( "testing" "github.com/containers/common/pkg/sysinfo" - "github.com/containers/libpod/v2/pkg/cgroups" - "github.com/containers/libpod/v2/pkg/rootless" + "github.com/containers/podman/v2/pkg/cgroups" + "github.com/containers/podman/v2/pkg/rootless" "github.com/containers/storage" "github.com/containers/storage/pkg/idtools" "github.com/docker/go-units" diff --git a/pkg/spec/storage.go b/pkg/spec/storage.go index 8a7ecc4da..5e2f04e50 100644 --- a/pkg/spec/storage.go +++ b/pkg/spec/storage.go @@ -8,8 +8,8 @@ import ( "strings" "github.com/containers/buildah/pkg/parse" - "github.com/containers/libpod/v2/libpod" - "github.com/containers/libpod/v2/pkg/util" + "github.com/containers/podman/v2/libpod" + "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/pkg/specgen/config_unsupported.go b/pkg/specgen/config_unsupported.go index 6b6ba6181..85ff1e9fd 100644 --- a/pkg/specgen/config_unsupported.go +++ b/pkg/specgen/config_unsupported.go @@ -3,7 +3,7 @@ package specgen import ( - "github.com/containers/libpod/v2/libpod/image" + "github.com/containers/podman/v2/libpod/image" spec "github.com/opencontainers/runtime-spec/specs-go" "github.com/pkg/errors" ) diff --git a/pkg/specgen/container_validate.go b/pkg/specgen/container_validate.go index eddc4ad5d..1a1bb4526 100644 --- a/pkg/specgen/container_validate.go +++ b/pkg/specgen/container_validate.go @@ -3,9 +3,9 @@ package specgen import ( "strings" - "github.com/containers/libpod/v2/libpod/define" - "github.com/containers/libpod/v2/pkg/rootless" - "github.com/containers/libpod/v2/pkg/util" + "github.com/containers/podman/v2/libpod/define" + "github.com/containers/podman/v2/pkg/rootless" + "github.com/containers/podman/v2/pkg/util" "github.com/pkg/errors" ) diff --git a/pkg/specgen/generate/config_linux.go b/pkg/specgen/generate/config_linux.go index 9b6bd2827..35508c023 100644 --- a/pkg/specgen/generate/config_linux.go +++ b/pkg/specgen/generate/config_linux.go @@ -7,7 +7,7 @@ import ( "path/filepath" "strings" - "github.com/containers/libpod/v2/pkg/rootless" + "github.com/containers/podman/v2/pkg/rootless" spec "github.com/opencontainers/runtime-spec/specs-go" "github.com/opencontainers/runtime-tools/generate" "github.com/pkg/errors" diff --git a/pkg/specgen/generate/config_linux_cgo.go b/pkg/specgen/generate/config_linux_cgo.go index 7ea4278a2..f35d56750 100644 --- a/pkg/specgen/generate/config_linux_cgo.go +++ b/pkg/specgen/generate/config_linux_cgo.go @@ -6,9 +6,9 @@ import ( "context" "io/ioutil" - "github.com/containers/libpod/v2/libpod/image" - "github.com/containers/libpod/v2/pkg/seccomp" - "github.com/containers/libpod/v2/pkg/specgen" + "github.com/containers/podman/v2/libpod/image" + "github.com/containers/podman/v2/pkg/seccomp" + "github.com/containers/podman/v2/pkg/specgen" spec "github.com/opencontainers/runtime-spec/specs-go" "github.com/pkg/errors" goSeccomp "github.com/seccomp/containers-golang" diff --git a/pkg/specgen/generate/config_linux_nocgo.go b/pkg/specgen/generate/config_linux_nocgo.go index 8afd2f9dc..184122aeb 100644 --- a/pkg/specgen/generate/config_linux_nocgo.go +++ b/pkg/specgen/generate/config_linux_nocgo.go @@ -5,8 +5,8 @@ package generate import ( "errors" - "github.com/containers/libpod/v2/libpod/image" - "github.com/containers/libpod/v2/pkg/specgen" + "github.com/containers/podman/v2/libpod/image" + "github.com/containers/podman/v2/pkg/specgen" spec "github.com/opencontainers/runtime-spec/specs-go" ) diff --git a/pkg/specgen/generate/container.go b/pkg/specgen/generate/container.go index f0d52d0c3..65f8197bc 100644 --- a/pkg/specgen/generate/container.go +++ b/pkg/specgen/generate/container.go @@ -4,12 +4,12 @@ import ( "context" "github.com/containers/image/v5/manifest" - "github.com/containers/libpod/v2/libpod" - "github.com/containers/libpod/v2/libpod/image" - ann "github.com/containers/libpod/v2/pkg/annotations" - envLib "github.com/containers/libpod/v2/pkg/env" - "github.com/containers/libpod/v2/pkg/signal" - "github.com/containers/libpod/v2/pkg/specgen" + "github.com/containers/podman/v2/libpod" + "github.com/containers/podman/v2/libpod/image" + ann "github.com/containers/podman/v2/pkg/annotations" + envLib "github.com/containers/podman/v2/pkg/env" + "github.com/containers/podman/v2/pkg/signal" + "github.com/containers/podman/v2/pkg/specgen" spec "github.com/opencontainers/runtime-spec/specs-go" "github.com/pkg/errors" "golang.org/x/sys/unix" diff --git a/pkg/specgen/generate/container_create.go b/pkg/specgen/generate/container_create.go index 934d5fbac..9dfb35be3 100644 --- a/pkg/specgen/generate/container_create.go +++ b/pkg/specgen/generate/container_create.go @@ -6,10 +6,10 @@ import ( "path/filepath" "github.com/containers/common/pkg/config" - "github.com/containers/libpod/v2/libpod" - "github.com/containers/libpod/v2/libpod/image" - "github.com/containers/libpod/v2/pkg/specgen" - "github.com/containers/libpod/v2/pkg/util" + "github.com/containers/podman/v2/libpod" + "github.com/containers/podman/v2/libpod/image" + "github.com/containers/podman/v2/pkg/specgen" + "github.com/containers/podman/v2/pkg/util" "github.com/containers/storage" "github.com/pkg/errors" "github.com/sirupsen/logrus" diff --git a/pkg/specgen/generate/namespaces.go b/pkg/specgen/generate/namespaces.go index a19009bc2..b8ab1399e 100644 --- a/pkg/specgen/generate/namespaces.go +++ b/pkg/specgen/generate/namespaces.go @@ -7,12 +7,12 @@ import ( "strings" "github.com/containers/common/pkg/config" - "github.com/containers/libpod/v2/libpod" - "github.com/containers/libpod/v2/libpod/define" - "github.com/containers/libpod/v2/libpod/image" - "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/libpod" + "github.com/containers/podman/v2/libpod/define" + "github.com/containers/podman/v2/libpod/image" + "github.com/containers/podman/v2/pkg/rootless" + "github.com/containers/podman/v2/pkg/specgen" + "github.com/containers/podman/v2/pkg/util" spec "github.com/opencontainers/runtime-spec/specs-go" "github.com/opencontainers/runtime-tools/generate" "github.com/pkg/errors" diff --git a/pkg/specgen/generate/oci.go b/pkg/specgen/generate/oci.go index f279aac1c..78cd32253 100644 --- a/pkg/specgen/generate/oci.go +++ b/pkg/specgen/generate/oci.go @@ -5,11 +5,11 @@ import ( "strings" "github.com/containers/common/pkg/config" - "github.com/containers/libpod/v2/libpod" - "github.com/containers/libpod/v2/libpod/define" - "github.com/containers/libpod/v2/libpod/image" - "github.com/containers/libpod/v2/pkg/rootless" - "github.com/containers/libpod/v2/pkg/specgen" + "github.com/containers/podman/v2/libpod" + "github.com/containers/podman/v2/libpod/define" + "github.com/containers/podman/v2/libpod/image" + "github.com/containers/podman/v2/pkg/rootless" + "github.com/containers/podman/v2/pkg/specgen" "github.com/opencontainers/runc/libcontainer/user" spec "github.com/opencontainers/runtime-spec/specs-go" "github.com/opencontainers/runtime-tools/generate" diff --git a/pkg/specgen/generate/pod_create.go b/pkg/specgen/generate/pod_create.go index 4fe1b6435..0cbfca2db 100644 --- a/pkg/specgen/generate/pod_create.go +++ b/pkg/specgen/generate/pod_create.go @@ -3,8 +3,8 @@ package generate import ( "context" - "github.com/containers/libpod/v2/libpod" - "github.com/containers/libpod/v2/pkg/specgen" + "github.com/containers/podman/v2/libpod" + "github.com/containers/podman/v2/pkg/specgen" "github.com/pkg/errors" "github.com/sirupsen/logrus" ) diff --git a/pkg/specgen/generate/ports.go b/pkg/specgen/generate/ports.go index c8d1c27c5..1ad7e6f4d 100644 --- a/pkg/specgen/generate/ports.go +++ b/pkg/specgen/generate/ports.go @@ -6,8 +6,8 @@ import ( "strconv" "strings" - "github.com/containers/libpod/v2/libpod/image" - "github.com/containers/libpod/v2/pkg/specgen" + "github.com/containers/podman/v2/libpod/image" + "github.com/containers/podman/v2/pkg/specgen" "github.com/cri-o/ocicni/pkg/ocicni" "github.com/pkg/errors" "github.com/sirupsen/logrus" diff --git a/pkg/specgen/generate/security.go b/pkg/specgen/generate/security.go index fcd1622f9..4352ef718 100644 --- a/pkg/specgen/generate/security.go +++ b/pkg/specgen/generate/security.go @@ -6,10 +6,10 @@ import ( "github.com/containers/common/pkg/apparmor" "github.com/containers/common/pkg/capabilities" "github.com/containers/common/pkg/config" - "github.com/containers/libpod/v2/libpod" - "github.com/containers/libpod/v2/libpod/image" - "github.com/containers/libpod/v2/pkg/specgen" - "github.com/containers/libpod/v2/pkg/util" + "github.com/containers/podman/v2/libpod" + "github.com/containers/podman/v2/libpod/image" + "github.com/containers/podman/v2/pkg/specgen" + "github.com/containers/podman/v2/pkg/util" "github.com/opencontainers/runtime-tools/generate" "github.com/opencontainers/selinux/go-selinux/label" "github.com/pkg/errors" diff --git a/pkg/specgen/generate/storage.go b/pkg/specgen/generate/storage.go index f3b1a4e3d..182ae74a7 100644 --- a/pkg/specgen/generate/storage.go +++ b/pkg/specgen/generate/storage.go @@ -9,10 +9,10 @@ import ( "strings" "github.com/containers/common/pkg/config" - "github.com/containers/libpod/v2/libpod" - "github.com/containers/libpod/v2/libpod/image" - "github.com/containers/libpod/v2/pkg/specgen" - "github.com/containers/libpod/v2/pkg/util" + "github.com/containers/podman/v2/libpod" + "github.com/containers/podman/v2/libpod/image" + "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/pkg/specgen/generate/validate.go b/pkg/specgen/generate/validate.go index cd2f9ec22..dca45cc0e 100644 --- a/pkg/specgen/generate/validate.go +++ b/pkg/specgen/generate/validate.go @@ -2,8 +2,8 @@ package generate import ( "github.com/containers/common/pkg/sysinfo" - "github.com/containers/libpod/v2/pkg/cgroups" - "github.com/containers/libpod/v2/pkg/specgen" + "github.com/containers/podman/v2/pkg/cgroups" + "github.com/containers/podman/v2/pkg/specgen" "github.com/pkg/errors" ) diff --git a/pkg/specgen/namespaces.go b/pkg/specgen/namespaces.go index 9bf2c5d05..90c56d366 100644 --- a/pkg/specgen/namespaces.go +++ b/pkg/specgen/namespaces.go @@ -3,8 +3,8 @@ package specgen import ( "strings" - "github.com/containers/libpod/v2/pkg/cgroups" - "github.com/containers/libpod/v2/pkg/rootless" + "github.com/containers/podman/v2/pkg/cgroups" + "github.com/containers/podman/v2/pkg/rootless" "github.com/pkg/errors" ) diff --git a/pkg/specgen/pod_validate.go b/pkg/specgen/pod_validate.go index 69c3b58ed..d5e0aecf2 100644 --- a/pkg/specgen/pod_validate.go +++ b/pkg/specgen/pod_validate.go @@ -1,8 +1,8 @@ package specgen import ( - "github.com/containers/libpod/v2/pkg/rootless" - "github.com/containers/libpod/v2/pkg/util" + "github.com/containers/podman/v2/pkg/rootless" + "github.com/containers/podman/v2/pkg/util" "github.com/pkg/errors" ) diff --git a/pkg/systemd/dbus.go b/pkg/systemd/dbus.go index 76ea2b9b4..60712bd6f 100644 --- a/pkg/systemd/dbus.go +++ b/pkg/systemd/dbus.go @@ -6,7 +6,7 @@ import ( "path/filepath" "strconv" - "github.com/containers/libpod/v2/pkg/rootless" + "github.com/containers/podman/v2/pkg/rootless" "github.com/coreos/go-systemd/v22/dbus" godbus "github.com/godbus/dbus/v5" ) diff --git a/pkg/systemd/generate/containers.go b/pkg/systemd/generate/containers.go index b77fb5e11..3d266a7a1 100644 --- a/pkg/systemd/generate/containers.go +++ b/pkg/systemd/generate/containers.go @@ -11,9 +11,9 @@ import ( "text/template" "time" - "github.com/containers/libpod/v2/libpod" - "github.com/containers/libpod/v2/pkg/domain/entities" - "github.com/containers/libpod/v2/version" + "github.com/containers/podman/v2/libpod" + "github.com/containers/podman/v2/pkg/domain/entities" + "github.com/containers/podman/v2/version" "github.com/pkg/errors" "github.com/sirupsen/logrus" ) @@ -237,7 +237,7 @@ func executeContainerTemplate(info *containerInfo, options entities.GenerateSyst // Enforce --replace for named containers. This will // make systemd units more robuts as it allows them to // start after system crashes (see - // github.com/containers/libpod/issues/5485). + // github.com/containers/podman/issues/5485). startCommand = append(startCommand, "--replace") } startCommand = append(startCommand, info.CreateCommand[index:]...) diff --git a/pkg/systemd/generate/containers_test.go b/pkg/systemd/generate/containers_test.go index 13138c0cd..41817c03c 100644 --- a/pkg/systemd/generate/containers_test.go +++ b/pkg/systemd/generate/containers_test.go @@ -3,7 +3,7 @@ package generate import ( "testing" - "github.com/containers/libpod/v2/pkg/domain/entities" + "github.com/containers/podman/v2/pkg/domain/entities" ) func TestValidateRestartPolicyContainer(t *testing.T) { diff --git a/pkg/systemd/generate/pods.go b/pkg/systemd/generate/pods.go index 1c7ef7792..ec28dfe84 100644 --- a/pkg/systemd/generate/pods.go +++ b/pkg/systemd/generate/pods.go @@ -11,9 +11,9 @@ import ( "text/template" "time" - "github.com/containers/libpod/v2/libpod" - "github.com/containers/libpod/v2/pkg/domain/entities" - "github.com/containers/libpod/v2/version" + "github.com/containers/podman/v2/libpod" + "github.com/containers/podman/v2/pkg/domain/entities" + "github.com/containers/podman/v2/version" "github.com/pkg/errors" "github.com/sirupsen/logrus" ) diff --git a/pkg/systemd/generate/pods_test.go b/pkg/systemd/generate/pods_test.go index 4089b44e5..32c760956 100644 --- a/pkg/systemd/generate/pods_test.go +++ b/pkg/systemd/generate/pods_test.go @@ -3,7 +3,7 @@ package generate import ( "testing" - "github.com/containers/libpod/v2/pkg/domain/entities" + "github.com/containers/podman/v2/pkg/domain/entities" ) func TestValidateRestartPolicyPod(t *testing.T) { diff --git a/pkg/util/utils.go b/pkg/util/utils.go index 9eeb116c0..82282a549 100644 --- a/pkg/util/utils.go +++ b/pkg/util/utils.go @@ -15,10 +15,10 @@ import ( "github.com/BurntSushi/toml" "github.com/containers/common/pkg/config" "github.com/containers/image/v5/types" - "github.com/containers/libpod/v2/pkg/errorhandling" - "github.com/containers/libpod/v2/pkg/namespaces" - "github.com/containers/libpod/v2/pkg/rootless" - "github.com/containers/libpod/v2/pkg/signal" + "github.com/containers/podman/v2/pkg/errorhandling" + "github.com/containers/podman/v2/pkg/namespaces" + "github.com/containers/podman/v2/pkg/rootless" + "github.com/containers/podman/v2/pkg/signal" "github.com/containers/storage" "github.com/containers/storage/pkg/idtools" v1 "github.com/opencontainers/image-spec/specs-go/v1" diff --git a/pkg/util/utils_linux.go b/pkg/util/utils_linux.go index d4c2644b3..29b16f765 100644 --- a/pkg/util/utils_linux.go +++ b/pkg/util/utils_linux.go @@ -6,7 +6,7 @@ import ( "path/filepath" "syscall" - "github.com/containers/libpod/v2/pkg/rootless" + "github.com/containers/podman/v2/pkg/rootless" "github.com/containers/psgo" "github.com/pkg/errors" "github.com/sirupsen/logrus" diff --git a/pkg/util/utils_supported.go b/pkg/util/utils_supported.go index 82bfdb3ec..bf59240c6 100644 --- a/pkg/util/utils_supported.go +++ b/pkg/util/utils_supported.go @@ -11,7 +11,7 @@ import ( "path/filepath" "syscall" - "github.com/containers/libpod/v2/pkg/rootless" + "github.com/containers/podman/v2/pkg/rootless" "github.com/pkg/errors" "github.com/sirupsen/logrus" ) diff --git a/pkg/varlink/io.podman.varlink b/pkg/varlink/io.podman.varlink index 0cb95ef97..6240936d0 100644 --- a/pkg/varlink/io.podman.varlink +++ b/pkg/varlink/io.podman.varlink @@ -1,5 +1,5 @@ # Podman Service Interface and API description. The master version of this document can be found -# in the [API.md](https://github.com/containers/libpod/blob/master/API.md) file in the upstream libpod repository. +# in the [API.md](https://github.com/containers/podman/blob/master/API.md) file in the upstream libpod repository. interface io.podman type Volume ( diff --git a/pkg/varlinkapi/attach.go b/pkg/varlinkapi/attach.go index 8acf2a1b6..38354a790 100644 --- a/pkg/varlinkapi/attach.go +++ b/pkg/varlinkapi/attach.go @@ -7,11 +7,11 @@ import ( "context" "io" - "github.com/containers/libpod/v2/libpod" - "github.com/containers/libpod/v2/libpod/define" - "github.com/containers/libpod/v2/libpod/events" - iopodman "github.com/containers/libpod/v2/pkg/varlink" - "github.com/containers/libpod/v2/pkg/varlinkapi/virtwriter" + "github.com/containers/podman/v2/libpod" + "github.com/containers/podman/v2/libpod/define" + "github.com/containers/podman/v2/libpod/events" + iopodman "github.com/containers/podman/v2/pkg/varlink" + "github.com/containers/podman/v2/pkg/varlinkapi/virtwriter" "github.com/pkg/errors" "github.com/sirupsen/logrus" "k8s.io/client-go/tools/remotecommand" diff --git a/pkg/varlinkapi/config.go b/pkg/varlinkapi/config.go index cd6342a17..50e6fb833 100644 --- a/pkg/varlinkapi/config.go +++ b/pkg/varlinkapi/config.go @@ -3,8 +3,8 @@ package varlinkapi import ( - "github.com/containers/libpod/v2/libpod" - iopodman "github.com/containers/libpod/v2/pkg/varlink" + "github.com/containers/podman/v2/libpod" + iopodman "github.com/containers/podman/v2/pkg/varlink" "github.com/spf13/cobra" ) diff --git a/pkg/varlinkapi/container.go b/pkg/varlinkapi/container.go index d578d9b87..bf3ed0022 100644 --- a/pkg/varlinkapi/container.go +++ b/pkg/varlinkapi/container.go @@ -15,11 +15,11 @@ import ( "time" "github.com/containers/image/v5/types" - "github.com/containers/libpod/v2/libpod" - "github.com/containers/libpod/v2/libpod/define" - "github.com/containers/libpod/v2/libpod/image" - "github.com/containers/libpod/v2/pkg/timetype" - "github.com/containers/libpod/v2/pkg/util" + "github.com/containers/podman/v2/libpod" + "github.com/containers/podman/v2/libpod/define" + "github.com/containers/podman/v2/libpod/image" + "github.com/containers/podman/v2/pkg/timetype" + "github.com/containers/podman/v2/pkg/util" "github.com/cri-o/ocicni/pkg/ocicni" "github.com/docker/go-units" "github.com/google/shlex" diff --git a/pkg/varlinkapi/containers.go b/pkg/varlinkapi/containers.go index 07b492331..fef3b6476 100644 --- a/pkg/varlinkapi/containers.go +++ b/pkg/varlinkapi/containers.go @@ -14,13 +14,13 @@ import ( "syscall" "time" - "github.com/containers/libpod/v2/libpod" - "github.com/containers/libpod/v2/libpod/define" - "github.com/containers/libpod/v2/libpod/logs" - "github.com/containers/libpod/v2/pkg/cgroups" - "github.com/containers/libpod/v2/pkg/rootless" - iopodman "github.com/containers/libpod/v2/pkg/varlink" - "github.com/containers/libpod/v2/pkg/varlinkapi/virtwriter" + "github.com/containers/podman/v2/libpod" + "github.com/containers/podman/v2/libpod/define" + "github.com/containers/podman/v2/libpod/logs" + "github.com/containers/podman/v2/pkg/cgroups" + "github.com/containers/podman/v2/pkg/rootless" + iopodman "github.com/containers/podman/v2/pkg/varlink" + "github.com/containers/podman/v2/pkg/varlinkapi/virtwriter" "github.com/containers/storage/pkg/archive" "github.com/pkg/errors" "github.com/sirupsen/logrus" diff --git a/pkg/varlinkapi/containers_create.go b/pkg/varlinkapi/containers_create.go index 2fdcfedca..771e58089 100644 --- a/pkg/varlinkapi/containers_create.go +++ b/pkg/varlinkapi/containers_create.go @@ -3,7 +3,7 @@ package varlinkapi import ( - iopodman "github.com/containers/libpod/v2/pkg/varlink" + iopodman "github.com/containers/podman/v2/pkg/varlink" ) // CreateContainer ... diff --git a/pkg/varlinkapi/create.go b/pkg/varlinkapi/create.go index ac93939d9..2d3e20f67 100644 --- a/pkg/varlinkapi/create.go +++ b/pkg/varlinkapi/create.go @@ -15,22 +15,22 @@ import ( "github.com/containers/common/pkg/sysinfo" "github.com/containers/image/v5/manifest" - "github.com/containers/libpod/v2/cmd/podman/parse" - "github.com/containers/libpod/v2/libpod" - "github.com/containers/libpod/v2/libpod/define" - "github.com/containers/libpod/v2/libpod/image" - ann "github.com/containers/libpod/v2/pkg/annotations" - "github.com/containers/libpod/v2/pkg/autoupdate" - "github.com/containers/libpod/v2/pkg/cgroups" - envLib "github.com/containers/libpod/v2/pkg/env" - "github.com/containers/libpod/v2/pkg/errorhandling" - "github.com/containers/libpod/v2/pkg/inspect" - ns "github.com/containers/libpod/v2/pkg/namespaces" - "github.com/containers/libpod/v2/pkg/rootless" - "github.com/containers/libpod/v2/pkg/seccomp" - cc "github.com/containers/libpod/v2/pkg/spec" - 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" + "github.com/containers/podman/v2/libpod/define" + "github.com/containers/podman/v2/libpod/image" + ann "github.com/containers/podman/v2/pkg/annotations" + "github.com/containers/podman/v2/pkg/autoupdate" + "github.com/containers/podman/v2/pkg/cgroups" + envLib "github.com/containers/podman/v2/pkg/env" + "github.com/containers/podman/v2/pkg/errorhandling" + "github.com/containers/podman/v2/pkg/inspect" + ns "github.com/containers/podman/v2/pkg/namespaces" + "github.com/containers/podman/v2/pkg/rootless" + "github.com/containers/podman/v2/pkg/seccomp" + cc "github.com/containers/podman/v2/pkg/spec" + systemdGen "github.com/containers/podman/v2/pkg/systemd/generate" + "github.com/containers/podman/v2/pkg/util" "github.com/docker/go-connections/nat" "github.com/docker/go-units" "github.com/opentracing/opentracing-go" diff --git a/pkg/varlinkapi/events.go b/pkg/varlinkapi/events.go index 910b64a57..8628b1ce6 100644 --- a/pkg/varlinkapi/events.go +++ b/pkg/varlinkapi/events.go @@ -6,8 +6,8 @@ import ( "context" "time" - "github.com/containers/libpod/v2/libpod/events" - iopodman "github.com/containers/libpod/v2/pkg/varlink" + "github.com/containers/podman/v2/libpod/events" + iopodman "github.com/containers/podman/v2/pkg/varlink" ) // GetEvents is a remote endpoint to get events from the event log diff --git a/pkg/varlinkapi/funcs.go b/pkg/varlinkapi/funcs.go index e32e311b0..8fb8a7ea0 100644 --- a/pkg/varlinkapi/funcs.go +++ b/pkg/varlinkapi/funcs.go @@ -7,7 +7,7 @@ import ( "strings" "github.com/containers/image/v5/types" - "github.com/containers/libpod/v2/libpod/image" + "github.com/containers/podman/v2/libpod/image" "github.com/google/shlex" "github.com/pkg/errors" ) diff --git a/pkg/varlinkapi/generate.go b/pkg/varlinkapi/generate.go index 7c481aad7..bbc16dae5 100644 --- a/pkg/varlinkapi/generate.go +++ b/pkg/varlinkapi/generate.go @@ -5,7 +5,7 @@ package varlinkapi import ( "encoding/json" - iopodman "github.com/containers/libpod/v2/pkg/varlink" + iopodman "github.com/containers/podman/v2/pkg/varlink" ) // GenerateKube ... diff --git a/pkg/varlinkapi/images.go b/pkg/varlinkapi/images.go index 8d67a47bc..1dcfa2213 100644 --- a/pkg/varlinkapi/images.go +++ b/pkg/varlinkapi/images.go @@ -20,13 +20,13 @@ import ( "github.com/containers/image/v5/manifest" "github.com/containers/image/v5/transports/alltransports" "github.com/containers/image/v5/types" - "github.com/containers/libpod/v2/libpod" - "github.com/containers/libpod/v2/libpod/define" - "github.com/containers/libpod/v2/libpod/image" - "github.com/containers/libpod/v2/pkg/channelwriter" - "github.com/containers/libpod/v2/pkg/util" - iopodman "github.com/containers/libpod/v2/pkg/varlink" - "github.com/containers/libpod/v2/utils" + "github.com/containers/podman/v2/libpod" + "github.com/containers/podman/v2/libpod/define" + "github.com/containers/podman/v2/libpod/image" + "github.com/containers/podman/v2/pkg/channelwriter" + "github.com/containers/podman/v2/pkg/util" + iopodman "github.com/containers/podman/v2/pkg/varlink" + "github.com/containers/podman/v2/utils" "github.com/containers/storage/pkg/archive" v1 "github.com/opencontainers/image-spec/specs-go/v1" "github.com/pkg/errors" diff --git a/pkg/varlinkapi/intermediate_varlink.go b/pkg/varlinkapi/intermediate_varlink.go index f1a183017..0d74f1a95 100644 --- a/pkg/varlinkapi/intermediate_varlink.go +++ b/pkg/varlinkapi/intermediate_varlink.go @@ -4,8 +4,8 @@ package varlinkapi import ( "github.com/containers/common/pkg/config" - "github.com/containers/libpod/v2/pkg/rootless" - iopodman "github.com/containers/libpod/v2/pkg/varlink" + "github.com/containers/podman/v2/pkg/rootless" + iopodman "github.com/containers/podman/v2/pkg/varlink" "github.com/pkg/errors" ) diff --git a/pkg/varlinkapi/mount.go b/pkg/varlinkapi/mount.go index a04a0b630..6fd4de709 100644 --- a/pkg/varlinkapi/mount.go +++ b/pkg/varlinkapi/mount.go @@ -2,7 +2,7 @@ package varlinkapi -import iopodman "github.com/containers/libpod/v2/pkg/varlink" +import iopodman "github.com/containers/podman/v2/pkg/varlink" // ListContainerMounts ... func (i *VarlinkAPI) ListContainerMounts(call iopodman.VarlinkCall) error { diff --git a/pkg/varlinkapi/pods.go b/pkg/varlinkapi/pods.go index b190233d5..189434780 100644 --- a/pkg/varlinkapi/pods.go +++ b/pkg/varlinkapi/pods.go @@ -8,9 +8,9 @@ import ( "strconv" "syscall" - "github.com/containers/libpod/v2/libpod" - "github.com/containers/libpod/v2/libpod/define" - iopodman "github.com/containers/libpod/v2/pkg/varlink" + "github.com/containers/podman/v2/libpod" + "github.com/containers/podman/v2/libpod/define" + iopodman "github.com/containers/podman/v2/pkg/varlink" "github.com/cri-o/ocicni/pkg/ocicni" "github.com/docker/go-connections/nat" "github.com/pkg/errors" diff --git a/pkg/varlinkapi/remote_client.go b/pkg/varlinkapi/remote_client.go index 0ad2d89cc..88c11c126 100644 --- a/pkg/varlinkapi/remote_client.go +++ b/pkg/varlinkapi/remote_client.go @@ -3,8 +3,8 @@ package varlinkapi import ( - "github.com/containers/libpod/v2/libpod/define" - iopodman "github.com/containers/libpod/v2/pkg/varlink" + "github.com/containers/podman/v2/libpod/define" + iopodman "github.com/containers/podman/v2/pkg/varlink" ) // ContainerStatsToLibpodContainerStats converts the varlink containerstats to a libpod diff --git a/pkg/varlinkapi/shortcuts.go b/pkg/varlinkapi/shortcuts.go index 8e21cc5d0..bfb05c0e3 100644 --- a/pkg/varlinkapi/shortcuts.go +++ b/pkg/varlinkapi/shortcuts.go @@ -1,7 +1,7 @@ package varlinkapi import ( - "github.com/containers/libpod/v2/libpod" + "github.com/containers/podman/v2/libpod" "github.com/sirupsen/logrus" ) diff --git a/pkg/varlinkapi/system.go b/pkg/varlinkapi/system.go index b5fe681fd..9e4db2611 100644 --- a/pkg/varlinkapi/system.go +++ b/pkg/varlinkapi/system.go @@ -10,8 +10,8 @@ import ( "time" "github.com/containers/image/v5/pkg/sysregistriesv2" - "github.com/containers/libpod/v2/libpod/define" - iopodman "github.com/containers/libpod/v2/pkg/varlink" + "github.com/containers/podman/v2/libpod/define" + iopodman "github.com/containers/podman/v2/pkg/varlink" "github.com/sirupsen/logrus" ) diff --git a/pkg/varlinkapi/transfers.go b/pkg/varlinkapi/transfers.go index 32c227d56..a4550a417 100644 --- a/pkg/varlinkapi/transfers.go +++ b/pkg/varlinkapi/transfers.go @@ -8,7 +8,7 @@ import ( "io/ioutil" "os" - iopodman "github.com/containers/libpod/v2/pkg/varlink" + iopodman "github.com/containers/podman/v2/pkg/varlink" "github.com/sirupsen/logrus" ) diff --git a/pkg/varlinkapi/util.go b/pkg/varlinkapi/util.go index 64b61c6fd..748d8f9cc 100644 --- a/pkg/varlinkapi/util.go +++ b/pkg/varlinkapi/util.go @@ -9,10 +9,10 @@ import ( "time" "github.com/containers/buildah" - "github.com/containers/libpod/v2/libpod" - "github.com/containers/libpod/v2/libpod/define" - "github.com/containers/libpod/v2/pkg/channelwriter" - iopodman "github.com/containers/libpod/v2/pkg/varlink" + "github.com/containers/podman/v2/libpod" + "github.com/containers/podman/v2/libpod/define" + "github.com/containers/podman/v2/pkg/channelwriter" + iopodman "github.com/containers/podman/v2/pkg/varlink" "github.com/containers/storage/pkg/archive" ) diff --git a/pkg/varlinkapi/volumes.go b/pkg/varlinkapi/volumes.go index a1e711d34..7cc714ea4 100644 --- a/pkg/varlinkapi/volumes.go +++ b/pkg/varlinkapi/volumes.go @@ -6,9 +6,9 @@ import ( "context" "encoding/json" - "github.com/containers/libpod/v2/libpod" - "github.com/containers/libpod/v2/pkg/domain/infra/abi/parse" - iopodman "github.com/containers/libpod/v2/pkg/varlink" + "github.com/containers/podman/v2/libpod" + "github.com/containers/podman/v2/pkg/domain/infra/abi/parse" + iopodman "github.com/containers/podman/v2/pkg/varlink" ) // VolumeCreate creates a libpod volume based on input from a varlink connection |