diff options
Diffstat (limited to 'pkg')
341 files changed, 925 insertions, 925 deletions
diff --git a/pkg/api/handlers/compat/auth.go b/pkg/api/handlers/compat/auth.go index cf53e060c..4c4ad8afd 100644 --- a/pkg/api/handlers/compat/auth.go +++ b/pkg/api/handlers/compat/auth.go @@ -9,10 +9,10 @@ import ( DockerClient "github.com/containers/image/v5/docker" "github.com/containers/image/v5/types" - "github.com/containers/podman/v3/libpod" - "github.com/containers/podman/v3/pkg/api/handlers/utils" - api "github.com/containers/podman/v3/pkg/api/types" - "github.com/containers/podman/v3/pkg/domain/entities" + "github.com/containers/podman/v4/libpod" + "github.com/containers/podman/v4/pkg/api/handlers/utils" + api "github.com/containers/podman/v4/pkg/api/types" + "github.com/containers/podman/v4/pkg/domain/entities" docker "github.com/docker/docker/api/types" "github.com/pkg/errors" ) diff --git a/pkg/api/handlers/compat/changes.go b/pkg/api/handlers/compat/changes.go index fe580437d..f26f239dc 100644 --- a/pkg/api/handlers/compat/changes.go +++ b/pkg/api/handlers/compat/changes.go @@ -3,10 +3,10 @@ package compat import ( "net/http" - "github.com/containers/podman/v3/libpod" - "github.com/containers/podman/v3/libpod/define" - "github.com/containers/podman/v3/pkg/api/handlers/utils" - api "github.com/containers/podman/v3/pkg/api/types" + "github.com/containers/podman/v4/libpod" + "github.com/containers/podman/v4/libpod/define" + "github.com/containers/podman/v4/pkg/api/handlers/utils" + api "github.com/containers/podman/v4/pkg/api/types" "github.com/gorilla/schema" "github.com/pkg/errors" ) diff --git a/pkg/api/handlers/compat/containers.go b/pkg/api/handlers/compat/containers.go index 4539199d3..94393886f 100644 --- a/pkg/api/handlers/compat/containers.go +++ b/pkg/api/handlers/compat/containers.go @@ -10,17 +10,17 @@ import ( "syscall" "time" - "github.com/containers/podman/v3/libpod" - "github.com/containers/podman/v3/libpod/define" - "github.com/containers/podman/v3/pkg/api/handlers" - "github.com/containers/podman/v3/pkg/api/handlers/utils" - api "github.com/containers/podman/v3/pkg/api/types" - "github.com/containers/podman/v3/pkg/domain/entities" - "github.com/containers/podman/v3/pkg/domain/filters" - "github.com/containers/podman/v3/pkg/domain/infra/abi" - "github.com/containers/podman/v3/pkg/ps" - "github.com/containers/podman/v3/pkg/signal" - "github.com/containers/podman/v3/pkg/util" + "github.com/containers/podman/v4/libpod" + "github.com/containers/podman/v4/libpod/define" + "github.com/containers/podman/v4/pkg/api/handlers" + "github.com/containers/podman/v4/pkg/api/handlers/utils" + api "github.com/containers/podman/v4/pkg/api/types" + "github.com/containers/podman/v4/pkg/domain/entities" + "github.com/containers/podman/v4/pkg/domain/filters" + "github.com/containers/podman/v4/pkg/domain/infra/abi" + "github.com/containers/podman/v4/pkg/ps" + "github.com/containers/podman/v4/pkg/signal" + "github.com/containers/podman/v4/pkg/util" "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/container" "github.com/docker/docker/api/types/network" diff --git a/pkg/api/handlers/compat/containers_archive.go b/pkg/api/handlers/compat/containers_archive.go index 54cbe01e9..a0e3c6d02 100644 --- a/pkg/api/handlers/compat/containers_archive.go +++ b/pkg/api/handlers/compat/containers_archive.go @@ -6,13 +6,13 @@ import ( "net/http" "os" - "github.com/containers/podman/v3/libpod" - "github.com/containers/podman/v3/libpod/define" - "github.com/containers/podman/v3/pkg/api/handlers/utils" - api "github.com/containers/podman/v3/pkg/api/types" - "github.com/containers/podman/v3/pkg/copy" - "github.com/containers/podman/v3/pkg/domain/entities" - "github.com/containers/podman/v3/pkg/domain/infra/abi" + "github.com/containers/podman/v4/libpod" + "github.com/containers/podman/v4/libpod/define" + "github.com/containers/podman/v4/pkg/api/handlers/utils" + api "github.com/containers/podman/v4/pkg/api/types" + "github.com/containers/podman/v4/pkg/copy" + "github.com/containers/podman/v4/pkg/domain/entities" + "github.com/containers/podman/v4/pkg/domain/infra/abi" "github.com/gorilla/schema" "github.com/pkg/errors" "github.com/sirupsen/logrus" diff --git a/pkg/api/handlers/compat/containers_attach.go b/pkg/api/handlers/compat/containers_attach.go index 40d5e2d4d..ccdf054b9 100644 --- a/pkg/api/handlers/compat/containers_attach.go +++ b/pkg/api/handlers/compat/containers_attach.go @@ -3,11 +3,11 @@ package compat import ( "net/http" - "github.com/containers/podman/v3/libpod" - "github.com/containers/podman/v3/libpod/define" - "github.com/containers/podman/v3/pkg/api/handlers/utils" - "github.com/containers/podman/v3/pkg/api/server/idle" - api "github.com/containers/podman/v3/pkg/api/types" + "github.com/containers/podman/v4/libpod" + "github.com/containers/podman/v4/libpod/define" + "github.com/containers/podman/v4/pkg/api/handlers/utils" + "github.com/containers/podman/v4/pkg/api/server/idle" + api "github.com/containers/podman/v4/pkg/api/types" "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 8837e08ca..467231150 100644 --- a/pkg/api/handlers/compat/containers_create.go +++ b/pkg/api/handlers/compat/containers_create.go @@ -4,15 +4,15 @@ import ( "encoding/json" "net/http" - "github.com/containers/podman/v3/cmd/podman/common" - "github.com/containers/podman/v3/libpod" - "github.com/containers/podman/v3/pkg/api/handlers" - "github.com/containers/podman/v3/pkg/api/handlers/utils" - api "github.com/containers/podman/v3/pkg/api/types" - "github.com/containers/podman/v3/pkg/domain/entities" - "github.com/containers/podman/v3/pkg/domain/infra/abi" - "github.com/containers/podman/v3/pkg/specgen" - "github.com/containers/podman/v3/pkg/specgenutil" + "github.com/containers/podman/v4/cmd/podman/common" + "github.com/containers/podman/v4/libpod" + "github.com/containers/podman/v4/pkg/api/handlers" + "github.com/containers/podman/v4/pkg/api/handlers/utils" + api "github.com/containers/podman/v4/pkg/api/types" + "github.com/containers/podman/v4/pkg/domain/entities" + "github.com/containers/podman/v4/pkg/domain/infra/abi" + "github.com/containers/podman/v4/pkg/specgen" + "github.com/containers/podman/v4/pkg/specgenutil" "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 6b43a544b..8be1dcf99 100644 --- a/pkg/api/handlers/compat/containers_export.go +++ b/pkg/api/handlers/compat/containers_export.go @@ -5,9 +5,9 @@ import ( "net/http" "os" - "github.com/containers/podman/v3/libpod" - "github.com/containers/podman/v3/pkg/api/handlers/utils" - api "github.com/containers/podman/v3/pkg/api/types" + "github.com/containers/podman/v4/libpod" + "github.com/containers/podman/v4/pkg/api/handlers/utils" + api "github.com/containers/podman/v4/pkg/api/types" "github.com/pkg/errors" ) diff --git a/pkg/api/handlers/compat/containers_logs.go b/pkg/api/handlers/compat/containers_logs.go index 4adcaa511..20f71a4fe 100644 --- a/pkg/api/handlers/compat/containers_logs.go +++ b/pkg/api/handlers/compat/containers_logs.go @@ -10,11 +10,11 @@ import ( "sync" "time" - "github.com/containers/podman/v3/libpod" - "github.com/containers/podman/v3/libpod/logs" - "github.com/containers/podman/v3/pkg/api/handlers/utils" - api "github.com/containers/podman/v3/pkg/api/types" - "github.com/containers/podman/v3/pkg/util" + "github.com/containers/podman/v4/libpod" + "github.com/containers/podman/v4/libpod/logs" + "github.com/containers/podman/v4/pkg/api/handlers/utils" + api "github.com/containers/podman/v4/pkg/api/types" + "github.com/containers/podman/v4/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 99c2f6bdc..91aca2b3f 100644 --- a/pkg/api/handlers/compat/containers_pause.go +++ b/pkg/api/handlers/compat/containers_pause.go @@ -3,9 +3,9 @@ package compat import ( "net/http" - "github.com/containers/podman/v3/libpod" - "github.com/containers/podman/v3/pkg/api/handlers/utils" - api "github.com/containers/podman/v3/pkg/api/types" + "github.com/containers/podman/v4/libpod" + "github.com/containers/podman/v4/pkg/api/handlers/utils" + api "github.com/containers/podman/v4/pkg/api/types" ) 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 9fa8bc9f4..2a2c9f678 100644 --- a/pkg/api/handlers/compat/containers_prune.go +++ b/pkg/api/handlers/compat/containers_prune.go @@ -4,13 +4,13 @@ import ( "bytes" "net/http" - "github.com/containers/podman/v3/libpod" - "github.com/containers/podman/v3/pkg/api/handlers" - "github.com/containers/podman/v3/pkg/api/handlers/utils" - api "github.com/containers/podman/v3/pkg/api/types" - "github.com/containers/podman/v3/pkg/domain/entities/reports" - "github.com/containers/podman/v3/pkg/domain/filters" - "github.com/containers/podman/v3/pkg/util" + "github.com/containers/podman/v4/libpod" + "github.com/containers/podman/v4/pkg/api/handlers" + "github.com/containers/podman/v4/pkg/api/handlers/utils" + api "github.com/containers/podman/v4/pkg/api/types" + "github.com/containers/podman/v4/pkg/domain/entities/reports" + "github.com/containers/podman/v4/pkg/domain/filters" + "github.com/containers/podman/v4/pkg/util" "github.com/pkg/errors" ) diff --git a/pkg/api/handlers/compat/containers_restart.go b/pkg/api/handlers/compat/containers_restart.go index 8ef2ff308..66bca23e6 100644 --- a/pkg/api/handlers/compat/containers_restart.go +++ b/pkg/api/handlers/compat/containers_restart.go @@ -3,12 +3,12 @@ package compat import ( "net/http" - "github.com/containers/podman/v3/libpod" - "github.com/containers/podman/v3/libpod/define" - "github.com/containers/podman/v3/pkg/api/handlers/utils" - api "github.com/containers/podman/v3/pkg/api/types" - "github.com/containers/podman/v3/pkg/domain/entities" - "github.com/containers/podman/v3/pkg/domain/infra/abi" + "github.com/containers/podman/v4/libpod" + "github.com/containers/podman/v4/libpod/define" + "github.com/containers/podman/v4/pkg/api/handlers/utils" + api "github.com/containers/podman/v4/pkg/api/types" + "github.com/containers/podman/v4/pkg/domain/entities" + "github.com/containers/podman/v4/pkg/domain/infra/abi" "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 fb68389bc..0b7f5160a 100644 --- a/pkg/api/handlers/compat/containers_start.go +++ b/pkg/api/handlers/compat/containers_start.go @@ -3,12 +3,12 @@ package compat import ( "net/http" - api "github.com/containers/podman/v3/pkg/api/types" + api "github.com/containers/podman/v4/pkg/api/types" "github.com/sirupsen/logrus" - "github.com/containers/podman/v3/libpod" - "github.com/containers/podman/v3/libpod/define" - "github.com/containers/podman/v3/pkg/api/handlers/utils" + "github.com/containers/podman/v4/libpod" + "github.com/containers/podman/v4/libpod/define" + "github.com/containers/podman/v4/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 ad91a3a8e..c770a03f5 100644 --- a/pkg/api/handlers/compat/containers_stats.go +++ b/pkg/api/handlers/compat/containers_stats.go @@ -6,10 +6,10 @@ import ( "time" "github.com/containers/common/pkg/cgroups" - "github.com/containers/podman/v3/libpod" - "github.com/containers/podman/v3/libpod/define" - "github.com/containers/podman/v3/pkg/api/handlers/utils" - api "github.com/containers/podman/v3/pkg/api/types" + "github.com/containers/podman/v4/libpod" + "github.com/containers/podman/v4/libpod/define" + "github.com/containers/podman/v4/pkg/api/handlers/utils" + api "github.com/containers/podman/v4/pkg/api/types" 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 10ac67f76..5bc3a34ac 100644 --- a/pkg/api/handlers/compat/containers_stop.go +++ b/pkg/api/handlers/compat/containers_stop.go @@ -3,12 +3,12 @@ package compat import ( "net/http" - "github.com/containers/podman/v3/libpod" - "github.com/containers/podman/v3/libpod/define" - "github.com/containers/podman/v3/pkg/api/handlers/utils" - api "github.com/containers/podman/v3/pkg/api/types" - "github.com/containers/podman/v3/pkg/domain/entities" - "github.com/containers/podman/v3/pkg/domain/infra/abi" + "github.com/containers/podman/v4/libpod" + "github.com/containers/podman/v4/libpod/define" + "github.com/containers/podman/v4/pkg/api/handlers/utils" + api "github.com/containers/podman/v4/pkg/api/types" + "github.com/containers/podman/v4/pkg/domain/entities" + "github.com/containers/podman/v4/pkg/domain/infra/abi" "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 545320ad9..6970cabe3 100644 --- a/pkg/api/handlers/compat/containers_top.go +++ b/pkg/api/handlers/compat/containers_top.go @@ -7,10 +7,10 @@ import ( "strings" "time" - "github.com/containers/podman/v3/libpod" - "github.com/containers/podman/v3/pkg/api/handlers" - "github.com/containers/podman/v3/pkg/api/handlers/utils" - api "github.com/containers/podman/v3/pkg/api/types" + "github.com/containers/podman/v4/libpod" + "github.com/containers/podman/v4/pkg/api/handlers" + "github.com/containers/podman/v4/pkg/api/handlers/utils" + api "github.com/containers/podman/v4/pkg/api/types" "github.com/gorilla/schema" "github.com/pkg/errors" "github.com/sirupsen/logrus" diff --git a/pkg/api/handlers/compat/containers_unpause.go b/pkg/api/handlers/compat/containers_unpause.go index 3f4f2f531..67409bc8d 100644 --- a/pkg/api/handlers/compat/containers_unpause.go +++ b/pkg/api/handlers/compat/containers_unpause.go @@ -3,9 +3,9 @@ package compat import ( "net/http" - "github.com/containers/podman/v3/libpod" - "github.com/containers/podman/v3/pkg/api/handlers/utils" - api "github.com/containers/podman/v3/pkg/api/types" + "github.com/containers/podman/v4/libpod" + "github.com/containers/podman/v4/pkg/api/handlers/utils" + api "github.com/containers/podman/v4/pkg/api/types" ) 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 bc31a36c4..cdee56aee 100644 --- a/pkg/api/handlers/compat/events.go +++ b/pkg/api/handlers/compat/events.go @@ -3,12 +3,12 @@ package compat import ( "net/http" - "github.com/containers/podman/v3/libpod" - "github.com/containers/podman/v3/libpod/events" - "github.com/containers/podman/v3/pkg/api/handlers/utils" - api "github.com/containers/podman/v3/pkg/api/types" - "github.com/containers/podman/v3/pkg/domain/entities" - "github.com/containers/podman/v3/pkg/util" + "github.com/containers/podman/v4/libpod" + "github.com/containers/podman/v4/libpod/events" + "github.com/containers/podman/v4/pkg/api/handlers/utils" + api "github.com/containers/podman/v4/pkg/api/types" + "github.com/containers/podman/v4/pkg/domain/entities" + "github.com/containers/podman/v4/pkg/util" "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 76f720bf2..c1ace5a38 100644 --- a/pkg/api/handlers/compat/exec.go +++ b/pkg/api/handlers/compat/exec.go @@ -6,13 +6,13 @@ import ( "net/http" "strings" - "github.com/containers/podman/v3/libpod" - "github.com/containers/podman/v3/libpod/define" - "github.com/containers/podman/v3/pkg/api/handlers" - "github.com/containers/podman/v3/pkg/api/handlers/utils" - "github.com/containers/podman/v3/pkg/api/server/idle" - api "github.com/containers/podman/v3/pkg/api/types" - "github.com/containers/podman/v3/pkg/specgenutil" + "github.com/containers/podman/v4/libpod" + "github.com/containers/podman/v4/libpod/define" + "github.com/containers/podman/v4/pkg/api/handlers" + "github.com/containers/podman/v4/pkg/api/handlers/utils" + "github.com/containers/podman/v4/pkg/api/server/idle" + api "github.com/containers/podman/v4/pkg/api/types" + "github.com/containers/podman/v4/pkg/specgenutil" "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 f08a7ee41..97fa4ddad 100644 --- a/pkg/api/handlers/compat/images.go +++ b/pkg/api/handlers/compat/images.go @@ -14,13 +14,13 @@ import ( "github.com/containers/common/pkg/filters" "github.com/containers/image/v5/manifest" "github.com/containers/image/v5/types" - "github.com/containers/podman/v3/libpod" - "github.com/containers/podman/v3/pkg/api/handlers" - "github.com/containers/podman/v3/pkg/api/handlers/utils" - api "github.com/containers/podman/v3/pkg/api/types" - "github.com/containers/podman/v3/pkg/auth" - "github.com/containers/podman/v3/pkg/domain/entities" - "github.com/containers/podman/v3/pkg/domain/infra/abi" + "github.com/containers/podman/v4/libpod" + "github.com/containers/podman/v4/pkg/api/handlers" + "github.com/containers/podman/v4/pkg/api/handlers/utils" + api "github.com/containers/podman/v4/pkg/api/types" + "github.com/containers/podman/v4/pkg/auth" + "github.com/containers/podman/v4/pkg/domain/entities" + "github.com/containers/podman/v4/pkg/domain/infra/abi" "github.com/containers/storage" "github.com/gorilla/schema" "github.com/opencontainers/go-digest" diff --git a/pkg/api/handlers/compat/images_build.go b/pkg/api/handlers/compat/images_build.go index 6d4fe5513..d9c9558e5 100644 --- a/pkg/api/handlers/compat/images_build.go +++ b/pkg/api/handlers/compat/images_build.go @@ -17,11 +17,11 @@ import ( buildahDefine "github.com/containers/buildah/define" "github.com/containers/buildah/pkg/parse" "github.com/containers/image/v5/types" - "github.com/containers/podman/v3/libpod" - "github.com/containers/podman/v3/pkg/api/handlers/utils" - api "github.com/containers/podman/v3/pkg/api/types" - "github.com/containers/podman/v3/pkg/auth" - "github.com/containers/podman/v3/pkg/channel" + "github.com/containers/podman/v4/libpod" + "github.com/containers/podman/v4/pkg/api/handlers/utils" + api "github.com/containers/podman/v4/pkg/api/types" + "github.com/containers/podman/v4/pkg/auth" + "github.com/containers/podman/v4/pkg/channel" "github.com/containers/storage/pkg/archive" "github.com/docker/docker/pkg/jsonmessage" "github.com/gorilla/schema" diff --git a/pkg/api/handlers/compat/images_history.go b/pkg/api/handlers/compat/images_history.go index fb3c2ebd2..dfaea0a76 100644 --- a/pkg/api/handlers/compat/images_history.go +++ b/pkg/api/handlers/compat/images_history.go @@ -3,10 +3,10 @@ package compat import ( "net/http" - "github.com/containers/podman/v3/libpod" - "github.com/containers/podman/v3/pkg/api/handlers" - "github.com/containers/podman/v3/pkg/api/handlers/utils" - api "github.com/containers/podman/v3/pkg/api/types" + "github.com/containers/podman/v4/libpod" + "github.com/containers/podman/v4/pkg/api/handlers" + "github.com/containers/podman/v4/pkg/api/handlers/utils" + api "github.com/containers/podman/v4/pkg/api/types" "github.com/pkg/errors" ) diff --git a/pkg/api/handlers/compat/images_prune.go b/pkg/api/handlers/compat/images_prune.go index 5728c83c7..8fbf97248 100644 --- a/pkg/api/handlers/compat/images_prune.go +++ b/pkg/api/handlers/compat/images_prune.go @@ -5,13 +5,13 @@ import ( "fmt" "net/http" - "github.com/containers/podman/v3/libpod" - "github.com/containers/podman/v3/pkg/api/handlers" - "github.com/containers/podman/v3/pkg/api/handlers/utils" - api "github.com/containers/podman/v3/pkg/api/types" - "github.com/containers/podman/v3/pkg/domain/entities" - "github.com/containers/podman/v3/pkg/domain/infra/abi" - "github.com/containers/podman/v3/pkg/util" + "github.com/containers/podman/v4/libpod" + "github.com/containers/podman/v4/pkg/api/handlers" + "github.com/containers/podman/v4/pkg/api/handlers/utils" + api "github.com/containers/podman/v4/pkg/api/types" + "github.com/containers/podman/v4/pkg/domain/entities" + "github.com/containers/podman/v4/pkg/domain/infra/abi" + "github.com/containers/podman/v4/pkg/util" "github.com/docker/docker/api/types" "github.com/pkg/errors" ) diff --git a/pkg/api/handlers/compat/images_push.go b/pkg/api/handlers/compat/images_push.go index 04cad204d..6d4a8cdcf 100644 --- a/pkg/api/handlers/compat/images_push.go +++ b/pkg/api/handlers/compat/images_push.go @@ -8,12 +8,12 @@ import ( "strings" "github.com/containers/image/v5/types" - "github.com/containers/podman/v3/libpod" - "github.com/containers/podman/v3/pkg/api/handlers/utils" - api "github.com/containers/podman/v3/pkg/api/types" - "github.com/containers/podman/v3/pkg/auth" - "github.com/containers/podman/v3/pkg/domain/entities" - "github.com/containers/podman/v3/pkg/domain/infra/abi" + "github.com/containers/podman/v4/libpod" + "github.com/containers/podman/v4/pkg/api/handlers/utils" + api "github.com/containers/podman/v4/pkg/api/types" + "github.com/containers/podman/v4/pkg/auth" + "github.com/containers/podman/v4/pkg/domain/entities" + "github.com/containers/podman/v4/pkg/domain/infra/abi" "github.com/containers/storage" "github.com/docker/docker/pkg/jsonmessage" "github.com/gorilla/schema" diff --git a/pkg/api/handlers/compat/images_remove.go b/pkg/api/handlers/compat/images_remove.go index 5c06d8de0..df4644b2a 100644 --- a/pkg/api/handlers/compat/images_remove.go +++ b/pkg/api/handlers/compat/images_remove.go @@ -3,11 +3,11 @@ package compat import ( "net/http" - "github.com/containers/podman/v3/libpod" - "github.com/containers/podman/v3/pkg/api/handlers/utils" - api "github.com/containers/podman/v3/pkg/api/types" - "github.com/containers/podman/v3/pkg/domain/entities" - "github.com/containers/podman/v3/pkg/domain/infra/abi" + "github.com/containers/podman/v4/libpod" + "github.com/containers/podman/v4/pkg/api/handlers/utils" + api "github.com/containers/podman/v4/pkg/api/types" + "github.com/containers/podman/v4/pkg/domain/entities" + "github.com/containers/podman/v4/pkg/domain/infra/abi" "github.com/containers/storage" "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 f6ad86a04..cdf7b12ab 100644 --- a/pkg/api/handlers/compat/images_search.go +++ b/pkg/api/handlers/compat/images_search.go @@ -5,12 +5,12 @@ import ( "net/http" "github.com/containers/image/v5/types" - "github.com/containers/podman/v3/libpod" - "github.com/containers/podman/v3/pkg/api/handlers/utils" - api "github.com/containers/podman/v3/pkg/api/types" - "github.com/containers/podman/v3/pkg/auth" - "github.com/containers/podman/v3/pkg/domain/entities" - "github.com/containers/podman/v3/pkg/domain/infra/abi" + "github.com/containers/podman/v4/libpod" + "github.com/containers/podman/v4/pkg/api/handlers/utils" + api "github.com/containers/podman/v4/pkg/api/types" + "github.com/containers/podman/v4/pkg/auth" + "github.com/containers/podman/v4/pkg/domain/entities" + "github.com/containers/podman/v4/pkg/domain/infra/abi" "github.com/containers/storage" "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 3fe13e2f5..ce6b1de58 100644 --- a/pkg/api/handlers/compat/images_tag.go +++ b/pkg/api/handlers/compat/images_tag.go @@ -5,9 +5,9 @@ import ( "net/http" "github.com/containers/common/libimage" - "github.com/containers/podman/v3/libpod" - "github.com/containers/podman/v3/pkg/api/handlers/utils" - api "github.com/containers/podman/v3/pkg/api/types" + "github.com/containers/podman/v4/libpod" + "github.com/containers/podman/v4/pkg/api/handlers/utils" + api "github.com/containers/podman/v4/pkg/api/types" "github.com/pkg/errors" ) diff --git a/pkg/api/handlers/compat/info.go b/pkg/api/handlers/compat/info.go index dac1eb193..42a513002 100644 --- a/pkg/api/handlers/compat/info.go +++ b/pkg/api/handlers/compat/info.go @@ -11,12 +11,12 @@ import ( "github.com/containers/common/pkg/config" "github.com/containers/common/pkg/sysinfo" - "github.com/containers/podman/v3/libpod" - "github.com/containers/podman/v3/libpod/define" - "github.com/containers/podman/v3/pkg/api/handlers" - "github.com/containers/podman/v3/pkg/api/handlers/utils" - api "github.com/containers/podman/v3/pkg/api/types" - "github.com/containers/podman/v3/pkg/rootless" + "github.com/containers/podman/v4/libpod" + "github.com/containers/podman/v4/libpod/define" + "github.com/containers/podman/v4/pkg/api/handlers" + "github.com/containers/podman/v4/pkg/api/handlers/utils" + api "github.com/containers/podman/v4/pkg/api/types" + "github.com/containers/podman/v4/pkg/rootless" docker "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/registry" "github.com/docker/docker/api/types/swarm" diff --git a/pkg/api/handlers/compat/networks.go b/pkg/api/handlers/compat/networks.go index 3345a9cfe..90a8b3c12 100644 --- a/pkg/api/handlers/compat/networks.go +++ b/pkg/api/handlers/compat/networks.go @@ -8,13 +8,13 @@ import ( nettypes "github.com/containers/common/libnetwork/types" netutil "github.com/containers/common/libnetwork/util" - "github.com/containers/podman/v3/libpod" - "github.com/containers/podman/v3/libpod/define" - "github.com/containers/podman/v3/pkg/api/handlers/utils" - api "github.com/containers/podman/v3/pkg/api/types" - "github.com/containers/podman/v3/pkg/domain/entities" - "github.com/containers/podman/v3/pkg/domain/infra/abi" - "github.com/containers/podman/v3/pkg/util" + "github.com/containers/podman/v4/libpod" + "github.com/containers/podman/v4/libpod/define" + "github.com/containers/podman/v4/pkg/api/handlers/utils" + api "github.com/containers/podman/v4/pkg/api/types" + "github.com/containers/podman/v4/pkg/domain/entities" + "github.com/containers/podman/v4/pkg/domain/infra/abi" + "github.com/containers/podman/v4/pkg/util" "github.com/docker/docker/api/types" dockerNetwork "github.com/docker/docker/api/types/network" diff --git a/pkg/api/handlers/compat/resize.go b/pkg/api/handlers/compat/resize.go index d7796658b..373d76f6b 100644 --- a/pkg/api/handlers/compat/resize.go +++ b/pkg/api/handlers/compat/resize.go @@ -5,10 +5,10 @@ import ( "net/http" "strings" - "github.com/containers/podman/v3/libpod" - "github.com/containers/podman/v3/libpod/define" - "github.com/containers/podman/v3/pkg/api/handlers/utils" - api "github.com/containers/podman/v3/pkg/api/types" + "github.com/containers/podman/v4/libpod" + "github.com/containers/podman/v4/libpod/define" + "github.com/containers/podman/v4/pkg/api/handlers/utils" + api "github.com/containers/podman/v4/pkg/api/types" "github.com/gorilla/mux" "github.com/gorilla/schema" "github.com/pkg/errors" diff --git a/pkg/api/handlers/compat/secrets.go b/pkg/api/handlers/compat/secrets.go index 52cfe03ba..b298ae626 100644 --- a/pkg/api/handlers/compat/secrets.go +++ b/pkg/api/handlers/compat/secrets.go @@ -7,12 +7,12 @@ import ( "fmt" "net/http" - "github.com/containers/podman/v3/libpod" - "github.com/containers/podman/v3/pkg/api/handlers/utils" - api "github.com/containers/podman/v3/pkg/api/types" - "github.com/containers/podman/v3/pkg/domain/entities" - "github.com/containers/podman/v3/pkg/domain/infra/abi" - "github.com/containers/podman/v3/pkg/util" + "github.com/containers/podman/v4/libpod" + "github.com/containers/podman/v4/pkg/api/handlers/utils" + api "github.com/containers/podman/v4/pkg/api/types" + "github.com/containers/podman/v4/pkg/domain/entities" + "github.com/containers/podman/v4/pkg/domain/infra/abi" + "github.com/containers/podman/v4/pkg/util" "github.com/pkg/errors" ) diff --git a/pkg/api/handlers/compat/swagger.go b/pkg/api/handlers/compat/swagger.go index 32167d6b5..86527da6e 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/podman/v3/pkg/domain/entities" + "github.com/containers/podman/v4/pkg/domain/entities" "github.com/docker/docker/api/types" ) diff --git a/pkg/api/handlers/compat/system.go b/pkg/api/handlers/compat/system.go index 1e78db181..97bc9eac2 100644 --- a/pkg/api/handlers/compat/system.go +++ b/pkg/api/handlers/compat/system.go @@ -4,12 +4,12 @@ import ( "net/http" "strings" - "github.com/containers/podman/v3/libpod" - "github.com/containers/podman/v3/pkg/api/handlers" - "github.com/containers/podman/v3/pkg/api/handlers/utils" - api "github.com/containers/podman/v3/pkg/api/types" - "github.com/containers/podman/v3/pkg/domain/entities" - "github.com/containers/podman/v3/pkg/domain/infra/abi" + "github.com/containers/podman/v4/libpod" + "github.com/containers/podman/v4/pkg/api/handlers" + "github.com/containers/podman/v4/pkg/api/handlers/utils" + api "github.com/containers/podman/v4/pkg/api/types" + "github.com/containers/podman/v4/pkg/domain/entities" + "github.com/containers/podman/v4/pkg/domain/infra/abi" docker "github.com/docker/docker/api/types" ) diff --git a/pkg/api/handlers/compat/unsupported.go b/pkg/api/handlers/compat/unsupported.go index 508d0ee18..2217e87c3 100644 --- a/pkg/api/handlers/compat/unsupported.go +++ b/pkg/api/handlers/compat/unsupported.go @@ -4,8 +4,8 @@ import ( "fmt" "net/http" - "github.com/containers/podman/v3/pkg/api/handlers/utils" - "github.com/containers/podman/v3/pkg/errorhandling" + "github.com/containers/podman/v4/pkg/api/handlers/utils" + "github.com/containers/podman/v4/pkg/errorhandling" log "github.com/sirupsen/logrus" ) diff --git a/pkg/api/handlers/compat/version.go b/pkg/api/handlers/compat/version.go index 01cbb252c..c526a5aa2 100644 --- a/pkg/api/handlers/compat/version.go +++ b/pkg/api/handlers/compat/version.go @@ -6,13 +6,13 @@ import ( goRuntime "runtime" "time" - "github.com/containers/podman/v3/libpod" - "github.com/containers/podman/v3/libpod/define" - "github.com/containers/podman/v3/pkg/api/handlers/utils" - api "github.com/containers/podman/v3/pkg/api/types" - "github.com/containers/podman/v3/pkg/domain/entities" - "github.com/containers/podman/v3/pkg/domain/entities/types" - "github.com/containers/podman/v3/version" + "github.com/containers/podman/v4/libpod" + "github.com/containers/podman/v4/libpod/define" + "github.com/containers/podman/v4/pkg/api/handlers/utils" + api "github.com/containers/podman/v4/pkg/api/types" + "github.com/containers/podman/v4/pkg/domain/entities" + "github.com/containers/podman/v4/pkg/domain/entities/types" + "github.com/containers/podman/v4/version" "github.com/pkg/errors" "github.com/sirupsen/logrus" ) diff --git a/pkg/api/handlers/compat/volumes.go b/pkg/api/handlers/compat/volumes.go index e779aa185..352b5c7c3 100644 --- a/pkg/api/handlers/compat/volumes.go +++ b/pkg/api/handlers/compat/volumes.go @@ -7,14 +7,14 @@ import ( "net/url" "time" - "github.com/containers/podman/v3/libpod" - "github.com/containers/podman/v3/libpod/define" - "github.com/containers/podman/v3/pkg/api/handlers" - "github.com/containers/podman/v3/pkg/api/handlers/utils" - api "github.com/containers/podman/v3/pkg/api/types" - "github.com/containers/podman/v3/pkg/domain/filters" - "github.com/containers/podman/v3/pkg/domain/infra/abi/parse" - "github.com/containers/podman/v3/pkg/util" + "github.com/containers/podman/v4/libpod" + "github.com/containers/podman/v4/libpod/define" + "github.com/containers/podman/v4/pkg/api/handlers" + "github.com/containers/podman/v4/pkg/api/handlers/utils" + api "github.com/containers/podman/v4/pkg/api/types" + "github.com/containers/podman/v4/pkg/domain/filters" + "github.com/containers/podman/v4/pkg/domain/infra/abi/parse" + "github.com/containers/podman/v4/pkg/util" 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 764456dd4..5e8f12960 100644 --- a/pkg/api/handlers/decoder.go +++ b/pkg/api/handlers/decoder.go @@ -6,8 +6,8 @@ import ( "syscall" "time" - "github.com/containers/podman/v3/libpod/define" - "github.com/containers/podman/v3/pkg/util" + "github.com/containers/podman/v4/libpod/define" + "github.com/containers/podman/v4/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 21c72bbda..2a0af6976 100644 --- a/pkg/api/handlers/libpod/containers.go +++ b/pkg/api/handlers/libpod/containers.go @@ -7,14 +7,14 @@ import ( "os" "strings" - "github.com/containers/podman/v3/libpod" - "github.com/containers/podman/v3/libpod/define" - "github.com/containers/podman/v3/pkg/api/handlers/compat" - "github.com/containers/podman/v3/pkg/api/handlers/utils" - api "github.com/containers/podman/v3/pkg/api/types" - "github.com/containers/podman/v3/pkg/domain/entities" - "github.com/containers/podman/v3/pkg/domain/infra/abi" - "github.com/containers/podman/v3/pkg/util" + "github.com/containers/podman/v4/libpod" + "github.com/containers/podman/v4/libpod/define" + "github.com/containers/podman/v4/pkg/api/handlers/compat" + "github.com/containers/podman/v4/pkg/api/handlers/utils" + api "github.com/containers/podman/v4/pkg/api/types" + "github.com/containers/podman/v4/pkg/domain/entities" + "github.com/containers/podman/v4/pkg/domain/infra/abi" + "github.com/containers/podman/v4/pkg/util" "github.com/gorilla/schema" "github.com/pkg/errors" "github.com/sirupsen/logrus" diff --git a/pkg/api/handlers/libpod/containers_create.go b/pkg/api/handlers/libpod/containers_create.go index d1841769a..d579cc032 100644 --- a/pkg/api/handlers/libpod/containers_create.go +++ b/pkg/api/handlers/libpod/containers_create.go @@ -5,12 +5,12 @@ import ( "encoding/json" "net/http" - "github.com/containers/podman/v3/libpod" - "github.com/containers/podman/v3/pkg/api/handlers/utils" - api "github.com/containers/podman/v3/pkg/api/types" - "github.com/containers/podman/v3/pkg/domain/entities" - "github.com/containers/podman/v3/pkg/specgen" - "github.com/containers/podman/v3/pkg/specgen/generate" + "github.com/containers/podman/v4/libpod" + "github.com/containers/podman/v4/pkg/api/handlers/utils" + api "github.com/containers/podman/v4/pkg/api/types" + "github.com/containers/podman/v4/pkg/domain/entities" + "github.com/containers/podman/v4/pkg/specgen" + "github.com/containers/podman/v4/pkg/specgen/generate" "github.com/pkg/errors" ) diff --git a/pkg/api/handlers/libpod/containers_stats.go b/pkg/api/handlers/libpod/containers_stats.go index 016214aa2..d808bf1c0 100644 --- a/pkg/api/handlers/libpod/containers_stats.go +++ b/pkg/api/handlers/libpod/containers_stats.go @@ -5,12 +5,12 @@ import ( "net/http" "github.com/containers/common/pkg/cgroups" - "github.com/containers/podman/v3/libpod" - "github.com/containers/podman/v3/pkg/api/handlers/utils" - api "github.com/containers/podman/v3/pkg/api/types" - "github.com/containers/podman/v3/pkg/domain/entities" - "github.com/containers/podman/v3/pkg/domain/infra/abi" - "github.com/containers/podman/v3/pkg/rootless" + "github.com/containers/podman/v4/libpod" + "github.com/containers/podman/v4/pkg/api/handlers/utils" + api "github.com/containers/podman/v4/pkg/api/types" + "github.com/containers/podman/v4/pkg/domain/entities" + "github.com/containers/podman/v4/pkg/domain/infra/abi" + "github.com/containers/podman/v4/pkg/rootless" "github.com/gorilla/schema" "github.com/pkg/errors" "github.com/sirupsen/logrus" diff --git a/pkg/api/handlers/libpod/generate.go b/pkg/api/handlers/libpod/generate.go index 88fd69d45..aadb5ad52 100644 --- a/pkg/api/handlers/libpod/generate.go +++ b/pkg/api/handlers/libpod/generate.go @@ -3,12 +3,12 @@ package libpod import ( "net/http" - "github.com/containers/podman/v3/libpod" - "github.com/containers/podman/v3/pkg/api/handlers/utils" - api "github.com/containers/podman/v3/pkg/api/types" - "github.com/containers/podman/v3/pkg/domain/entities" - "github.com/containers/podman/v3/pkg/domain/infra/abi" - "github.com/containers/podman/v3/pkg/util" + "github.com/containers/podman/v4/libpod" + "github.com/containers/podman/v4/pkg/api/handlers/utils" + api "github.com/containers/podman/v4/pkg/api/types" + "github.com/containers/podman/v4/pkg/domain/entities" + "github.com/containers/podman/v4/pkg/domain/infra/abi" + "github.com/containers/podman/v4/pkg/util" "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 cad4378e5..ba6e81bf1 100644 --- a/pkg/api/handlers/libpod/healthcheck.go +++ b/pkg/api/handlers/libpod/healthcheck.go @@ -3,10 +3,10 @@ package libpod import ( "net/http" - "github.com/containers/podman/v3/libpod" - "github.com/containers/podman/v3/libpod/define" - "github.com/containers/podman/v3/pkg/api/handlers/utils" - api "github.com/containers/podman/v3/pkg/api/types" + "github.com/containers/podman/v4/libpod" + "github.com/containers/podman/v4/libpod/define" + "github.com/containers/podman/v4/pkg/api/handlers/utils" + api "github.com/containers/podman/v4/pkg/api/types" ) 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 d3dbf3023..f9aade0ec 100644 --- a/pkg/api/handlers/libpod/images.go +++ b/pkg/api/handlers/libpod/images.go @@ -14,17 +14,17 @@ import ( "github.com/containers/common/libimage" "github.com/containers/image/v5/manifest" "github.com/containers/image/v5/types" - "github.com/containers/podman/v3/libpod" - "github.com/containers/podman/v3/libpod/define" - "github.com/containers/podman/v3/pkg/api/handlers" - "github.com/containers/podman/v3/pkg/api/handlers/utils" - api "github.com/containers/podman/v3/pkg/api/types" - "github.com/containers/podman/v3/pkg/auth" - "github.com/containers/podman/v3/pkg/domain/entities" - "github.com/containers/podman/v3/pkg/domain/infra/abi" - "github.com/containers/podman/v3/pkg/errorhandling" - "github.com/containers/podman/v3/pkg/util" - utils2 "github.com/containers/podman/v3/utils" + "github.com/containers/podman/v4/libpod" + "github.com/containers/podman/v4/libpod/define" + "github.com/containers/podman/v4/pkg/api/handlers" + "github.com/containers/podman/v4/pkg/api/handlers/utils" + api "github.com/containers/podman/v4/pkg/api/types" + "github.com/containers/podman/v4/pkg/auth" + "github.com/containers/podman/v4/pkg/domain/entities" + "github.com/containers/podman/v4/pkg/domain/infra/abi" + "github.com/containers/podman/v4/pkg/errorhandling" + "github.com/containers/podman/v4/pkg/util" + utils2 "github.com/containers/podman/v4/utils" "github.com/containers/storage" "github.com/gorilla/schema" "github.com/pkg/errors" diff --git a/pkg/api/handlers/libpod/images_pull.go b/pkg/api/handlers/libpod/images_pull.go index 518e7cc65..945c5947a 100644 --- a/pkg/api/handlers/libpod/images_pull.go +++ b/pkg/api/handlers/libpod/images_pull.go @@ -8,12 +8,12 @@ import ( "github.com/containers/common/libimage" "github.com/containers/common/pkg/config" "github.com/containers/image/v5/types" - "github.com/containers/podman/v3/libpod" - "github.com/containers/podman/v3/pkg/api/handlers/utils" - api "github.com/containers/podman/v3/pkg/api/types" - "github.com/containers/podman/v3/pkg/auth" - "github.com/containers/podman/v3/pkg/channel" - "github.com/containers/podman/v3/pkg/domain/entities" + "github.com/containers/podman/v4/libpod" + "github.com/containers/podman/v4/pkg/api/handlers/utils" + api "github.com/containers/podman/v4/pkg/api/types" + "github.com/containers/podman/v4/pkg/auth" + "github.com/containers/podman/v4/pkg/channel" + "github.com/containers/podman/v4/pkg/domain/entities" "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 67dc8637c..a8c0cf1d8 100644 --- a/pkg/api/handlers/libpod/info.go +++ b/pkg/api/handlers/libpod/info.go @@ -3,10 +3,10 @@ package libpod import ( "net/http" - "github.com/containers/podman/v3/libpod" - "github.com/containers/podman/v3/pkg/api/handlers/utils" - api "github.com/containers/podman/v3/pkg/api/types" - "github.com/containers/podman/v3/pkg/domain/infra/abi" + "github.com/containers/podman/v4/libpod" + "github.com/containers/podman/v4/pkg/api/handlers/utils" + api "github.com/containers/podman/v4/pkg/api/types" + "github.com/containers/podman/v4/pkg/domain/infra/abi" ) 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 ef0839d1f..69cf4fe7f 100644 --- a/pkg/api/handlers/libpod/manifests.go +++ b/pkg/api/handlers/libpod/manifests.go @@ -12,14 +12,14 @@ import ( "github.com/containers/image/v5/docker/reference" "github.com/containers/image/v5/manifest" "github.com/containers/image/v5/types" - "github.com/containers/podman/v3/libpod" - "github.com/containers/podman/v3/pkg/api/handlers" - "github.com/containers/podman/v3/pkg/api/handlers/utils" - api "github.com/containers/podman/v3/pkg/api/types" - "github.com/containers/podman/v3/pkg/auth" - "github.com/containers/podman/v3/pkg/domain/entities" - "github.com/containers/podman/v3/pkg/domain/infra/abi" - "github.com/containers/podman/v3/pkg/errorhandling" + "github.com/containers/podman/v4/libpod" + "github.com/containers/podman/v4/pkg/api/handlers" + "github.com/containers/podman/v4/pkg/api/handlers/utils" + api "github.com/containers/podman/v4/pkg/api/types" + "github.com/containers/podman/v4/pkg/auth" + "github.com/containers/podman/v4/pkg/domain/entities" + "github.com/containers/podman/v4/pkg/domain/infra/abi" + "github.com/containers/podman/v4/pkg/errorhandling" "github.com/gorilla/mux" "github.com/gorilla/schema" "github.com/opencontainers/go-digest" diff --git a/pkg/api/handlers/libpod/networks.go b/pkg/api/handlers/libpod/networks.go index d140ec07f..aebf601b7 100644 --- a/pkg/api/handlers/libpod/networks.go +++ b/pkg/api/handlers/libpod/networks.go @@ -5,13 +5,13 @@ import ( "net/http" "github.com/containers/common/libnetwork/types" - "github.com/containers/podman/v3/libpod" - "github.com/containers/podman/v3/libpod/define" - "github.com/containers/podman/v3/pkg/api/handlers/utils" - api "github.com/containers/podman/v3/pkg/api/types" - "github.com/containers/podman/v3/pkg/domain/entities" - "github.com/containers/podman/v3/pkg/domain/infra/abi" - "github.com/containers/podman/v3/pkg/util" + "github.com/containers/podman/v4/libpod" + "github.com/containers/podman/v4/libpod/define" + "github.com/containers/podman/v4/pkg/api/handlers/utils" + api "github.com/containers/podman/v4/pkg/api/types" + "github.com/containers/podman/v4/pkg/domain/entities" + "github.com/containers/podman/v4/pkg/domain/infra/abi" + "github.com/containers/podman/v4/pkg/util" "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 6ef83ad92..0c480dfbf 100644 --- a/pkg/api/handlers/libpod/play.go +++ b/pkg/api/handlers/libpod/play.go @@ -8,12 +8,12 @@ import ( "os" "github.com/containers/image/v5/types" - "github.com/containers/podman/v3/libpod" - "github.com/containers/podman/v3/pkg/api/handlers/utils" - api "github.com/containers/podman/v3/pkg/api/types" - "github.com/containers/podman/v3/pkg/auth" - "github.com/containers/podman/v3/pkg/domain/entities" - "github.com/containers/podman/v3/pkg/domain/infra/abi" + "github.com/containers/podman/v4/libpod" + "github.com/containers/podman/v4/pkg/api/handlers/utils" + api "github.com/containers/podman/v4/pkg/api/types" + "github.com/containers/podman/v4/pkg/auth" + "github.com/containers/podman/v4/pkg/domain/entities" + "github.com/containers/podman/v4/pkg/domain/infra/abi" "github.com/gorilla/schema" "github.com/pkg/errors" "github.com/sirupsen/logrus" diff --git a/pkg/api/handlers/libpod/pods.go b/pkg/api/handlers/libpod/pods.go index 43b39060b..4b15c9675 100644 --- a/pkg/api/handlers/libpod/pods.go +++ b/pkg/api/handlers/libpod/pods.go @@ -7,17 +7,17 @@ import ( "strings" "time" - "github.com/containers/podman/v3/libpod" - "github.com/containers/podman/v3/libpod/define" - "github.com/containers/podman/v3/pkg/api/handlers" - "github.com/containers/podman/v3/pkg/api/handlers/utils" - api "github.com/containers/podman/v3/pkg/api/types" - "github.com/containers/podman/v3/pkg/domain/entities" - "github.com/containers/podman/v3/pkg/domain/infra/abi" - "github.com/containers/podman/v3/pkg/specgen" - "github.com/containers/podman/v3/pkg/specgen/generate" - "github.com/containers/podman/v3/pkg/specgenutil" - "github.com/containers/podman/v3/pkg/util" + "github.com/containers/podman/v4/libpod" + "github.com/containers/podman/v4/libpod/define" + "github.com/containers/podman/v4/pkg/api/handlers" + "github.com/containers/podman/v4/pkg/api/handlers/utils" + api "github.com/containers/podman/v4/pkg/api/types" + "github.com/containers/podman/v4/pkg/domain/entities" + "github.com/containers/podman/v4/pkg/domain/infra/abi" + "github.com/containers/podman/v4/pkg/specgen" + "github.com/containers/podman/v4/pkg/specgen/generate" + "github.com/containers/podman/v4/pkg/specgenutil" + "github.com/containers/podman/v4/pkg/util" "github.com/gorilla/schema" "github.com/pkg/errors" "github.com/sirupsen/logrus" diff --git a/pkg/api/handlers/libpod/secrets.go b/pkg/api/handlers/libpod/secrets.go index 5cdff8387..2523dc139 100644 --- a/pkg/api/handlers/libpod/secrets.go +++ b/pkg/api/handlers/libpod/secrets.go @@ -5,11 +5,11 @@ import ( "net/http" "reflect" - "github.com/containers/podman/v3/libpod" - "github.com/containers/podman/v3/pkg/api/handlers/utils" - api "github.com/containers/podman/v3/pkg/api/types" - "github.com/containers/podman/v3/pkg/domain/entities" - "github.com/containers/podman/v3/pkg/domain/infra/abi" + "github.com/containers/podman/v4/libpod" + "github.com/containers/podman/v4/pkg/api/handlers/utils" + api "github.com/containers/podman/v4/pkg/api/types" + "github.com/containers/podman/v4/pkg/domain/entities" + "github.com/containers/podman/v4/pkg/domain/infra/abi" "github.com/gorilla/schema" "github.com/pkg/errors" ) diff --git a/pkg/api/handlers/libpod/swagger.go b/pkg/api/handlers/libpod/swagger.go index db93d7ac6..5f33e6c01 100644 --- a/pkg/api/handlers/libpod/swagger.go +++ b/pkg/api/handlers/libpod/swagger.go @@ -6,9 +6,9 @@ import ( "github.com/containers/common/libnetwork/types" "github.com/containers/image/v5/manifest" - "github.com/containers/podman/v3/libpod/define" - "github.com/containers/podman/v3/pkg/api/handlers/utils" - "github.com/containers/podman/v3/pkg/domain/entities" + "github.com/containers/podman/v4/libpod/define" + "github.com/containers/podman/v4/pkg/api/handlers/utils" + "github.com/containers/podman/v4/pkg/domain/entities" "github.com/pkg/errors" ) diff --git a/pkg/api/handlers/libpod/system.go b/pkg/api/handlers/libpod/system.go index b7c60736f..f06d4b8c5 100644 --- a/pkg/api/handlers/libpod/system.go +++ b/pkg/api/handlers/libpod/system.go @@ -3,12 +3,12 @@ package libpod import ( "net/http" - "github.com/containers/podman/v3/libpod" - "github.com/containers/podman/v3/pkg/api/handlers/utils" - api "github.com/containers/podman/v3/pkg/api/types" - "github.com/containers/podman/v3/pkg/domain/entities" - "github.com/containers/podman/v3/pkg/domain/infra/abi" - "github.com/containers/podman/v3/pkg/util" + "github.com/containers/podman/v4/libpod" + "github.com/containers/podman/v4/pkg/api/handlers/utils" + api "github.com/containers/podman/v4/pkg/api/types" + "github.com/containers/podman/v4/pkg/domain/entities" + "github.com/containers/podman/v4/pkg/domain/infra/abi" + "github.com/containers/podman/v4/pkg/util" "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 ffdb30551..29085c06f 100644 --- a/pkg/api/handlers/libpod/volumes.go +++ b/pkg/api/handlers/libpod/volumes.go @@ -5,16 +5,16 @@ import ( "net/http" "net/url" - "github.com/containers/podman/v3/libpod" - "github.com/containers/podman/v3/libpod/define" - "github.com/containers/podman/v3/pkg/api/handlers/utils" - api "github.com/containers/podman/v3/pkg/api/types" - "github.com/containers/podman/v3/pkg/domain/entities" - "github.com/containers/podman/v3/pkg/domain/entities/reports" - "github.com/containers/podman/v3/pkg/domain/filters" - "github.com/containers/podman/v3/pkg/domain/infra/abi" - "github.com/containers/podman/v3/pkg/domain/infra/abi/parse" - "github.com/containers/podman/v3/pkg/util" + "github.com/containers/podman/v4/libpod" + "github.com/containers/podman/v4/libpod/define" + "github.com/containers/podman/v4/pkg/api/handlers/utils" + api "github.com/containers/podman/v4/pkg/api/types" + "github.com/containers/podman/v4/pkg/domain/entities" + "github.com/containers/podman/v4/pkg/domain/entities/reports" + "github.com/containers/podman/v4/pkg/domain/filters" + "github.com/containers/podman/v4/pkg/domain/infra/abi" + "github.com/containers/podman/v4/pkg/domain/infra/abi/parse" + "github.com/containers/podman/v4/pkg/util" "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 7868ff206..7446d901e 100644 --- a/pkg/api/handlers/swagger/swagger.go +++ b/pkg/api/handlers/swagger/swagger.go @@ -1,10 +1,10 @@ package swagger import ( - "github.com/containers/podman/v3/libpod/define" - "github.com/containers/podman/v3/pkg/api/handlers" - "github.com/containers/podman/v3/pkg/domain/entities" - "github.com/containers/podman/v3/pkg/inspect" + "github.com/containers/podman/v4/libpod/define" + "github.com/containers/podman/v4/pkg/api/handlers" + "github.com/containers/podman/v4/pkg/domain/entities" + "github.com/containers/podman/v4/pkg/inspect" "github.com/docker/docker/api/types" ) diff --git a/pkg/api/handlers/types.go b/pkg/api/handlers/types.go index d3a592bdf..07eebb4f4 100644 --- a/pkg/api/handlers/types.go +++ b/pkg/api/handlers/types.go @@ -5,7 +5,7 @@ import ( "time" "github.com/containers/common/libimage" - "github.com/containers/podman/v3/pkg/domain/entities" + "github.com/containers/podman/v4/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/types/types.go b/pkg/api/handlers/types/types.go index e7920047e..71e1d5024 100644 --- a/pkg/api/handlers/types/types.go +++ b/pkg/api/handlers/types/types.go @@ -1,6 +1,6 @@ package types -import "github.com/containers/podman/v3/pkg/domain/entities" +import "github.com/containers/podman/v4/pkg/domain/entities" // LibpodImagesRemoveReport is the return type for image removal via the rest // api. diff --git a/pkg/api/handlers/utils/containers.go b/pkg/api/handlers/utils/containers.go index 6f875fc30..d1e1164a4 100644 --- a/pkg/api/handlers/utils/containers.go +++ b/pkg/api/handlers/utils/containers.go @@ -7,17 +7,17 @@ import ( "strconv" "time" - "github.com/containers/podman/v3/libpod/events" - api "github.com/containers/podman/v3/pkg/api/types" - "github.com/containers/podman/v3/pkg/domain/entities" - "github.com/containers/podman/v3/pkg/domain/infra/abi" + "github.com/containers/podman/v4/libpod/events" + api "github.com/containers/podman/v4/pkg/api/types" + "github.com/containers/podman/v4/pkg/domain/entities" + "github.com/containers/podman/v4/pkg/domain/infra/abi" - "github.com/containers/podman/v3/pkg/api/handlers" + "github.com/containers/podman/v4/pkg/api/handlers" "github.com/sirupsen/logrus" - "github.com/containers/podman/v3/libpod/define" + "github.com/containers/podman/v4/libpod/define" - "github.com/containers/podman/v3/libpod" + "github.com/containers/podman/v4/libpod" "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 4a8005bfd..1bce19c10 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/podman/v3/libpod/define" - "github.com/containers/podman/v3/pkg/errorhandling" + "github.com/containers/podman/v4/libpod/define" + "github.com/containers/podman/v4/pkg/errorhandling" "github.com/containers/storage" "github.com/pkg/errors" log "github.com/sirupsen/logrus" diff --git a/pkg/api/handlers/utils/handler.go b/pkg/api/handlers/utils/handler.go index ee83755a1..a9b6f0659 100644 --- a/pkg/api/handlers/utils/handler.go +++ b/pkg/api/handlers/utils/handler.go @@ -10,7 +10,7 @@ import ( "unsafe" "github.com/blang/semver" - "github.com/containers/podman/v3/version" + "github.com/containers/podman/v4/version" "github.com/gorilla/mux" jsoniter "github.com/json-iterator/go" "github.com/pkg/errors" diff --git a/pkg/api/handlers/utils/handler_test.go b/pkg/api/handlers/utils/handler_test.go index 5957e7d74..924f5d246 100644 --- a/pkg/api/handlers/utils/handler_test.go +++ b/pkg/api/handlers/utils/handler_test.go @@ -7,7 +7,7 @@ import ( "net/http/httptest" "testing" - "github.com/containers/podman/v3/version" + "github.com/containers/podman/v4/version" "github.com/gorilla/mux" ) diff --git a/pkg/api/handlers/utils/images.go b/pkg/api/handlers/utils/images.go index 639de9915..15b16bc43 100644 --- a/pkg/api/handlers/utils/images.go +++ b/pkg/api/handlers/utils/images.go @@ -10,9 +10,9 @@ import ( storageTransport "github.com/containers/image/v5/storage" "github.com/containers/image/v5/transports/alltransports" "github.com/containers/image/v5/types" - "github.com/containers/podman/v3/libpod" - api "github.com/containers/podman/v3/pkg/api/types" - "github.com/containers/podman/v3/pkg/util" + "github.com/containers/podman/v4/libpod" + api "github.com/containers/podman/v4/pkg/api/types" + "github.com/containers/podman/v4/pkg/util" "github.com/containers/storage" "github.com/docker/distribution/reference" "github.com/pkg/errors" diff --git a/pkg/api/server/handler_api.go b/pkg/api/server/handler_api.go index 88b9b7397..a3aa681d0 100644 --- a/pkg/api/server/handler_api.go +++ b/pkg/api/server/handler_api.go @@ -5,7 +5,7 @@ import ( "net/http" "runtime" - "github.com/containers/podman/v3/version" + "github.com/containers/podman/v4/version" "github.com/sirupsen/logrus" ) diff --git a/pkg/api/server/handler_panic.go b/pkg/api/server/handler_panic.go index f643db79a..e00b3b5e7 100644 --- a/pkg/api/server/handler_panic.go +++ b/pkg/api/server/handler_panic.go @@ -5,7 +5,7 @@ import ( "net/http" "runtime" - "github.com/containers/podman/v3/pkg/api/handlers/utils" + "github.com/containers/podman/v4/pkg/api/handlers/utils" "github.com/gorilla/mux" "github.com/sirupsen/logrus" ) diff --git a/pkg/api/server/handler_rid.go b/pkg/api/server/handler_rid.go index 7dcf436f7..ee278071a 100644 --- a/pkg/api/server/handler_rid.go +++ b/pkg/api/server/handler_rid.go @@ -5,7 +5,7 @@ import ( "io/ioutil" "net/http" - "github.com/containers/podman/v3/pkg/api/types" + "github.com/containers/podman/v4/pkg/api/types" "github.com/google/uuid" "github.com/gorilla/handlers" "github.com/gorilla/mux" diff --git a/pkg/api/server/register_archive.go b/pkg/api/server/register_archive.go index 82d72ee6a..e51d12300 100644 --- a/pkg/api/server/register_archive.go +++ b/pkg/api/server/register_archive.go @@ -3,7 +3,7 @@ package server import ( "net/http" - "github.com/containers/podman/v3/pkg/api/handlers/compat" + "github.com/containers/podman/v4/pkg/api/handlers/compat" "github.com/gorilla/mux" ) diff --git a/pkg/api/server/register_auth.go b/pkg/api/server/register_auth.go index c07337653..e66a211fd 100644 --- a/pkg/api/server/register_auth.go +++ b/pkg/api/server/register_auth.go @@ -3,7 +3,7 @@ package server import ( "net/http" - "github.com/containers/podman/v3/pkg/api/handlers/compat" + "github.com/containers/podman/v4/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 4d19c04d4..89324794e 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/podman/v3/pkg/api/handlers/compat" - "github.com/containers/podman/v3/pkg/api/handlers/libpod" + "github.com/containers/podman/v4/pkg/api/handlers/compat" + "github.com/containers/podman/v4/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 cbb4476f3..8048c1ad2 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/podman/v3/pkg/api/handlers/compat" + "github.com/containers/podman/v4/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 553f2c0ea..10a7b76fc 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/podman/v3/pkg/api/handlers/compat" + "github.com/containers/podman/v4/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 e353d714c..c19ca7859 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/podman/v3/pkg/api/handlers/compat" + "github.com/containers/podman/v4/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 65340bf56..47057959c 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/podman/v3/pkg/api/handlers/libpod" + "github.com/containers/podman/v4/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 7d8541a51..014e82fe4 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/podman/v3/pkg/api/handlers/libpod" + "github.com/containers/podman/v4/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 df48253e2..f0b52dfc6 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/podman/v3/pkg/api/handlers/compat" - "github.com/containers/podman/v3/pkg/api/handlers/libpod" + "github.com/containers/podman/v4/pkg/api/handlers/compat" + "github.com/containers/podman/v4/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 45185ba3b..ccb145366 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/podman/v3/pkg/api/handlers/compat" - "github.com/containers/podman/v3/pkg/api/handlers/libpod" + "github.com/containers/podman/v4/pkg/api/handlers/compat" + "github.com/containers/podman/v4/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 8cd3d8b22..58def109e 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/podman/v3/pkg/api/handlers/libpod" + "github.com/containers/podman/v4/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 45d24af61..348b99400 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/podman/v3/pkg/api/handlers/compat" + "github.com/containers/podman/v4/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 77e8a80fd..baa1fe6fb 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/podman/v3/pkg/api/handlers/compat" - "github.com/containers/podman/v3/pkg/api/handlers/libpod" + "github.com/containers/podman/v4/pkg/api/handlers/compat" + "github.com/containers/podman/v4/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 1222b3dba..22c7eb3fd 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/podman/v3/pkg/api/handlers/compat" + "github.com/containers/podman/v4/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 5ace01929..52bc75bcf 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/podman/v3/pkg/api/handlers/libpod" + "github.com/containers/podman/v4/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 6fe217bfd..0134f1f32 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/podman/v3/pkg/api/handlers/compat" + "github.com/containers/podman/v4/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 16a7bbb4c..7aeafe724 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/podman/v3/pkg/api/handlers/libpod" + "github.com/containers/podman/v4/pkg/api/handlers/libpod" "github.com/gorilla/mux" ) diff --git a/pkg/api/server/register_secrets.go b/pkg/api/server/register_secrets.go index 129912179..26bc07834 100644 --- a/pkg/api/server/register_secrets.go +++ b/pkg/api/server/register_secrets.go @@ -3,8 +3,8 @@ package server import ( "net/http" - "github.com/containers/podman/v3/pkg/api/handlers/compat" - "github.com/containers/podman/v3/pkg/api/handlers/libpod" + "github.com/containers/podman/v4/pkg/api/handlers/compat" + "github.com/containers/podman/v4/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 48af7713f..1f6edb336 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/podman/v3/pkg/api/handlers/libpod" + "github.com/containers/podman/v4/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 fce35ba32..9bb1b1c7c 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/podman/v3/pkg/api/handlers/utils" + "github.com/containers/podman/v4/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 739daf7a6..a70f3b5f2 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/podman/v3/pkg/api/handlers/compat" - "github.com/containers/podman/v3/pkg/api/handlers/libpod" + "github.com/containers/podman/v4/pkg/api/handlers/compat" + "github.com/containers/podman/v4/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 462edf4ee..e9680f9ef 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/podman/v3/pkg/api/handlers/compat" + "github.com/containers/podman/v4/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 d1c1d5024..d36350146 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/podman/v3/pkg/api/handlers/compat" - "github.com/containers/podman/v3/pkg/api/handlers/libpod" + "github.com/containers/podman/v4/pkg/api/handlers/compat" + "github.com/containers/podman/v4/pkg/api/handlers/libpod" "github.com/gorilla/mux" ) diff --git a/pkg/api/server/server.go b/pkg/api/server/server.go index 65b7e2474..73740a6f9 100644 --- a/pkg/api/server/server.go +++ b/pkg/api/server/server.go @@ -14,12 +14,12 @@ import ( "syscall" "time" - "github.com/containers/podman/v3/libpod" - "github.com/containers/podman/v3/libpod/shutdown" - "github.com/containers/podman/v3/pkg/api/handlers" - "github.com/containers/podman/v3/pkg/api/server/idle" - "github.com/containers/podman/v3/pkg/api/types" - "github.com/containers/podman/v3/pkg/domain/entities" + "github.com/containers/podman/v4/libpod" + "github.com/containers/podman/v4/libpod/shutdown" + "github.com/containers/podman/v4/pkg/api/handlers" + "github.com/containers/podman/v4/pkg/api/server/idle" + "github.com/containers/podman/v4/pkg/api/types" + "github.com/containers/podman/v4/pkg/domain/entities" "github.com/coreos/go-systemd/v22/activation" "github.com/coreos/go-systemd/v22/daemon" "github.com/gorilla/mux" diff --git a/pkg/api/server/swagger.go b/pkg/api/server/swagger.go index 3f8f6f9c5..7b0e7a5a7 100644 --- a/pkg/api/server/swagger.go +++ b/pkg/api/server/swagger.go @@ -1,11 +1,11 @@ package server import ( - "github.com/containers/podman/v3/libpod" - "github.com/containers/podman/v3/libpod/define" - "github.com/containers/podman/v3/pkg/domain/entities" - "github.com/containers/podman/v3/pkg/domain/entities/reports" - "github.com/containers/podman/v3/pkg/errorhandling" + "github.com/containers/podman/v4/libpod" + "github.com/containers/podman/v4/libpod/define" + "github.com/containers/podman/v4/pkg/domain/entities" + "github.com/containers/podman/v4/pkg/domain/entities/reports" + "github.com/containers/podman/v4/pkg/errorhandling" docker "github.com/docker/docker/api/types" ) diff --git a/pkg/autoupdate/autoupdate.go b/pkg/autoupdate/autoupdate.go index 29c234ce9..07962a965 100644 --- a/pkg/autoupdate/autoupdate.go +++ b/pkg/autoupdate/autoupdate.go @@ -10,11 +10,11 @@ import ( "github.com/containers/image/v5/docker" "github.com/containers/image/v5/docker/reference" "github.com/containers/image/v5/transports/alltransports" - "github.com/containers/podman/v3/libpod" - "github.com/containers/podman/v3/libpod/define" - "github.com/containers/podman/v3/pkg/domain/entities" - "github.com/containers/podman/v3/pkg/systemd" - systemdDefine "github.com/containers/podman/v3/pkg/systemd/define" + "github.com/containers/podman/v4/libpod" + "github.com/containers/podman/v4/libpod/define" + "github.com/containers/podman/v4/pkg/domain/entities" + "github.com/containers/podman/v4/pkg/systemd" + systemdDefine "github.com/containers/podman/v4/pkg/systemd/define" "github.com/coreos/go-systemd/v22/dbus" "github.com/pkg/errors" "github.com/sirupsen/logrus" diff --git a/pkg/bindings/README.md b/pkg/bindings/README.md index 9e3610043..2863039e4 100644 --- a/pkg/bindings/README.md +++ b/pkg/bindings/README.md @@ -39,7 +39,7 @@ import ( "fmt" "os" - "github.com/containers/podman/v3/pkg/bindings" + "github.com/containers/podman/v4/pkg/bindings" ) func main() { @@ -70,8 +70,8 @@ import ( "fmt" "os" - "github.com/containers/podman/v3/pkg/bindings" - "github.com/containers/podman/v3/pkg/bindings/containers" + "github.com/containers/podman/v4/pkg/bindings" + "github.com/containers/podman/v4/pkg/bindings/containers" ) func main() { @@ -98,8 +98,8 @@ import ( "fmt" "os" - "github.com/containers/podman/v3/pkg/bindings" - "github.com/containers/podman/v3/pkg/bindings/images" + "github.com/containers/podman/v4/pkg/bindings" + "github.com/containers/podman/v4/pkg/bindings/images" ) func main() { @@ -126,10 +126,10 @@ import ( "fmt" "os" - "github.com/containers/podman/v3/pkg/bindings" - "github.com/containers/podman/v3/pkg/bindings/containers" - "github.com/containers/podman/v3/pkg/bindings/images" - "github.com/containers/podman/v3/pkg/specgen" + "github.com/containers/podman/v4/pkg/bindings" + "github.com/containers/podman/v4/pkg/bindings/containers" + "github.com/containers/podman/v4/pkg/bindings/images" + "github.com/containers/podman/v4/pkg/specgen" ) func main() { diff --git a/pkg/bindings/connection.go b/pkg/bindings/connection.go index 332aa97c8..36e47e5ed 100644 --- a/pkg/bindings/connection.go +++ b/pkg/bindings/connection.go @@ -13,8 +13,8 @@ import ( "time" "github.com/blang/semver" - "github.com/containers/podman/v3/pkg/terminal" - "github.com/containers/podman/v3/version" + "github.com/containers/podman/v4/pkg/terminal" + "github.com/containers/podman/v4/version" "github.com/pkg/errors" "github.com/sirupsen/logrus" "golang.org/x/crypto/ssh" diff --git a/pkg/bindings/containers/archive.go b/pkg/bindings/containers/archive.go index d64fbffd6..4f4b5a36a 100644 --- a/pkg/bindings/containers/archive.go +++ b/pkg/bindings/containers/archive.go @@ -6,9 +6,9 @@ import ( "net/http" "net/url" - "github.com/containers/podman/v3/pkg/bindings" - "github.com/containers/podman/v3/pkg/copy" - "github.com/containers/podman/v3/pkg/domain/entities" + "github.com/containers/podman/v4/pkg/bindings" + "github.com/containers/podman/v4/pkg/copy" + "github.com/containers/podman/v4/pkg/domain/entities" "github.com/pkg/errors" ) diff --git a/pkg/bindings/containers/attach.go b/pkg/bindings/containers/attach.go index c02265cd8..c6d434c87 100644 --- a/pkg/bindings/containers/attach.go +++ b/pkg/bindings/containers/attach.go @@ -15,10 +15,10 @@ import ( "strconv" "time" - "github.com/containers/podman/v3/libpod/define" - "github.com/containers/podman/v3/pkg/bindings" - sig "github.com/containers/podman/v3/pkg/signal" - "github.com/containers/podman/v3/utils" + "github.com/containers/podman/v4/libpod/define" + "github.com/containers/podman/v4/pkg/bindings" + sig "github.com/containers/podman/v4/pkg/signal" + "github.com/containers/podman/v4/utils" "github.com/moby/term" "github.com/pkg/errors" "github.com/sirupsen/logrus" diff --git a/pkg/bindings/containers/checkpoint.go b/pkg/bindings/containers/checkpoint.go index 7b4ec093d..1d8c34b33 100644 --- a/pkg/bindings/containers/checkpoint.go +++ b/pkg/bindings/containers/checkpoint.go @@ -6,8 +6,8 @@ import ( "net/http" "os" - "github.com/containers/podman/v3/pkg/bindings" - "github.com/containers/podman/v3/pkg/domain/entities" + "github.com/containers/podman/v4/pkg/bindings" + "github.com/containers/podman/v4/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 372a99d32..41761a2c6 100644 --- a/pkg/bindings/containers/commit.go +++ b/pkg/bindings/containers/commit.go @@ -4,8 +4,8 @@ import ( "context" "net/http" - "github.com/containers/podman/v3/pkg/api/handlers" - "github.com/containers/podman/v3/pkg/bindings" + "github.com/containers/podman/v4/pkg/api/handlers" + "github.com/containers/podman/v4/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 0148e62cb..be421cc8b 100644 --- a/pkg/bindings/containers/containers.go +++ b/pkg/bindings/containers/containers.go @@ -7,11 +7,11 @@ import ( "net/url" "strings" - "github.com/containers/podman/v3/libpod/define" - "github.com/containers/podman/v3/pkg/api/handlers" - "github.com/containers/podman/v3/pkg/bindings" - "github.com/containers/podman/v3/pkg/domain/entities" - "github.com/containers/podman/v3/pkg/domain/entities/reports" + "github.com/containers/podman/v4/libpod/define" + "github.com/containers/podman/v4/pkg/api/handlers" + "github.com/containers/podman/v4/pkg/bindings" + "github.com/containers/podman/v4/pkg/domain/entities" + "github.com/containers/podman/v4/pkg/domain/entities/reports" "github.com/pkg/errors" "github.com/sirupsen/logrus" ) diff --git a/pkg/bindings/containers/create.go b/pkg/bindings/containers/create.go index 83b5b5ac7..9c090f67d 100644 --- a/pkg/bindings/containers/create.go +++ b/pkg/bindings/containers/create.go @@ -5,9 +5,9 @@ import ( "net/http" "strings" - "github.com/containers/podman/v3/pkg/bindings" - "github.com/containers/podman/v3/pkg/domain/entities" - "github.com/containers/podman/v3/pkg/specgen" + "github.com/containers/podman/v4/pkg/bindings" + "github.com/containers/podman/v4/pkg/domain/entities" + "github.com/containers/podman/v4/pkg/specgen" jsoniter "github.com/json-iterator/go" ) diff --git a/pkg/bindings/containers/diff.go b/pkg/bindings/containers/diff.go index 65a4f81bb..2eb13088c 100644 --- a/pkg/bindings/containers/diff.go +++ b/pkg/bindings/containers/diff.go @@ -4,7 +4,7 @@ import ( "context" "net/http" - "github.com/containers/podman/v3/pkg/bindings" + "github.com/containers/podman/v4/pkg/bindings" "github.com/containers/storage/pkg/archive" ) diff --git a/pkg/bindings/containers/exec.go b/pkg/bindings/containers/exec.go index e41ed66c6..ce02763a1 100644 --- a/pkg/bindings/containers/exec.go +++ b/pkg/bindings/containers/exec.go @@ -6,9 +6,9 @@ import ( "net/http" "strings" - "github.com/containers/podman/v3/libpod/define" - "github.com/containers/podman/v3/pkg/api/handlers" - "github.com/containers/podman/v3/pkg/bindings" + "github.com/containers/podman/v4/libpod/define" + "github.com/containers/podman/v4/pkg/api/handlers" + "github.com/containers/podman/v4/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 990d8dc69..e0680238d 100644 --- a/pkg/bindings/containers/healthcheck.go +++ b/pkg/bindings/containers/healthcheck.go @@ -4,8 +4,8 @@ import ( "context" "net/http" - "github.com/containers/podman/v3/libpod/define" - "github.com/containers/podman/v3/pkg/bindings" + "github.com/containers/podman/v4/libpod/define" + "github.com/containers/podman/v4/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 df1dd22ea..7f7f07395 100644 --- a/pkg/bindings/containers/logs.go +++ b/pkg/bindings/containers/logs.go @@ -7,7 +7,7 @@ import ( "net/http" "strconv" - "github.com/containers/podman/v3/pkg/bindings" + "github.com/containers/podman/v4/pkg/bindings" "github.com/pkg/errors" ) diff --git a/pkg/bindings/containers/mount.go b/pkg/bindings/containers/mount.go index 5756c4cab..de286e4b4 100644 --- a/pkg/bindings/containers/mount.go +++ b/pkg/bindings/containers/mount.go @@ -4,7 +4,7 @@ import ( "context" "net/http" - "github.com/containers/podman/v3/pkg/bindings" + "github.com/containers/podman/v4/pkg/bindings" ) // Mount mounts an existing container to the filesystem. It returns the path diff --git a/pkg/bindings/containers/rename.go b/pkg/bindings/containers/rename.go index 29dfc581b..7cc16e334 100644 --- a/pkg/bindings/containers/rename.go +++ b/pkg/bindings/containers/rename.go @@ -4,7 +4,7 @@ import ( "context" "net/http" - "github.com/containers/podman/v3/pkg/bindings" + "github.com/containers/podman/v4/pkg/bindings" ) // Rename an existing container. diff --git a/pkg/bindings/containers/types.go b/pkg/bindings/containers/types.go index db3eb3e1b..4915e3e23 100644 --- a/pkg/bindings/containers/types.go +++ b/pkg/bindings/containers/types.go @@ -4,7 +4,7 @@ import ( "bufio" "io" - "github.com/containers/podman/v3/libpod/define" + "github.com/containers/podman/v4/libpod/define" ) //go:generate go run ../generator/generator.go LogOptions diff --git a/pkg/bindings/containers/types_attach_options.go b/pkg/bindings/containers/types_attach_options.go index 6db21c41a..9fa21ef4e 100644 --- a/pkg/bindings/containers/types_attach_options.go +++ b/pkg/bindings/containers/types_attach_options.go @@ -4,7 +4,7 @@ package containers import ( "net/url" - "github.com/containers/podman/v3/pkg/bindings/internal/util" + "github.com/containers/podman/v4/pkg/bindings/internal/util" ) // Changed returns true if named field has been set diff --git a/pkg/bindings/containers/types_checkpoint_options.go b/pkg/bindings/containers/types_checkpoint_options.go index 391748d76..e717daf9f 100644 --- a/pkg/bindings/containers/types_checkpoint_options.go +++ b/pkg/bindings/containers/types_checkpoint_options.go @@ -4,7 +4,7 @@ package containers import ( "net/url" - "github.com/containers/podman/v3/pkg/bindings/internal/util" + "github.com/containers/podman/v4/pkg/bindings/internal/util" ) // Changed returns true if named field has been set diff --git a/pkg/bindings/containers/types_commit_options.go b/pkg/bindings/containers/types_commit_options.go index ab506720c..7eb04198f 100644 --- a/pkg/bindings/containers/types_commit_options.go +++ b/pkg/bindings/containers/types_commit_options.go @@ -4,7 +4,7 @@ package containers import ( "net/url" - "github.com/containers/podman/v3/pkg/bindings/internal/util" + "github.com/containers/podman/v4/pkg/bindings/internal/util" ) // Changed returns true if named field has been set diff --git a/pkg/bindings/containers/types_copy_options.go b/pkg/bindings/containers/types_copy_options.go index 6c6981d64..8fcfe71a6 100644 --- a/pkg/bindings/containers/types_copy_options.go +++ b/pkg/bindings/containers/types_copy_options.go @@ -4,7 +4,7 @@ package containers import ( "net/url" - "github.com/containers/podman/v3/pkg/bindings/internal/util" + "github.com/containers/podman/v4/pkg/bindings/internal/util" ) // Changed returns true if named field has been set diff --git a/pkg/bindings/containers/types_create_options.go b/pkg/bindings/containers/types_create_options.go index eaef377e7..57896b9ef 100644 --- a/pkg/bindings/containers/types_create_options.go +++ b/pkg/bindings/containers/types_create_options.go @@ -4,7 +4,7 @@ package containers import ( "net/url" - "github.com/containers/podman/v3/pkg/bindings/internal/util" + "github.com/containers/podman/v4/pkg/bindings/internal/util" ) // Changed returns true if named field has been set diff --git a/pkg/bindings/containers/types_diff_options.go b/pkg/bindings/containers/types_diff_options.go index cde0ca392..5fc3dedae 100644 --- a/pkg/bindings/containers/types_diff_options.go +++ b/pkg/bindings/containers/types_diff_options.go @@ -4,7 +4,7 @@ package containers import ( "net/url" - "github.com/containers/podman/v3/pkg/bindings/internal/util" + "github.com/containers/podman/v4/pkg/bindings/internal/util" ) // Changed returns true if named field has been set diff --git a/pkg/bindings/containers/types_execinspect_options.go b/pkg/bindings/containers/types_execinspect_options.go index 7a047548a..0e926be0c 100644 --- a/pkg/bindings/containers/types_execinspect_options.go +++ b/pkg/bindings/containers/types_execinspect_options.go @@ -4,7 +4,7 @@ package containers import ( "net/url" - "github.com/containers/podman/v3/pkg/bindings/internal/util" + "github.com/containers/podman/v4/pkg/bindings/internal/util" ) // Changed returns true if named field has been set diff --git a/pkg/bindings/containers/types_execstart_options.go b/pkg/bindings/containers/types_execstart_options.go index 543e6b09b..4bd66e25b 100644 --- a/pkg/bindings/containers/types_execstart_options.go +++ b/pkg/bindings/containers/types_execstart_options.go @@ -4,7 +4,7 @@ package containers import ( "net/url" - "github.com/containers/podman/v3/pkg/bindings/internal/util" + "github.com/containers/podman/v4/pkg/bindings/internal/util" ) // Changed returns true if named field has been set diff --git a/pkg/bindings/containers/types_execstartandattach_options.go b/pkg/bindings/containers/types_execstartandattach_options.go index 741e59972..df7ac45d1 100644 --- a/pkg/bindings/containers/types_execstartandattach_options.go +++ b/pkg/bindings/containers/types_execstartandattach_options.go @@ -6,7 +6,7 @@ import ( "io" "net/url" - "github.com/containers/podman/v3/pkg/bindings/internal/util" + "github.com/containers/podman/v4/pkg/bindings/internal/util" ) // Changed returns true if named field has been set diff --git a/pkg/bindings/containers/types_exists_options.go b/pkg/bindings/containers/types_exists_options.go index 9d354a07c..6c73fcc65 100644 --- a/pkg/bindings/containers/types_exists_options.go +++ b/pkg/bindings/containers/types_exists_options.go @@ -4,7 +4,7 @@ package containers import ( "net/url" - "github.com/containers/podman/v3/pkg/bindings/internal/util" + "github.com/containers/podman/v4/pkg/bindings/internal/util" ) // Changed returns true if named field has been set diff --git a/pkg/bindings/containers/types_export_options.go b/pkg/bindings/containers/types_export_options.go index 79ff04f29..041a18041 100644 --- a/pkg/bindings/containers/types_export_options.go +++ b/pkg/bindings/containers/types_export_options.go @@ -4,7 +4,7 @@ package containers import ( "net/url" - "github.com/containers/podman/v3/pkg/bindings/internal/util" + "github.com/containers/podman/v4/pkg/bindings/internal/util" ) // Changed returns true if named field has been set diff --git a/pkg/bindings/containers/types_healthcheck_options.go b/pkg/bindings/containers/types_healthcheck_options.go index f51993ba5..f7daafdab 100644 --- a/pkg/bindings/containers/types_healthcheck_options.go +++ b/pkg/bindings/containers/types_healthcheck_options.go @@ -4,7 +4,7 @@ package containers import ( "net/url" - "github.com/containers/podman/v3/pkg/bindings/internal/util" + "github.com/containers/podman/v4/pkg/bindings/internal/util" ) // Changed returns true if named field has been set diff --git a/pkg/bindings/containers/types_init_options.go b/pkg/bindings/containers/types_init_options.go index 2b73c24fd..f93422ee3 100644 --- a/pkg/bindings/containers/types_init_options.go +++ b/pkg/bindings/containers/types_init_options.go @@ -4,7 +4,7 @@ package containers import ( "net/url" - "github.com/containers/podman/v3/pkg/bindings/internal/util" + "github.com/containers/podman/v4/pkg/bindings/internal/util" ) // Changed returns true if named field has been set diff --git a/pkg/bindings/containers/types_inspect_options.go b/pkg/bindings/containers/types_inspect_options.go index 6a5f6bfca..0fa8d0917 100644 --- a/pkg/bindings/containers/types_inspect_options.go +++ b/pkg/bindings/containers/types_inspect_options.go @@ -4,7 +4,7 @@ package containers import ( "net/url" - "github.com/containers/podman/v3/pkg/bindings/internal/util" + "github.com/containers/podman/v4/pkg/bindings/internal/util" ) // Changed returns true if named field has been set diff --git a/pkg/bindings/containers/types_kill_options.go b/pkg/bindings/containers/types_kill_options.go index c755d3be2..af26b3416 100644 --- a/pkg/bindings/containers/types_kill_options.go +++ b/pkg/bindings/containers/types_kill_options.go @@ -4,7 +4,7 @@ package containers import ( "net/url" - "github.com/containers/podman/v3/pkg/bindings/internal/util" + "github.com/containers/podman/v4/pkg/bindings/internal/util" ) // Changed returns true if named field has been set diff --git a/pkg/bindings/containers/types_list_options.go b/pkg/bindings/containers/types_list_options.go index 37f95e0ce..0204423eb 100644 --- a/pkg/bindings/containers/types_list_options.go +++ b/pkg/bindings/containers/types_list_options.go @@ -4,7 +4,7 @@ package containers import ( "net/url" - "github.com/containers/podman/v3/pkg/bindings/internal/util" + "github.com/containers/podman/v4/pkg/bindings/internal/util" ) // Changed returns true if named field has been set diff --git a/pkg/bindings/containers/types_log_options.go b/pkg/bindings/containers/types_log_options.go index d8160d4f7..4aab596d8 100644 --- a/pkg/bindings/containers/types_log_options.go +++ b/pkg/bindings/containers/types_log_options.go @@ -4,7 +4,7 @@ package containers import ( "net/url" - "github.com/containers/podman/v3/pkg/bindings/internal/util" + "github.com/containers/podman/v4/pkg/bindings/internal/util" ) // Changed returns true if named field has been set diff --git a/pkg/bindings/containers/types_mount_options.go b/pkg/bindings/containers/types_mount_options.go index eccc7bb73..1e0b7ddbf 100644 --- a/pkg/bindings/containers/types_mount_options.go +++ b/pkg/bindings/containers/types_mount_options.go @@ -4,7 +4,7 @@ package containers import ( "net/url" - "github.com/containers/podman/v3/pkg/bindings/internal/util" + "github.com/containers/podman/v4/pkg/bindings/internal/util" ) // Changed returns true if named field has been set diff --git a/pkg/bindings/containers/types_mountedcontainerpaths_options.go b/pkg/bindings/containers/types_mountedcontainerpaths_options.go index 7d053aba2..62377b52b 100644 --- a/pkg/bindings/containers/types_mountedcontainerpaths_options.go +++ b/pkg/bindings/containers/types_mountedcontainerpaths_options.go @@ -4,7 +4,7 @@ package containers import ( "net/url" - "github.com/containers/podman/v3/pkg/bindings/internal/util" + "github.com/containers/podman/v4/pkg/bindings/internal/util" ) // Changed returns true if named field has been set diff --git a/pkg/bindings/containers/types_pause_options.go b/pkg/bindings/containers/types_pause_options.go index bd1740b25..26ee31db0 100644 --- a/pkg/bindings/containers/types_pause_options.go +++ b/pkg/bindings/containers/types_pause_options.go @@ -4,7 +4,7 @@ package containers import ( "net/url" - "github.com/containers/podman/v3/pkg/bindings/internal/util" + "github.com/containers/podman/v4/pkg/bindings/internal/util" ) // Changed returns true if named field has been set diff --git a/pkg/bindings/containers/types_prune_options.go b/pkg/bindings/containers/types_prune_options.go index 016a43b66..413b84f47 100644 --- a/pkg/bindings/containers/types_prune_options.go +++ b/pkg/bindings/containers/types_prune_options.go @@ -4,7 +4,7 @@ package containers import ( "net/url" - "github.com/containers/podman/v3/pkg/bindings/internal/util" + "github.com/containers/podman/v4/pkg/bindings/internal/util" ) // Changed returns true if named field has been set diff --git a/pkg/bindings/containers/types_remove_options.go b/pkg/bindings/containers/types_remove_options.go index 7fa198d2f..b73b01cd2 100644 --- a/pkg/bindings/containers/types_remove_options.go +++ b/pkg/bindings/containers/types_remove_options.go @@ -4,7 +4,7 @@ package containers import ( "net/url" - "github.com/containers/podman/v3/pkg/bindings/internal/util" + "github.com/containers/podman/v4/pkg/bindings/internal/util" ) // Changed returns true if named field has been set diff --git a/pkg/bindings/containers/types_rename_options.go b/pkg/bindings/containers/types_rename_options.go index f55f7f5f0..1957a3982 100644 --- a/pkg/bindings/containers/types_rename_options.go +++ b/pkg/bindings/containers/types_rename_options.go @@ -4,7 +4,7 @@ package containers import ( "net/url" - "github.com/containers/podman/v3/pkg/bindings/internal/util" + "github.com/containers/podman/v4/pkg/bindings/internal/util" ) // Changed returns true if named field has been set diff --git a/pkg/bindings/containers/types_resizeexectty_options.go b/pkg/bindings/containers/types_resizeexectty_options.go index fb4a1d36a..2a7d5b540 100644 --- a/pkg/bindings/containers/types_resizeexectty_options.go +++ b/pkg/bindings/containers/types_resizeexectty_options.go @@ -4,7 +4,7 @@ package containers import ( "net/url" - "github.com/containers/podman/v3/pkg/bindings/internal/util" + "github.com/containers/podman/v4/pkg/bindings/internal/util" ) // Changed returns true if named field has been set diff --git a/pkg/bindings/containers/types_resizetty_options.go b/pkg/bindings/containers/types_resizetty_options.go index 1115478e9..fc027c48d 100644 --- a/pkg/bindings/containers/types_resizetty_options.go +++ b/pkg/bindings/containers/types_resizetty_options.go @@ -4,7 +4,7 @@ package containers import ( "net/url" - "github.com/containers/podman/v3/pkg/bindings/internal/util" + "github.com/containers/podman/v4/pkg/bindings/internal/util" ) // Changed returns true if named field has been set diff --git a/pkg/bindings/containers/types_restart_options.go b/pkg/bindings/containers/types_restart_options.go index eb4538ea9..f5f20df51 100644 --- a/pkg/bindings/containers/types_restart_options.go +++ b/pkg/bindings/containers/types_restart_options.go @@ -4,7 +4,7 @@ package containers import ( "net/url" - "github.com/containers/podman/v3/pkg/bindings/internal/util" + "github.com/containers/podman/v4/pkg/bindings/internal/util" ) // Changed returns true if named field has been set diff --git a/pkg/bindings/containers/types_restore_options.go b/pkg/bindings/containers/types_restore_options.go index 7af2bba32..d2778396a 100644 --- a/pkg/bindings/containers/types_restore_options.go +++ b/pkg/bindings/containers/types_restore_options.go @@ -4,7 +4,7 @@ package containers import ( "net/url" - "github.com/containers/podman/v3/pkg/bindings/internal/util" + "github.com/containers/podman/v4/pkg/bindings/internal/util" ) // Changed returns true if named field has been set diff --git a/pkg/bindings/containers/types_shouldrestart_options.go b/pkg/bindings/containers/types_shouldrestart_options.go index b43cf67e2..e9d529355 100644 --- a/pkg/bindings/containers/types_shouldrestart_options.go +++ b/pkg/bindings/containers/types_shouldrestart_options.go @@ -4,7 +4,7 @@ package containers import ( "net/url" - "github.com/containers/podman/v3/pkg/bindings/internal/util" + "github.com/containers/podman/v4/pkg/bindings/internal/util" ) // Changed returns true if named field has been set diff --git a/pkg/bindings/containers/types_start_options.go b/pkg/bindings/containers/types_start_options.go index 30914d003..88342dcd0 100644 --- a/pkg/bindings/containers/types_start_options.go +++ b/pkg/bindings/containers/types_start_options.go @@ -4,7 +4,7 @@ package containers import ( "net/url" - "github.com/containers/podman/v3/pkg/bindings/internal/util" + "github.com/containers/podman/v4/pkg/bindings/internal/util" ) // Changed returns true if named field has been set diff --git a/pkg/bindings/containers/types_stats_options.go b/pkg/bindings/containers/types_stats_options.go index 9306c806c..51b3fb41d 100644 --- a/pkg/bindings/containers/types_stats_options.go +++ b/pkg/bindings/containers/types_stats_options.go @@ -4,7 +4,7 @@ package containers import ( "net/url" - "github.com/containers/podman/v3/pkg/bindings/internal/util" + "github.com/containers/podman/v4/pkg/bindings/internal/util" ) // Changed returns true if named field has been set diff --git a/pkg/bindings/containers/types_stop_options.go b/pkg/bindings/containers/types_stop_options.go index c6db8b909..375557ecb 100644 --- a/pkg/bindings/containers/types_stop_options.go +++ b/pkg/bindings/containers/types_stop_options.go @@ -4,7 +4,7 @@ package containers import ( "net/url" - "github.com/containers/podman/v3/pkg/bindings/internal/util" + "github.com/containers/podman/v4/pkg/bindings/internal/util" ) // Changed returns true if named field has been set diff --git a/pkg/bindings/containers/types_top_options.go b/pkg/bindings/containers/types_top_options.go index 7ff04a7b6..61d37ed0d 100644 --- a/pkg/bindings/containers/types_top_options.go +++ b/pkg/bindings/containers/types_top_options.go @@ -4,7 +4,7 @@ package containers import ( "net/url" - "github.com/containers/podman/v3/pkg/bindings/internal/util" + "github.com/containers/podman/v4/pkg/bindings/internal/util" ) // Changed returns true if named field has been set diff --git a/pkg/bindings/containers/types_unmount_options.go b/pkg/bindings/containers/types_unmount_options.go index 4e5adb2a8..0faa405c4 100644 --- a/pkg/bindings/containers/types_unmount_options.go +++ b/pkg/bindings/containers/types_unmount_options.go @@ -4,7 +4,7 @@ package containers import ( "net/url" - "github.com/containers/podman/v3/pkg/bindings/internal/util" + "github.com/containers/podman/v4/pkg/bindings/internal/util" ) // Changed returns true if named field has been set diff --git a/pkg/bindings/containers/types_unpause_options.go b/pkg/bindings/containers/types_unpause_options.go index d0d806a58..4a967862e 100644 --- a/pkg/bindings/containers/types_unpause_options.go +++ b/pkg/bindings/containers/types_unpause_options.go @@ -4,7 +4,7 @@ package containers import ( "net/url" - "github.com/containers/podman/v3/pkg/bindings/internal/util" + "github.com/containers/podman/v4/pkg/bindings/internal/util" ) // Changed returns true if named field has been set diff --git a/pkg/bindings/containers/types_wait_options.go b/pkg/bindings/containers/types_wait_options.go index 4ca30f71b..e74c07821 100644 --- a/pkg/bindings/containers/types_wait_options.go +++ b/pkg/bindings/containers/types_wait_options.go @@ -4,8 +4,8 @@ package containers import ( "net/url" - "github.com/containers/podman/v3/libpod/define" - "github.com/containers/podman/v3/pkg/bindings/internal/util" + "github.com/containers/podman/v4/libpod/define" + "github.com/containers/podman/v4/pkg/bindings/internal/util" ) // Changed returns true if named field has been set diff --git a/pkg/bindings/errors.go b/pkg/bindings/errors.go index be184b916..44973eb41 100644 --- a/pkg/bindings/errors.go +++ b/pkg/bindings/errors.go @@ -4,7 +4,7 @@ import ( "encoding/json" "io/ioutil" - "github.com/containers/podman/v3/pkg/errorhandling" + "github.com/containers/podman/v4/pkg/errorhandling" "github.com/pkg/errors" ) diff --git a/pkg/bindings/generate/generate.go b/pkg/bindings/generate/generate.go index 641c14231..daca8046f 100644 --- a/pkg/bindings/generate/generate.go +++ b/pkg/bindings/generate/generate.go @@ -5,8 +5,8 @@ import ( "errors" "net/http" - "github.com/containers/podman/v3/pkg/bindings" - "github.com/containers/podman/v3/pkg/domain/entities" + "github.com/containers/podman/v4/pkg/bindings" + "github.com/containers/podman/v4/pkg/domain/entities" ) func Systemd(ctx context.Context, nameOrID string, options *SystemdOptions) (*entities.GenerateSystemdReport, error) { diff --git a/pkg/bindings/generate/types_kube_options.go b/pkg/bindings/generate/types_kube_options.go index 0dd23afb0..2a8b007b8 100644 --- a/pkg/bindings/generate/types_kube_options.go +++ b/pkg/bindings/generate/types_kube_options.go @@ -4,7 +4,7 @@ package generate import ( "net/url" - "github.com/containers/podman/v3/pkg/bindings/internal/util" + "github.com/containers/podman/v4/pkg/bindings/internal/util" ) // Changed returns true if named field has been set diff --git a/pkg/bindings/generate/types_systemd_options.go b/pkg/bindings/generate/types_systemd_options.go index 504d4da7f..960e45e50 100644 --- a/pkg/bindings/generate/types_systemd_options.go +++ b/pkg/bindings/generate/types_systemd_options.go @@ -4,7 +4,7 @@ package generate import ( "net/url" - "github.com/containers/podman/v3/pkg/bindings/internal/util" + "github.com/containers/podman/v4/pkg/bindings/internal/util" ) // Changed returns true if named field has been set diff --git a/pkg/bindings/generator/generator.go b/pkg/bindings/generator/generator.go index f7388ec6a..a224013ea 100644 --- a/pkg/bindings/generator/generator.go +++ b/pkg/bindings/generator/generator.go @@ -82,7 +82,7 @@ func main() { } // always add reflect - imports := []string{"\"reflect\"", "\"github.com/containers/podman/v3/pkg/bindings/internal/util\""} + imports := []string{"\"reflect\"", "\"github.com/containers/podman/v4/pkg/bindings/internal/util\""} for _, imp := range f.Imports { imports = append(imports, imp.Path.Value) } diff --git a/pkg/bindings/images/build.go b/pkg/bindings/images/build.go index 9880c73e4..b7220f5c5 100644 --- a/pkg/bindings/images/build.go +++ b/pkg/bindings/images/build.go @@ -18,9 +18,9 @@ import ( "strings" "github.com/containers/buildah/define" - "github.com/containers/podman/v3/pkg/auth" - "github.com/containers/podman/v3/pkg/bindings" - "github.com/containers/podman/v3/pkg/domain/entities" + "github.com/containers/podman/v4/pkg/auth" + "github.com/containers/podman/v4/pkg/bindings" + "github.com/containers/podman/v4/pkg/domain/entities" "github.com/containers/storage/pkg/fileutils" "github.com/containers/storage/pkg/ioutils" "github.com/docker/go-units" diff --git a/pkg/bindings/images/diff.go b/pkg/bindings/images/diff.go index 3df0b9615..2a59e6d69 100644 --- a/pkg/bindings/images/diff.go +++ b/pkg/bindings/images/diff.go @@ -4,7 +4,7 @@ import ( "context" "net/http" - "github.com/containers/podman/v3/pkg/bindings" + "github.com/containers/podman/v4/pkg/bindings" "github.com/containers/storage/pkg/archive" ) diff --git a/pkg/bindings/images/images.go b/pkg/bindings/images/images.go index 152ff0cde..8e3b07929 100644 --- a/pkg/bindings/images/images.go +++ b/pkg/bindings/images/images.go @@ -9,11 +9,11 @@ import ( "strconv" imageTypes "github.com/containers/image/v5/types" - "github.com/containers/podman/v3/pkg/api/handlers/types" - "github.com/containers/podman/v3/pkg/auth" - "github.com/containers/podman/v3/pkg/bindings" - "github.com/containers/podman/v3/pkg/domain/entities" - "github.com/containers/podman/v3/pkg/domain/entities/reports" + "github.com/containers/podman/v4/pkg/api/handlers/types" + "github.com/containers/podman/v4/pkg/auth" + "github.com/containers/podman/v4/pkg/bindings" + "github.com/containers/podman/v4/pkg/domain/entities" + "github.com/containers/podman/v4/pkg/domain/entities/reports" "github.com/pkg/errors" ) diff --git a/pkg/bindings/images/pull.go b/pkg/bindings/images/pull.go index ac583973f..20e47179c 100644 --- a/pkg/bindings/images/pull.go +++ b/pkg/bindings/images/pull.go @@ -11,10 +11,10 @@ import ( "strconv" "github.com/containers/image/v5/types" - "github.com/containers/podman/v3/pkg/auth" - "github.com/containers/podman/v3/pkg/bindings" - "github.com/containers/podman/v3/pkg/domain/entities" - "github.com/containers/podman/v3/pkg/errorhandling" + "github.com/containers/podman/v4/pkg/auth" + "github.com/containers/podman/v4/pkg/bindings" + "github.com/containers/podman/v4/pkg/domain/entities" + "github.com/containers/podman/v4/pkg/errorhandling" "github.com/pkg/errors" ) diff --git a/pkg/bindings/images/rm.go b/pkg/bindings/images/rm.go index 47d7c2a4b..b80bacf45 100644 --- a/pkg/bindings/images/rm.go +++ b/pkg/bindings/images/rm.go @@ -4,10 +4,10 @@ import ( "context" "net/http" - "github.com/containers/podman/v3/pkg/api/handlers/types" - "github.com/containers/podman/v3/pkg/bindings" - "github.com/containers/podman/v3/pkg/domain/entities" - "github.com/containers/podman/v3/pkg/errorhandling" + "github.com/containers/podman/v4/pkg/api/handlers/types" + "github.com/containers/podman/v4/pkg/bindings" + "github.com/containers/podman/v4/pkg/domain/entities" + "github.com/containers/podman/v4/pkg/errorhandling" ) // Remove removes one or more images from the local storage. Use optional force option to remove an diff --git a/pkg/bindings/images/types_diff_options.go b/pkg/bindings/images/types_diff_options.go index 658358e95..3a3032155 100644 --- a/pkg/bindings/images/types_diff_options.go +++ b/pkg/bindings/images/types_diff_options.go @@ -4,7 +4,7 @@ package images import ( "net/url" - "github.com/containers/podman/v3/pkg/bindings/internal/util" + "github.com/containers/podman/v4/pkg/bindings/internal/util" ) // Changed returns true if named field has been set diff --git a/pkg/bindings/images/types_exists_options.go b/pkg/bindings/images/types_exists_options.go index 3158a1a54..7521d85f3 100644 --- a/pkg/bindings/images/types_exists_options.go +++ b/pkg/bindings/images/types_exists_options.go @@ -4,7 +4,7 @@ package images import ( "net/url" - "github.com/containers/podman/v3/pkg/bindings/internal/util" + "github.com/containers/podman/v4/pkg/bindings/internal/util" ) // Changed returns true if named field has been set diff --git a/pkg/bindings/images/types_export_options.go b/pkg/bindings/images/types_export_options.go index 649b6814e..77850734c 100644 --- a/pkg/bindings/images/types_export_options.go +++ b/pkg/bindings/images/types_export_options.go @@ -4,7 +4,7 @@ package images import ( "net/url" - "github.com/containers/podman/v3/pkg/bindings/internal/util" + "github.com/containers/podman/v4/pkg/bindings/internal/util" ) // Changed returns true if named field has been set diff --git a/pkg/bindings/images/types_get_options.go b/pkg/bindings/images/types_get_options.go index 9c10b9f54..36b62272e 100644 --- a/pkg/bindings/images/types_get_options.go +++ b/pkg/bindings/images/types_get_options.go @@ -4,7 +4,7 @@ package images import ( "net/url" - "github.com/containers/podman/v3/pkg/bindings/internal/util" + "github.com/containers/podman/v4/pkg/bindings/internal/util" ) // Changed returns true if named field has been set diff --git a/pkg/bindings/images/types_history_options.go b/pkg/bindings/images/types_history_options.go index 0175b49e6..a9abb482a 100644 --- a/pkg/bindings/images/types_history_options.go +++ b/pkg/bindings/images/types_history_options.go @@ -4,7 +4,7 @@ package images import ( "net/url" - "github.com/containers/podman/v3/pkg/bindings/internal/util" + "github.com/containers/podman/v4/pkg/bindings/internal/util" ) // Changed returns true if named field has been set diff --git a/pkg/bindings/images/types_import_options.go b/pkg/bindings/images/types_import_options.go index aed567934..ea66fa312 100644 --- a/pkg/bindings/images/types_import_options.go +++ b/pkg/bindings/images/types_import_options.go @@ -4,7 +4,7 @@ package images import ( "net/url" - "github.com/containers/podman/v3/pkg/bindings/internal/util" + "github.com/containers/podman/v4/pkg/bindings/internal/util" ) // Changed returns true if named field has been set diff --git a/pkg/bindings/images/types_list_options.go b/pkg/bindings/images/types_list_options.go index d810e0588..f47cd9c75 100644 --- a/pkg/bindings/images/types_list_options.go +++ b/pkg/bindings/images/types_list_options.go @@ -4,7 +4,7 @@ package images import ( "net/url" - "github.com/containers/podman/v3/pkg/bindings/internal/util" + "github.com/containers/podman/v4/pkg/bindings/internal/util" ) // Changed returns true if named field has been set diff --git a/pkg/bindings/images/types_load_options.go b/pkg/bindings/images/types_load_options.go index b139a96f4..9978201ce 100644 --- a/pkg/bindings/images/types_load_options.go +++ b/pkg/bindings/images/types_load_options.go @@ -4,7 +4,7 @@ package images import ( "net/url" - "github.com/containers/podman/v3/pkg/bindings/internal/util" + "github.com/containers/podman/v4/pkg/bindings/internal/util" ) // Changed returns true if named field has been set diff --git a/pkg/bindings/images/types_prune_options.go b/pkg/bindings/images/types_prune_options.go index c9772045e..eddf1ae45 100644 --- a/pkg/bindings/images/types_prune_options.go +++ b/pkg/bindings/images/types_prune_options.go @@ -4,7 +4,7 @@ package images import ( "net/url" - "github.com/containers/podman/v3/pkg/bindings/internal/util" + "github.com/containers/podman/v4/pkg/bindings/internal/util" ) // Changed returns true if named field has been set diff --git a/pkg/bindings/images/types_pull_options.go b/pkg/bindings/images/types_pull_options.go index 630235aec..4cd525185 100644 --- a/pkg/bindings/images/types_pull_options.go +++ b/pkg/bindings/images/types_pull_options.go @@ -4,7 +4,7 @@ package images import ( "net/url" - "github.com/containers/podman/v3/pkg/bindings/internal/util" + "github.com/containers/podman/v4/pkg/bindings/internal/util" ) // Changed returns true if named field has been set diff --git a/pkg/bindings/images/types_push_options.go b/pkg/bindings/images/types_push_options.go index 183db47aa..4985c9451 100644 --- a/pkg/bindings/images/types_push_options.go +++ b/pkg/bindings/images/types_push_options.go @@ -4,7 +4,7 @@ package images import ( "net/url" - "github.com/containers/podman/v3/pkg/bindings/internal/util" + "github.com/containers/podman/v4/pkg/bindings/internal/util" ) // Changed returns true if named field has been set diff --git a/pkg/bindings/images/types_remove_options.go b/pkg/bindings/images/types_remove_options.go index 30321db25..1fbe5f4ea 100644 --- a/pkg/bindings/images/types_remove_options.go +++ b/pkg/bindings/images/types_remove_options.go @@ -4,7 +4,7 @@ package images import ( "net/url" - "github.com/containers/podman/v3/pkg/bindings/internal/util" + "github.com/containers/podman/v4/pkg/bindings/internal/util" ) // Changed returns true if named field has been set diff --git a/pkg/bindings/images/types_search_options.go b/pkg/bindings/images/types_search_options.go index 4424f1504..63de15c59 100644 --- a/pkg/bindings/images/types_search_options.go +++ b/pkg/bindings/images/types_search_options.go @@ -4,7 +4,7 @@ package images import ( "net/url" - "github.com/containers/podman/v3/pkg/bindings/internal/util" + "github.com/containers/podman/v4/pkg/bindings/internal/util" ) // Changed returns true if named field has been set diff --git a/pkg/bindings/images/types_tag_options.go b/pkg/bindings/images/types_tag_options.go index 0d5772417..30cef4dd2 100644 --- a/pkg/bindings/images/types_tag_options.go +++ b/pkg/bindings/images/types_tag_options.go @@ -4,7 +4,7 @@ package images import ( "net/url" - "github.com/containers/podman/v3/pkg/bindings/internal/util" + "github.com/containers/podman/v4/pkg/bindings/internal/util" ) // Changed returns true if named field has been set diff --git a/pkg/bindings/images/types_tree_options.go b/pkg/bindings/images/types_tree_options.go index d70a81b06..57eecf959 100644 --- a/pkg/bindings/images/types_tree_options.go +++ b/pkg/bindings/images/types_tree_options.go @@ -4,7 +4,7 @@ package images import ( "net/url" - "github.com/containers/podman/v3/pkg/bindings/internal/util" + "github.com/containers/podman/v4/pkg/bindings/internal/util" ) // Changed returns true if named field has been set diff --git a/pkg/bindings/images/types_untag_options.go b/pkg/bindings/images/types_untag_options.go index 5d6cda000..eba687f3d 100644 --- a/pkg/bindings/images/types_untag_options.go +++ b/pkg/bindings/images/types_untag_options.go @@ -4,7 +4,7 @@ package images import ( "net/url" - "github.com/containers/podman/v3/pkg/bindings/internal/util" + "github.com/containers/podman/v4/pkg/bindings/internal/util" ) // Changed returns true if named field has been set diff --git a/pkg/bindings/manifests/manifests.go b/pkg/bindings/manifests/manifests.go index 50e324efa..458cb913a 100644 --- a/pkg/bindings/manifests/manifests.go +++ b/pkg/bindings/manifests/manifests.go @@ -11,10 +11,10 @@ import ( "github.com/blang/semver" "github.com/containers/image/v5/manifest" - "github.com/containers/podman/v3/pkg/api/handlers" - "github.com/containers/podman/v3/pkg/bindings" - "github.com/containers/podman/v3/pkg/bindings/images" - "github.com/containers/podman/v3/version" + "github.com/containers/podman/v4/pkg/api/handlers" + "github.com/containers/podman/v4/pkg/bindings" + "github.com/containers/podman/v4/pkg/bindings/images" + "github.com/containers/podman/v4/version" jsoniter "github.com/json-iterator/go" ) diff --git a/pkg/bindings/manifests/types_add_options.go b/pkg/bindings/manifests/types_add_options.go index c2e7b5e89..0696a69b6 100644 --- a/pkg/bindings/manifests/types_add_options.go +++ b/pkg/bindings/manifests/types_add_options.go @@ -4,7 +4,7 @@ package manifests import ( "net/url" - "github.com/containers/podman/v3/pkg/bindings/internal/util" + "github.com/containers/podman/v4/pkg/bindings/internal/util" ) // Changed returns true if named field has been set diff --git a/pkg/bindings/manifests/types_create_options.go b/pkg/bindings/manifests/types_create_options.go index a04b7f4dd..960332a82 100644 --- a/pkg/bindings/manifests/types_create_options.go +++ b/pkg/bindings/manifests/types_create_options.go @@ -4,7 +4,7 @@ package manifests import ( "net/url" - "github.com/containers/podman/v3/pkg/bindings/internal/util" + "github.com/containers/podman/v4/pkg/bindings/internal/util" ) // Changed returns true if named field has been set diff --git a/pkg/bindings/manifests/types_exists_options.go b/pkg/bindings/manifests/types_exists_options.go index 0531b92c1..287710ce9 100644 --- a/pkg/bindings/manifests/types_exists_options.go +++ b/pkg/bindings/manifests/types_exists_options.go @@ -4,7 +4,7 @@ package manifests import ( "net/url" - "github.com/containers/podman/v3/pkg/bindings/internal/util" + "github.com/containers/podman/v4/pkg/bindings/internal/util" ) // Changed returns true if named field has been set diff --git a/pkg/bindings/manifests/types_inspect_options.go b/pkg/bindings/manifests/types_inspect_options.go index 686d7171d..f5a2df4dd 100644 --- a/pkg/bindings/manifests/types_inspect_options.go +++ b/pkg/bindings/manifests/types_inspect_options.go @@ -4,7 +4,7 @@ package manifests import ( "net/url" - "github.com/containers/podman/v3/pkg/bindings/internal/util" + "github.com/containers/podman/v4/pkg/bindings/internal/util" ) // Changed returns true if named field has been set diff --git a/pkg/bindings/manifests/types_modify_options.go b/pkg/bindings/manifests/types_modify_options.go index ee5d94dbf..6d75c1e5f 100644 --- a/pkg/bindings/manifests/types_modify_options.go +++ b/pkg/bindings/manifests/types_modify_options.go @@ -4,7 +4,7 @@ package manifests import ( "net/url" - "github.com/containers/podman/v3/pkg/bindings/internal/util" + "github.com/containers/podman/v4/pkg/bindings/internal/util" ) // Changed returns true if named field has been set diff --git a/pkg/bindings/manifests/types_remove_options.go b/pkg/bindings/manifests/types_remove_options.go index 90edd2b82..efadbe2c0 100644 --- a/pkg/bindings/manifests/types_remove_options.go +++ b/pkg/bindings/manifests/types_remove_options.go @@ -4,7 +4,7 @@ package manifests import ( "net/url" - "github.com/containers/podman/v3/pkg/bindings/internal/util" + "github.com/containers/podman/v4/pkg/bindings/internal/util" ) // Changed returns true if named field has been set diff --git a/pkg/bindings/network/network.go b/pkg/bindings/network/network.go index f3e7c3ef2..6c7777fdd 100644 --- a/pkg/bindings/network/network.go +++ b/pkg/bindings/network/network.go @@ -6,8 +6,8 @@ import ( "strings" "github.com/containers/common/libnetwork/types" - "github.com/containers/podman/v3/pkg/bindings" - "github.com/containers/podman/v3/pkg/domain/entities" + "github.com/containers/podman/v4/pkg/bindings" + "github.com/containers/podman/v4/pkg/domain/entities" jsoniter "github.com/json-iterator/go" ) diff --git a/pkg/bindings/network/types_create_options.go b/pkg/bindings/network/types_create_options.go index 1b1afebc1..63551c14a 100644 --- a/pkg/bindings/network/types_create_options.go +++ b/pkg/bindings/network/types_create_options.go @@ -5,7 +5,7 @@ import ( "net" "net/url" - "github.com/containers/podman/v3/pkg/bindings/internal/util" + "github.com/containers/podman/v4/pkg/bindings/internal/util" ) // Changed returns true if named field has been set diff --git a/pkg/bindings/network/types_disconnect_options.go b/pkg/bindings/network/types_disconnect_options.go index c95204447..0c3560d17 100644 --- a/pkg/bindings/network/types_disconnect_options.go +++ b/pkg/bindings/network/types_disconnect_options.go @@ -4,7 +4,7 @@ package network import ( "net/url" - "github.com/containers/podman/v3/pkg/bindings/internal/util" + "github.com/containers/podman/v4/pkg/bindings/internal/util" ) // Changed returns true if named field has been set diff --git a/pkg/bindings/network/types_exists_options.go b/pkg/bindings/network/types_exists_options.go index 10430f9f5..890f85db0 100644 --- a/pkg/bindings/network/types_exists_options.go +++ b/pkg/bindings/network/types_exists_options.go @@ -4,7 +4,7 @@ package network import ( "net/url" - "github.com/containers/podman/v3/pkg/bindings/internal/util" + "github.com/containers/podman/v4/pkg/bindings/internal/util" ) // Changed returns true if named field has been set diff --git a/pkg/bindings/network/types_inspect_options.go b/pkg/bindings/network/types_inspect_options.go index 47426a605..1d5fcd4c8 100644 --- a/pkg/bindings/network/types_inspect_options.go +++ b/pkg/bindings/network/types_inspect_options.go @@ -4,7 +4,7 @@ package network import ( "net/url" - "github.com/containers/podman/v3/pkg/bindings/internal/util" + "github.com/containers/podman/v4/pkg/bindings/internal/util" ) // Changed returns true if named field has been set diff --git a/pkg/bindings/network/types_list_options.go b/pkg/bindings/network/types_list_options.go index 60281f2ba..95bf088a8 100644 --- a/pkg/bindings/network/types_list_options.go +++ b/pkg/bindings/network/types_list_options.go @@ -4,7 +4,7 @@ package network import ( "net/url" - "github.com/containers/podman/v3/pkg/bindings/internal/util" + "github.com/containers/podman/v4/pkg/bindings/internal/util" ) // Changed returns true if named field has been set diff --git a/pkg/bindings/network/types_prune_options.go b/pkg/bindings/network/types_prune_options.go index 06e4eb19c..4d0fdbf43 100644 --- a/pkg/bindings/network/types_prune_options.go +++ b/pkg/bindings/network/types_prune_options.go @@ -4,7 +4,7 @@ package network import ( "net/url" - "github.com/containers/podman/v3/pkg/bindings/internal/util" + "github.com/containers/podman/v4/pkg/bindings/internal/util" ) // Changed returns true if named field has been set diff --git a/pkg/bindings/network/types_remove_options.go b/pkg/bindings/network/types_remove_options.go index 2f7fea77e..6c73a3989 100644 --- a/pkg/bindings/network/types_remove_options.go +++ b/pkg/bindings/network/types_remove_options.go @@ -4,7 +4,7 @@ package network import ( "net/url" - "github.com/containers/podman/v3/pkg/bindings/internal/util" + "github.com/containers/podman/v4/pkg/bindings/internal/util" ) // Changed returns true if named field has been set diff --git a/pkg/bindings/play/play.go b/pkg/bindings/play/play.go index 111a25cac..d4018b6b3 100644 --- a/pkg/bindings/play/play.go +++ b/pkg/bindings/play/play.go @@ -7,9 +7,9 @@ import ( "strconv" "github.com/containers/image/v5/types" - "github.com/containers/podman/v3/pkg/auth" - "github.com/containers/podman/v3/pkg/bindings" - "github.com/containers/podman/v3/pkg/domain/entities" + "github.com/containers/podman/v4/pkg/auth" + "github.com/containers/podman/v4/pkg/bindings" + "github.com/containers/podman/v4/pkg/domain/entities" "github.com/sirupsen/logrus" ) diff --git a/pkg/bindings/play/types_kube_options.go b/pkg/bindings/play/types_kube_options.go index 593f026a3..83a6f1566 100644 --- a/pkg/bindings/play/types_kube_options.go +++ b/pkg/bindings/play/types_kube_options.go @@ -5,7 +5,7 @@ import ( "net" "net/url" - "github.com/containers/podman/v3/pkg/bindings/internal/util" + "github.com/containers/podman/v4/pkg/bindings/internal/util" ) // Changed returns true if named field has been set diff --git a/pkg/bindings/pods/pods.go b/pkg/bindings/pods/pods.go index 9e32f766d..6b454635c 100644 --- a/pkg/bindings/pods/pods.go +++ b/pkg/bindings/pods/pods.go @@ -6,10 +6,10 @@ import ( "net/url" "strings" - "github.com/containers/podman/v3/pkg/api/handlers" - "github.com/containers/podman/v3/pkg/bindings" - "github.com/containers/podman/v3/pkg/domain/entities" - "github.com/containers/podman/v3/pkg/errorhandling" + "github.com/containers/podman/v4/pkg/api/handlers" + "github.com/containers/podman/v4/pkg/bindings" + "github.com/containers/podman/v4/pkg/domain/entities" + "github.com/containers/podman/v4/pkg/errorhandling" jsoniter "github.com/json-iterator/go" ) diff --git a/pkg/bindings/pods/types_create_options.go b/pkg/bindings/pods/types_create_options.go index ce7649e96..c7b7114e2 100644 --- a/pkg/bindings/pods/types_create_options.go +++ b/pkg/bindings/pods/types_create_options.go @@ -4,7 +4,7 @@ package pods import ( "net/url" - "github.com/containers/podman/v3/pkg/bindings/internal/util" + "github.com/containers/podman/v4/pkg/bindings/internal/util" ) // Changed returns true if named field has been set diff --git a/pkg/bindings/pods/types_exists_options.go b/pkg/bindings/pods/types_exists_options.go index 096f5a3f1..ca043986f 100644 --- a/pkg/bindings/pods/types_exists_options.go +++ b/pkg/bindings/pods/types_exists_options.go @@ -4,7 +4,7 @@ package pods import ( "net/url" - "github.com/containers/podman/v3/pkg/bindings/internal/util" + "github.com/containers/podman/v4/pkg/bindings/internal/util" ) // Changed returns true if named field has been set diff --git a/pkg/bindings/pods/types_inspect_options.go b/pkg/bindings/pods/types_inspect_options.go index 7a2c25058..cf630f36b 100644 --- a/pkg/bindings/pods/types_inspect_options.go +++ b/pkg/bindings/pods/types_inspect_options.go @@ -4,7 +4,7 @@ package pods import ( "net/url" - "github.com/containers/podman/v3/pkg/bindings/internal/util" + "github.com/containers/podman/v4/pkg/bindings/internal/util" ) // Changed returns true if named field has been set diff --git a/pkg/bindings/pods/types_kill_options.go b/pkg/bindings/pods/types_kill_options.go index ce521d3c0..547afe5d3 100644 --- a/pkg/bindings/pods/types_kill_options.go +++ b/pkg/bindings/pods/types_kill_options.go @@ -4,7 +4,7 @@ package pods import ( "net/url" - "github.com/containers/podman/v3/pkg/bindings/internal/util" + "github.com/containers/podman/v4/pkg/bindings/internal/util" ) // Changed returns true if named field has been set diff --git a/pkg/bindings/pods/types_list_options.go b/pkg/bindings/pods/types_list_options.go index f786aa38c..af6ce44f8 100644 --- a/pkg/bindings/pods/types_list_options.go +++ b/pkg/bindings/pods/types_list_options.go @@ -4,7 +4,7 @@ package pods import ( "net/url" - "github.com/containers/podman/v3/pkg/bindings/internal/util" + "github.com/containers/podman/v4/pkg/bindings/internal/util" ) // Changed returns true if named field has been set diff --git a/pkg/bindings/pods/types_pause_options.go b/pkg/bindings/pods/types_pause_options.go index 34792602c..6f38ad9b7 100644 --- a/pkg/bindings/pods/types_pause_options.go +++ b/pkg/bindings/pods/types_pause_options.go @@ -4,7 +4,7 @@ package pods import ( "net/url" - "github.com/containers/podman/v3/pkg/bindings/internal/util" + "github.com/containers/podman/v4/pkg/bindings/internal/util" ) // Changed returns true if named field has been set diff --git a/pkg/bindings/pods/types_prune_options.go b/pkg/bindings/pods/types_prune_options.go index ad2d1b983..9d1f3749a 100644 --- a/pkg/bindings/pods/types_prune_options.go +++ b/pkg/bindings/pods/types_prune_options.go @@ -4,7 +4,7 @@ package pods import ( "net/url" - "github.com/containers/podman/v3/pkg/bindings/internal/util" + "github.com/containers/podman/v4/pkg/bindings/internal/util" ) // Changed returns true if named field has been set diff --git a/pkg/bindings/pods/types_remove_options.go b/pkg/bindings/pods/types_remove_options.go index bbcc4d769..53c30617f 100644 --- a/pkg/bindings/pods/types_remove_options.go +++ b/pkg/bindings/pods/types_remove_options.go @@ -4,7 +4,7 @@ package pods import ( "net/url" - "github.com/containers/podman/v3/pkg/bindings/internal/util" + "github.com/containers/podman/v4/pkg/bindings/internal/util" ) // Changed returns true if named field has been set diff --git a/pkg/bindings/pods/types_restart_options.go b/pkg/bindings/pods/types_restart_options.go index 1018ce9ea..d2beb641b 100644 --- a/pkg/bindings/pods/types_restart_options.go +++ b/pkg/bindings/pods/types_restart_options.go @@ -4,7 +4,7 @@ package pods import ( "net/url" - "github.com/containers/podman/v3/pkg/bindings/internal/util" + "github.com/containers/podman/v4/pkg/bindings/internal/util" ) // Changed returns true if named field has been set diff --git a/pkg/bindings/pods/types_start_options.go b/pkg/bindings/pods/types_start_options.go index 0dbe27bc1..59f3000e6 100644 --- a/pkg/bindings/pods/types_start_options.go +++ b/pkg/bindings/pods/types_start_options.go @@ -4,7 +4,7 @@ package pods import ( "net/url" - "github.com/containers/podman/v3/pkg/bindings/internal/util" + "github.com/containers/podman/v4/pkg/bindings/internal/util" ) // Changed returns true if named field has been set diff --git a/pkg/bindings/pods/types_stats_options.go b/pkg/bindings/pods/types_stats_options.go index 3c9592946..ad7b6ca0a 100644 --- a/pkg/bindings/pods/types_stats_options.go +++ b/pkg/bindings/pods/types_stats_options.go @@ -4,7 +4,7 @@ package pods import ( "net/url" - "github.com/containers/podman/v3/pkg/bindings/internal/util" + "github.com/containers/podman/v4/pkg/bindings/internal/util" ) // Changed returns true if named field has been set diff --git a/pkg/bindings/pods/types_stop_options.go b/pkg/bindings/pods/types_stop_options.go index a96f41d1d..198210845 100644 --- a/pkg/bindings/pods/types_stop_options.go +++ b/pkg/bindings/pods/types_stop_options.go @@ -4,7 +4,7 @@ package pods import ( "net/url" - "github.com/containers/podman/v3/pkg/bindings/internal/util" + "github.com/containers/podman/v4/pkg/bindings/internal/util" ) // Changed returns true if named field has been set diff --git a/pkg/bindings/pods/types_top_options.go b/pkg/bindings/pods/types_top_options.go index 2e319afb2..3d165c503 100644 --- a/pkg/bindings/pods/types_top_options.go +++ b/pkg/bindings/pods/types_top_options.go @@ -4,7 +4,7 @@ package pods import ( "net/url" - "github.com/containers/podman/v3/pkg/bindings/internal/util" + "github.com/containers/podman/v4/pkg/bindings/internal/util" ) // Changed returns true if named field has been set diff --git a/pkg/bindings/pods/types_unpause_options.go b/pkg/bindings/pods/types_unpause_options.go index 88e9f60df..0cd5c3447 100644 --- a/pkg/bindings/pods/types_unpause_options.go +++ b/pkg/bindings/pods/types_unpause_options.go @@ -4,7 +4,7 @@ package pods import ( "net/url" - "github.com/containers/podman/v3/pkg/bindings/internal/util" + "github.com/containers/podman/v4/pkg/bindings/internal/util" ) // Changed returns true if named field has been set diff --git a/pkg/bindings/secrets/secrets.go b/pkg/bindings/secrets/secrets.go index 3847188a5..7ad827dd3 100644 --- a/pkg/bindings/secrets/secrets.go +++ b/pkg/bindings/secrets/secrets.go @@ -5,8 +5,8 @@ import ( "io" "net/http" - "github.com/containers/podman/v3/pkg/bindings" - "github.com/containers/podman/v3/pkg/domain/entities" + "github.com/containers/podman/v4/pkg/bindings" + "github.com/containers/podman/v4/pkg/domain/entities" ) // List returns information about existing secrets in the form of a slice. diff --git a/pkg/bindings/secrets/types_create_options.go b/pkg/bindings/secrets/types_create_options.go index 2c0633682..6b1666a42 100644 --- a/pkg/bindings/secrets/types_create_options.go +++ b/pkg/bindings/secrets/types_create_options.go @@ -4,7 +4,7 @@ package secrets import ( "net/url" - "github.com/containers/podman/v3/pkg/bindings/internal/util" + "github.com/containers/podman/v4/pkg/bindings/internal/util" ) // Changed returns true if named field has been set diff --git a/pkg/bindings/secrets/types_inspect_options.go b/pkg/bindings/secrets/types_inspect_options.go index 79ea97293..fe26ae3b8 100644 --- a/pkg/bindings/secrets/types_inspect_options.go +++ b/pkg/bindings/secrets/types_inspect_options.go @@ -4,7 +4,7 @@ package secrets import ( "net/url" - "github.com/containers/podman/v3/pkg/bindings/internal/util" + "github.com/containers/podman/v4/pkg/bindings/internal/util" ) // Changed returns true if named field has been set diff --git a/pkg/bindings/secrets/types_list_options.go b/pkg/bindings/secrets/types_list_options.go index 87b657ff9..97351e16d 100644 --- a/pkg/bindings/secrets/types_list_options.go +++ b/pkg/bindings/secrets/types_list_options.go @@ -4,7 +4,7 @@ package secrets import ( "net/url" - "github.com/containers/podman/v3/pkg/bindings/internal/util" + "github.com/containers/podman/v4/pkg/bindings/internal/util" ) // Changed returns true if named field has been set diff --git a/pkg/bindings/secrets/types_remove_options.go b/pkg/bindings/secrets/types_remove_options.go index 424a0c2e1..f8a060fdd 100644 --- a/pkg/bindings/secrets/types_remove_options.go +++ b/pkg/bindings/secrets/types_remove_options.go @@ -4,7 +4,7 @@ package secrets import ( "net/url" - "github.com/containers/podman/v3/pkg/bindings/internal/util" + "github.com/containers/podman/v4/pkg/bindings/internal/util" ) // Changed returns true if named field has been set diff --git a/pkg/bindings/system/info.go b/pkg/bindings/system/info.go index 8d7c30b26..a75ffc982 100644 --- a/pkg/bindings/system/info.go +++ b/pkg/bindings/system/info.go @@ -4,8 +4,8 @@ import ( "context" "net/http" - "github.com/containers/podman/v3/libpod/define" - "github.com/containers/podman/v3/pkg/bindings" + "github.com/containers/podman/v4/libpod/define" + "github.com/containers/podman/v4/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 3f59b3d7e..1eb90ab54 100644 --- a/pkg/bindings/system/system.go +++ b/pkg/bindings/system/system.go @@ -8,9 +8,9 @@ import ( "net/http" "time" - "github.com/containers/podman/v3/libpod/define" - "github.com/containers/podman/v3/pkg/bindings" - "github.com/containers/podman/v3/pkg/domain/entities" + "github.com/containers/podman/v4/libpod/define" + "github.com/containers/podman/v4/pkg/bindings" + "github.com/containers/podman/v4/pkg/domain/entities" "github.com/pkg/errors" "github.com/sirupsen/logrus" ) diff --git a/pkg/bindings/system/types_disk_options.go b/pkg/bindings/system/types_disk_options.go index d057a2361..7f9cd000e 100644 --- a/pkg/bindings/system/types_disk_options.go +++ b/pkg/bindings/system/types_disk_options.go @@ -4,7 +4,7 @@ package system import ( "net/url" - "github.com/containers/podman/v3/pkg/bindings/internal/util" + "github.com/containers/podman/v4/pkg/bindings/internal/util" ) // Changed returns true if named field has been set diff --git a/pkg/bindings/system/types_events_options.go b/pkg/bindings/system/types_events_options.go index 6bb13b8a6..d7f057267 100644 --- a/pkg/bindings/system/types_events_options.go +++ b/pkg/bindings/system/types_events_options.go @@ -4,7 +4,7 @@ package system import ( "net/url" - "github.com/containers/podman/v3/pkg/bindings/internal/util" + "github.com/containers/podman/v4/pkg/bindings/internal/util" ) // Changed returns true if named field has been set diff --git a/pkg/bindings/system/types_info_options.go b/pkg/bindings/system/types_info_options.go index 0a12d7db6..eae6a74bf 100644 --- a/pkg/bindings/system/types_info_options.go +++ b/pkg/bindings/system/types_info_options.go @@ -4,7 +4,7 @@ package system import ( "net/url" - "github.com/containers/podman/v3/pkg/bindings/internal/util" + "github.com/containers/podman/v4/pkg/bindings/internal/util" ) // Changed returns true if named field has been set diff --git a/pkg/bindings/system/types_prune_options.go b/pkg/bindings/system/types_prune_options.go index 4feb359ef..47805febf 100644 --- a/pkg/bindings/system/types_prune_options.go +++ b/pkg/bindings/system/types_prune_options.go @@ -4,7 +4,7 @@ package system import ( "net/url" - "github.com/containers/podman/v3/pkg/bindings/internal/util" + "github.com/containers/podman/v4/pkg/bindings/internal/util" ) // Changed returns true if named field has been set diff --git a/pkg/bindings/system/types_version_options.go b/pkg/bindings/system/types_version_options.go index 840777ca6..30e02dd95 100644 --- a/pkg/bindings/system/types_version_options.go +++ b/pkg/bindings/system/types_version_options.go @@ -4,7 +4,7 @@ package system import ( "net/url" - "github.com/containers/podman/v3/pkg/bindings/internal/util" + "github.com/containers/podman/v4/pkg/bindings/internal/util" ) // Changed returns true if named field has been set diff --git a/pkg/bindings/test/attach_test.go b/pkg/bindings/test/attach_test.go index c78836cb3..670566882 100644 --- a/pkg/bindings/test/attach_test.go +++ b/pkg/bindings/test/attach_test.go @@ -5,9 +5,9 @@ import ( "fmt" "time" - "github.com/containers/podman/v3/libpod/define" - "github.com/containers/podman/v3/pkg/bindings/containers" - "github.com/containers/podman/v3/pkg/specgen" + "github.com/containers/podman/v4/libpod/define" + "github.com/containers/podman/v4/pkg/bindings/containers" + "github.com/containers/podman/v4/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 26690c46a..b421f0797 100644 --- a/pkg/bindings/test/auth_test.go +++ b/pkg/bindings/test/auth_test.go @@ -7,8 +7,8 @@ import ( "github.com/containers/common/pkg/auth" "github.com/containers/image/v5/types" - podmanRegistry "github.com/containers/podman/v3/hack/podman-registry-go" - "github.com/containers/podman/v3/pkg/bindings/images" + podmanRegistry "github.com/containers/podman/v4/hack/podman-registry-go" + "github.com/containers/podman/v4/pkg/bindings/images" . "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 76649f628..d1a07598e 100644 --- a/pkg/bindings/test/common_test.go +++ b/pkg/bindings/test/common_test.go @@ -10,10 +10,10 @@ import ( "strings" "time" - "github.com/containers/podman/v3/libpod/define" - . "github.com/containers/podman/v3/pkg/bindings" - "github.com/containers/podman/v3/pkg/bindings/containers" - "github.com/containers/podman/v3/pkg/specgen" + "github.com/containers/podman/v4/libpod/define" + . "github.com/containers/podman/v4/pkg/bindings" + "github.com/containers/podman/v4/pkg/bindings/containers" + "github.com/containers/podman/v4/pkg/specgen" "github.com/onsi/ginkgo" "github.com/onsi/gomega/gexec" "github.com/pkg/errors" diff --git a/pkg/bindings/test/connection_test.go b/pkg/bindings/test/connection_test.go index 84a047bc9..0c51f316a 100644 --- a/pkg/bindings/test/connection_test.go +++ b/pkg/bindings/test/connection_test.go @@ -4,8 +4,8 @@ import ( "context" "time" - "github.com/containers/podman/v3/pkg/bindings/containers" - "github.com/containers/podman/v3/pkg/bindings/system" + "github.com/containers/podman/v4/pkg/bindings/containers" + "github.com/containers/podman/v4/pkg/bindings/system" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" "github.com/onsi/gomega/gexec" diff --git a/pkg/bindings/test/containers_test.go b/pkg/bindings/test/containers_test.go index cab032a40..af2bad691 100644 --- a/pkg/bindings/test/containers_test.go +++ b/pkg/bindings/test/containers_test.go @@ -5,11 +5,11 @@ import ( "strings" "time" - "github.com/containers/podman/v3/libpod/define" - "github.com/containers/podman/v3/pkg/bindings" - "github.com/containers/podman/v3/pkg/bindings/containers" - "github.com/containers/podman/v3/pkg/domain/entities/reports" - "github.com/containers/podman/v3/pkg/specgen" + "github.com/containers/podman/v4/libpod/define" + "github.com/containers/podman/v4/pkg/bindings" + "github.com/containers/podman/v4/pkg/bindings/containers" + "github.com/containers/podman/v4/pkg/domain/entities/reports" + "github.com/containers/podman/v4/pkg/specgen" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" "github.com/onsi/gomega/gexec" diff --git a/pkg/bindings/test/create_test.go b/pkg/bindings/test/create_test.go index f70ba7248..c8df26528 100644 --- a/pkg/bindings/test/create_test.go +++ b/pkg/bindings/test/create_test.go @@ -3,8 +3,8 @@ package bindings_test import ( "time" - "github.com/containers/podman/v3/pkg/bindings/containers" - "github.com/containers/podman/v3/pkg/specgen" + "github.com/containers/podman/v4/pkg/bindings/containers" + "github.com/containers/podman/v4/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 d2f9b121a..f6a6aee7b 100644 --- a/pkg/bindings/test/exec_test.go +++ b/pkg/bindings/test/exec_test.go @@ -3,8 +3,8 @@ package bindings_test import ( "time" - "github.com/containers/podman/v3/pkg/api/handlers" - "github.com/containers/podman/v3/pkg/bindings/containers" + "github.com/containers/podman/v4/pkg/api/handlers" + "github.com/containers/podman/v4/pkg/bindings/containers" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" "github.com/onsi/gomega/gexec" diff --git a/pkg/bindings/test/generator_test.go b/pkg/bindings/test/generator_test.go index ab0c49713..7dc91b153 100644 --- a/pkg/bindings/test/generator_test.go +++ b/pkg/bindings/test/generator_test.go @@ -1,7 +1,7 @@ package bindings_test import ( - "github.com/containers/podman/v3/pkg/bindings/containers" + "github.com/containers/podman/v4/pkg/bindings/containers" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gstruct" diff --git a/pkg/bindings/test/images_test.go b/pkg/bindings/test/images_test.go index 4ee824472..d667a2dee 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/podman/v3/pkg/bindings" - "github.com/containers/podman/v3/pkg/bindings/containers" - "github.com/containers/podman/v3/pkg/bindings/images" - "github.com/containers/podman/v3/pkg/domain/entities" + "github.com/containers/podman/v4/pkg/bindings" + "github.com/containers/podman/v4/pkg/bindings/containers" + "github.com/containers/podman/v4/pkg/bindings/images" + "github.com/containers/podman/v4/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 f643a2c28..0dda205fc 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/podman/v3/pkg/bindings/containers" - "github.com/containers/podman/v3/pkg/bindings/images" - "github.com/containers/podman/v3/pkg/bindings/system" - "github.com/containers/podman/v3/pkg/specgen" + "github.com/containers/podman/v4/pkg/bindings/containers" + "github.com/containers/podman/v4/pkg/bindings/images" + "github.com/containers/podman/v4/pkg/bindings/system" + "github.com/containers/podman/v4/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 280006d15..64becda43 100644 --- a/pkg/bindings/test/manifests_test.go +++ b/pkg/bindings/test/manifests_test.go @@ -4,9 +4,9 @@ import ( "net/http" "time" - "github.com/containers/podman/v3/pkg/bindings" - "github.com/containers/podman/v3/pkg/bindings/images" - "github.com/containers/podman/v3/pkg/bindings/manifests" + "github.com/containers/podman/v4/pkg/bindings" + "github.com/containers/podman/v4/pkg/bindings/images" + "github.com/containers/podman/v4/pkg/bindings/manifests" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" "github.com/onsi/gomega/gexec" diff --git a/pkg/bindings/test/networks_test.go b/pkg/bindings/test/networks_test.go index 5924d865a..ee2d6f472 100644 --- a/pkg/bindings/test/networks_test.go +++ b/pkg/bindings/test/networks_test.go @@ -7,9 +7,9 @@ import ( "time" "github.com/containers/common/libnetwork/types" - "github.com/containers/podman/v3/pkg/bindings" - "github.com/containers/podman/v3/pkg/bindings/containers" - "github.com/containers/podman/v3/pkg/bindings/network" + "github.com/containers/podman/v4/pkg/bindings" + "github.com/containers/podman/v4/pkg/bindings/containers" + "github.com/containers/podman/v4/pkg/bindings/network" . "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 0a4261ea2..1c93c5595 100644 --- a/pkg/bindings/test/pods_test.go +++ b/pkg/bindings/test/pods_test.go @@ -6,13 +6,13 @@ import ( "strings" "time" - "github.com/containers/podman/v3/libpod/define" - "github.com/containers/podman/v3/pkg/bindings" - "github.com/containers/podman/v3/pkg/bindings/pods" - "github.com/containers/podman/v3/pkg/domain/entities" - "github.com/containers/podman/v3/pkg/errorhandling" - "github.com/containers/podman/v3/pkg/specgen" - "github.com/containers/podman/v3/utils" + "github.com/containers/podman/v4/libpod/define" + "github.com/containers/podman/v4/pkg/bindings" + "github.com/containers/podman/v4/pkg/bindings/pods" + "github.com/containers/podman/v4/pkg/domain/entities" + "github.com/containers/podman/v4/pkg/errorhandling" + "github.com/containers/podman/v4/pkg/specgen" + "github.com/containers/podman/v4/utils" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" "github.com/onsi/gomega/gexec" diff --git a/pkg/bindings/test/resource_test.go b/pkg/bindings/test/resource_test.go index 19ac33eb2..8da2178ef 100644 --- a/pkg/bindings/test/resource_test.go +++ b/pkg/bindings/test/resource_test.go @@ -11,11 +11,11 @@ import ( "strconv" "syscall" - "github.com/containers/podman/v3/pkg/bindings" - "github.com/containers/podman/v3/pkg/bindings/containers" - "github.com/containers/podman/v3/pkg/bindings/images" - "github.com/containers/podman/v3/pkg/bindings/pods" - "github.com/containers/podman/v3/pkg/bindings/system" + "github.com/containers/podman/v4/pkg/bindings" + "github.com/containers/podman/v4/pkg/bindings/containers" + "github.com/containers/podman/v4/pkg/bindings/images" + "github.com/containers/podman/v4/pkg/bindings/pods" + "github.com/containers/podman/v4/pkg/bindings/system" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/pkg/bindings/test/secrets_test.go b/pkg/bindings/test/secrets_test.go index 52c964556..377f49b2f 100644 --- a/pkg/bindings/test/secrets_test.go +++ b/pkg/bindings/test/secrets_test.go @@ -6,8 +6,8 @@ import ( "strings" "time" - "github.com/containers/podman/v3/pkg/bindings" - "github.com/containers/podman/v3/pkg/bindings/secrets" + "github.com/containers/podman/v4/pkg/bindings" + "github.com/containers/podman/v4/pkg/bindings/secrets" . "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 4549a14c9..741992e0a 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/podman/v3/pkg/bindings/containers" - "github.com/containers/podman/v3/pkg/bindings/pods" - "github.com/containers/podman/v3/pkg/bindings/system" - "github.com/containers/podman/v3/pkg/bindings/volumes" - "github.com/containers/podman/v3/pkg/domain/entities" - "github.com/containers/podman/v3/pkg/domain/entities/reports" + "github.com/containers/podman/v4/pkg/bindings/containers" + "github.com/containers/podman/v4/pkg/bindings/pods" + "github.com/containers/podman/v4/pkg/bindings/system" + "github.com/containers/podman/v4/pkg/bindings/volumes" + "github.com/containers/podman/v4/pkg/domain/entities" + "github.com/containers/podman/v4/pkg/domain/entities/reports" . "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 43ef54889..c0d01439b 100644 --- a/pkg/bindings/test/volumes_test.go +++ b/pkg/bindings/test/volumes_test.go @@ -6,11 +6,11 @@ import ( "net/http" "time" - "github.com/containers/podman/v3/pkg/bindings" - "github.com/containers/podman/v3/pkg/bindings/containers" - "github.com/containers/podman/v3/pkg/bindings/volumes" - "github.com/containers/podman/v3/pkg/domain/entities" - "github.com/containers/podman/v3/pkg/domain/entities/reports" + "github.com/containers/podman/v4/pkg/bindings" + "github.com/containers/podman/v4/pkg/bindings/containers" + "github.com/containers/podman/v4/pkg/bindings/volumes" + "github.com/containers/podman/v4/pkg/domain/entities" + "github.com/containers/podman/v4/pkg/domain/entities/reports" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" "github.com/onsi/gomega/gexec" diff --git a/pkg/bindings/volumes/types_create_options.go b/pkg/bindings/volumes/types_create_options.go index 416c6aa26..49c59f48a 100644 --- a/pkg/bindings/volumes/types_create_options.go +++ b/pkg/bindings/volumes/types_create_options.go @@ -4,7 +4,7 @@ package volumes import ( "net/url" - "github.com/containers/podman/v3/pkg/bindings/internal/util" + "github.com/containers/podman/v4/pkg/bindings/internal/util" ) // Changed returns true if named field has been set diff --git a/pkg/bindings/volumes/types_exists_options.go b/pkg/bindings/volumes/types_exists_options.go index 5c9cc9295..3493c23ea 100644 --- a/pkg/bindings/volumes/types_exists_options.go +++ b/pkg/bindings/volumes/types_exists_options.go @@ -4,7 +4,7 @@ package volumes import ( "net/url" - "github.com/containers/podman/v3/pkg/bindings/internal/util" + "github.com/containers/podman/v4/pkg/bindings/internal/util" ) // Changed returns true if named field has been set diff --git a/pkg/bindings/volumes/types_inspect_options.go b/pkg/bindings/volumes/types_inspect_options.go index 4358748c2..a4aefd994 100644 --- a/pkg/bindings/volumes/types_inspect_options.go +++ b/pkg/bindings/volumes/types_inspect_options.go @@ -4,7 +4,7 @@ package volumes import ( "net/url" - "github.com/containers/podman/v3/pkg/bindings/internal/util" + "github.com/containers/podman/v4/pkg/bindings/internal/util" ) // Changed returns true if named field has been set diff --git a/pkg/bindings/volumes/types_list_options.go b/pkg/bindings/volumes/types_list_options.go index e4896649c..3d1930bf4 100644 --- a/pkg/bindings/volumes/types_list_options.go +++ b/pkg/bindings/volumes/types_list_options.go @@ -4,7 +4,7 @@ package volumes import ( "net/url" - "github.com/containers/podman/v3/pkg/bindings/internal/util" + "github.com/containers/podman/v4/pkg/bindings/internal/util" ) // Changed returns true if named field has been set diff --git a/pkg/bindings/volumes/types_prune_options.go b/pkg/bindings/volumes/types_prune_options.go index 2e2964981..3b4671c47 100644 --- a/pkg/bindings/volumes/types_prune_options.go +++ b/pkg/bindings/volumes/types_prune_options.go @@ -4,7 +4,7 @@ package volumes import ( "net/url" - "github.com/containers/podman/v3/pkg/bindings/internal/util" + "github.com/containers/podman/v4/pkg/bindings/internal/util" ) // Changed returns true if named field has been set diff --git a/pkg/bindings/volumes/types_remove_options.go b/pkg/bindings/volumes/types_remove_options.go index fe079cddf..356527705 100644 --- a/pkg/bindings/volumes/types_remove_options.go +++ b/pkg/bindings/volumes/types_remove_options.go @@ -4,7 +4,7 @@ package volumes import ( "net/url" - "github.com/containers/podman/v3/pkg/bindings/internal/util" + "github.com/containers/podman/v4/pkg/bindings/internal/util" ) // Changed returns true if named field has been set diff --git a/pkg/bindings/volumes/volumes.go b/pkg/bindings/volumes/volumes.go index ce5a01c49..290eab219 100644 --- a/pkg/bindings/volumes/volumes.go +++ b/pkg/bindings/volumes/volumes.go @@ -5,9 +5,9 @@ import ( "net/http" "strings" - "github.com/containers/podman/v3/pkg/bindings" - "github.com/containers/podman/v3/pkg/domain/entities" - "github.com/containers/podman/v3/pkg/domain/entities/reports" + "github.com/containers/podman/v4/pkg/bindings" + "github.com/containers/podman/v4/pkg/domain/entities" + "github.com/containers/podman/v4/pkg/domain/entities/reports" jsoniter "github.com/json-iterator/go" ) diff --git a/pkg/checkpoint/checkpoint_restore.go b/pkg/checkpoint/checkpoint_restore.go index 34bd8a124..1ebd6a455 100644 --- a/pkg/checkpoint/checkpoint_restore.go +++ b/pkg/checkpoint/checkpoint_restore.go @@ -8,13 +8,13 @@ import ( metadata "github.com/checkpoint-restore/checkpointctl/lib" "github.com/containers/common/libimage" "github.com/containers/common/pkg/config" - "github.com/containers/podman/v3/libpod" - ann "github.com/containers/podman/v3/pkg/annotations" - "github.com/containers/podman/v3/pkg/checkpoint/crutils" - "github.com/containers/podman/v3/pkg/criu" - "github.com/containers/podman/v3/pkg/domain/entities" - "github.com/containers/podman/v3/pkg/specgen/generate" - "github.com/containers/podman/v3/pkg/specgenutil" + "github.com/containers/podman/v4/libpod" + ann "github.com/containers/podman/v4/pkg/annotations" + "github.com/containers/podman/v4/pkg/checkpoint/crutils" + "github.com/containers/podman/v4/pkg/criu" + "github.com/containers/podman/v4/pkg/domain/entities" + "github.com/containers/podman/v4/pkg/specgen/generate" + "github.com/containers/podman/v4/pkg/specgenutil" spec "github.com/opencontainers/runtime-spec/specs-go" "github.com/pkg/errors" "github.com/sirupsen/logrus" diff --git a/pkg/copy/fileinfo.go b/pkg/copy/fileinfo.go index fb711311c..0ccca5b6e 100644 --- a/pkg/copy/fileinfo.go +++ b/pkg/copy/fileinfo.go @@ -8,7 +8,7 @@ import ( "path/filepath" "strings" - "github.com/containers/podman/v3/libpod/define" + "github.com/containers/podman/v4/libpod/define" "github.com/pkg/errors" ) diff --git a/pkg/domain/entities/container_ps.go b/pkg/domain/entities/container_ps.go index d32a2eead..a5562e7c9 100644 --- a/pkg/domain/entities/container_ps.go +++ b/pkg/domain/entities/container_ps.go @@ -6,7 +6,7 @@ import ( "time" "github.com/containers/common/libnetwork/types" - "github.com/containers/podman/v3/pkg/ps/define" + "github.com/containers/podman/v4/pkg/ps/define" "github.com/pkg/errors" ) diff --git a/pkg/domain/entities/containers.go b/pkg/domain/entities/containers.go index 110265e59..d39a70732 100644 --- a/pkg/domain/entities/containers.go +++ b/pkg/domain/entities/containers.go @@ -8,8 +8,8 @@ import ( nettypes "github.com/containers/common/libnetwork/types" "github.com/containers/image/v5/types" - "github.com/containers/podman/v3/libpod/define" - "github.com/containers/podman/v3/pkg/specgen" + "github.com/containers/podman/v4/libpod/define" + "github.com/containers/podman/v4/pkg/specgen" "github.com/containers/storage/pkg/archive" ) diff --git a/pkg/domain/entities/engine_container.go b/pkg/domain/entities/engine_container.go index 962782fd8..5dedceacc 100644 --- a/pkg/domain/entities/engine_container.go +++ b/pkg/domain/entities/engine_container.go @@ -6,9 +6,9 @@ import ( "github.com/containers/common/libnetwork/types" "github.com/containers/common/pkg/config" - "github.com/containers/podman/v3/libpod/define" - "github.com/containers/podman/v3/pkg/domain/entities/reports" - "github.com/containers/podman/v3/pkg/specgen" + "github.com/containers/podman/v4/libpod/define" + "github.com/containers/podman/v4/pkg/domain/entities/reports" + "github.com/containers/podman/v4/pkg/specgen" ) type ContainerCopyFunc func() error diff --git a/pkg/domain/entities/engine_image.go b/pkg/domain/entities/engine_image.go index bf9fcfd27..5011d82aa 100644 --- a/pkg/domain/entities/engine_image.go +++ b/pkg/domain/entities/engine_image.go @@ -4,7 +4,7 @@ import ( "context" "github.com/containers/common/pkg/config" - "github.com/containers/podman/v3/pkg/domain/entities/reports" + "github.com/containers/podman/v4/pkg/domain/entities/reports" ) type ImageEngine interface { diff --git a/pkg/domain/entities/events.go b/pkg/domain/entities/events.go index fa815d7b9..d8ba0f1d3 100644 --- a/pkg/domain/entities/events.go +++ b/pkg/domain/entities/events.go @@ -4,7 +4,7 @@ import ( "strconv" "time" - libpodEvents "github.com/containers/podman/v3/libpod/events" + libpodEvents "github.com/containers/podman/v4/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 bc41d7844..2ac21cfeb 100644 --- a/pkg/domain/entities/images.go +++ b/pkg/domain/entities/images.go @@ -7,8 +7,8 @@ import ( "github.com/containers/common/pkg/config" "github.com/containers/image/v5/manifest" "github.com/containers/image/v5/types" - "github.com/containers/podman/v3/pkg/inspect" - "github.com/containers/podman/v3/pkg/trust" + "github.com/containers/podman/v4/pkg/inspect" + "github.com/containers/podman/v4/pkg/trust" "github.com/docker/docker/api/types/container" "github.com/opencontainers/go-digest" v1 "github.com/opencontainers/image-spec/specs-go/v1" diff --git a/pkg/domain/entities/pods.go b/pkg/domain/entities/pods.go index 60d171f86..aeccc82b4 100644 --- a/pkg/domain/entities/pods.go +++ b/pkg/domain/entities/pods.go @@ -6,9 +6,9 @@ import ( "time" commonFlag "github.com/containers/common/pkg/flag" - "github.com/containers/podman/v3/libpod/define" - "github.com/containers/podman/v3/pkg/specgen" - "github.com/containers/podman/v3/pkg/util" + "github.com/containers/podman/v4/libpod/define" + "github.com/containers/podman/v4/pkg/specgen" + "github.com/containers/podman/v4/pkg/util" "github.com/opencontainers/runtime-spec/specs-go" ) diff --git a/pkg/domain/entities/secrets.go b/pkg/domain/entities/secrets.go index 55b470d7b..d8af937a7 100644 --- a/pkg/domain/entities/secrets.go +++ b/pkg/domain/entities/secrets.go @@ -3,7 +3,7 @@ package entities import ( "time" - "github.com/containers/podman/v3/pkg/errorhandling" + "github.com/containers/podman/v4/pkg/errorhandling" ) type SecretCreateReport struct { diff --git a/pkg/domain/entities/system.go b/pkg/domain/entities/system.go index 49f0c2323..21026477d 100644 --- a/pkg/domain/entities/system.go +++ b/pkg/domain/entities/system.go @@ -3,9 +3,9 @@ package entities import ( "time" - "github.com/containers/podman/v3/libpod/define" - "github.com/containers/podman/v3/pkg/domain/entities/reports" - "github.com/containers/podman/v3/pkg/domain/entities/types" + "github.com/containers/podman/v4/libpod/define" + "github.com/containers/podman/v4/pkg/domain/entities/reports" + "github.com/containers/podman/v4/pkg/domain/entities/types" ) // ServiceOptions provides the input for starting an API and sidecar pprof services diff --git a/pkg/domain/entities/types.go b/pkg/domain/entities/types.go index ec30b6f9a..4d9ced900 100644 --- a/pkg/domain/entities/types.go +++ b/pkg/domain/entities/types.go @@ -5,9 +5,9 @@ import ( buildahDefine "github.com/containers/buildah/define" "github.com/containers/common/libnetwork/types" - "github.com/containers/podman/v3/libpod/define" - "github.com/containers/podman/v3/libpod/events" - "github.com/containers/podman/v3/pkg/specgen" + "github.com/containers/podman/v4/libpod/define" + "github.com/containers/podman/v4/libpod/events" + "github.com/containers/podman/v4/pkg/specgen" "github.com/containers/storage/pkg/archive" ) diff --git a/pkg/domain/entities/volumes.go b/pkg/domain/entities/volumes.go index 9b2a170e2..9bdce8392 100644 --- a/pkg/domain/entities/volumes.go +++ b/pkg/domain/entities/volumes.go @@ -3,7 +3,7 @@ package entities import ( "net/url" - "github.com/containers/podman/v3/libpod/define" + "github.com/containers/podman/v4/libpod/define" docker_api_types "github.com/docker/docker/api/types" docker_api_types_volume "github.com/docker/docker/api/types/volume" ) diff --git a/pkg/domain/filters/containers.go b/pkg/domain/filters/containers.go index 60a1efb22..85ba4f84f 100644 --- a/pkg/domain/filters/containers.go +++ b/pkg/domain/filters/containers.go @@ -6,9 +6,9 @@ import ( "strings" "time" - "github.com/containers/podman/v3/libpod" - "github.com/containers/podman/v3/libpod/define" - "github.com/containers/podman/v3/pkg/util" + "github.com/containers/podman/v4/libpod" + "github.com/containers/podman/v4/libpod/define" + "github.com/containers/podman/v4/pkg/util" "github.com/pkg/errors" ) diff --git a/pkg/domain/filters/pods.go b/pkg/domain/filters/pods.go index 8231dbc79..2f9442dff 100644 --- a/pkg/domain/filters/pods.go +++ b/pkg/domain/filters/pods.go @@ -4,9 +4,9 @@ import ( "strconv" "strings" - "github.com/containers/podman/v3/libpod" - "github.com/containers/podman/v3/libpod/define" - "github.com/containers/podman/v3/pkg/util" + "github.com/containers/podman/v4/libpod" + "github.com/containers/podman/v4/libpod/define" + "github.com/containers/podman/v4/pkg/util" "github.com/pkg/errors" ) diff --git a/pkg/domain/filters/volumes.go b/pkg/domain/filters/volumes.go index d55c44ef5..e88bd4228 100644 --- a/pkg/domain/filters/volumes.go +++ b/pkg/domain/filters/volumes.go @@ -4,8 +4,8 @@ import ( "net/url" "strings" - "github.com/containers/podman/v3/libpod" - "github.com/containers/podman/v3/pkg/util" + "github.com/containers/podman/v4/libpod" + "github.com/containers/podman/v4/pkg/util" "github.com/pkg/errors" ) diff --git a/pkg/domain/infra/abi/archive.go b/pkg/domain/infra/abi/archive.go index b60baa935..01e3c7dd1 100644 --- a/pkg/domain/infra/abi/archive.go +++ b/pkg/domain/infra/abi/archive.go @@ -4,7 +4,7 @@ import ( "context" "io" - "github.com/containers/podman/v3/pkg/domain/entities" + "github.com/containers/podman/v4/pkg/domain/entities" ) func (ic *ContainerEngine) ContainerCopyFromArchive(ctx context.Context, nameOrID, containerPath string, reader io.Reader, options entities.CopyOptions) (entities.ContainerCopyFunc, error) { diff --git a/pkg/domain/infra/abi/auto-update.go b/pkg/domain/infra/abi/auto-update.go index b98ee1cb2..028ea5a07 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/podman/v3/pkg/autoupdate" - "github.com/containers/podman/v3/pkg/domain/entities" + "github.com/containers/podman/v4/pkg/autoupdate" + "github.com/containers/podman/v4/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 cab4c3c9a..a5c4647d7 100644 --- a/pkg/domain/infra/abi/containers.go +++ b/pkg/domain/infra/abi/containers.go @@ -13,24 +13,24 @@ import ( "github.com/containers/common/pkg/cgroups" "github.com/containers/common/pkg/config" "github.com/containers/image/v5/manifest" - "github.com/containers/podman/v3/libpod" - "github.com/containers/podman/v3/libpod/define" - "github.com/containers/podman/v3/libpod/events" - "github.com/containers/podman/v3/libpod/logs" - "github.com/containers/podman/v3/pkg/checkpoint" - "github.com/containers/podman/v3/pkg/domain/entities" - "github.com/containers/podman/v3/pkg/domain/entities/reports" - dfilters "github.com/containers/podman/v3/pkg/domain/filters" - "github.com/containers/podman/v3/pkg/domain/infra/abi/terminal" - "github.com/containers/podman/v3/pkg/errorhandling" - parallelctr "github.com/containers/podman/v3/pkg/parallel/ctr" - "github.com/containers/podman/v3/pkg/ps" - "github.com/containers/podman/v3/pkg/rootless" - "github.com/containers/podman/v3/pkg/signal" - "github.com/containers/podman/v3/pkg/specgen" - "github.com/containers/podman/v3/pkg/specgen/generate" - "github.com/containers/podman/v3/pkg/specgenutil" - "github.com/containers/podman/v3/pkg/util" + "github.com/containers/podman/v4/libpod" + "github.com/containers/podman/v4/libpod/define" + "github.com/containers/podman/v4/libpod/events" + "github.com/containers/podman/v4/libpod/logs" + "github.com/containers/podman/v4/pkg/checkpoint" + "github.com/containers/podman/v4/pkg/domain/entities" + "github.com/containers/podman/v4/pkg/domain/entities/reports" + dfilters "github.com/containers/podman/v4/pkg/domain/filters" + "github.com/containers/podman/v4/pkg/domain/infra/abi/terminal" + "github.com/containers/podman/v4/pkg/errorhandling" + parallelctr "github.com/containers/podman/v4/pkg/parallel/ctr" + "github.com/containers/podman/v4/pkg/ps" + "github.com/containers/podman/v4/pkg/rootless" + "github.com/containers/podman/v4/pkg/signal" + "github.com/containers/podman/v4/pkg/specgen" + "github.com/containers/podman/v4/pkg/specgen/generate" + "github.com/containers/podman/v4/pkg/specgenutil" + "github.com/containers/podman/v4/pkg/util" "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 716e77716..fac15f72d 100644 --- a/pkg/domain/infra/abi/containers_runlabel.go +++ b/pkg/domain/infra/abi/containers_runlabel.go @@ -9,10 +9,10 @@ import ( "github.com/containers/common/libimage" "github.com/containers/common/pkg/config" - "github.com/containers/podman/v3/libpod/define" - "github.com/containers/podman/v3/pkg/domain/entities" - envLib "github.com/containers/podman/v3/pkg/env" - "github.com/containers/podman/v3/utils" + "github.com/containers/podman/v4/libpod/define" + "github.com/containers/podman/v4/pkg/domain/entities" + envLib "github.com/containers/podman/v4/pkg/env" + "github.com/containers/podman/v4/utils" "github.com/google/shlex" "github.com/pkg/errors" "github.com/sirupsen/logrus" diff --git a/pkg/domain/infra/abi/containers_stat.go b/pkg/domain/infra/abi/containers_stat.go index 98a23c70b..2183d39f0 100644 --- a/pkg/domain/infra/abi/containers_stat.go +++ b/pkg/domain/infra/abi/containers_stat.go @@ -3,7 +3,7 @@ package abi import ( "context" - "github.com/containers/podman/v3/pkg/domain/entities" + "github.com/containers/podman/v4/pkg/domain/entities" ) func (ic *ContainerEngine) ContainerStat(ctx context.Context, nameOrID string, containerPath string) (*entities.ContainerStatReport, error) { diff --git a/pkg/domain/infra/abi/events.go b/pkg/domain/infra/abi/events.go index d7e2566e3..dffe1ac1a 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/podman/v3/libpod/events" - "github.com/containers/podman/v3/pkg/domain/entities" + "github.com/containers/podman/v4/libpod/events" + "github.com/containers/podman/v4/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 68bb351bf..cd5ac00b7 100644 --- a/pkg/domain/infra/abi/generate.go +++ b/pkg/domain/infra/abi/generate.go @@ -6,10 +6,10 @@ import ( "fmt" "strings" - "github.com/containers/podman/v3/libpod" - "github.com/containers/podman/v3/libpod/define" - "github.com/containers/podman/v3/pkg/domain/entities" - "github.com/containers/podman/v3/pkg/systemd/generate" + "github.com/containers/podman/v4/libpod" + "github.com/containers/podman/v4/libpod/define" + "github.com/containers/podman/v4/pkg/domain/entities" + "github.com/containers/podman/v4/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 92ccd19af..c4d8cfb09 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/podman/v3/libpod/define" - "github.com/containers/podman/v3/pkg/domain/entities" + "github.com/containers/podman/v4/libpod/define" + "github.com/containers/podman/v4/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 592e0f4e3..3adf9b26c 100644 --- a/pkg/domain/infra/abi/images.go +++ b/pkg/domain/infra/abi/images.go @@ -22,13 +22,13 @@ import ( "github.com/containers/image/v5/signature" "github.com/containers/image/v5/transports" "github.com/containers/image/v5/transports/alltransports" - "github.com/containers/podman/v3/libpod/define" - "github.com/containers/podman/v3/pkg/domain/entities" - "github.com/containers/podman/v3/pkg/domain/entities/reports" - domainUtils "github.com/containers/podman/v3/pkg/domain/utils" - "github.com/containers/podman/v3/pkg/errorhandling" - "github.com/containers/podman/v3/pkg/rootless" - "github.com/containers/podman/v3/utils" + "github.com/containers/podman/v4/libpod/define" + "github.com/containers/podman/v4/pkg/domain/entities" + "github.com/containers/podman/v4/pkg/domain/entities/reports" + domainUtils "github.com/containers/podman/v4/pkg/domain/utils" + "github.com/containers/podman/v4/pkg/errorhandling" + "github.com/containers/podman/v4/pkg/rootless" + "github.com/containers/podman/v4/utils" "github.com/containers/storage" dockerRef "github.com/docker/distribution/reference" "github.com/opencontainers/go-digest" diff --git a/pkg/domain/infra/abi/images_list.go b/pkg/domain/infra/abi/images_list.go index 47b47b065..9a0aaaf3a 100644 --- a/pkg/domain/infra/abi/images_list.go +++ b/pkg/domain/infra/abi/images_list.go @@ -4,7 +4,7 @@ import ( "context" "github.com/containers/common/libimage" - "github.com/containers/podman/v3/pkg/domain/entities" + "github.com/containers/podman/v4/pkg/domain/entities" "github.com/pkg/errors" ) diff --git a/pkg/domain/infra/abi/manifest.go b/pkg/domain/infra/abi/manifest.go index d8733130b..0e999a019 100644 --- a/pkg/domain/infra/abi/manifest.go +++ b/pkg/domain/infra/abi/manifest.go @@ -13,7 +13,7 @@ import ( "github.com/containers/image/v5/pkg/shortnames" "github.com/containers/image/v5/transports" "github.com/containers/image/v5/transports/alltransports" - "github.com/containers/podman/v3/pkg/domain/entities" + "github.com/containers/podman/v4/pkg/domain/entities" "github.com/containers/storage" "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 196fd3656..910008fc7 100644 --- a/pkg/domain/infra/abi/network.go +++ b/pkg/domain/infra/abi/network.go @@ -5,9 +5,9 @@ import ( "github.com/containers/common/libnetwork/types" netutil "github.com/containers/common/libnetwork/util" - "github.com/containers/podman/v3/libpod/define" - "github.com/containers/podman/v3/pkg/domain/entities" - "github.com/containers/podman/v3/pkg/util" + "github.com/containers/podman/v4/libpod/define" + "github.com/containers/podman/v4/pkg/domain/entities" + "github.com/containers/podman/v4/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 5a75e1216..2d1adab74 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/podman/v3/libpod" - "github.com/containers/podman/v3/libpod/define" + "github.com/containers/podman/v4/libpod" + "github.com/containers/podman/v4/libpod/define" units "github.com/docker/go-units" "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 25aae7019..86a60e92d 100644 --- a/pkg/domain/infra/abi/play.go +++ b/pkg/domain/infra/abi/play.go @@ -16,15 +16,15 @@ import ( nettypes "github.com/containers/common/libnetwork/types" "github.com/containers/common/pkg/config" "github.com/containers/image/v5/types" - "github.com/containers/podman/v3/libpod" - "github.com/containers/podman/v3/libpod/define" - "github.com/containers/podman/v3/pkg/autoupdate" - "github.com/containers/podman/v3/pkg/domain/entities" - "github.com/containers/podman/v3/pkg/specgen" - "github.com/containers/podman/v3/pkg/specgen/generate" - "github.com/containers/podman/v3/pkg/specgen/generate/kube" - "github.com/containers/podman/v3/pkg/specgenutil" - "github.com/containers/podman/v3/pkg/util" + "github.com/containers/podman/v4/libpod" + "github.com/containers/podman/v4/libpod/define" + "github.com/containers/podman/v4/pkg/autoupdate" + "github.com/containers/podman/v4/pkg/domain/entities" + "github.com/containers/podman/v4/pkg/specgen" + "github.com/containers/podman/v4/pkg/specgen/generate" + "github.com/containers/podman/v4/pkg/specgen/generate/kube" + "github.com/containers/podman/v4/pkg/specgenutil" + "github.com/containers/podman/v4/pkg/util" "github.com/ghodss/yaml" "github.com/pkg/errors" "github.com/sirupsen/logrus" diff --git a/pkg/domain/infra/abi/pods.go b/pkg/domain/infra/abi/pods.go index 7bda7e994..32deb20e0 100644 --- a/pkg/domain/infra/abi/pods.go +++ b/pkg/domain/infra/abi/pods.go @@ -3,12 +3,12 @@ package abi import ( "context" - "github.com/containers/podman/v3/libpod" - "github.com/containers/podman/v3/libpod/define" - "github.com/containers/podman/v3/pkg/domain/entities" - dfilters "github.com/containers/podman/v3/pkg/domain/filters" - "github.com/containers/podman/v3/pkg/signal" - "github.com/containers/podman/v3/pkg/specgen/generate" + "github.com/containers/podman/v4/libpod" + "github.com/containers/podman/v4/libpod/define" + "github.com/containers/podman/v4/pkg/domain/entities" + dfilters "github.com/containers/podman/v4/pkg/domain/filters" + "github.com/containers/podman/v4/pkg/signal" + "github.com/containers/podman/v4/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 70f953fd4..6123027b8 100644 --- a/pkg/domain/infra/abi/pods_stats.go +++ b/pkg/domain/infra/abi/pods_stats.go @@ -5,10 +5,10 @@ import ( "fmt" "github.com/containers/common/pkg/cgroups" - "github.com/containers/podman/v3/libpod" - "github.com/containers/podman/v3/pkg/domain/entities" - "github.com/containers/podman/v3/pkg/rootless" - "github.com/containers/podman/v3/utils" + "github.com/containers/podman/v4/libpod" + "github.com/containers/podman/v4/pkg/domain/entities" + "github.com/containers/podman/v4/pkg/rootless" + "github.com/containers/podman/v4/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 3e7ea0d09..68712899d 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/podman/v3/libpod" + "github.com/containers/podman/v4/libpod" ) // Image-related runtime linked against libpod library diff --git a/pkg/domain/infra/abi/secrets.go b/pkg/domain/infra/abi/secrets.go index 34c230e75..b9380ad73 100644 --- a/pkg/domain/infra/abi/secrets.go +++ b/pkg/domain/infra/abi/secrets.go @@ -6,8 +6,8 @@ import ( "io/ioutil" "path/filepath" - "github.com/containers/podman/v3/pkg/domain/entities" - "github.com/containers/podman/v3/pkg/domain/utils" + "github.com/containers/podman/v4/pkg/domain/entities" + "github.com/containers/podman/v4/pkg/domain/utils" "github.com/pkg/errors" ) diff --git a/pkg/domain/infra/abi/system.go b/pkg/domain/infra/abi/system.go index 02b4181f5..d12d14c1f 100644 --- a/pkg/domain/infra/abi/system.go +++ b/pkg/domain/infra/abi/system.go @@ -10,12 +10,12 @@ import ( "github.com/containers/common/pkg/cgroups" "github.com/containers/common/pkg/config" - "github.com/containers/podman/v3/libpod/define" - "github.com/containers/podman/v3/pkg/domain/entities" - "github.com/containers/podman/v3/pkg/domain/entities/reports" - "github.com/containers/podman/v3/pkg/rootless" - "github.com/containers/podman/v3/pkg/util" - "github.com/containers/podman/v3/utils" + "github.com/containers/podman/v4/libpod/define" + "github.com/containers/podman/v4/pkg/domain/entities" + "github.com/containers/podman/v4/pkg/domain/entities/reports" + "github.com/containers/podman/v4/pkg/rootless" + "github.com/containers/podman/v4/pkg/util" + "github.com/containers/podman/v4/utils" "github.com/containers/storage" "github.com/containers/storage/pkg/unshare" "github.com/pkg/errors" diff --git a/pkg/domain/infra/abi/terminal/sigproxy_linux.go b/pkg/domain/infra/abi/terminal/sigproxy_linux.go index 3b129f5ea..206ded091 100644 --- a/pkg/domain/infra/abi/terminal/sigproxy_linux.go +++ b/pkg/domain/infra/abi/terminal/sigproxy_linux.go @@ -4,10 +4,10 @@ import ( "os" "syscall" - "github.com/containers/podman/v3/libpod" - "github.com/containers/podman/v3/libpod/define" - "github.com/containers/podman/v3/libpod/shutdown" - "github.com/containers/podman/v3/pkg/signal" + "github.com/containers/podman/v4/libpod" + "github.com/containers/podman/v4/libpod/define" + "github.com/containers/podman/v4/libpod/shutdown" + "github.com/containers/podman/v4/pkg/signal" "github.com/pkg/errors" "github.com/sirupsen/logrus" ) diff --git a/pkg/domain/infra/abi/terminal/terminal.go b/pkg/domain/infra/abi/terminal/terminal.go index 067c0c08e..692f8dcd5 100644 --- a/pkg/domain/infra/abi/terminal/terminal.go +++ b/pkg/domain/infra/abi/terminal/terminal.go @@ -5,8 +5,8 @@ import ( "os" "os/signal" - "github.com/containers/podman/v3/libpod/define" - lsignal "github.com/containers/podman/v3/pkg/signal" + "github.com/containers/podman/v4/libpod/define" + lsignal "github.com/containers/podman/v4/pkg/signal" "github.com/moby/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 ba047bf33..78c792d2b 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/podman/v3/libpod" - "github.com/containers/podman/v3/libpod/define" + "github.com/containers/podman/v4/libpod" + "github.com/containers/podman/v4/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 af7814163..3777c1d3b 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/podman/v3/pkg/domain/entities" - "github.com/containers/podman/v3/pkg/trust" + "github.com/containers/podman/v4/pkg/domain/entities" + "github.com/containers/podman/v4/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 e514631db..ee7269807 100644 --- a/pkg/domain/infra/abi/volumes.go +++ b/pkg/domain/infra/abi/volumes.go @@ -3,12 +3,12 @@ package abi import ( "context" - "github.com/containers/podman/v3/libpod" - "github.com/containers/podman/v3/libpod/define" - "github.com/containers/podman/v3/pkg/domain/entities" - "github.com/containers/podman/v3/pkg/domain/entities/reports" - "github.com/containers/podman/v3/pkg/domain/filters" - "github.com/containers/podman/v3/pkg/domain/infra/abi/parse" + "github.com/containers/podman/v4/libpod" + "github.com/containers/podman/v4/libpod/define" + "github.com/containers/podman/v4/pkg/domain/entities" + "github.com/containers/podman/v4/pkg/domain/entities/reports" + "github.com/containers/podman/v4/pkg/domain/filters" + "github.com/containers/podman/v4/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 ec7de2743..5b7b7cf8a 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/podman/v3/libpod" - "github.com/containers/podman/v3/pkg/bindings" - "github.com/containers/podman/v3/pkg/domain/entities" - "github.com/containers/podman/v3/pkg/domain/infra/abi" - "github.com/containers/podman/v3/pkg/domain/infra/tunnel" + "github.com/containers/podman/v4/libpod" + "github.com/containers/podman/v4/pkg/bindings" + "github.com/containers/podman/v4/pkg/domain/entities" + "github.com/containers/podman/v4/pkg/domain/infra/abi" + "github.com/containers/podman/v4/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 e7107ff38..b4414dc54 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/podman/v3/pkg/domain/entities" + "github.com/containers/podman/v4/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 b307d04b3..519af5ab7 100644 --- a/pkg/domain/infra/runtime_libpod.go +++ b/pkg/domain/infra/runtime_libpod.go @@ -10,11 +10,11 @@ import ( "sync" "github.com/containers/common/pkg/cgroups" - "github.com/containers/podman/v3/cmd/podman/utils" - "github.com/containers/podman/v3/libpod" - "github.com/containers/podman/v3/pkg/domain/entities" - "github.com/containers/podman/v3/pkg/namespaces" - "github.com/containers/podman/v3/pkg/rootless" + "github.com/containers/podman/v4/cmd/podman/utils" + "github.com/containers/podman/v4/libpod" + "github.com/containers/podman/v4/pkg/domain/entities" + "github.com/containers/podman/v4/pkg/namespaces" + "github.com/containers/podman/v4/pkg/rootless" "github.com/containers/storage/pkg/idtools" "github.com/containers/storage/types" "github.com/pkg/errors" diff --git a/pkg/domain/infra/runtime_proxy.go b/pkg/domain/infra/runtime_proxy.go index 8fe264989..a70b61165 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/podman/v3/pkg/domain/entities" - "github.com/containers/podman/v3/pkg/domain/infra/abi" + "github.com/containers/podman/v4/pkg/domain/entities" + "github.com/containers/podman/v4/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 185d223b7..68f8b0dac 100644 --- a/pkg/domain/infra/runtime_tunnel.go +++ b/pkg/domain/infra/runtime_tunnel.go @@ -7,9 +7,9 @@ import ( "fmt" "sync" - "github.com/containers/podman/v3/pkg/bindings" - "github.com/containers/podman/v3/pkg/domain/entities" - "github.com/containers/podman/v3/pkg/domain/infra/tunnel" + "github.com/containers/podman/v4/pkg/bindings" + "github.com/containers/podman/v4/pkg/domain/entities" + "github.com/containers/podman/v4/pkg/domain/infra/tunnel" ) var ( diff --git a/pkg/domain/infra/tunnel/auto-update.go b/pkg/domain/infra/tunnel/auto-update.go index 038c60537..ba41f0378 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/podman/v3/pkg/domain/entities" + "github.com/containers/podman/v4/pkg/domain/entities" "github.com/pkg/errors" ) diff --git a/pkg/domain/infra/tunnel/containers.go b/pkg/domain/infra/tunnel/containers.go index ae689f1f7..67e709486 100644 --- a/pkg/domain/infra/tunnel/containers.go +++ b/pkg/domain/infra/tunnel/containers.go @@ -12,15 +12,15 @@ import ( "github.com/containers/common/pkg/config" "github.com/containers/image/v5/docker/reference" - "github.com/containers/podman/v3/libpod/define" - "github.com/containers/podman/v3/libpod/events" - "github.com/containers/podman/v3/pkg/api/handlers" - "github.com/containers/podman/v3/pkg/bindings/containers" - "github.com/containers/podman/v3/pkg/domain/entities" - "github.com/containers/podman/v3/pkg/domain/entities/reports" - "github.com/containers/podman/v3/pkg/errorhandling" - "github.com/containers/podman/v3/pkg/specgen" - "github.com/containers/podman/v3/pkg/util" + "github.com/containers/podman/v4/libpod/define" + "github.com/containers/podman/v4/libpod/events" + "github.com/containers/podman/v4/pkg/api/handlers" + "github.com/containers/podman/v4/pkg/bindings/containers" + "github.com/containers/podman/v4/pkg/domain/entities" + "github.com/containers/podman/v4/pkg/domain/entities/reports" + "github.com/containers/podman/v4/pkg/errorhandling" + "github.com/containers/podman/v4/pkg/specgen" + "github.com/containers/podman/v4/pkg/util" "github.com/containers/storage/types" "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 203550c5d..1f27cdff8 100644 --- a/pkg/domain/infra/tunnel/events.go +++ b/pkg/domain/infra/tunnel/events.go @@ -4,9 +4,9 @@ import ( "context" "strings" - "github.com/containers/podman/v3/libpod/events" - "github.com/containers/podman/v3/pkg/bindings/system" - "github.com/containers/podman/v3/pkg/domain/entities" + "github.com/containers/podman/v4/libpod/events" + "github.com/containers/podman/v4/pkg/bindings/system" + "github.com/containers/podman/v4/pkg/domain/entities" "github.com/pkg/errors" ) diff --git a/pkg/domain/infra/tunnel/generate.go b/pkg/domain/infra/tunnel/generate.go index dd895b61f..49b66e908 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/podman/v3/pkg/bindings/generate" - "github.com/containers/podman/v3/pkg/domain/entities" + "github.com/containers/podman/v4/pkg/bindings/generate" + "github.com/containers/podman/v4/pkg/domain/entities" ) func (ic *ContainerEngine) GenerateSystemd(ctx context.Context, nameOrID string, opts entities.GenerateSystemdOptions) (*entities.GenerateSystemdReport, error) { diff --git a/pkg/domain/infra/tunnel/healthcheck.go b/pkg/domain/infra/tunnel/healthcheck.go index 9d37826e0..67d529201 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/podman/v3/libpod/define" - "github.com/containers/podman/v3/pkg/bindings/containers" - "github.com/containers/podman/v3/pkg/domain/entities" + "github.com/containers/podman/v4/libpod/define" + "github.com/containers/podman/v4/pkg/bindings/containers" + "github.com/containers/podman/v4/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 f088d360b..5b14fac37 100644 --- a/pkg/domain/infra/tunnel/helpers.go +++ b/pkg/domain/infra/tunnel/helpers.go @@ -3,11 +3,11 @@ package tunnel import ( "context" - "github.com/containers/podman/v3/libpod/define" - "github.com/containers/podman/v3/pkg/bindings/containers" - "github.com/containers/podman/v3/pkg/bindings/pods" - "github.com/containers/podman/v3/pkg/domain/entities" - "github.com/containers/podman/v3/pkg/errorhandling" + "github.com/containers/podman/v4/libpod/define" + "github.com/containers/podman/v4/pkg/bindings/containers" + "github.com/containers/podman/v4/pkg/bindings/pods" + "github.com/containers/podman/v4/pkg/domain/entities" + "github.com/containers/podman/v4/pkg/errorhandling" "github.com/pkg/errors" ) diff --git a/pkg/domain/infra/tunnel/images.go b/pkg/domain/infra/tunnel/images.go index f26a489e6..3ee97d94c 100644 --- a/pkg/domain/infra/tunnel/images.go +++ b/pkg/domain/infra/tunnel/images.go @@ -12,13 +12,13 @@ import ( "github.com/containers/common/pkg/config" "github.com/containers/image/v5/docker/reference" "github.com/containers/image/v5/types" - "github.com/containers/podman/v3/libpod/define" - "github.com/containers/podman/v3/pkg/bindings/images" - "github.com/containers/podman/v3/pkg/domain/entities" - "github.com/containers/podman/v3/pkg/domain/entities/reports" - "github.com/containers/podman/v3/pkg/domain/utils" - "github.com/containers/podman/v3/pkg/errorhandling" - utils2 "github.com/containers/podman/v3/utils" + "github.com/containers/podman/v4/libpod/define" + "github.com/containers/podman/v4/pkg/bindings/images" + "github.com/containers/podman/v4/pkg/domain/entities" + "github.com/containers/podman/v4/pkg/domain/entities/reports" + "github.com/containers/podman/v4/pkg/domain/utils" + "github.com/containers/podman/v4/pkg/errorhandling" + utils2 "github.com/containers/podman/v4/utils" "github.com/pkg/errors" ) diff --git a/pkg/domain/infra/tunnel/manifest.go b/pkg/domain/infra/tunnel/manifest.go index f89c59bc7..d2efed8d3 100644 --- a/pkg/domain/infra/tunnel/manifest.go +++ b/pkg/domain/infra/tunnel/manifest.go @@ -7,9 +7,9 @@ import ( "strings" "github.com/containers/image/v5/types" - "github.com/containers/podman/v3/pkg/bindings/images" - "github.com/containers/podman/v3/pkg/bindings/manifests" - "github.com/containers/podman/v3/pkg/domain/entities" + "github.com/containers/podman/v4/pkg/bindings/images" + "github.com/containers/podman/v4/pkg/bindings/manifests" + "github.com/containers/podman/v4/pkg/domain/entities" "github.com/pkg/errors" ) diff --git a/pkg/domain/infra/tunnel/network.go b/pkg/domain/infra/tunnel/network.go index 0f1430b1a..415999a96 100644 --- a/pkg/domain/infra/tunnel/network.go +++ b/pkg/domain/infra/tunnel/network.go @@ -4,10 +4,10 @@ import ( "context" "github.com/containers/common/libnetwork/types" - "github.com/containers/podman/v3/libpod/define" - "github.com/containers/podman/v3/pkg/bindings/network" - "github.com/containers/podman/v3/pkg/domain/entities" - "github.com/containers/podman/v3/pkg/errorhandling" + "github.com/containers/podman/v4/libpod/define" + "github.com/containers/podman/v4/pkg/bindings/network" + "github.com/containers/podman/v4/pkg/domain/entities" + "github.com/containers/podman/v4/pkg/errorhandling" "github.com/pkg/errors" ) diff --git a/pkg/domain/infra/tunnel/play.go b/pkg/domain/infra/tunnel/play.go index 103be0cf1..55844730b 100644 --- a/pkg/domain/infra/tunnel/play.go +++ b/pkg/domain/infra/tunnel/play.go @@ -4,8 +4,8 @@ import ( "context" "github.com/containers/image/v5/types" - "github.com/containers/podman/v3/pkg/bindings/play" - "github.com/containers/podman/v3/pkg/domain/entities" + "github.com/containers/podman/v4/pkg/bindings/play" + "github.com/containers/podman/v4/pkg/domain/entities" ) func (ic *ContainerEngine) PlayKube(ctx context.Context, path string, opts entities.PlayKubeOptions) (*entities.PlayKubeReport, error) { diff --git a/pkg/domain/infra/tunnel/pods.go b/pkg/domain/infra/tunnel/pods.go index bd3df1aa7..4f44e7e4a 100644 --- a/pkg/domain/infra/tunnel/pods.go +++ b/pkg/domain/infra/tunnel/pods.go @@ -3,10 +3,10 @@ package tunnel import ( "context" - "github.com/containers/podman/v3/libpod/define" - "github.com/containers/podman/v3/pkg/bindings/pods" - "github.com/containers/podman/v3/pkg/domain/entities" - "github.com/containers/podman/v3/pkg/util" + "github.com/containers/podman/v4/libpod/define" + "github.com/containers/podman/v4/pkg/bindings/pods" + "github.com/containers/podman/v4/pkg/domain/entities" + "github.com/containers/podman/v4/pkg/util" "github.com/pkg/errors" ) diff --git a/pkg/domain/infra/tunnel/secrets.go b/pkg/domain/infra/tunnel/secrets.go index e5fa200bd..2412ed0a2 100644 --- a/pkg/domain/infra/tunnel/secrets.go +++ b/pkg/domain/infra/tunnel/secrets.go @@ -4,9 +4,9 @@ import ( "context" "io" - "github.com/containers/podman/v3/pkg/bindings/secrets" - "github.com/containers/podman/v3/pkg/domain/entities" - "github.com/containers/podman/v3/pkg/errorhandling" + "github.com/containers/podman/v4/pkg/bindings/secrets" + "github.com/containers/podman/v4/pkg/domain/entities" + "github.com/containers/podman/v4/pkg/errorhandling" "github.com/pkg/errors" ) diff --git a/pkg/domain/infra/tunnel/system.go b/pkg/domain/infra/tunnel/system.go index 6b43cf038..4185134dc 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/podman/v3/libpod/define" - "github.com/containers/podman/v3/pkg/bindings/system" - "github.com/containers/podman/v3/pkg/domain/entities" + "github.com/containers/podman/v4/libpod/define" + "github.com/containers/podman/v4/pkg/bindings/system" + "github.com/containers/podman/v4/pkg/domain/entities" ) func (ic *ContainerEngine) Info(ctx context.Context) (*define.Info, error) { diff --git a/pkg/domain/infra/tunnel/trust.go b/pkg/domain/infra/tunnel/trust.go index e0bd535ec..deb9965a3 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/podman/v3/pkg/domain/entities" + "github.com/containers/podman/v4/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 ccb363935..f4abeab0f 100644 --- a/pkg/domain/infra/tunnel/volumes.go +++ b/pkg/domain/infra/tunnel/volumes.go @@ -3,10 +3,10 @@ package tunnel import ( "context" - "github.com/containers/podman/v3/pkg/bindings/volumes" - "github.com/containers/podman/v3/pkg/domain/entities" - "github.com/containers/podman/v3/pkg/domain/entities/reports" - "github.com/containers/podman/v3/pkg/errorhandling" + "github.com/containers/podman/v4/pkg/bindings/volumes" + "github.com/containers/podman/v4/pkg/domain/entities" + "github.com/containers/podman/v4/pkg/domain/entities/reports" + "github.com/containers/podman/v4/pkg/errorhandling" "github.com/pkg/errors" ) diff --git a/pkg/domain/utils/secrets_filters.go b/pkg/domain/utils/secrets_filters.go index 3ff7c7530..e76bc592f 100644 --- a/pkg/domain/utils/secrets_filters.go +++ b/pkg/domain/utils/secrets_filters.go @@ -4,7 +4,7 @@ import ( "strings" "github.com/containers/common/pkg/secrets" - "github.com/containers/podman/v3/pkg/util" + "github.com/containers/podman/v4/pkg/util" "github.com/pkg/errors" ) diff --git a/pkg/hooks/0.1.0/hook.go b/pkg/hooks/0.1.0/hook.go index fb5760172..c3df5fa1d 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/podman/v3/pkg/hooks/1.0.0" + current "github.com/containers/podman/v4/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 637aad638..5beadbaaf 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/podman/v3/pkg/hooks/1.0.0" + current "github.com/containers/podman/v4/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 f49195f65..ecd5b7dfc 100644 --- a/pkg/hooks/hooks.go +++ b/pkg/hooks/hooks.go @@ -9,7 +9,7 @@ import ( "strings" "sync" - current "github.com/containers/podman/v3/pkg/hooks/1.0.0" + current "github.com/containers/podman/v4/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 f7b00dd3d..fb3c63250 100644 --- a/pkg/hooks/hooks_test.go +++ b/pkg/hooks/hooks_test.go @@ -9,7 +9,7 @@ import ( "runtime" "testing" - current "github.com/containers/podman/v3/pkg/hooks/1.0.0" + current "github.com/containers/podman/v4/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 ece6e52d1..d2d7140a5 100644 --- a/pkg/hooks/monitor.go +++ b/pkg/hooks/monitor.go @@ -3,7 +3,7 @@ package hooks import ( "context" - current "github.com/containers/podman/v3/pkg/hooks/1.0.0" + current "github.com/containers/podman/v4/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 e7e5aa66f..c48d51f7d 100644 --- a/pkg/hooks/read.go +++ b/pkg/hooks/read.go @@ -8,8 +8,8 @@ import ( "path/filepath" "strings" - old "github.com/containers/podman/v3/pkg/hooks/0.1.0" - current "github.com/containers/podman/v3/pkg/hooks/1.0.0" + old "github.com/containers/podman/v4/pkg/hooks/0.1.0" + current "github.com/containers/podman/v4/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 9f4de049e..6e6c190bb 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/podman/v3/pkg/hooks/1.0.0" + current "github.com/containers/podman/v4/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 5caeae1f0..cd26db6b0 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/podman/v3/libpod/define" + "github.com/containers/podman/v4/libpod/define" "github.com/opencontainers/go-digest" v1 "github.com/opencontainers/image-spec/specs-go/v1" ) diff --git a/pkg/kubeutils/resize.go b/pkg/kubeutils/resize.go index 5d004bc54..7b14b6db3 100644 --- a/pkg/kubeutils/resize.go +++ b/pkg/kubeutils/resize.go @@ -17,7 +17,7 @@ limitations under the License. package kubeutils import ( - "github.com/containers/podman/v3/libpod/define" + "github.com/containers/podman/v4/libpod/define" "k8s.io/apimachinery/pkg/util/runtime" ) diff --git a/pkg/machine/qemu/machine.go b/pkg/machine/qemu/machine.go index 560037542..e1870f1ac 100644 --- a/pkg/machine/qemu/machine.go +++ b/pkg/machine/qemu/machine.go @@ -16,9 +16,9 @@ import ( "time" "github.com/containers/common/pkg/config" - "github.com/containers/podman/v3/pkg/machine" - "github.com/containers/podman/v3/pkg/rootless" - "github.com/containers/podman/v3/utils" + "github.com/containers/podman/v4/pkg/machine" + "github.com/containers/podman/v4/pkg/rootless" + "github.com/containers/podman/v4/utils" "github.com/containers/storage/pkg/homedir" "github.com/digitalocean/go-qemu/qmp" "github.com/docker/go-units" diff --git a/pkg/machine/qemu/options_linux.go b/pkg/machine/qemu/options_linux.go index c73a68cc6..8f267dbe2 100644 --- a/pkg/machine/qemu/options_linux.go +++ b/pkg/machine/qemu/options_linux.go @@ -1,8 +1,8 @@ package qemu import ( - "github.com/containers/podman/v3/pkg/rootless" - "github.com/containers/podman/v3/pkg/util" + "github.com/containers/podman/v4/pkg/rootless" + "github.com/containers/podman/v4/pkg/util" ) func getRuntimeDir() (string, error) { diff --git a/pkg/machine/wsl/machine.go b/pkg/machine/wsl/machine.go index b4ee79acc..6cab855d3 100644 --- a/pkg/machine/wsl/machine.go +++ b/pkg/machine/wsl/machine.go @@ -16,8 +16,8 @@ import ( "strings" "time" - "github.com/containers/podman/v3/pkg/machine" - "github.com/containers/podman/v3/utils" + "github.com/containers/podman/v4/pkg/machine" + "github.com/containers/podman/v4/utils" "github.com/containers/storage/pkg/homedir" "github.com/pkg/errors" "github.com/sirupsen/logrus" diff --git a/pkg/parallel/ctr/ctr.go b/pkg/parallel/ctr/ctr.go index 16999fabf..ca47a0ee4 100644 --- a/pkg/parallel/ctr/ctr.go +++ b/pkg/parallel/ctr/ctr.go @@ -3,8 +3,8 @@ package ctr import ( "context" - "github.com/containers/podman/v3/libpod" - "github.com/containers/podman/v3/pkg/parallel" + "github.com/containers/podman/v4/libpod" + "github.com/containers/podman/v4/pkg/parallel" "github.com/sirupsen/logrus" ) diff --git a/pkg/ps/ps.go b/pkg/ps/ps.go index a1d77e785..5fe1b83e2 100644 --- a/pkg/ps/ps.go +++ b/pkg/ps/ps.go @@ -9,11 +9,11 @@ import ( "strings" "time" - "github.com/containers/podman/v3/libpod" - "github.com/containers/podman/v3/libpod/define" - "github.com/containers/podman/v3/pkg/domain/entities" - "github.com/containers/podman/v3/pkg/domain/filters" - psdefine "github.com/containers/podman/v3/pkg/ps/define" + "github.com/containers/podman/v4/libpod" + "github.com/containers/podman/v4/libpod/define" + "github.com/containers/podman/v4/pkg/domain/entities" + "github.com/containers/podman/v4/pkg/domain/filters" + psdefine "github.com/containers/podman/v4/pkg/ps/define" "github.com/containers/storage" "github.com/containers/storage/types" "github.com/pkg/errors" diff --git a/pkg/resolvconf/resolvconf.go b/pkg/resolvconf/resolvconf.go index cfaedc74a..f23cd61b0 100644 --- a/pkg/resolvconf/resolvconf.go +++ b/pkg/resolvconf/resolvconf.go @@ -9,7 +9,7 @@ import ( "strings" "sync" - "github.com/containers/podman/v3/pkg/resolvconf/dns" + "github.com/containers/podman/v4/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 92725adc7..22f5041d0 100644 --- a/pkg/rootless/rootless_linux.go +++ b/pkg/rootless/rootless_linux.go @@ -18,7 +18,7 @@ import ( "sync" "unsafe" - "github.com/containers/podman/v3/pkg/errorhandling" + "github.com/containers/podman/v4/pkg/errorhandling" "github.com/containers/storage/pkg/idtools" pmount "github.com/containers/storage/pkg/mount" "github.com/containers/storage/pkg/unshare" diff --git a/pkg/specgen/container_validate.go b/pkg/specgen/container_validate.go index d06a047c1..a279b8a62 100644 --- a/pkg/specgen/container_validate.go +++ b/pkg/specgen/container_validate.go @@ -4,9 +4,9 @@ import ( "strconv" "strings" - "github.com/containers/podman/v3/libpod/define" - "github.com/containers/podman/v3/pkg/rootless" - "github.com/containers/podman/v3/pkg/util" + "github.com/containers/podman/v4/libpod/define" + "github.com/containers/podman/v4/pkg/rootless" + "github.com/containers/podman/v4/pkg/util" "github.com/opencontainers/runtime-spec/specs-go" "github.com/pkg/errors" ) diff --git a/pkg/specgen/generate/config_linux.go b/pkg/specgen/generate/config_linux.go index 2d1e2b288..fe220b9e8 100644 --- a/pkg/specgen/generate/config_linux.go +++ b/pkg/specgen/generate/config_linux.go @@ -8,8 +8,8 @@ import ( "path/filepath" "strings" - "github.com/containers/podman/v3/libpod/define" - "github.com/containers/podman/v3/pkg/rootless" + "github.com/containers/podman/v4/libpod/define" + "github.com/containers/podman/v4/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 6ffbf69c1..239655c72 100644 --- a/pkg/specgen/generate/config_linux_cgo.go +++ b/pkg/specgen/generate/config_linux_cgo.go @@ -8,8 +8,8 @@ import ( "github.com/containers/common/libimage" goSeccomp "github.com/containers/common/pkg/seccomp" - "github.com/containers/podman/v3/pkg/seccomp" - "github.com/containers/podman/v3/pkg/specgen" + "github.com/containers/podman/v4/pkg/seccomp" + "github.com/containers/podman/v4/pkg/specgen" spec "github.com/opencontainers/runtime-spec/specs-go" "github.com/pkg/errors" "github.com/sirupsen/logrus" diff --git a/pkg/specgen/generate/config_linux_nocgo.go b/pkg/specgen/generate/config_linux_nocgo.go index 4a1880b74..9ead739a7 100644 --- a/pkg/specgen/generate/config_linux_nocgo.go +++ b/pkg/specgen/generate/config_linux_nocgo.go @@ -6,7 +6,7 @@ import ( "errors" "github.com/containers/common/libimage" - "github.com/containers/podman/v3/pkg/specgen" + "github.com/containers/podman/v4/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 7b55a0cb3..a4d862a60 100644 --- a/pkg/specgen/generate/container.go +++ b/pkg/specgen/generate/container.go @@ -8,12 +8,12 @@ import ( "github.com/containers/common/libimage" "github.com/containers/common/pkg/config" - "github.com/containers/podman/v3/libpod" - "github.com/containers/podman/v3/libpod/define" - ann "github.com/containers/podman/v3/pkg/annotations" - envLib "github.com/containers/podman/v3/pkg/env" - "github.com/containers/podman/v3/pkg/signal" - "github.com/containers/podman/v3/pkg/specgen" + "github.com/containers/podman/v4/libpod" + "github.com/containers/podman/v4/libpod/define" + ann "github.com/containers/podman/v4/pkg/annotations" + envLib "github.com/containers/podman/v4/pkg/env" + "github.com/containers/podman/v4/pkg/signal" + "github.com/containers/podman/v4/pkg/specgen" spec "github.com/opencontainers/runtime-spec/specs-go" "github.com/pkg/errors" "github.com/sirupsen/logrus" diff --git a/pkg/specgen/generate/container_create.go b/pkg/specgen/generate/container_create.go index dc116d1e6..a7a7353d0 100644 --- a/pkg/specgen/generate/container_create.go +++ b/pkg/specgen/generate/container_create.go @@ -8,11 +8,11 @@ import ( cdi "github.com/container-orchestrated-devices/container-device-interface/pkg/cdi" "github.com/containers/common/libimage" - "github.com/containers/podman/v3/libpod" - "github.com/containers/podman/v3/libpod/define" - "github.com/containers/podman/v3/pkg/namespaces" - "github.com/containers/podman/v3/pkg/specgen" - "github.com/containers/podman/v3/pkg/util" + "github.com/containers/podman/v4/libpod" + "github.com/containers/podman/v4/libpod/define" + "github.com/containers/podman/v4/pkg/namespaces" + "github.com/containers/podman/v4/pkg/specgen" + "github.com/containers/podman/v4/pkg/util" spec "github.com/opencontainers/runtime-spec/specs-go" "github.com/opencontainers/selinux/go-selinux/label" "github.com/pkg/errors" diff --git a/pkg/specgen/generate/kube/kube.go b/pkg/specgen/generate/kube/kube.go index b4f633f31..2fd149b49 100644 --- a/pkg/specgen/generate/kube/kube.go +++ b/pkg/specgen/generate/kube/kube.go @@ -13,12 +13,12 @@ import ( "github.com/containers/common/pkg/parse" "github.com/containers/common/pkg/secrets" "github.com/containers/image/v5/manifest" - "github.com/containers/podman/v3/libpod/define" - ann "github.com/containers/podman/v3/pkg/annotations" - "github.com/containers/podman/v3/pkg/domain/entities" - "github.com/containers/podman/v3/pkg/specgen" - "github.com/containers/podman/v3/pkg/specgen/generate" - "github.com/containers/podman/v3/pkg/util" + "github.com/containers/podman/v4/libpod/define" + ann "github.com/containers/podman/v4/pkg/annotations" + "github.com/containers/podman/v4/pkg/domain/entities" + "github.com/containers/podman/v4/pkg/specgen" + "github.com/containers/podman/v4/pkg/specgen/generate" + "github.com/containers/podman/v4/pkg/util" "github.com/docker/go-units" spec "github.com/opencontainers/runtime-spec/specs-go" "github.com/pkg/errors" diff --git a/pkg/specgen/generate/kube/seccomp.go b/pkg/specgen/generate/kube/seccomp.go index da15cf519..b977b6f50 100644 --- a/pkg/specgen/generate/kube/seccomp.go +++ b/pkg/specgen/generate/kube/seccomp.go @@ -4,7 +4,7 @@ import ( "path/filepath" "strings" - "github.com/containers/podman/v3/libpod" + "github.com/containers/podman/v4/libpod" "github.com/pkg/errors" v1 "k8s.io/api/core/v1" ) diff --git a/pkg/specgen/generate/kube/volume.go b/pkg/specgen/generate/kube/volume.go index 76ec0a390..e52d70092 100644 --- a/pkg/specgen/generate/kube/volume.go +++ b/pkg/specgen/generate/kube/volume.go @@ -4,7 +4,7 @@ import ( "os" "github.com/containers/common/pkg/parse" - "github.com/containers/podman/v3/libpod" + "github.com/containers/podman/v4/libpod" "github.com/pkg/errors" "github.com/sirupsen/logrus" v1 "k8s.io/api/core/v1" diff --git a/pkg/specgen/generate/namespaces.go b/pkg/specgen/generate/namespaces.go index 760fbe2b9..93d9caf4c 100644 --- a/pkg/specgen/generate/namespaces.go +++ b/pkg/specgen/generate/namespaces.go @@ -9,11 +9,11 @@ import ( "github.com/containers/common/libimage" "github.com/containers/common/libnetwork/types" "github.com/containers/common/pkg/config" - "github.com/containers/podman/v3/libpod" - "github.com/containers/podman/v3/libpod/define" - "github.com/containers/podman/v3/pkg/rootless" - "github.com/containers/podman/v3/pkg/specgen" - "github.com/containers/podman/v3/pkg/util" + "github.com/containers/podman/v4/libpod" + "github.com/containers/podman/v4/libpod/define" + "github.com/containers/podman/v4/pkg/rootless" + "github.com/containers/podman/v4/pkg/specgen" + "github.com/containers/podman/v4/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 f72ffe80c..945c994ea 100644 --- a/pkg/specgen/generate/oci.go +++ b/pkg/specgen/generate/oci.go @@ -9,10 +9,10 @@ import ( "github.com/containers/common/libimage" "github.com/containers/common/pkg/cgroups" "github.com/containers/common/pkg/config" - "github.com/containers/podman/v3/libpod" - "github.com/containers/podman/v3/libpod/define" - "github.com/containers/podman/v3/pkg/rootless" - "github.com/containers/podman/v3/pkg/specgen" + "github.com/containers/podman/v4/libpod" + "github.com/containers/podman/v4/libpod/define" + "github.com/containers/podman/v4/pkg/rootless" + "github.com/containers/podman/v4/pkg/specgen" spec "github.com/opencontainers/runtime-spec/specs-go" "github.com/opencontainers/runtime-tools/generate" "github.com/pkg/errors" diff --git a/pkg/specgen/generate/pod_create.go b/pkg/specgen/generate/pod_create.go index 0a797c571..369ebda58 100644 --- a/pkg/specgen/generate/pod_create.go +++ b/pkg/specgen/generate/pod_create.go @@ -9,10 +9,10 @@ import ( buildahDefine "github.com/containers/buildah/define" "github.com/containers/common/pkg/config" - "github.com/containers/podman/v3/libpod" - "github.com/containers/podman/v3/libpod/define" - "github.com/containers/podman/v3/pkg/domain/entities" - "github.com/containers/podman/v3/pkg/specgen" + "github.com/containers/podman/v4/libpod" + "github.com/containers/podman/v4/libpod/define" + "github.com/containers/podman/v4/pkg/domain/entities" + "github.com/containers/podman/v4/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 a1cc1cf68..c30c4e49d 100644 --- a/pkg/specgen/generate/ports.go +++ b/pkg/specgen/generate/ports.go @@ -9,11 +9,11 @@ import ( "github.com/containers/common/libimage" "github.com/containers/common/libnetwork/types" - "github.com/containers/podman/v3/utils" + "github.com/containers/podman/v4/utils" - "github.com/containers/podman/v3/pkg/specgen" - "github.com/containers/podman/v3/pkg/specgenutil" - "github.com/containers/podman/v3/pkg/util" + "github.com/containers/podman/v4/pkg/specgen" + "github.com/containers/podman/v4/pkg/specgenutil" + "github.com/containers/podman/v4/pkg/util" "github.com/pkg/errors" "github.com/sirupsen/logrus" ) diff --git a/pkg/specgen/generate/security.go b/pkg/specgen/generate/security.go index a11debdb5..2eaf71897 100644 --- a/pkg/specgen/generate/security.go +++ b/pkg/specgen/generate/security.go @@ -7,10 +7,10 @@ import ( "github.com/containers/common/pkg/apparmor" "github.com/containers/common/pkg/capabilities" "github.com/containers/common/pkg/config" - "github.com/containers/podman/v3/libpod" - "github.com/containers/podman/v3/libpod/define" - "github.com/containers/podman/v3/pkg/specgen" - "github.com/containers/podman/v3/pkg/util" + "github.com/containers/podman/v4/libpod" + "github.com/containers/podman/v4/libpod/define" + "github.com/containers/podman/v4/pkg/specgen" + "github.com/containers/podman/v4/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 30248a886..6dcc1b7bf 100644 --- a/pkg/specgen/generate/storage.go +++ b/pkg/specgen/generate/storage.go @@ -11,10 +11,10 @@ import ( "github.com/containers/common/libimage" "github.com/containers/common/pkg/config" "github.com/containers/common/pkg/parse" - "github.com/containers/podman/v3/libpod" - "github.com/containers/podman/v3/libpod/define" - "github.com/containers/podman/v3/pkg/specgen" - "github.com/containers/podman/v3/pkg/util" + "github.com/containers/podman/v4/libpod" + "github.com/containers/podman/v4/libpod/define" + "github.com/containers/podman/v4/pkg/specgen" + "github.com/containers/podman/v4/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 c74db7325..8da3f2936 100644 --- a/pkg/specgen/generate/validate.go +++ b/pkg/specgen/generate/validate.go @@ -6,8 +6,8 @@ import ( "github.com/containers/common/pkg/cgroups" "github.com/containers/common/pkg/sysinfo" - "github.com/containers/podman/v3/pkg/specgen" - "github.com/containers/podman/v3/utils" + "github.com/containers/podman/v4/pkg/specgen" + "github.com/containers/podman/v4/utils" "github.com/pkg/errors" ) diff --git a/pkg/specgen/namespaces.go b/pkg/specgen/namespaces.go index baf6cbec9..1634b86b5 100644 --- a/pkg/specgen/namespaces.go +++ b/pkg/specgen/namespaces.go @@ -8,9 +8,9 @@ import ( "github.com/containers/common/libnetwork/types" "github.com/containers/common/pkg/cgroups" - "github.com/containers/podman/v3/libpod/define" - "github.com/containers/podman/v3/pkg/rootless" - "github.com/containers/podman/v3/pkg/util" + "github.com/containers/podman/v4/libpod/define" + "github.com/containers/podman/v4/pkg/rootless" + "github.com/containers/podman/v4/pkg/util" "github.com/containers/storage" spec "github.com/opencontainers/runtime-spec/specs-go" "github.com/opencontainers/runtime-tools/generate" diff --git a/pkg/specgen/namespaces_test.go b/pkg/specgen/namespaces_test.go index bb2fdd4c6..368c92bd5 100644 --- a/pkg/specgen/namespaces_test.go +++ b/pkg/specgen/namespaces_test.go @@ -5,7 +5,7 @@ import ( "testing" "github.com/containers/common/libnetwork/types" - "github.com/containers/podman/v3/pkg/rootless" + "github.com/containers/podman/v4/pkg/rootless" "github.com/stretchr/testify/assert" ) diff --git a/pkg/specgen/pod_validate.go b/pkg/specgen/pod_validate.go index c5a66189c..8d971a25e 100644 --- a/pkg/specgen/pod_validate.go +++ b/pkg/specgen/pod_validate.go @@ -1,7 +1,7 @@ package specgen import ( - "github.com/containers/podman/v3/pkg/util" + "github.com/containers/podman/v4/pkg/util" "github.com/pkg/errors" ) diff --git a/pkg/specgenutil/createparse.go b/pkg/specgenutil/createparse.go index b46d8fbc6..9666e4be0 100644 --- a/pkg/specgenutil/createparse.go +++ b/pkg/specgenutil/createparse.go @@ -2,7 +2,7 @@ package specgenutil import ( "github.com/containers/common/pkg/config" - "github.com/containers/podman/v3/pkg/domain/entities" + "github.com/containers/podman/v4/pkg/domain/entities" "github.com/pkg/errors" ) diff --git a/pkg/specgenutil/specgen.go b/pkg/specgenutil/specgen.go index ee089695e..b6a18a274 100644 --- a/pkg/specgenutil/specgen.go +++ b/pkg/specgenutil/specgen.go @@ -10,15 +10,15 @@ import ( "github.com/containers/common/pkg/config" "github.com/containers/image/v5/manifest" - "github.com/containers/podman/v3/cmd/podman/parse" - "github.com/containers/podman/v3/libpod/define" - ann "github.com/containers/podman/v3/pkg/annotations" - "github.com/containers/podman/v3/pkg/domain/entities" - envLib "github.com/containers/podman/v3/pkg/env" - "github.com/containers/podman/v3/pkg/namespaces" - "github.com/containers/podman/v3/pkg/specgen" - systemdDefine "github.com/containers/podman/v3/pkg/systemd/define" - "github.com/containers/podman/v3/pkg/util" + "github.com/containers/podman/v4/cmd/podman/parse" + "github.com/containers/podman/v4/libpod/define" + ann "github.com/containers/podman/v4/pkg/annotations" + "github.com/containers/podman/v4/pkg/domain/entities" + envLib "github.com/containers/podman/v4/pkg/env" + "github.com/containers/podman/v4/pkg/namespaces" + "github.com/containers/podman/v4/pkg/specgen" + systemdDefine "github.com/containers/podman/v4/pkg/systemd/define" + "github.com/containers/podman/v4/pkg/util" "github.com/docker/go-units" "github.com/opencontainers/runtime-spec/specs-go" "github.com/pkg/errors" diff --git a/pkg/specgenutil/volumes.go b/pkg/specgenutil/volumes.go index 8ff770f9c..6b9624ebb 100644 --- a/pkg/specgenutil/volumes.go +++ b/pkg/specgenutil/volumes.go @@ -6,9 +6,9 @@ import ( "strings" "github.com/containers/common/pkg/parse" - "github.com/containers/podman/v3/libpod/define" - "github.com/containers/podman/v3/pkg/specgen" - "github.com/containers/podman/v3/pkg/util" + "github.com/containers/podman/v4/libpod/define" + "github.com/containers/podman/v4/pkg/specgen" + "github.com/containers/podman/v4/pkg/util" spec "github.com/opencontainers/runtime-spec/specs-go" "github.com/pkg/errors" ) diff --git a/pkg/systemd/dbus.go b/pkg/systemd/dbus.go index 04aaa117a..1b1bc8be9 100644 --- a/pkg/systemd/dbus.go +++ b/pkg/systemd/dbus.go @@ -6,7 +6,7 @@ import ( "path/filepath" "strconv" - "github.com/containers/podman/v3/pkg/rootless" + "github.com/containers/podman/v4/pkg/rootless" "github.com/coreos/go-systemd/v22/dbus" godbus "github.com/godbus/dbus/v5" "github.com/sirupsen/logrus" diff --git a/pkg/systemd/generate/common.go b/pkg/systemd/generate/common.go index 8689e084c..a6f8f7cd4 100644 --- a/pkg/systemd/generate/common.go +++ b/pkg/systemd/generate/common.go @@ -4,7 +4,7 @@ import ( "strconv" "strings" - "github.com/containers/podman/v3/pkg/systemd/define" + "github.com/containers/podman/v4/pkg/systemd/define" "github.com/pkg/errors" ) diff --git a/pkg/systemd/generate/containers.go b/pkg/systemd/generate/containers.go index d0c94123d..fd5c247f3 100644 --- a/pkg/systemd/generate/containers.go +++ b/pkg/systemd/generate/containers.go @@ -9,11 +9,11 @@ import ( "text/template" "time" - "github.com/containers/podman/v3/libpod" - libpodDefine "github.com/containers/podman/v3/libpod/define" - "github.com/containers/podman/v3/pkg/domain/entities" - "github.com/containers/podman/v3/pkg/systemd/define" - "github.com/containers/podman/v3/version" + "github.com/containers/podman/v4/libpod" + libpodDefine "github.com/containers/podman/v4/libpod/define" + "github.com/containers/podman/v4/pkg/domain/entities" + "github.com/containers/podman/v4/pkg/systemd/define" + "github.com/containers/podman/v4/version" "github.com/pkg/errors" "github.com/sirupsen/logrus" "github.com/spf13/pflag" diff --git a/pkg/systemd/generate/containers_test.go b/pkg/systemd/generate/containers_test.go index 33b09005c..45bb5173a 100644 --- a/pkg/systemd/generate/containers_test.go +++ b/pkg/systemd/generate/containers_test.go @@ -4,8 +4,8 @@ import ( "fmt" "testing" - "github.com/containers/podman/v3/pkg/domain/entities" - "github.com/containers/podman/v3/pkg/systemd/define" + "github.com/containers/podman/v4/pkg/domain/entities" + "github.com/containers/podman/v4/pkg/systemd/define" "github.com/stretchr/testify/assert" ) diff --git a/pkg/systemd/generate/pods.go b/pkg/systemd/generate/pods.go index f2d04dadc..17e1dc5a2 100644 --- a/pkg/systemd/generate/pods.go +++ b/pkg/systemd/generate/pods.go @@ -9,10 +9,10 @@ import ( "text/template" "time" - "github.com/containers/podman/v3/libpod" - "github.com/containers/podman/v3/pkg/domain/entities" - "github.com/containers/podman/v3/pkg/systemd/define" - "github.com/containers/podman/v3/version" + "github.com/containers/podman/v4/libpod" + "github.com/containers/podman/v4/pkg/domain/entities" + "github.com/containers/podman/v4/pkg/systemd/define" + "github.com/containers/podman/v4/version" "github.com/pkg/errors" "github.com/sirupsen/logrus" "github.com/spf13/pflag" diff --git a/pkg/systemd/generate/pods_test.go b/pkg/systemd/generate/pods_test.go index 0889507a5..6c84c8895 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/podman/v3/pkg/domain/entities" + "github.com/containers/podman/v4/pkg/domain/entities" "github.com/stretchr/testify/assert" ) diff --git a/pkg/util/filters.go b/pkg/util/filters.go index 99fac2478..05ba4f82c 100644 --- a/pkg/util/filters.go +++ b/pkg/util/filters.go @@ -8,7 +8,7 @@ import ( "strings" "time" - "github.com/containers/podman/v3/pkg/timetype" + "github.com/containers/podman/v4/pkg/timetype" "github.com/pkg/errors" ) diff --git a/pkg/util/utils.go b/pkg/util/utils.go index 11edf265f..925ff9830 100644 --- a/pkg/util/utils.go +++ b/pkg/util/utils.go @@ -17,10 +17,10 @@ import ( "github.com/BurntSushi/toml" "github.com/containers/common/pkg/config" "github.com/containers/image/v5/types" - "github.com/containers/podman/v3/pkg/errorhandling" - "github.com/containers/podman/v3/pkg/namespaces" - "github.com/containers/podman/v3/pkg/rootless" - "github.com/containers/podman/v3/pkg/signal" + "github.com/containers/podman/v4/pkg/errorhandling" + "github.com/containers/podman/v4/pkg/namespaces" + "github.com/containers/podman/v4/pkg/rootless" + "github.com/containers/podman/v4/pkg/signal" "github.com/containers/storage/pkg/idtools" stypes "github.com/containers/storage/types" v1 "github.com/opencontainers/image-spec/specs-go/v1" diff --git a/pkg/util/utils_supported.go b/pkg/util/utils_supported.go index 6eba0bc3c..848b35a45 100644 --- a/pkg/util/utils_supported.go +++ b/pkg/util/utils_supported.go @@ -11,7 +11,7 @@ import ( "path/filepath" "syscall" - "github.com/containers/podman/v3/pkg/rootless" + "github.com/containers/podman/v4/pkg/rootless" "github.com/pkg/errors" "github.com/sirupsen/logrus" ) |