diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2022-01-18 08:40:06 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-18 08:40:06 -0500 |
| commit | 29d7ab3f82e38c442e449739e218349b9a4a16ea (patch) | |
| tree | 0ae61e3b0161c9057dfdcf84a9f5afe250dd9b95 | |
| parent | d6b0720b9cd5d993dffc229e73d8377aae2c2ed4 (diff) | |
| parent | bd09b7aa79aee34608e71fd4ba90d157dae828fc (diff) | |
| download | podman-29d7ab3f82e38c442e449739e218349b9a4a16ea.tar.gz podman-29d7ab3f82e38c442e449739e218349b9a4a16ea.tar.bz2 podman-29d7ab3f82e38c442e449739e218349b9a4a16ea.zip | |
Merge pull request #12897 from vrothberg/bump-module
bump go module to version 4
720 files changed, 1975 insertions, 1975 deletions
@@ -94,7 +94,7 @@ else BUILD_INFO ?= $(shell date "+$(DATE_FMT)") ISODATE ?= $(shell date --iso-8601) endif -LIBPOD := ${PROJECT}/v3/libpod +LIBPOD := ${PROJECT}/v4/libpod GOFLAGS ?= -trimpath LDFLAGS_PODMAN ?= \ -X $(LIBPOD)/define.gitCommit=$(GIT_COMMIT) \ diff --git a/cmd/podman/auto-update.go b/cmd/podman/auto-update.go index 8364181d2..f8b9fba08 100644 --- a/cmd/podman/auto-update.go +++ b/cmd/podman/auto-update.go @@ -9,10 +9,10 @@ import ( "github.com/containers/common/pkg/auth" "github.com/containers/common/pkg/completion" "github.com/containers/common/pkg/report" - "github.com/containers/podman/v3/cmd/podman/common" - "github.com/containers/podman/v3/cmd/podman/registry" - "github.com/containers/podman/v3/pkg/domain/entities" - "github.com/containers/podman/v3/pkg/errorhandling" + "github.com/containers/podman/v4/cmd/podman/common" + "github.com/containers/podman/v4/cmd/podman/registry" + "github.com/containers/podman/v4/pkg/domain/entities" + "github.com/containers/podman/v4/pkg/errorhandling" "github.com/pkg/errors" "github.com/spf13/cobra" ) diff --git a/cmd/podman/common/completion.go b/cmd/podman/common/completion.go index 2bd67bf4f..a2ce3834d 100644 --- a/cmd/podman/common/completion.go +++ b/cmd/podman/common/completion.go @@ -10,12 +10,12 @@ import ( "github.com/containers/common/libnetwork/types" "github.com/containers/common/pkg/config" "github.com/containers/image/v5/pkg/sysregistriesv2" - "github.com/containers/podman/v3/cmd/podman/registry" - "github.com/containers/podman/v3/libpod/define" - "github.com/containers/podman/v3/pkg/domain/entities" - "github.com/containers/podman/v3/pkg/rootless" - systemdDefine "github.com/containers/podman/v3/pkg/systemd/define" - "github.com/containers/podman/v3/pkg/util" + "github.com/containers/podman/v4/cmd/podman/registry" + "github.com/containers/podman/v4/libpod/define" + "github.com/containers/podman/v4/pkg/domain/entities" + "github.com/containers/podman/v4/pkg/rootless" + systemdDefine "github.com/containers/podman/v4/pkg/systemd/define" + "github.com/containers/podman/v4/pkg/util" "github.com/spf13/cobra" ) diff --git a/cmd/podman/common/completion_test.go b/cmd/podman/common/completion_test.go index 84b3c1132..d28ac3928 100644 --- a/cmd/podman/common/completion_test.go +++ b/cmd/podman/common/completion_test.go @@ -3,7 +3,7 @@ package common_test import ( "testing" - "github.com/containers/podman/v3/cmd/podman/common" + "github.com/containers/podman/v4/cmd/podman/common" "github.com/spf13/cobra" "github.com/stretchr/testify/assert" ) diff --git a/cmd/podman/common/create.go b/cmd/podman/common/create.go index 3ce4e6731..5fefbacdf 100644 --- a/cmd/podman/common/create.go +++ b/cmd/podman/common/create.go @@ -6,9 +6,9 @@ import ( "github.com/containers/common/pkg/auth" "github.com/containers/common/pkg/completion" commonFlag "github.com/containers/common/pkg/flag" - "github.com/containers/podman/v3/cmd/podman/registry" - "github.com/containers/podman/v3/libpod/define" - "github.com/containers/podman/v3/pkg/domain/entities" + "github.com/containers/podman/v4/cmd/podman/registry" + "github.com/containers/podman/v4/libpod/define" + "github.com/containers/podman/v4/pkg/domain/entities" "github.com/spf13/cobra" ) diff --git a/cmd/podman/common/create_opts.go b/cmd/podman/common/create_opts.go index eb0d07836..a4f94616c 100644 --- a/cmd/podman/common/create_opts.go +++ b/cmd/podman/common/create_opts.go @@ -11,12 +11,12 @@ import ( "github.com/containers/common/libnetwork/types" "github.com/containers/common/pkg/cgroups" "github.com/containers/common/pkg/config" - "github.com/containers/podman/v3/cmd/podman/registry" - "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/rootless" - "github.com/containers/podman/v3/pkg/specgen" + "github.com/containers/podman/v4/cmd/podman/registry" + "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/rootless" + "github.com/containers/podman/v4/pkg/specgen" "github.com/docker/docker/api/types/mount" "github.com/pkg/errors" ) diff --git a/cmd/podman/common/create_test.go b/cmd/podman/common/create_test.go index 601078b61..ab41f81ad 100644 --- a/cmd/podman/common/create_test.go +++ b/cmd/podman/common/create_test.go @@ -5,8 +5,8 @@ import ( "strings" "testing" - "github.com/containers/podman/v3/cmd/podman/common" - "github.com/containers/podman/v3/pkg/domain/entities" + "github.com/containers/podman/v4/cmd/podman/common" + "github.com/containers/podman/v4/pkg/domain/entities" "github.com/stretchr/testify/assert" ) diff --git a/cmd/podman/common/default.go b/cmd/podman/common/default.go index 7997e761c..7caec50ff 100644 --- a/cmd/podman/common/default.go +++ b/cmd/podman/common/default.go @@ -1,7 +1,7 @@ package common import ( - "github.com/containers/podman/v3/cmd/podman/registry" + "github.com/containers/podman/v4/cmd/podman/registry" ) var ( diff --git a/cmd/podman/common/diffChanges.go b/cmd/podman/common/diffChanges.go index 7930e4f2c..99b5f1dcd 100644 --- a/cmd/podman/common/diffChanges.go +++ b/cmd/podman/common/diffChanges.go @@ -4,7 +4,7 @@ import ( "fmt" "os" - "github.com/containers/podman/v3/pkg/domain/entities" + "github.com/containers/podman/v4/pkg/domain/entities" "github.com/containers/storage/pkg/archive" "github.com/pkg/errors" ) diff --git a/cmd/podman/common/netflags.go b/cmd/podman/common/netflags.go index 39b699812..255996ac3 100644 --- a/cmd/podman/common/netflags.go +++ b/cmd/podman/common/netflags.go @@ -5,11 +5,11 @@ import ( "github.com/containers/common/libnetwork/types" "github.com/containers/common/pkg/completion" - "github.com/containers/podman/v3/cmd/podman/parse" - "github.com/containers/podman/v3/libpod/define" - "github.com/containers/podman/v3/pkg/domain/entities" - "github.com/containers/podman/v3/pkg/specgen" - "github.com/containers/podman/v3/pkg/specgenutil" + "github.com/containers/podman/v4/cmd/podman/parse" + "github.com/containers/podman/v4/libpod/define" + "github.com/containers/podman/v4/pkg/domain/entities" + "github.com/containers/podman/v4/pkg/specgen" + "github.com/containers/podman/v4/pkg/specgenutil" "github.com/pkg/errors" "github.com/spf13/cobra" "github.com/spf13/pflag" diff --git a/cmd/podman/completion/completion.go b/cmd/podman/completion/completion.go index 12fba9a54..b02a0d772 100644 --- a/cmd/podman/completion/completion.go +++ b/cmd/podman/completion/completion.go @@ -7,7 +7,7 @@ import ( "strings" commonComp "github.com/containers/common/pkg/completion" - "github.com/containers/podman/v3/cmd/podman/registry" + "github.com/containers/podman/v4/cmd/podman/registry" "github.com/spf13/cobra" ) diff --git a/cmd/podman/containers/attach.go b/cmd/podman/containers/attach.go index acfa0357b..1a05ea5c3 100644 --- a/cmd/podman/containers/attach.go +++ b/cmd/podman/containers/attach.go @@ -3,10 +3,10 @@ package containers import ( "os" - "github.com/containers/podman/v3/cmd/podman/common" - "github.com/containers/podman/v3/cmd/podman/registry" - "github.com/containers/podman/v3/cmd/podman/validate" - "github.com/containers/podman/v3/pkg/domain/entities" + "github.com/containers/podman/v4/cmd/podman/common" + "github.com/containers/podman/v4/cmd/podman/registry" + "github.com/containers/podman/v4/cmd/podman/validate" + "github.com/containers/podman/v4/pkg/domain/entities" "github.com/pkg/errors" "github.com/spf13/cobra" ) diff --git a/cmd/podman/containers/checkpoint.go b/cmd/podman/containers/checkpoint.go index 43a1b75e5..f24e77106 100644 --- a/cmd/podman/containers/checkpoint.go +++ b/cmd/podman/containers/checkpoint.go @@ -7,13 +7,13 @@ import ( "time" "github.com/containers/common/pkg/completion" - "github.com/containers/podman/v3/cmd/podman/common" - "github.com/containers/podman/v3/cmd/podman/registry" - "github.com/containers/podman/v3/cmd/podman/utils" - "github.com/containers/podman/v3/cmd/podman/validate" - "github.com/containers/podman/v3/pkg/criu" - "github.com/containers/podman/v3/pkg/domain/entities" - "github.com/containers/podman/v3/pkg/rootless" + "github.com/containers/podman/v4/cmd/podman/common" + "github.com/containers/podman/v4/cmd/podman/registry" + "github.com/containers/podman/v4/cmd/podman/utils" + "github.com/containers/podman/v4/cmd/podman/validate" + "github.com/containers/podman/v4/pkg/criu" + "github.com/containers/podman/v4/pkg/domain/entities" + "github.com/containers/podman/v4/pkg/rootless" "github.com/containers/storage/pkg/archive" "github.com/pkg/errors" "github.com/spf13/cobra" diff --git a/cmd/podman/containers/cleanup.go b/cmd/podman/containers/cleanup.go index a3d339358..aa2734607 100644 --- a/cmd/podman/containers/cleanup.go +++ b/cmd/podman/containers/cleanup.go @@ -4,11 +4,11 @@ import ( "fmt" "github.com/containers/common/pkg/completion" - "github.com/containers/podman/v3/cmd/podman/common" - "github.com/containers/podman/v3/cmd/podman/registry" - "github.com/containers/podman/v3/cmd/podman/utils" - "github.com/containers/podman/v3/cmd/podman/validate" - "github.com/containers/podman/v3/pkg/domain/entities" + "github.com/containers/podman/v4/cmd/podman/common" + "github.com/containers/podman/v4/cmd/podman/registry" + "github.com/containers/podman/v4/cmd/podman/utils" + "github.com/containers/podman/v4/cmd/podman/validate" + "github.com/containers/podman/v4/pkg/domain/entities" "github.com/pkg/errors" "github.com/sirupsen/logrus" "github.com/spf13/cobra" diff --git a/cmd/podman/containers/commit.go b/cmd/podman/containers/commit.go index f74f12851..f74fd4ab1 100644 --- a/cmd/podman/containers/commit.go +++ b/cmd/podman/containers/commit.go @@ -8,9 +8,9 @@ import ( "strings" "github.com/containers/common/pkg/completion" - "github.com/containers/podman/v3/cmd/podman/common" - "github.com/containers/podman/v3/cmd/podman/registry" - "github.com/containers/podman/v3/pkg/domain/entities" + "github.com/containers/podman/v4/cmd/podman/common" + "github.com/containers/podman/v4/cmd/podman/registry" + "github.com/containers/podman/v4/pkg/domain/entities" "github.com/pkg/errors" "github.com/spf13/cobra" ) diff --git a/cmd/podman/containers/container.go b/cmd/podman/containers/container.go index 14e030bf4..d53204ba9 100644 --- a/cmd/podman/containers/container.go +++ b/cmd/podman/containers/container.go @@ -1,9 +1,9 @@ package containers import ( - "github.com/containers/podman/v3/cmd/podman/registry" - "github.com/containers/podman/v3/cmd/podman/validate" - "github.com/containers/podman/v3/pkg/util" + "github.com/containers/podman/v4/cmd/podman/registry" + "github.com/containers/podman/v4/cmd/podman/validate" + "github.com/containers/podman/v4/pkg/util" "github.com/spf13/cobra" ) diff --git a/cmd/podman/containers/cp.go b/cmd/podman/containers/cp.go index 7b5846a35..7ac28b799 100644 --- a/cmd/podman/containers/cp.go +++ b/cmd/podman/containers/cp.go @@ -10,11 +10,11 @@ import ( "strings" buildahCopiah "github.com/containers/buildah/copier" - "github.com/containers/podman/v3/cmd/podman/common" - "github.com/containers/podman/v3/cmd/podman/registry" - "github.com/containers/podman/v3/pkg/copy" - "github.com/containers/podman/v3/pkg/domain/entities" - "github.com/containers/podman/v3/pkg/errorhandling" + "github.com/containers/podman/v4/cmd/podman/common" + "github.com/containers/podman/v4/cmd/podman/registry" + "github.com/containers/podman/v4/pkg/copy" + "github.com/containers/podman/v4/pkg/domain/entities" + "github.com/containers/podman/v4/pkg/errorhandling" "github.com/containers/storage/pkg/archive" "github.com/containers/storage/pkg/idtools" "github.com/pkg/errors" diff --git a/cmd/podman/containers/create.go b/cmd/podman/containers/create.go index db78c96ee..89d2e5515 100644 --- a/cmd/podman/containers/create.go +++ b/cmd/podman/containers/create.go @@ -11,14 +11,14 @@ import ( "github.com/containers/common/pkg/config" "github.com/containers/image/v5/transports/alltransports" "github.com/containers/image/v5/types" - "github.com/containers/podman/v3/cmd/podman/common" - "github.com/containers/podman/v3/cmd/podman/registry" - "github.com/containers/podman/v3/cmd/podman/utils" - "github.com/containers/podman/v3/libpod/define" - "github.com/containers/podman/v3/pkg/domain/entities" - "github.com/containers/podman/v3/pkg/specgen" - "github.com/containers/podman/v3/pkg/specgenutil" - "github.com/containers/podman/v3/pkg/util" + "github.com/containers/podman/v4/cmd/podman/common" + "github.com/containers/podman/v4/cmd/podman/registry" + "github.com/containers/podman/v4/cmd/podman/utils" + "github.com/containers/podman/v4/libpod/define" + "github.com/containers/podman/v4/pkg/domain/entities" + "github.com/containers/podman/v4/pkg/specgen" + "github.com/containers/podman/v4/pkg/specgenutil" + "github.com/containers/podman/v4/pkg/util" "github.com/mattn/go-isatty" "github.com/pkg/errors" "github.com/sirupsen/logrus" diff --git a/cmd/podman/containers/diff.go b/cmd/podman/containers/diff.go index 7463e96ad..e1a8ea729 100644 --- a/cmd/podman/containers/diff.go +++ b/cmd/podman/containers/diff.go @@ -1,12 +1,12 @@ package containers import ( - "github.com/containers/podman/v3/cmd/podman/common" - "github.com/containers/podman/v3/cmd/podman/diff" - "github.com/containers/podman/v3/cmd/podman/registry" - "github.com/containers/podman/v3/cmd/podman/validate" - "github.com/containers/podman/v3/libpod/define" - "github.com/containers/podman/v3/pkg/domain/entities" + "github.com/containers/podman/v4/cmd/podman/common" + "github.com/containers/podman/v4/cmd/podman/diff" + "github.com/containers/podman/v4/cmd/podman/registry" + "github.com/containers/podman/v4/cmd/podman/validate" + "github.com/containers/podman/v4/libpod/define" + "github.com/containers/podman/v4/pkg/domain/entities" "github.com/pkg/errors" "github.com/spf13/cobra" ) diff --git a/cmd/podman/containers/exec.go b/cmd/podman/containers/exec.go index 5d0da1514..f5b93a96a 100644 --- a/cmd/podman/containers/exec.go +++ b/cmd/podman/containers/exec.go @@ -6,13 +6,13 @@ import ( "os" "github.com/containers/common/pkg/completion" - "github.com/containers/podman/v3/cmd/podman/common" - "github.com/containers/podman/v3/cmd/podman/registry" - "github.com/containers/podman/v3/cmd/podman/validate" - "github.com/containers/podman/v3/libpod/define" - "github.com/containers/podman/v3/pkg/domain/entities" - envLib "github.com/containers/podman/v3/pkg/env" - "github.com/containers/podman/v3/pkg/rootless" + "github.com/containers/podman/v4/cmd/podman/common" + "github.com/containers/podman/v4/cmd/podman/registry" + "github.com/containers/podman/v4/cmd/podman/validate" + "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/pkg/rootless" "github.com/pkg/errors" "github.com/spf13/cobra" ) diff --git a/cmd/podman/containers/exists.go b/cmd/podman/containers/exists.go index cf7ac4c5d..69f9b85cd 100644 --- a/cmd/podman/containers/exists.go +++ b/cmd/podman/containers/exists.go @@ -3,9 +3,9 @@ package containers import ( "context" - "github.com/containers/podman/v3/cmd/podman/common" - "github.com/containers/podman/v3/cmd/podman/registry" - "github.com/containers/podman/v3/pkg/domain/entities" + "github.com/containers/podman/v4/cmd/podman/common" + "github.com/containers/podman/v4/cmd/podman/registry" + "github.com/containers/podman/v4/pkg/domain/entities" "github.com/spf13/cobra" ) diff --git a/cmd/podman/containers/export.go b/cmd/podman/containers/export.go index e031578b8..0fed94e86 100644 --- a/cmd/podman/containers/export.go +++ b/cmd/podman/containers/export.go @@ -5,10 +5,10 @@ import ( "os" "github.com/containers/common/pkg/completion" - "github.com/containers/podman/v3/cmd/podman/common" - "github.com/containers/podman/v3/cmd/podman/parse" - "github.com/containers/podman/v3/cmd/podman/registry" - "github.com/containers/podman/v3/pkg/domain/entities" + "github.com/containers/podman/v4/cmd/podman/common" + "github.com/containers/podman/v4/cmd/podman/parse" + "github.com/containers/podman/v4/cmd/podman/registry" + "github.com/containers/podman/v4/pkg/domain/entities" "github.com/pkg/errors" "github.com/spf13/cobra" "golang.org/x/crypto/ssh/terminal" diff --git a/cmd/podman/containers/init.go b/cmd/podman/containers/init.go index e68217478..7336a2332 100644 --- a/cmd/podman/containers/init.go +++ b/cmd/podman/containers/init.go @@ -3,11 +3,11 @@ package containers import ( "fmt" - "github.com/containers/podman/v3/cmd/podman/common" - "github.com/containers/podman/v3/cmd/podman/registry" - "github.com/containers/podman/v3/cmd/podman/utils" - "github.com/containers/podman/v3/cmd/podman/validate" - "github.com/containers/podman/v3/pkg/domain/entities" + "github.com/containers/podman/v4/cmd/podman/common" + "github.com/containers/podman/v4/cmd/podman/registry" + "github.com/containers/podman/v4/cmd/podman/utils" + "github.com/containers/podman/v4/cmd/podman/validate" + "github.com/containers/podman/v4/pkg/domain/entities" "github.com/spf13/cobra" "github.com/spf13/pflag" ) diff --git a/cmd/podman/containers/inspect.go b/cmd/podman/containers/inspect.go index 5a8ccc628..8c219b67c 100644 --- a/cmd/podman/containers/inspect.go +++ b/cmd/podman/containers/inspect.go @@ -1,12 +1,12 @@ package containers import ( - "github.com/containers/podman/v3/cmd/podman/common" - "github.com/containers/podman/v3/cmd/podman/inspect" - "github.com/containers/podman/v3/cmd/podman/registry" - "github.com/containers/podman/v3/cmd/podman/validate" - "github.com/containers/podman/v3/libpod/define" - "github.com/containers/podman/v3/pkg/domain/entities" + "github.com/containers/podman/v4/cmd/podman/common" + "github.com/containers/podman/v4/cmd/podman/inspect" + "github.com/containers/podman/v4/cmd/podman/registry" + "github.com/containers/podman/v4/cmd/podman/validate" + "github.com/containers/podman/v4/libpod/define" + "github.com/containers/podman/v4/pkg/domain/entities" "github.com/spf13/cobra" ) diff --git a/cmd/podman/containers/kill.go b/cmd/podman/containers/kill.go index fe4083df8..32f9899cd 100644 --- a/cmd/podman/containers/kill.go +++ b/cmd/podman/containers/kill.go @@ -7,12 +7,12 @@ import ( "strings" "github.com/containers/common/pkg/completion" - "github.com/containers/podman/v3/cmd/podman/common" - "github.com/containers/podman/v3/cmd/podman/registry" - "github.com/containers/podman/v3/cmd/podman/utils" - "github.com/containers/podman/v3/cmd/podman/validate" - "github.com/containers/podman/v3/pkg/domain/entities" - "github.com/containers/podman/v3/pkg/signal" + "github.com/containers/podman/v4/cmd/podman/common" + "github.com/containers/podman/v4/cmd/podman/registry" + "github.com/containers/podman/v4/cmd/podman/utils" + "github.com/containers/podman/v4/cmd/podman/validate" + "github.com/containers/podman/v4/pkg/domain/entities" + "github.com/containers/podman/v4/pkg/signal" "github.com/pkg/errors" "github.com/spf13/cobra" ) diff --git a/cmd/podman/containers/list.go b/cmd/podman/containers/list.go index 203f9560e..3dbf4248b 100644 --- a/cmd/podman/containers/list.go +++ b/cmd/podman/containers/list.go @@ -2,8 +2,8 @@ package containers import ( "github.com/containers/common/pkg/completion" - "github.com/containers/podman/v3/cmd/podman/registry" - "github.com/containers/podman/v3/cmd/podman/validate" + "github.com/containers/podman/v4/cmd/podman/registry" + "github.com/containers/podman/v4/cmd/podman/validate" "github.com/spf13/cobra" ) diff --git a/cmd/podman/containers/logs.go b/cmd/podman/containers/logs.go index 1548c6c24..8b08a6313 100644 --- a/cmd/podman/containers/logs.go +++ b/cmd/podman/containers/logs.go @@ -4,11 +4,11 @@ import ( "os" "github.com/containers/common/pkg/completion" - "github.com/containers/podman/v3/cmd/podman/common" - "github.com/containers/podman/v3/cmd/podman/registry" - "github.com/containers/podman/v3/cmd/podman/validate" - "github.com/containers/podman/v3/pkg/domain/entities" - "github.com/containers/podman/v3/pkg/util" + "github.com/containers/podman/v4/cmd/podman/common" + "github.com/containers/podman/v4/cmd/podman/registry" + "github.com/containers/podman/v4/cmd/podman/validate" + "github.com/containers/podman/v4/pkg/domain/entities" + "github.com/containers/podman/v4/pkg/util" "github.com/pkg/errors" "github.com/spf13/cobra" ) diff --git a/cmd/podman/containers/mount.go b/cmd/podman/containers/mount.go index 271fc4c6b..18177e3ce 100644 --- a/cmd/podman/containers/mount.go +++ b/cmd/podman/containers/mount.go @@ -5,11 +5,11 @@ import ( "os" "github.com/containers/common/pkg/report" - "github.com/containers/podman/v3/cmd/podman/common" - "github.com/containers/podman/v3/cmd/podman/registry" - "github.com/containers/podman/v3/cmd/podman/utils" - "github.com/containers/podman/v3/cmd/podman/validate" - "github.com/containers/podman/v3/pkg/domain/entities" + "github.com/containers/podman/v4/cmd/podman/common" + "github.com/containers/podman/v4/cmd/podman/registry" + "github.com/containers/podman/v4/cmd/podman/utils" + "github.com/containers/podman/v4/cmd/podman/validate" + "github.com/containers/podman/v4/pkg/domain/entities" "github.com/pkg/errors" "github.com/spf13/cobra" ) diff --git a/cmd/podman/containers/pause.go b/cmd/podman/containers/pause.go index 1e37bab55..9dbe97d11 100644 --- a/cmd/podman/containers/pause.go +++ b/cmd/podman/containers/pause.go @@ -5,11 +5,11 @@ import ( "fmt" "github.com/containers/common/pkg/cgroups" - "github.com/containers/podman/v3/cmd/podman/common" - "github.com/containers/podman/v3/cmd/podman/registry" - "github.com/containers/podman/v3/cmd/podman/utils" - "github.com/containers/podman/v3/pkg/domain/entities" - "github.com/containers/podman/v3/pkg/rootless" + "github.com/containers/podman/v4/cmd/podman/common" + "github.com/containers/podman/v4/cmd/podman/registry" + "github.com/containers/podman/v4/cmd/podman/utils" + "github.com/containers/podman/v4/pkg/domain/entities" + "github.com/containers/podman/v4/pkg/rootless" "github.com/pkg/errors" "github.com/spf13/cobra" "github.com/spf13/pflag" diff --git a/cmd/podman/containers/port.go b/cmd/podman/containers/port.go index 0e582ae52..22d1d16d3 100644 --- a/cmd/podman/containers/port.go +++ b/cmd/podman/containers/port.go @@ -5,10 +5,10 @@ import ( "strconv" "strings" - "github.com/containers/podman/v3/cmd/podman/common" - "github.com/containers/podman/v3/cmd/podman/registry" - "github.com/containers/podman/v3/cmd/podman/validate" - "github.com/containers/podman/v3/pkg/domain/entities" + "github.com/containers/podman/v4/cmd/podman/common" + "github.com/containers/podman/v4/cmd/podman/registry" + "github.com/containers/podman/v4/cmd/podman/validate" + "github.com/containers/podman/v4/pkg/domain/entities" "github.com/pkg/errors" "github.com/spf13/cobra" "github.com/spf13/pflag" diff --git a/cmd/podman/containers/prune.go b/cmd/podman/containers/prune.go index f58e37fd1..100bf52c6 100644 --- a/cmd/podman/containers/prune.go +++ b/cmd/podman/containers/prune.go @@ -8,12 +8,12 @@ import ( "strings" "github.com/containers/common/pkg/completion" - "github.com/containers/podman/v3/cmd/podman/common" - "github.com/containers/podman/v3/cmd/podman/parse" - "github.com/containers/podman/v3/cmd/podman/registry" - "github.com/containers/podman/v3/cmd/podman/utils" - "github.com/containers/podman/v3/cmd/podman/validate" - "github.com/containers/podman/v3/pkg/domain/entities" + "github.com/containers/podman/v4/cmd/podman/common" + "github.com/containers/podman/v4/cmd/podman/parse" + "github.com/containers/podman/v4/cmd/podman/registry" + "github.com/containers/podman/v4/cmd/podman/utils" + "github.com/containers/podman/v4/cmd/podman/validate" + "github.com/containers/podman/v4/pkg/domain/entities" "github.com/spf13/cobra" ) diff --git a/cmd/podman/containers/ps.go b/cmd/podman/containers/ps.go index f6ba3c1f3..91bb9bdb7 100644 --- a/cmd/podman/containers/ps.go +++ b/cmd/podman/containers/ps.go @@ -10,11 +10,11 @@ import ( "github.com/containers/common/libnetwork/types" "github.com/containers/common/pkg/completion" "github.com/containers/common/pkg/report" - "github.com/containers/podman/v3/cmd/podman/common" - "github.com/containers/podman/v3/cmd/podman/registry" - "github.com/containers/podman/v3/cmd/podman/utils" - "github.com/containers/podman/v3/cmd/podman/validate" - "github.com/containers/podman/v3/pkg/domain/entities" + "github.com/containers/podman/v4/cmd/podman/common" + "github.com/containers/podman/v4/cmd/podman/registry" + "github.com/containers/podman/v4/cmd/podman/utils" + "github.com/containers/podman/v4/cmd/podman/validate" + "github.com/containers/podman/v4/pkg/domain/entities" "github.com/docker/go-units" "github.com/pkg/errors" "github.com/sirupsen/logrus" diff --git a/cmd/podman/containers/rename.go b/cmd/podman/containers/rename.go index 1371e50e0..1c0b28ce3 100644 --- a/cmd/podman/containers/rename.go +++ b/cmd/podman/containers/rename.go @@ -1,9 +1,9 @@ package containers import ( - "github.com/containers/podman/v3/cmd/podman/common" - "github.com/containers/podman/v3/cmd/podman/registry" - "github.com/containers/podman/v3/pkg/domain/entities" + "github.com/containers/podman/v4/cmd/podman/common" + "github.com/containers/podman/v4/cmd/podman/registry" + "github.com/containers/podman/v4/pkg/domain/entities" "github.com/pkg/errors" "github.com/spf13/cobra" ) diff --git a/cmd/podman/containers/restart.go b/cmd/podman/containers/restart.go index 41b33258f..69d8d71ea 100644 --- a/cmd/podman/containers/restart.go +++ b/cmd/podman/containers/restart.go @@ -5,12 +5,12 @@ import ( "fmt" "github.com/containers/common/pkg/completion" - "github.com/containers/podman/v3/cmd/podman/common" - "github.com/containers/podman/v3/cmd/podman/registry" - "github.com/containers/podman/v3/cmd/podman/utils" - "github.com/containers/podman/v3/cmd/podman/validate" - "github.com/containers/podman/v3/libpod/define" - "github.com/containers/podman/v3/pkg/domain/entities" + "github.com/containers/podman/v4/cmd/podman/common" + "github.com/containers/podman/v4/cmd/podman/registry" + "github.com/containers/podman/v4/cmd/podman/utils" + "github.com/containers/podman/v4/cmd/podman/validate" + "github.com/containers/podman/v4/libpod/define" + "github.com/containers/podman/v4/pkg/domain/entities" "github.com/pkg/errors" "github.com/spf13/cobra" ) diff --git a/cmd/podman/containers/restore.go b/cmd/podman/containers/restore.go index cf0ad5f80..3b51f5f17 100644 --- a/cmd/podman/containers/restore.go +++ b/cmd/podman/containers/restore.go @@ -6,12 +6,12 @@ import ( "time" "github.com/containers/common/pkg/completion" - "github.com/containers/podman/v3/cmd/podman/common" - "github.com/containers/podman/v3/cmd/podman/registry" - "github.com/containers/podman/v3/cmd/podman/utils" - "github.com/containers/podman/v3/cmd/podman/validate" - "github.com/containers/podman/v3/pkg/domain/entities" - "github.com/containers/podman/v3/pkg/rootless" + "github.com/containers/podman/v4/cmd/podman/common" + "github.com/containers/podman/v4/cmd/podman/registry" + "github.com/containers/podman/v4/cmd/podman/utils" + "github.com/containers/podman/v4/cmd/podman/validate" + "github.com/containers/podman/v4/pkg/domain/entities" + "github.com/containers/podman/v4/pkg/rootless" "github.com/pkg/errors" "github.com/spf13/cobra" ) diff --git a/cmd/podman/containers/rm.go b/cmd/podman/containers/rm.go index a8fdee7fd..7e0955863 100644 --- a/cmd/podman/containers/rm.go +++ b/cmd/podman/containers/rm.go @@ -7,12 +7,12 @@ import ( "strings" "github.com/containers/common/pkg/completion" - "github.com/containers/podman/v3/cmd/podman/common" - "github.com/containers/podman/v3/cmd/podman/registry" - "github.com/containers/podman/v3/cmd/podman/utils" - "github.com/containers/podman/v3/cmd/podman/validate" - "github.com/containers/podman/v3/libpod/define" - "github.com/containers/podman/v3/pkg/domain/entities" + "github.com/containers/podman/v4/cmd/podman/common" + "github.com/containers/podman/v4/cmd/podman/registry" + "github.com/containers/podman/v4/cmd/podman/utils" + "github.com/containers/podman/v4/cmd/podman/validate" + "github.com/containers/podman/v4/libpod/define" + "github.com/containers/podman/v4/pkg/domain/entities" "github.com/pkg/errors" "github.com/sirupsen/logrus" "github.com/spf13/cobra" diff --git a/cmd/podman/containers/run.go b/cmd/podman/containers/run.go index b9a2c3bb5..5a64b8c32 100644 --- a/cmd/podman/containers/run.go +++ b/cmd/podman/containers/run.go @@ -6,15 +6,15 @@ import ( "strings" "github.com/containers/common/pkg/completion" - "github.com/containers/podman/v3/cmd/podman/common" - "github.com/containers/podman/v3/cmd/podman/registry" - "github.com/containers/podman/v3/cmd/podman/utils" - "github.com/containers/podman/v3/libpod/define" - "github.com/containers/podman/v3/pkg/domain/entities" - "github.com/containers/podman/v3/pkg/errorhandling" - "github.com/containers/podman/v3/pkg/rootless" - "github.com/containers/podman/v3/pkg/specgen" - "github.com/containers/podman/v3/pkg/specgenutil" + "github.com/containers/podman/v4/cmd/podman/common" + "github.com/containers/podman/v4/cmd/podman/registry" + "github.com/containers/podman/v4/cmd/podman/utils" + "github.com/containers/podman/v4/libpod/define" + "github.com/containers/podman/v4/pkg/domain/entities" + "github.com/containers/podman/v4/pkg/errorhandling" + "github.com/containers/podman/v4/pkg/rootless" + "github.com/containers/podman/v4/pkg/specgen" + "github.com/containers/podman/v4/pkg/specgenutil" "github.com/pkg/errors" "github.com/sirupsen/logrus" "github.com/spf13/cobra" diff --git a/cmd/podman/containers/runlabel.go b/cmd/podman/containers/runlabel.go index e60fcbe72..6410e3f1c 100644 --- a/cmd/podman/containers/runlabel.go +++ b/cmd/podman/containers/runlabel.go @@ -7,9 +7,9 @@ import ( "github.com/containers/common/pkg/auth" "github.com/containers/common/pkg/completion" "github.com/containers/image/v5/types" - "github.com/containers/podman/v3/cmd/podman/common" - "github.com/containers/podman/v3/cmd/podman/registry" - "github.com/containers/podman/v3/pkg/domain/entities" + "github.com/containers/podman/v4/cmd/podman/common" + "github.com/containers/podman/v4/cmd/podman/registry" + "github.com/containers/podman/v4/pkg/domain/entities" "github.com/sirupsen/logrus" "github.com/spf13/cobra" ) diff --git a/cmd/podman/containers/start.go b/cmd/podman/containers/start.go index 8813fc273..a7731a0a1 100644 --- a/cmd/podman/containers/start.go +++ b/cmd/podman/containers/start.go @@ -5,12 +5,12 @@ import ( "os" "strings" - "github.com/containers/podman/v3/cmd/podman/common" - "github.com/containers/podman/v3/cmd/podman/registry" - "github.com/containers/podman/v3/cmd/podman/utils" - "github.com/containers/podman/v3/cmd/podman/validate" - "github.com/containers/podman/v3/libpod/define" - "github.com/containers/podman/v3/pkg/domain/entities" + "github.com/containers/podman/v4/cmd/podman/common" + "github.com/containers/podman/v4/cmd/podman/registry" + "github.com/containers/podman/v4/cmd/podman/utils" + "github.com/containers/podman/v4/cmd/podman/validate" + "github.com/containers/podman/v4/libpod/define" + "github.com/containers/podman/v4/pkg/domain/entities" "github.com/pkg/errors" "github.com/spf13/cobra" ) diff --git a/cmd/podman/containers/stats.go b/cmd/podman/containers/stats.go index 9fba51597..715f5c081 100644 --- a/cmd/podman/containers/stats.go +++ b/cmd/podman/containers/stats.go @@ -7,12 +7,12 @@ import ( tm "github.com/buger/goterm" "github.com/containers/common/pkg/completion" "github.com/containers/common/pkg/report" - "github.com/containers/podman/v3/cmd/podman/common" - "github.com/containers/podman/v3/cmd/podman/registry" - "github.com/containers/podman/v3/cmd/podman/validate" - "github.com/containers/podman/v3/libpod/define" - "github.com/containers/podman/v3/pkg/domain/entities" - "github.com/containers/podman/v3/utils" + "github.com/containers/podman/v4/cmd/podman/common" + "github.com/containers/podman/v4/cmd/podman/registry" + "github.com/containers/podman/v4/cmd/podman/validate" + "github.com/containers/podman/v4/libpod/define" + "github.com/containers/podman/v4/pkg/domain/entities" + "github.com/containers/podman/v4/utils" "github.com/docker/go-units" "github.com/pkg/errors" "github.com/spf13/cobra" diff --git a/cmd/podman/containers/stop.go b/cmd/podman/containers/stop.go index 13da59a8c..381997fee 100644 --- a/cmd/podman/containers/stop.go +++ b/cmd/podman/containers/stop.go @@ -7,11 +7,11 @@ import ( "strings" "github.com/containers/common/pkg/completion" - "github.com/containers/podman/v3/cmd/podman/common" - "github.com/containers/podman/v3/cmd/podman/registry" - "github.com/containers/podman/v3/cmd/podman/utils" - "github.com/containers/podman/v3/cmd/podman/validate" - "github.com/containers/podman/v3/pkg/domain/entities" + "github.com/containers/podman/v4/cmd/podman/common" + "github.com/containers/podman/v4/cmd/podman/registry" + "github.com/containers/podman/v4/cmd/podman/utils" + "github.com/containers/podman/v4/cmd/podman/validate" + "github.com/containers/podman/v4/pkg/domain/entities" "github.com/pkg/errors" "github.com/spf13/cobra" ) diff --git a/cmd/podman/containers/top.go b/cmd/podman/containers/top.go index 963a251bb..389034e37 100644 --- a/cmd/podman/containers/top.go +++ b/cmd/podman/containers/top.go @@ -7,11 +7,11 @@ import ( "strings" "github.com/containers/common/pkg/report" - "github.com/containers/podman/v3/cmd/podman/common" - "github.com/containers/podman/v3/cmd/podman/registry" - "github.com/containers/podman/v3/cmd/podman/validate" - "github.com/containers/podman/v3/pkg/domain/entities" - "github.com/containers/podman/v3/pkg/util" + "github.com/containers/podman/v4/cmd/podman/common" + "github.com/containers/podman/v4/cmd/podman/registry" + "github.com/containers/podman/v4/cmd/podman/validate" + "github.com/containers/podman/v4/pkg/domain/entities" + "github.com/containers/podman/v4/pkg/util" "github.com/pkg/errors" "github.com/spf13/cobra" "github.com/spf13/pflag" diff --git a/cmd/podman/containers/unmount.go b/cmd/podman/containers/unmount.go index 96470da78..26b8cfcc5 100644 --- a/cmd/podman/containers/unmount.go +++ b/cmd/podman/containers/unmount.go @@ -3,11 +3,11 @@ package containers import ( "fmt" - "github.com/containers/podman/v3/cmd/podman/common" - "github.com/containers/podman/v3/cmd/podman/registry" - "github.com/containers/podman/v3/cmd/podman/utils" - "github.com/containers/podman/v3/cmd/podman/validate" - "github.com/containers/podman/v3/pkg/domain/entities" + "github.com/containers/podman/v4/cmd/podman/common" + "github.com/containers/podman/v4/cmd/podman/registry" + "github.com/containers/podman/v4/cmd/podman/utils" + "github.com/containers/podman/v4/cmd/podman/validate" + "github.com/containers/podman/v4/pkg/domain/entities" "github.com/spf13/cobra" "github.com/spf13/pflag" ) diff --git a/cmd/podman/containers/unpause.go b/cmd/podman/containers/unpause.go index cf37b6369..eaf50f2c7 100644 --- a/cmd/podman/containers/unpause.go +++ b/cmd/podman/containers/unpause.go @@ -5,11 +5,11 @@ import ( "fmt" "github.com/containers/common/pkg/cgroups" - "github.com/containers/podman/v3/cmd/podman/common" - "github.com/containers/podman/v3/cmd/podman/registry" - "github.com/containers/podman/v3/cmd/podman/utils" - "github.com/containers/podman/v3/pkg/domain/entities" - "github.com/containers/podman/v3/pkg/rootless" + "github.com/containers/podman/v4/cmd/podman/common" + "github.com/containers/podman/v4/cmd/podman/registry" + "github.com/containers/podman/v4/cmd/podman/utils" + "github.com/containers/podman/v4/pkg/domain/entities" + "github.com/containers/podman/v4/pkg/rootless" "github.com/pkg/errors" "github.com/spf13/cobra" "github.com/spf13/pflag" diff --git a/cmd/podman/containers/wait.go b/cmd/podman/containers/wait.go index e720421a6..720a696ce 100644 --- a/cmd/podman/containers/wait.go +++ b/cmd/podman/containers/wait.go @@ -6,12 +6,12 @@ import ( "time" "github.com/containers/common/pkg/completion" - "github.com/containers/podman/v3/cmd/podman/common" - "github.com/containers/podman/v3/cmd/podman/registry" - "github.com/containers/podman/v3/cmd/podman/utils" - "github.com/containers/podman/v3/cmd/podman/validate" - "github.com/containers/podman/v3/libpod/define" - "github.com/containers/podman/v3/pkg/domain/entities" + "github.com/containers/podman/v4/cmd/podman/common" + "github.com/containers/podman/v4/cmd/podman/registry" + "github.com/containers/podman/v4/cmd/podman/utils" + "github.com/containers/podman/v4/cmd/podman/validate" + "github.com/containers/podman/v4/libpod/define" + "github.com/containers/podman/v4/pkg/domain/entities" "github.com/pkg/errors" "github.com/spf13/cobra" ) diff --git a/cmd/podman/diff.go b/cmd/podman/diff.go index c592b6a22..7b78c8312 100644 --- a/cmd/podman/diff.go +++ b/cmd/podman/diff.go @@ -1,12 +1,12 @@ package main import ( - "github.com/containers/podman/v3/cmd/podman/common" - "github.com/containers/podman/v3/cmd/podman/diff" - "github.com/containers/podman/v3/cmd/podman/registry" - "github.com/containers/podman/v3/cmd/podman/validate" - "github.com/containers/podman/v3/libpod/define" - "github.com/containers/podman/v3/pkg/domain/entities" + "github.com/containers/podman/v4/cmd/podman/common" + "github.com/containers/podman/v4/cmd/podman/diff" + "github.com/containers/podman/v4/cmd/podman/registry" + "github.com/containers/podman/v4/cmd/podman/validate" + "github.com/containers/podman/v4/libpod/define" + "github.com/containers/podman/v4/pkg/domain/entities" "github.com/spf13/cobra" ) diff --git a/cmd/podman/diff/diff.go b/cmd/podman/diff/diff.go index fba4ea540..a26502de9 100644 --- a/cmd/podman/diff/diff.go +++ b/cmd/podman/diff/diff.go @@ -6,8 +6,8 @@ import ( "os" "github.com/containers/common/pkg/report" - "github.com/containers/podman/v3/cmd/podman/registry" - "github.com/containers/podman/v3/pkg/domain/entities" + "github.com/containers/podman/v4/cmd/podman/registry" + "github.com/containers/podman/v4/pkg/domain/entities" "github.com/containers/storage/pkg/archive" "github.com/pkg/errors" "github.com/spf13/cobra" diff --git a/cmd/podman/early_init_linux.go b/cmd/podman/early_init_linux.go index 268385baf..dfd9d1e30 100644 --- a/cmd/podman/early_init_linux.go +++ b/cmd/podman/early_init_linux.go @@ -5,7 +5,7 @@ import ( "os" "syscall" - "github.com/containers/podman/v3/libpod/define" + "github.com/containers/podman/v4/libpod/define" "github.com/pkg/errors" ) diff --git a/cmd/podman/generate/generate.go b/cmd/podman/generate/generate.go index a42aa9f21..0a12961f4 100644 --- a/cmd/podman/generate/generate.go +++ b/cmd/podman/generate/generate.go @@ -1,9 +1,9 @@ package pods import ( - "github.com/containers/podman/v3/cmd/podman/registry" - "github.com/containers/podman/v3/cmd/podman/validate" - "github.com/containers/podman/v3/pkg/util" + "github.com/containers/podman/v4/cmd/podman/registry" + "github.com/containers/podman/v4/cmd/podman/validate" + "github.com/containers/podman/v4/pkg/util" "github.com/spf13/cobra" ) diff --git a/cmd/podman/generate/kube.go b/cmd/podman/generate/kube.go index 60b8f0af0..c4c92799c 100644 --- a/cmd/podman/generate/kube.go +++ b/cmd/podman/generate/kube.go @@ -7,10 +7,10 @@ import ( "os" "github.com/containers/common/pkg/completion" - "github.com/containers/podman/v3/cmd/podman/common" - "github.com/containers/podman/v3/cmd/podman/registry" - "github.com/containers/podman/v3/cmd/podman/utils" - "github.com/containers/podman/v3/pkg/domain/entities" + "github.com/containers/podman/v4/cmd/podman/common" + "github.com/containers/podman/v4/cmd/podman/registry" + "github.com/containers/podman/v4/cmd/podman/utils" + "github.com/containers/podman/v4/pkg/domain/entities" "github.com/pkg/errors" "github.com/spf13/cobra" ) diff --git a/cmd/podman/generate/systemd.go b/cmd/podman/generate/systemd.go index a363b7e94..5ad42ebc0 100644 --- a/cmd/podman/generate/systemd.go +++ b/cmd/podman/generate/systemd.go @@ -8,11 +8,11 @@ import ( "github.com/containers/common/pkg/completion" "github.com/containers/common/pkg/report" - "github.com/containers/podman/v3/cmd/podman/common" - "github.com/containers/podman/v3/cmd/podman/registry" - "github.com/containers/podman/v3/cmd/podman/utils" - "github.com/containers/podman/v3/pkg/domain/entities" - systemDefine "github.com/containers/podman/v3/pkg/systemd/define" + "github.com/containers/podman/v4/cmd/podman/common" + "github.com/containers/podman/v4/cmd/podman/registry" + "github.com/containers/podman/v4/cmd/podman/utils" + "github.com/containers/podman/v4/pkg/domain/entities" + systemDefine "github.com/containers/podman/v4/pkg/systemd/define" "github.com/pkg/errors" "github.com/sirupsen/logrus" "github.com/spf13/cobra" diff --git a/cmd/podman/healthcheck/healthcheck.go b/cmd/podman/healthcheck/healthcheck.go index b42ae2182..164434c3d 100644 --- a/cmd/podman/healthcheck/healthcheck.go +++ b/cmd/podman/healthcheck/healthcheck.go @@ -1,8 +1,8 @@ package healthcheck import ( - "github.com/containers/podman/v3/cmd/podman/registry" - "github.com/containers/podman/v3/cmd/podman/validate" + "github.com/containers/podman/v4/cmd/podman/registry" + "github.com/containers/podman/v4/cmd/podman/validate" "github.com/spf13/cobra" ) diff --git a/cmd/podman/healthcheck/run.go b/cmd/podman/healthcheck/run.go index b03a07bc4..620e29baa 100644 --- a/cmd/podman/healthcheck/run.go +++ b/cmd/podman/healthcheck/run.go @@ -4,10 +4,10 @@ import ( "context" "fmt" - "github.com/containers/podman/v3/cmd/podman/common" - "github.com/containers/podman/v3/cmd/podman/registry" - "github.com/containers/podman/v3/libpod/define" - "github.com/containers/podman/v3/pkg/domain/entities" + "github.com/containers/podman/v4/cmd/podman/common" + "github.com/containers/podman/v4/cmd/podman/registry" + "github.com/containers/podman/v4/libpod/define" + "github.com/containers/podman/v4/pkg/domain/entities" "github.com/spf13/cobra" ) diff --git a/cmd/podman/images/build.go b/cmd/podman/images/build.go index 6fc73eb64..f975cd6d5 100644 --- a/cmd/podman/images/build.go +++ b/cmd/podman/images/build.go @@ -19,10 +19,10 @@ import ( "github.com/containers/common/pkg/config" encconfig "github.com/containers/ocicrypt/config" enchelpers "github.com/containers/ocicrypt/helpers" - "github.com/containers/podman/v3/cmd/podman/common" - "github.com/containers/podman/v3/cmd/podman/registry" - "github.com/containers/podman/v3/cmd/podman/utils" - "github.com/containers/podman/v3/pkg/domain/entities" + "github.com/containers/podman/v4/cmd/podman/common" + "github.com/containers/podman/v4/cmd/podman/registry" + "github.com/containers/podman/v4/cmd/podman/utils" + "github.com/containers/podman/v4/pkg/domain/entities" "github.com/pkg/errors" "github.com/sirupsen/logrus" "github.com/spf13/cobra" diff --git a/cmd/podman/images/buildx.go b/cmd/podman/images/buildx.go index 2577a3a74..581e4519a 100644 --- a/cmd/podman/images/buildx.go +++ b/cmd/podman/images/buildx.go @@ -1,8 +1,8 @@ package images import ( - "github.com/containers/podman/v3/cmd/podman/registry" - "github.com/containers/podman/v3/cmd/podman/validate" + "github.com/containers/podman/v4/cmd/podman/registry" + "github.com/containers/podman/v4/cmd/podman/validate" "github.com/spf13/cobra" ) diff --git a/cmd/podman/images/diff.go b/cmd/podman/images/diff.go index 825aab362..13a8f1d9d 100644 --- a/cmd/podman/images/diff.go +++ b/cmd/podman/images/diff.go @@ -1,11 +1,11 @@ package images import ( - "github.com/containers/podman/v3/cmd/podman/common" - "github.com/containers/podman/v3/cmd/podman/diff" - "github.com/containers/podman/v3/cmd/podman/registry" - "github.com/containers/podman/v3/libpod/define" - "github.com/containers/podman/v3/pkg/domain/entities" + "github.com/containers/podman/v4/cmd/podman/common" + "github.com/containers/podman/v4/cmd/podman/diff" + "github.com/containers/podman/v4/cmd/podman/registry" + "github.com/containers/podman/v4/libpod/define" + "github.com/containers/podman/v4/pkg/domain/entities" "github.com/spf13/cobra" "github.com/spf13/pflag" ) diff --git a/cmd/podman/images/exists.go b/cmd/podman/images/exists.go index d278eafda..d8971c318 100644 --- a/cmd/podman/images/exists.go +++ b/cmd/podman/images/exists.go @@ -1,8 +1,8 @@ package images import ( - "github.com/containers/podman/v3/cmd/podman/common" - "github.com/containers/podman/v3/cmd/podman/registry" + "github.com/containers/podman/v4/cmd/podman/common" + "github.com/containers/podman/v4/cmd/podman/registry" "github.com/spf13/cobra" ) diff --git a/cmd/podman/images/history.go b/cmd/podman/images/history.go index ac693a87b..c05d3475b 100644 --- a/cmd/podman/images/history.go +++ b/cmd/podman/images/history.go @@ -8,10 +8,10 @@ import ( "unicode" "github.com/containers/common/pkg/report" - "github.com/containers/podman/v3/cmd/podman/common" - "github.com/containers/podman/v3/cmd/podman/registry" - "github.com/containers/podman/v3/cmd/podman/utils" - "github.com/containers/podman/v3/pkg/domain/entities" + "github.com/containers/podman/v4/cmd/podman/common" + "github.com/containers/podman/v4/cmd/podman/registry" + "github.com/containers/podman/v4/cmd/podman/utils" + "github.com/containers/podman/v4/pkg/domain/entities" "github.com/docker/go-units" "github.com/pkg/errors" "github.com/spf13/cobra" diff --git a/cmd/podman/images/image.go b/cmd/podman/images/image.go index 92d1348bf..f5501adbc 100644 --- a/cmd/podman/images/image.go +++ b/cmd/podman/images/image.go @@ -1,8 +1,8 @@ package images import ( - "github.com/containers/podman/v3/cmd/podman/registry" - "github.com/containers/podman/v3/cmd/podman/validate" + "github.com/containers/podman/v4/cmd/podman/registry" + "github.com/containers/podman/v4/cmd/podman/validate" "github.com/spf13/cobra" ) diff --git a/cmd/podman/images/import.go b/cmd/podman/images/import.go index 3b6788f4a..a7416e298 100644 --- a/cmd/podman/images/import.go +++ b/cmd/podman/images/import.go @@ -9,10 +9,10 @@ import ( "strings" "github.com/containers/common/pkg/completion" - "github.com/containers/podman/v3/cmd/podman/common" - "github.com/containers/podman/v3/cmd/podman/parse" - "github.com/containers/podman/v3/cmd/podman/registry" - "github.com/containers/podman/v3/pkg/domain/entities" + "github.com/containers/podman/v4/cmd/podman/common" + "github.com/containers/podman/v4/cmd/podman/parse" + "github.com/containers/podman/v4/cmd/podman/registry" + "github.com/containers/podman/v4/pkg/domain/entities" "github.com/hashicorp/go-multierror" "github.com/pkg/errors" "github.com/spf13/cobra" diff --git a/cmd/podman/images/inspect.go b/cmd/podman/images/inspect.go index dd8cf8056..b4a79bc96 100644 --- a/cmd/podman/images/inspect.go +++ b/cmd/podman/images/inspect.go @@ -1,11 +1,11 @@ package images import ( - "github.com/containers/podman/v3/cmd/podman/common" - "github.com/containers/podman/v3/cmd/podman/inspect" - "github.com/containers/podman/v3/cmd/podman/registry" - "github.com/containers/podman/v3/pkg/domain/entities" - inspectTypes "github.com/containers/podman/v3/pkg/inspect" + "github.com/containers/podman/v4/cmd/podman/common" + "github.com/containers/podman/v4/cmd/podman/inspect" + "github.com/containers/podman/v4/cmd/podman/registry" + "github.com/containers/podman/v4/pkg/domain/entities" + inspectTypes "github.com/containers/podman/v4/pkg/inspect" "github.com/spf13/cobra" ) diff --git a/cmd/podman/images/list.go b/cmd/podman/images/list.go index 61514daa7..9bddf1cff 100644 --- a/cmd/podman/images/list.go +++ b/cmd/podman/images/list.go @@ -11,9 +11,9 @@ import ( "github.com/containers/common/pkg/completion" "github.com/containers/common/pkg/report" "github.com/containers/image/v5/docker/reference" - "github.com/containers/podman/v3/cmd/podman/common" - "github.com/containers/podman/v3/cmd/podman/registry" - "github.com/containers/podman/v3/pkg/domain/entities" + "github.com/containers/podman/v4/cmd/podman/common" + "github.com/containers/podman/v4/cmd/podman/registry" + "github.com/containers/podman/v4/pkg/domain/entities" "github.com/docker/go-units" "github.com/pkg/errors" "github.com/spf13/cobra" diff --git a/cmd/podman/images/load.go b/cmd/podman/images/load.go index 5cd410f5c..bbcfe93ce 100644 --- a/cmd/podman/images/load.go +++ b/cmd/podman/images/load.go @@ -10,10 +10,10 @@ import ( "github.com/containers/common/pkg/completion" "github.com/containers/common/pkg/download" - "github.com/containers/podman/v3/cmd/podman/registry" - "github.com/containers/podman/v3/cmd/podman/validate" - "github.com/containers/podman/v3/pkg/domain/entities" - "github.com/containers/podman/v3/pkg/util" + "github.com/containers/podman/v4/cmd/podman/registry" + "github.com/containers/podman/v4/cmd/podman/validate" + "github.com/containers/podman/v4/pkg/domain/entities" + "github.com/containers/podman/v4/pkg/util" "github.com/pkg/errors" "github.com/spf13/cobra" "golang.org/x/crypto/ssh/terminal" diff --git a/cmd/podman/images/mount.go b/cmd/podman/images/mount.go index cdeb9eecf..d5ab3d274 100644 --- a/cmd/podman/images/mount.go +++ b/cmd/podman/images/mount.go @@ -5,10 +5,10 @@ import ( "os" "github.com/containers/common/pkg/report" - "github.com/containers/podman/v3/cmd/podman/common" - "github.com/containers/podman/v3/cmd/podman/registry" - "github.com/containers/podman/v3/cmd/podman/utils" - "github.com/containers/podman/v3/pkg/domain/entities" + "github.com/containers/podman/v4/cmd/podman/common" + "github.com/containers/podman/v4/cmd/podman/registry" + "github.com/containers/podman/v4/cmd/podman/utils" + "github.com/containers/podman/v4/pkg/domain/entities" "github.com/pkg/errors" "github.com/spf13/cobra" ) diff --git a/cmd/podman/images/prune.go b/cmd/podman/images/prune.go index e4c320a55..d76496a68 100644 --- a/cmd/podman/images/prune.go +++ b/cmd/podman/images/prune.go @@ -7,12 +7,12 @@ import ( "strings" "github.com/containers/common/pkg/completion" - "github.com/containers/podman/v3/cmd/podman/common" - "github.com/containers/podman/v3/cmd/podman/parse" - "github.com/containers/podman/v3/cmd/podman/registry" - "github.com/containers/podman/v3/cmd/podman/utils" - "github.com/containers/podman/v3/cmd/podman/validate" - "github.com/containers/podman/v3/pkg/domain/entities" + "github.com/containers/podman/v4/cmd/podman/common" + "github.com/containers/podman/v4/cmd/podman/parse" + "github.com/containers/podman/v4/cmd/podman/registry" + "github.com/containers/podman/v4/cmd/podman/utils" + "github.com/containers/podman/v4/cmd/podman/validate" + "github.com/containers/podman/v4/pkg/domain/entities" "github.com/spf13/cobra" ) diff --git a/cmd/podman/images/pull.go b/cmd/podman/images/pull.go index 2a5fd86cc..a7da5518a 100644 --- a/cmd/podman/images/pull.go +++ b/cmd/podman/images/pull.go @@ -8,11 +8,11 @@ import ( "github.com/containers/common/pkg/auth" "github.com/containers/common/pkg/completion" "github.com/containers/image/v5/types" - "github.com/containers/podman/v3/cmd/podman/common" - "github.com/containers/podman/v3/cmd/podman/registry" - "github.com/containers/podman/v3/cmd/podman/utils" - "github.com/containers/podman/v3/pkg/domain/entities" - "github.com/containers/podman/v3/pkg/util" + "github.com/containers/podman/v4/cmd/podman/common" + "github.com/containers/podman/v4/cmd/podman/registry" + "github.com/containers/podman/v4/cmd/podman/utils" + "github.com/containers/podman/v4/pkg/domain/entities" + "github.com/containers/podman/v4/pkg/util" "github.com/pkg/errors" "github.com/spf13/cobra" ) diff --git a/cmd/podman/images/push.go b/cmd/podman/images/push.go index 37ace3ffe..a59bdd93c 100644 --- a/cmd/podman/images/push.go +++ b/cmd/podman/images/push.go @@ -6,10 +6,10 @@ import ( "github.com/containers/common/pkg/auth" "github.com/containers/common/pkg/completion" "github.com/containers/image/v5/types" - "github.com/containers/podman/v3/cmd/podman/common" - "github.com/containers/podman/v3/cmd/podman/registry" - "github.com/containers/podman/v3/pkg/domain/entities" - "github.com/containers/podman/v3/pkg/util" + "github.com/containers/podman/v4/cmd/podman/common" + "github.com/containers/podman/v4/cmd/podman/registry" + "github.com/containers/podman/v4/pkg/domain/entities" + "github.com/containers/podman/v4/pkg/util" "github.com/spf13/cobra" ) diff --git a/cmd/podman/images/rm.go b/cmd/podman/images/rm.go index be4c0b883..dd138d410 100644 --- a/cmd/podman/images/rm.go +++ b/cmd/podman/images/rm.go @@ -3,10 +3,10 @@ package images import ( "fmt" - "github.com/containers/podman/v3/cmd/podman/common" - "github.com/containers/podman/v3/cmd/podman/registry" - "github.com/containers/podman/v3/pkg/domain/entities" - "github.com/containers/podman/v3/pkg/errorhandling" + "github.com/containers/podman/v4/cmd/podman/common" + "github.com/containers/podman/v4/cmd/podman/registry" + "github.com/containers/podman/v4/pkg/domain/entities" + "github.com/containers/podman/v4/pkg/errorhandling" "github.com/pkg/errors" "github.com/spf13/cobra" "github.com/spf13/pflag" diff --git a/cmd/podman/images/save.go b/cmd/podman/images/save.go index 4f45cb912..a9fe675e1 100644 --- a/cmd/podman/images/save.go +++ b/cmd/podman/images/save.go @@ -6,12 +6,12 @@ import ( "strings" "github.com/containers/common/pkg/completion" - "github.com/containers/podman/v3/cmd/podman/common" - "github.com/containers/podman/v3/cmd/podman/parse" - "github.com/containers/podman/v3/cmd/podman/registry" - "github.com/containers/podman/v3/libpod/define" - "github.com/containers/podman/v3/pkg/domain/entities" - "github.com/containers/podman/v3/pkg/util" + "github.com/containers/podman/v4/cmd/podman/common" + "github.com/containers/podman/v4/cmd/podman/parse" + "github.com/containers/podman/v4/cmd/podman/registry" + "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" "github.com/spf13/cobra" "golang.org/x/crypto/ssh/terminal" diff --git a/cmd/podman/images/scp.go b/cmd/podman/images/scp.go index fb20d9417..1481e71c7 100644 --- a/cmd/podman/images/scp.go +++ b/cmd/podman/images/scp.go @@ -12,13 +12,13 @@ import ( "strings" "github.com/containers/common/pkg/config" - "github.com/containers/podman/v3/cmd/podman/common" - "github.com/containers/podman/v3/cmd/podman/registry" - "github.com/containers/podman/v3/cmd/podman/system/connection" - "github.com/containers/podman/v3/libpod/define" - "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/cmd/podman/common" + "github.com/containers/podman/v4/cmd/podman/registry" + "github.com/containers/podman/v4/cmd/podman/system/connection" + "github.com/containers/podman/v4/libpod/define" + "github.com/containers/podman/v4/pkg/domain/entities" + "github.com/containers/podman/v4/pkg/rootless" + "github.com/containers/podman/v4/utils" scpD "github.com/dtylman/scp" "github.com/pkg/errors" "github.com/sirupsen/logrus" diff --git a/cmd/podman/images/scp_test.go b/cmd/podman/images/scp_test.go index d4d8f8e58..315fda2ab 100644 --- a/cmd/podman/images/scp_test.go +++ b/cmd/podman/images/scp_test.go @@ -3,7 +3,7 @@ package images 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/cmd/podman/images/scp_utils.go b/cmd/podman/images/scp_utils.go index ebb874c1c..c488616c9 100644 --- a/cmd/podman/images/scp_utils.go +++ b/cmd/podman/images/scp_utils.go @@ -4,8 +4,8 @@ import ( "strings" "github.com/containers/image/v5/docker/reference" - "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" "github.com/pkg/errors" ) diff --git a/cmd/podman/images/search.go b/cmd/podman/images/search.go index 0791ac02c..292a1d060 100644 --- a/cmd/podman/images/search.go +++ b/cmd/podman/images/search.go @@ -9,8 +9,8 @@ import ( "github.com/containers/common/pkg/completion" "github.com/containers/common/pkg/report" "github.com/containers/image/v5/types" - "github.com/containers/podman/v3/cmd/podman/registry" - "github.com/containers/podman/v3/pkg/domain/entities" + "github.com/containers/podman/v4/cmd/podman/registry" + "github.com/containers/podman/v4/pkg/domain/entities" "github.com/pkg/errors" "github.com/spf13/cobra" ) diff --git a/cmd/podman/images/sign.go b/cmd/podman/images/sign.go index 4c42a0bd6..e4e201894 100644 --- a/cmd/podman/images/sign.go +++ b/cmd/podman/images/sign.go @@ -5,9 +5,9 @@ import ( "github.com/containers/common/pkg/auth" "github.com/containers/common/pkg/completion" - "github.com/containers/podman/v3/cmd/podman/common" - "github.com/containers/podman/v3/cmd/podman/registry" - "github.com/containers/podman/v3/pkg/domain/entities" + "github.com/containers/podman/v4/cmd/podman/common" + "github.com/containers/podman/v4/cmd/podman/registry" + "github.com/containers/podman/v4/pkg/domain/entities" "github.com/pkg/errors" "github.com/spf13/cobra" ) diff --git a/cmd/podman/images/tag.go b/cmd/podman/images/tag.go index 633368f50..1129b82e5 100644 --- a/cmd/podman/images/tag.go +++ b/cmd/podman/images/tag.go @@ -1,9 +1,9 @@ package images import ( - "github.com/containers/podman/v3/cmd/podman/common" - "github.com/containers/podman/v3/cmd/podman/registry" - "github.com/containers/podman/v3/pkg/domain/entities" + "github.com/containers/podman/v4/cmd/podman/common" + "github.com/containers/podman/v4/cmd/podman/registry" + "github.com/containers/podman/v4/pkg/domain/entities" "github.com/spf13/cobra" ) diff --git a/cmd/podman/images/tree.go b/cmd/podman/images/tree.go index 8ace9d63c..370a4e419 100644 --- a/cmd/podman/images/tree.go +++ b/cmd/podman/images/tree.go @@ -3,9 +3,9 @@ package images import ( "fmt" - "github.com/containers/podman/v3/cmd/podman/common" - "github.com/containers/podman/v3/cmd/podman/registry" - "github.com/containers/podman/v3/pkg/domain/entities" + "github.com/containers/podman/v4/cmd/podman/common" + "github.com/containers/podman/v4/cmd/podman/registry" + "github.com/containers/podman/v4/pkg/domain/entities" "github.com/spf13/cobra" ) diff --git a/cmd/podman/images/trust.go b/cmd/podman/images/trust.go index 28eb53193..a5badf72a 100644 --- a/cmd/podman/images/trust.go +++ b/cmd/podman/images/trust.go @@ -1,8 +1,8 @@ package images import ( - "github.com/containers/podman/v3/cmd/podman/registry" - "github.com/containers/podman/v3/cmd/podman/validate" + "github.com/containers/podman/v4/cmd/podman/registry" + "github.com/containers/podman/v4/cmd/podman/validate" "github.com/spf13/cobra" ) diff --git a/cmd/podman/images/trust_set.go b/cmd/podman/images/trust_set.go index e01a04146..fff035d12 100644 --- a/cmd/podman/images/trust_set.go +++ b/cmd/podman/images/trust_set.go @@ -5,10 +5,10 @@ import ( "regexp" "github.com/containers/common/pkg/completion" - "github.com/containers/podman/v3/cmd/podman/common" - "github.com/containers/podman/v3/cmd/podman/registry" - "github.com/containers/podman/v3/pkg/domain/entities" - "github.com/containers/podman/v3/pkg/util" + "github.com/containers/podman/v4/cmd/podman/common" + "github.com/containers/podman/v4/cmd/podman/registry" + "github.com/containers/podman/v4/pkg/domain/entities" + "github.com/containers/podman/v4/pkg/util" "github.com/pkg/errors" "github.com/spf13/cobra" ) diff --git a/cmd/podman/images/trust_show.go b/cmd/podman/images/trust_show.go index 04ea24ca5..bcb60e2b3 100644 --- a/cmd/podman/images/trust_show.go +++ b/cmd/podman/images/trust_show.go @@ -5,9 +5,9 @@ import ( "os" "github.com/containers/common/pkg/report" - "github.com/containers/podman/v3/cmd/podman/common" - "github.com/containers/podman/v3/cmd/podman/registry" - "github.com/containers/podman/v3/pkg/domain/entities" + "github.com/containers/podman/v4/cmd/podman/common" + "github.com/containers/podman/v4/cmd/podman/registry" + "github.com/containers/podman/v4/pkg/domain/entities" "github.com/spf13/cobra" ) diff --git a/cmd/podman/images/unmount.go b/cmd/podman/images/unmount.go index f72268ea2..3ada09937 100644 --- a/cmd/podman/images/unmount.go +++ b/cmd/podman/images/unmount.go @@ -3,10 +3,10 @@ package images import ( "fmt" - "github.com/containers/podman/v3/cmd/podman/common" - "github.com/containers/podman/v3/cmd/podman/registry" - "github.com/containers/podman/v3/cmd/podman/utils" - "github.com/containers/podman/v3/pkg/domain/entities" + "github.com/containers/podman/v4/cmd/podman/common" + "github.com/containers/podman/v4/cmd/podman/registry" + "github.com/containers/podman/v4/cmd/podman/utils" + "github.com/containers/podman/v4/pkg/domain/entities" "github.com/pkg/errors" "github.com/spf13/cobra" "github.com/spf13/pflag" diff --git a/cmd/podman/images/untag.go b/cmd/podman/images/untag.go index 4c1862242..50941e496 100644 --- a/cmd/podman/images/untag.go +++ b/cmd/podman/images/untag.go @@ -1,9 +1,9 @@ package images import ( - "github.com/containers/podman/v3/cmd/podman/common" - "github.com/containers/podman/v3/cmd/podman/registry" - "github.com/containers/podman/v3/pkg/domain/entities" + "github.com/containers/podman/v4/cmd/podman/common" + "github.com/containers/podman/v4/cmd/podman/registry" + "github.com/containers/podman/v4/pkg/domain/entities" "github.com/spf13/cobra" ) diff --git a/cmd/podman/inspect.go b/cmd/podman/inspect.go index 0c8102952..e8738ecc3 100644 --- a/cmd/podman/inspect.go +++ b/cmd/podman/inspect.go @@ -1,10 +1,10 @@ package main import ( - "github.com/containers/podman/v3/cmd/podman/common" - "github.com/containers/podman/v3/cmd/podman/inspect" - "github.com/containers/podman/v3/cmd/podman/registry" - "github.com/containers/podman/v3/pkg/domain/entities" + "github.com/containers/podman/v4/cmd/podman/common" + "github.com/containers/podman/v4/cmd/podman/inspect" + "github.com/containers/podman/v4/cmd/podman/registry" + "github.com/containers/podman/v4/pkg/domain/entities" "github.com/spf13/cobra" ) diff --git a/cmd/podman/inspect/inspect.go b/cmd/podman/inspect/inspect.go index 482b616af..ef8a06163 100644 --- a/cmd/podman/inspect/inspect.go +++ b/cmd/podman/inspect/inspect.go @@ -11,11 +11,11 @@ import ( "github.com/containers/common/pkg/completion" "github.com/containers/common/pkg/report" - "github.com/containers/podman/v3/cmd/podman/common" - "github.com/containers/podman/v3/cmd/podman/registry" - "github.com/containers/podman/v3/cmd/podman/validate" - "github.com/containers/podman/v3/libpod/define" - "github.com/containers/podman/v3/pkg/domain/entities" + "github.com/containers/podman/v4/cmd/podman/common" + "github.com/containers/podman/v4/cmd/podman/registry" + "github.com/containers/podman/v4/cmd/podman/validate" + "github.com/containers/podman/v4/libpod/define" + "github.com/containers/podman/v4/pkg/domain/entities" "github.com/pkg/errors" "github.com/sirupsen/logrus" "github.com/spf13/cobra" diff --git a/cmd/podman/login.go b/cmd/podman/login.go index 7e853b38d..a7ff8e908 100644 --- a/cmd/podman/login.go +++ b/cmd/podman/login.go @@ -7,8 +7,8 @@ import ( "github.com/containers/common/pkg/auth" "github.com/containers/common/pkg/completion" "github.com/containers/image/v5/types" - "github.com/containers/podman/v3/cmd/podman/common" - "github.com/containers/podman/v3/cmd/podman/registry" + "github.com/containers/podman/v4/cmd/podman/common" + "github.com/containers/podman/v4/cmd/podman/registry" "github.com/spf13/cobra" ) diff --git a/cmd/podman/logout.go b/cmd/podman/logout.go index f44b13a1f..e125247ed 100644 --- a/cmd/podman/logout.go +++ b/cmd/podman/logout.go @@ -6,8 +6,8 @@ import ( "github.com/containers/common/pkg/auth" "github.com/containers/common/pkg/completion" "github.com/containers/image/v5/types" - "github.com/containers/podman/v3/cmd/podman/common" - "github.com/containers/podman/v3/cmd/podman/registry" + "github.com/containers/podman/v4/cmd/podman/common" + "github.com/containers/podman/v4/cmd/podman/registry" "github.com/spf13/cobra" ) diff --git a/cmd/podman/machine/init.go b/cmd/podman/machine/init.go index ed04239c4..0834aa381 100644 --- a/cmd/podman/machine/init.go +++ b/cmd/podman/machine/init.go @@ -6,8 +6,8 @@ import ( "fmt" "github.com/containers/common/pkg/completion" - "github.com/containers/podman/v3/cmd/podman/registry" - "github.com/containers/podman/v3/pkg/machine" + "github.com/containers/podman/v4/cmd/podman/registry" + "github.com/containers/podman/v4/pkg/machine" "github.com/pkg/errors" "github.com/spf13/cobra" ) diff --git a/cmd/podman/machine/list.go b/cmd/podman/machine/list.go index 3d8def0db..b57d911a8 100644 --- a/cmd/podman/machine/list.go +++ b/cmd/podman/machine/list.go @@ -13,10 +13,10 @@ import ( "github.com/containers/common/pkg/completion" "github.com/containers/common/pkg/config" "github.com/containers/common/pkg/report" - "github.com/containers/podman/v3/cmd/podman/common" - "github.com/containers/podman/v3/cmd/podman/registry" - "github.com/containers/podman/v3/cmd/podman/validate" - "github.com/containers/podman/v3/pkg/machine" + "github.com/containers/podman/v4/cmd/podman/common" + "github.com/containers/podman/v4/cmd/podman/registry" + "github.com/containers/podman/v4/cmd/podman/validate" + "github.com/containers/podman/v4/pkg/machine" "github.com/docker/go-units" "github.com/pkg/errors" "github.com/spf13/cobra" diff --git a/cmd/podman/machine/machine.go b/cmd/podman/machine/machine.go index 22ffbbee7..4937fcbda 100644 --- a/cmd/podman/machine/machine.go +++ b/cmd/podman/machine/machine.go @@ -5,9 +5,9 @@ package machine import ( "strings" - "github.com/containers/podman/v3/cmd/podman/registry" - "github.com/containers/podman/v3/cmd/podman/validate" - "github.com/containers/podman/v3/pkg/machine" + "github.com/containers/podman/v4/cmd/podman/registry" + "github.com/containers/podman/v4/cmd/podman/validate" + "github.com/containers/podman/v4/pkg/machine" "github.com/spf13/cobra" ) diff --git a/cmd/podman/machine/platform.go b/cmd/podman/machine/platform.go index fc3186205..bbcf06c85 100644 --- a/cmd/podman/machine/platform.go +++ b/cmd/podman/machine/platform.go @@ -3,8 +3,8 @@ package machine import ( - "github.com/containers/podman/v3/pkg/machine" - "github.com/containers/podman/v3/pkg/machine/qemu" + "github.com/containers/podman/v4/pkg/machine" + "github.com/containers/podman/v4/pkg/machine/qemu" ) func getSystemDefaultProvider() machine.Provider { diff --git a/cmd/podman/machine/platform_windows.go b/cmd/podman/machine/platform_windows.go index a4a35e712..03978eda1 100644 --- a/cmd/podman/machine/platform_windows.go +++ b/cmd/podman/machine/platform_windows.go @@ -1,8 +1,8 @@ package machine import ( - "github.com/containers/podman/v3/pkg/machine" - "github.com/containers/podman/v3/pkg/machine/wsl" + "github.com/containers/podman/v4/pkg/machine" + "github.com/containers/podman/v4/pkg/machine/wsl" ) func getSystemDefaultProvider() machine.Provider { diff --git a/cmd/podman/machine/rm.go b/cmd/podman/machine/rm.go index c58e74a42..38873084a 100644 --- a/cmd/podman/machine/rm.go +++ b/cmd/podman/machine/rm.go @@ -8,8 +8,8 @@ import ( "os" "strings" - "github.com/containers/podman/v3/cmd/podman/registry" - "github.com/containers/podman/v3/pkg/machine" + "github.com/containers/podman/v4/cmd/podman/registry" + "github.com/containers/podman/v4/pkg/machine" "github.com/spf13/cobra" ) diff --git a/cmd/podman/machine/ssh.go b/cmd/podman/machine/ssh.go index 5ef34afc6..ba37f7ba4 100644 --- a/cmd/podman/machine/ssh.go +++ b/cmd/podman/machine/ssh.go @@ -7,8 +7,8 @@ import ( "github.com/containers/common/pkg/completion" "github.com/containers/common/pkg/config" - "github.com/containers/podman/v3/cmd/podman/registry" - "github.com/containers/podman/v3/pkg/machine" + "github.com/containers/podman/v4/cmd/podman/registry" + "github.com/containers/podman/v4/pkg/machine" "github.com/pkg/errors" "github.com/spf13/cobra" ) diff --git a/cmd/podman/machine/start.go b/cmd/podman/machine/start.go index a3770d61a..0bcf32cd5 100644 --- a/cmd/podman/machine/start.go +++ b/cmd/podman/machine/start.go @@ -5,8 +5,8 @@ package machine import ( "fmt" - "github.com/containers/podman/v3/cmd/podman/registry" - "github.com/containers/podman/v3/pkg/machine" + "github.com/containers/podman/v4/cmd/podman/registry" + "github.com/containers/podman/v4/pkg/machine" "github.com/pkg/errors" "github.com/spf13/cobra" ) diff --git a/cmd/podman/machine/stop.go b/cmd/podman/machine/stop.go index 17969298b..e6bf3cf2b 100644 --- a/cmd/podman/machine/stop.go +++ b/cmd/podman/machine/stop.go @@ -6,8 +6,8 @@ package machine import ( "fmt" - "github.com/containers/podman/v3/cmd/podman/registry" - "github.com/containers/podman/v3/pkg/machine" + "github.com/containers/podman/v4/cmd/podman/registry" + "github.com/containers/podman/v4/pkg/machine" "github.com/spf13/cobra" ) diff --git a/cmd/podman/main.go b/cmd/podman/main.go index b38734617..9850f5d27 100644 --- a/cmd/podman/main.go +++ b/cmd/podman/main.go @@ -5,23 +5,23 @@ import ( "os" "strings" - _ "github.com/containers/podman/v3/cmd/podman/completion" - _ "github.com/containers/podman/v3/cmd/podman/containers" - _ "github.com/containers/podman/v3/cmd/podman/generate" - _ "github.com/containers/podman/v3/cmd/podman/healthcheck" - _ "github.com/containers/podman/v3/cmd/podman/images" - _ "github.com/containers/podman/v3/cmd/podman/machine" - _ "github.com/containers/podman/v3/cmd/podman/manifest" - _ "github.com/containers/podman/v3/cmd/podman/networks" - _ "github.com/containers/podman/v3/cmd/podman/play" - _ "github.com/containers/podman/v3/cmd/podman/pods" - "github.com/containers/podman/v3/cmd/podman/registry" - _ "github.com/containers/podman/v3/cmd/podman/secrets" - _ "github.com/containers/podman/v3/cmd/podman/system" - _ "github.com/containers/podman/v3/cmd/podman/system/connection" - _ "github.com/containers/podman/v3/cmd/podman/volumes" - "github.com/containers/podman/v3/pkg/rootless" - "github.com/containers/podman/v3/pkg/terminal" + _ "github.com/containers/podman/v4/cmd/podman/completion" + _ "github.com/containers/podman/v4/cmd/podman/containers" + _ "github.com/containers/podman/v4/cmd/podman/generate" + _ "github.com/containers/podman/v4/cmd/podman/healthcheck" + _ "github.com/containers/podman/v4/cmd/podman/images" + _ "github.com/containers/podman/v4/cmd/podman/machine" + _ "github.com/containers/podman/v4/cmd/podman/manifest" + _ "github.com/containers/podman/v4/cmd/podman/networks" + _ "github.com/containers/podman/v4/cmd/podman/play" + _ "github.com/containers/podman/v4/cmd/podman/pods" + "github.com/containers/podman/v4/cmd/podman/registry" + _ "github.com/containers/podman/v4/cmd/podman/secrets" + _ "github.com/containers/podman/v4/cmd/podman/system" + _ "github.com/containers/podman/v4/cmd/podman/system/connection" + _ "github.com/containers/podman/v4/cmd/podman/volumes" + "github.com/containers/podman/v4/pkg/rootless" + "github.com/containers/podman/v4/pkg/terminal" "github.com/containers/storage/pkg/reexec" "github.com/sirupsen/logrus" "github.com/spf13/cobra" diff --git a/cmd/podman/manifest/add.go b/cmd/podman/manifest/add.go index d09533967..35583ffcb 100644 --- a/cmd/podman/manifest/add.go +++ b/cmd/podman/manifest/add.go @@ -7,10 +7,10 @@ import ( "github.com/containers/common/pkg/auth" "github.com/containers/common/pkg/completion" "github.com/containers/image/v5/types" - "github.com/containers/podman/v3/cmd/podman/common" - "github.com/containers/podman/v3/cmd/podman/registry" - "github.com/containers/podman/v3/pkg/domain/entities" - "github.com/containers/podman/v3/pkg/util" + "github.com/containers/podman/v4/cmd/podman/common" + "github.com/containers/podman/v4/cmd/podman/registry" + "github.com/containers/podman/v4/pkg/domain/entities" + "github.com/containers/podman/v4/pkg/util" "github.com/spf13/cobra" ) diff --git a/cmd/podman/manifest/annotate.go b/cmd/podman/manifest/annotate.go index a032a1fe5..304c8e55f 100644 --- a/cmd/podman/manifest/annotate.go +++ b/cmd/podman/manifest/annotate.go @@ -4,9 +4,9 @@ import ( "fmt" "github.com/containers/common/pkg/completion" - "github.com/containers/podman/v3/cmd/podman/common" - "github.com/containers/podman/v3/cmd/podman/registry" - "github.com/containers/podman/v3/pkg/domain/entities" + "github.com/containers/podman/v4/cmd/podman/common" + "github.com/containers/podman/v4/cmd/podman/registry" + "github.com/containers/podman/v4/pkg/domain/entities" "github.com/spf13/cobra" ) diff --git a/cmd/podman/manifest/create.go b/cmd/podman/manifest/create.go index acef53045..435b4a57c 100644 --- a/cmd/podman/manifest/create.go +++ b/cmd/podman/manifest/create.go @@ -3,9 +3,9 @@ package manifest import ( "fmt" - "github.com/containers/podman/v3/cmd/podman/common" - "github.com/containers/podman/v3/cmd/podman/registry" - "github.com/containers/podman/v3/pkg/domain/entities" + "github.com/containers/podman/v4/cmd/podman/common" + "github.com/containers/podman/v4/cmd/podman/registry" + "github.com/containers/podman/v4/pkg/domain/entities" "github.com/spf13/cobra" ) diff --git a/cmd/podman/manifest/exists.go b/cmd/podman/manifest/exists.go index 55318330d..011688540 100644 --- a/cmd/podman/manifest/exists.go +++ b/cmd/podman/manifest/exists.go @@ -1,8 +1,8 @@ package manifest import ( - "github.com/containers/podman/v3/cmd/podman/common" - "github.com/containers/podman/v3/cmd/podman/registry" + "github.com/containers/podman/v4/cmd/podman/common" + "github.com/containers/podman/v4/cmd/podman/registry" "github.com/spf13/cobra" ) diff --git a/cmd/podman/manifest/inspect.go b/cmd/podman/manifest/inspect.go index ac8ee3dc4..2cb6941c4 100644 --- a/cmd/podman/manifest/inspect.go +++ b/cmd/podman/manifest/inspect.go @@ -3,8 +3,8 @@ package manifest import ( "fmt" - "github.com/containers/podman/v3/cmd/podman/common" - "github.com/containers/podman/v3/cmd/podman/registry" + "github.com/containers/podman/v4/cmd/podman/common" + "github.com/containers/podman/v4/cmd/podman/registry" "github.com/spf13/cobra" ) diff --git a/cmd/podman/manifest/manifest.go b/cmd/podman/manifest/manifest.go index 98d5199f1..bb9f4a8c5 100644 --- a/cmd/podman/manifest/manifest.go +++ b/cmd/podman/manifest/manifest.go @@ -1,8 +1,8 @@ package manifest import ( - "github.com/containers/podman/v3/cmd/podman/registry" - "github.com/containers/podman/v3/cmd/podman/validate" + "github.com/containers/podman/v4/cmd/podman/registry" + "github.com/containers/podman/v4/cmd/podman/validate" "github.com/spf13/cobra" ) diff --git a/cmd/podman/manifest/push.go b/cmd/podman/manifest/push.go index 8b13f6dde..b96a65c4a 100644 --- a/cmd/podman/manifest/push.go +++ b/cmd/podman/manifest/push.go @@ -6,11 +6,11 @@ import ( "github.com/containers/common/pkg/auth" "github.com/containers/common/pkg/completion" "github.com/containers/image/v5/types" - "github.com/containers/podman/v3/cmd/podman/common" - "github.com/containers/podman/v3/cmd/podman/registry" - "github.com/containers/podman/v3/cmd/podman/utils" - "github.com/containers/podman/v3/pkg/domain/entities" - "github.com/containers/podman/v3/pkg/util" + "github.com/containers/podman/v4/cmd/podman/common" + "github.com/containers/podman/v4/cmd/podman/registry" + "github.com/containers/podman/v4/cmd/podman/utils" + "github.com/containers/podman/v4/pkg/domain/entities" + "github.com/containers/podman/v4/pkg/util" "github.com/pkg/errors" "github.com/spf13/cobra" ) diff --git a/cmd/podman/manifest/remove.go b/cmd/podman/manifest/remove.go index 4716af201..c32ffad78 100644 --- a/cmd/podman/manifest/remove.go +++ b/cmd/podman/manifest/remove.go @@ -3,8 +3,8 @@ package manifest import ( "fmt" - "github.com/containers/podman/v3/cmd/podman/common" - "github.com/containers/podman/v3/cmd/podman/registry" + "github.com/containers/podman/v4/cmd/podman/common" + "github.com/containers/podman/v4/cmd/podman/registry" "github.com/pkg/errors" "github.com/spf13/cobra" ) diff --git a/cmd/podman/manifest/rm.go b/cmd/podman/manifest/rm.go index b4a52653b..81ff5107e 100644 --- a/cmd/podman/manifest/rm.go +++ b/cmd/podman/manifest/rm.go @@ -4,9 +4,9 @@ import ( "context" "fmt" - "github.com/containers/podman/v3/cmd/podman/common" - "github.com/containers/podman/v3/cmd/podman/registry" - "github.com/containers/podman/v3/pkg/errorhandling" + "github.com/containers/podman/v4/cmd/podman/common" + "github.com/containers/podman/v4/cmd/podman/registry" + "github.com/containers/podman/v4/pkg/errorhandling" "github.com/spf13/cobra" ) diff --git a/cmd/podman/networks/connect.go b/cmd/podman/networks/connect.go index b0eece06c..60ef2b39a 100644 --- a/cmd/podman/networks/connect.go +++ b/cmd/podman/networks/connect.go @@ -5,9 +5,9 @@ import ( "github.com/containers/common/libnetwork/types" "github.com/containers/common/pkg/completion" - "github.com/containers/podman/v3/cmd/podman/common" - "github.com/containers/podman/v3/cmd/podman/registry" - "github.com/containers/podman/v3/pkg/domain/entities" + "github.com/containers/podman/v4/cmd/podman/common" + "github.com/containers/podman/v4/cmd/podman/registry" + "github.com/containers/podman/v4/pkg/domain/entities" "github.com/spf13/cobra" ) diff --git a/cmd/podman/networks/create.go b/cmd/podman/networks/create.go index ad1f9cbd0..9f6470858 100644 --- a/cmd/podman/networks/create.go +++ b/cmd/podman/networks/create.go @@ -7,10 +7,10 @@ import ( "github.com/containers/common/libnetwork/types" "github.com/containers/common/libnetwork/util" "github.com/containers/common/pkg/completion" - "github.com/containers/podman/v3/cmd/podman/common" - "github.com/containers/podman/v3/cmd/podman/parse" - "github.com/containers/podman/v3/cmd/podman/registry" - "github.com/containers/podman/v3/pkg/domain/entities" + "github.com/containers/podman/v4/cmd/podman/common" + "github.com/containers/podman/v4/cmd/podman/parse" + "github.com/containers/podman/v4/cmd/podman/registry" + "github.com/containers/podman/v4/pkg/domain/entities" "github.com/pkg/errors" "github.com/sirupsen/logrus" "github.com/spf13/cobra" diff --git a/cmd/podman/networks/disconnect.go b/cmd/podman/networks/disconnect.go index 7f2ff4252..51d1478bf 100644 --- a/cmd/podman/networks/disconnect.go +++ b/cmd/podman/networks/disconnect.go @@ -1,9 +1,9 @@ package network import ( - "github.com/containers/podman/v3/cmd/podman/common" - "github.com/containers/podman/v3/cmd/podman/registry" - "github.com/containers/podman/v3/pkg/domain/entities" + "github.com/containers/podman/v4/cmd/podman/common" + "github.com/containers/podman/v4/cmd/podman/registry" + "github.com/containers/podman/v4/pkg/domain/entities" "github.com/spf13/cobra" "github.com/spf13/pflag" ) diff --git a/cmd/podman/networks/exists.go b/cmd/podman/networks/exists.go index 89466ab7f..5f2c7d663 100644 --- a/cmd/podman/networks/exists.go +++ b/cmd/podman/networks/exists.go @@ -1,8 +1,8 @@ package network import ( - "github.com/containers/podman/v3/cmd/podman/common" - "github.com/containers/podman/v3/cmd/podman/registry" + "github.com/containers/podman/v4/cmd/podman/common" + "github.com/containers/podman/v4/cmd/podman/registry" "github.com/spf13/cobra" ) diff --git a/cmd/podman/networks/inspect.go b/cmd/podman/networks/inspect.go index 4f3e86fc9..3c07e5492 100644 --- a/cmd/podman/networks/inspect.go +++ b/cmd/podman/networks/inspect.go @@ -1,10 +1,10 @@ package network import ( - "github.com/containers/podman/v3/cmd/podman/common" - "github.com/containers/podman/v3/cmd/podman/inspect" - "github.com/containers/podman/v3/cmd/podman/registry" - "github.com/containers/podman/v3/pkg/domain/entities" + "github.com/containers/podman/v4/cmd/podman/common" + "github.com/containers/podman/v4/cmd/podman/inspect" + "github.com/containers/podman/v4/cmd/podman/registry" + "github.com/containers/podman/v4/pkg/domain/entities" "github.com/spf13/cobra" ) diff --git a/cmd/podman/networks/list.go b/cmd/podman/networks/list.go index be61d72d8..092cc6424 100644 --- a/cmd/podman/networks/list.go +++ b/cmd/podman/networks/list.go @@ -9,11 +9,11 @@ import ( "github.com/containers/common/libnetwork/types" "github.com/containers/common/pkg/completion" "github.com/containers/common/pkg/report" - "github.com/containers/podman/v3/cmd/podman/common" - "github.com/containers/podman/v3/cmd/podman/parse" - "github.com/containers/podman/v3/cmd/podman/registry" - "github.com/containers/podman/v3/cmd/podman/validate" - "github.com/containers/podman/v3/pkg/domain/entities" + "github.com/containers/podman/v4/cmd/podman/common" + "github.com/containers/podman/v4/cmd/podman/parse" + "github.com/containers/podman/v4/cmd/podman/registry" + "github.com/containers/podman/v4/cmd/podman/validate" + "github.com/containers/podman/v4/pkg/domain/entities" "github.com/spf13/cobra" "github.com/spf13/pflag" ) diff --git a/cmd/podman/networks/network.go b/cmd/podman/networks/network.go index 1070e7e82..45fbf00f4 100644 --- a/cmd/podman/networks/network.go +++ b/cmd/podman/networks/network.go @@ -1,9 +1,9 @@ package network import ( - "github.com/containers/podman/v3/cmd/podman/registry" - "github.com/containers/podman/v3/cmd/podman/validate" - "github.com/containers/podman/v3/pkg/util" + "github.com/containers/podman/v4/cmd/podman/registry" + "github.com/containers/podman/v4/cmd/podman/validate" + "github.com/containers/podman/v4/pkg/util" "github.com/spf13/cobra" ) diff --git a/cmd/podman/networks/prune.go b/cmd/podman/networks/prune.go index e113cd359..fa621ebac 100644 --- a/cmd/podman/networks/prune.go +++ b/cmd/podman/networks/prune.go @@ -6,12 +6,12 @@ import ( "os" "strings" - "github.com/containers/podman/v3/cmd/podman/common" - "github.com/containers/podman/v3/cmd/podman/parse" - "github.com/containers/podman/v3/cmd/podman/registry" - "github.com/containers/podman/v3/cmd/podman/utils" - "github.com/containers/podman/v3/cmd/podman/validate" - "github.com/containers/podman/v3/pkg/domain/entities" + "github.com/containers/podman/v4/cmd/podman/common" + "github.com/containers/podman/v4/cmd/podman/parse" + "github.com/containers/podman/v4/cmd/podman/registry" + "github.com/containers/podman/v4/cmd/podman/utils" + "github.com/containers/podman/v4/cmd/podman/validate" + "github.com/containers/podman/v4/pkg/domain/entities" "github.com/spf13/cobra" "github.com/spf13/pflag" ) diff --git a/cmd/podman/networks/reload.go b/cmd/podman/networks/reload.go index 371bea9ef..7b6323187 100644 --- a/cmd/podman/networks/reload.go +++ b/cmd/podman/networks/reload.go @@ -3,11 +3,11 @@ package network import ( "fmt" - "github.com/containers/podman/v3/cmd/podman/common" - "github.com/containers/podman/v3/cmd/podman/registry" - "github.com/containers/podman/v3/cmd/podman/utils" - "github.com/containers/podman/v3/cmd/podman/validate" - "github.com/containers/podman/v3/pkg/domain/entities" + "github.com/containers/podman/v4/cmd/podman/common" + "github.com/containers/podman/v4/cmd/podman/registry" + "github.com/containers/podman/v4/cmd/podman/utils" + "github.com/containers/podman/v4/cmd/podman/validate" + "github.com/containers/podman/v4/pkg/domain/entities" "github.com/spf13/cobra" "github.com/spf13/pflag" ) diff --git a/cmd/podman/networks/rm.go b/cmd/podman/networks/rm.go index 5efd02933..f71f59eea 100644 --- a/cmd/podman/networks/rm.go +++ b/cmd/podman/networks/rm.go @@ -5,11 +5,11 @@ import ( "strings" "github.com/containers/common/pkg/completion" - "github.com/containers/podman/v3/cmd/podman/common" - "github.com/containers/podman/v3/cmd/podman/registry" - "github.com/containers/podman/v3/cmd/podman/utils" - "github.com/containers/podman/v3/libpod/define" - "github.com/containers/podman/v3/pkg/domain/entities" + "github.com/containers/podman/v4/cmd/podman/common" + "github.com/containers/podman/v4/cmd/podman/registry" + "github.com/containers/podman/v4/cmd/podman/utils" + "github.com/containers/podman/v4/libpod/define" + "github.com/containers/podman/v4/pkg/domain/entities" "github.com/pkg/errors" "github.com/spf13/cobra" "github.com/spf13/pflag" diff --git a/cmd/podman/play/kube.go b/cmd/podman/play/kube.go index ae4066a6f..ccf6ea861 100644 --- a/cmd/podman/play/kube.go +++ b/cmd/podman/play/kube.go @@ -8,13 +8,13 @@ import ( "github.com/containers/common/pkg/auth" "github.com/containers/common/pkg/completion" "github.com/containers/image/v5/types" - "github.com/containers/podman/v3/cmd/podman/common" - "github.com/containers/podman/v3/cmd/podman/registry" - "github.com/containers/podman/v3/cmd/podman/utils" - "github.com/containers/podman/v3/libpod/define" - "github.com/containers/podman/v3/pkg/domain/entities" - "github.com/containers/podman/v3/pkg/errorhandling" - "github.com/containers/podman/v3/pkg/util" + "github.com/containers/podman/v4/cmd/podman/common" + "github.com/containers/podman/v4/cmd/podman/registry" + "github.com/containers/podman/v4/cmd/podman/utils" + "github.com/containers/podman/v4/libpod/define" + "github.com/containers/podman/v4/pkg/domain/entities" + "github.com/containers/podman/v4/pkg/errorhandling" + "github.com/containers/podman/v4/pkg/util" "github.com/pkg/errors" "github.com/spf13/cobra" ) diff --git a/cmd/podman/play/play.go b/cmd/podman/play/play.go index d676bd701..e277ec9bd 100644 --- a/cmd/podman/play/play.go +++ b/cmd/podman/play/play.go @@ -1,8 +1,8 @@ package pods import ( - "github.com/containers/podman/v3/cmd/podman/registry" - "github.com/containers/podman/v3/cmd/podman/validate" + "github.com/containers/podman/v4/cmd/podman/registry" + "github.com/containers/podman/v4/cmd/podman/validate" "github.com/spf13/cobra" ) diff --git a/cmd/podman/pods/create.go b/cmd/podman/pods/create.go index 6a28f7a79..5d8a5aeab 100644 --- a/cmd/podman/pods/create.go +++ b/cmd/podman/pods/create.go @@ -12,16 +12,16 @@ import ( "github.com/containers/common/pkg/completion" "github.com/containers/common/pkg/sysinfo" - "github.com/containers/podman/v3/cmd/podman/common" - "github.com/containers/podman/v3/cmd/podman/containers" - "github.com/containers/podman/v3/cmd/podman/parse" - "github.com/containers/podman/v3/cmd/podman/registry" - "github.com/containers/podman/v3/cmd/podman/validate" - "github.com/containers/podman/v3/pkg/domain/entities" - "github.com/containers/podman/v3/pkg/errorhandling" - "github.com/containers/podman/v3/pkg/specgen" - "github.com/containers/podman/v3/pkg/specgenutil" - "github.com/containers/podman/v3/pkg/util" + "github.com/containers/podman/v4/cmd/podman/common" + "github.com/containers/podman/v4/cmd/podman/containers" + "github.com/containers/podman/v4/cmd/podman/parse" + "github.com/containers/podman/v4/cmd/podman/registry" + "github.com/containers/podman/v4/cmd/podman/validate" + "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/pkg/specgenutil" + "github.com/containers/podman/v4/pkg/util" "github.com/docker/docker/pkg/parsers" "github.com/pkg/errors" "github.com/sirupsen/logrus" diff --git a/cmd/podman/pods/exists.go b/cmd/podman/pods/exists.go index c4e64f88e..cbab562a6 100644 --- a/cmd/podman/pods/exists.go +++ b/cmd/podman/pods/exists.go @@ -3,8 +3,8 @@ package pods import ( "context" - "github.com/containers/podman/v3/cmd/podman/common" - "github.com/containers/podman/v3/cmd/podman/registry" + "github.com/containers/podman/v4/cmd/podman/common" + "github.com/containers/podman/v4/cmd/podman/registry" "github.com/spf13/cobra" ) diff --git a/cmd/podman/pods/inspect.go b/cmd/podman/pods/inspect.go index fd34d255f..ae6a5ba88 100644 --- a/cmd/podman/pods/inspect.go +++ b/cmd/podman/pods/inspect.go @@ -6,11 +6,11 @@ import ( "text/template" "github.com/containers/common/pkg/report" - "github.com/containers/podman/v3/cmd/podman/common" - "github.com/containers/podman/v3/cmd/podman/registry" - "github.com/containers/podman/v3/cmd/podman/validate" - "github.com/containers/podman/v3/libpod/define" - "github.com/containers/podman/v3/pkg/domain/entities" + "github.com/containers/podman/v4/cmd/podman/common" + "github.com/containers/podman/v4/cmd/podman/registry" + "github.com/containers/podman/v4/cmd/podman/validate" + "github.com/containers/podman/v4/libpod/define" + "github.com/containers/podman/v4/pkg/domain/entities" "github.com/pkg/errors" "github.com/spf13/cobra" ) diff --git a/cmd/podman/pods/kill.go b/cmd/podman/pods/kill.go index 66693b419..7216e08bb 100644 --- a/cmd/podman/pods/kill.go +++ b/cmd/podman/pods/kill.go @@ -4,11 +4,11 @@ import ( "context" "fmt" - "github.com/containers/podman/v3/cmd/podman/common" - "github.com/containers/podman/v3/cmd/podman/registry" - "github.com/containers/podman/v3/cmd/podman/utils" - "github.com/containers/podman/v3/cmd/podman/validate" - "github.com/containers/podman/v3/pkg/domain/entities" + "github.com/containers/podman/v4/cmd/podman/common" + "github.com/containers/podman/v4/cmd/podman/registry" + "github.com/containers/podman/v4/cmd/podman/utils" + "github.com/containers/podman/v4/cmd/podman/validate" + "github.com/containers/podman/v4/pkg/domain/entities" "github.com/spf13/cobra" ) diff --git a/cmd/podman/pods/logs.go b/cmd/podman/pods/logs.go index a79c0430f..1b00f047e 100644 --- a/cmd/podman/pods/logs.go +++ b/cmd/podman/pods/logs.go @@ -4,12 +4,12 @@ import ( "os" "github.com/containers/common/pkg/completion" - "github.com/containers/podman/v3/cmd/podman/common" - "github.com/containers/podman/v3/cmd/podman/registry" - "github.com/containers/podman/v3/cmd/podman/validate" - "github.com/containers/podman/v3/libpod/define" - "github.com/containers/podman/v3/pkg/domain/entities" - "github.com/containers/podman/v3/pkg/util" + "github.com/containers/podman/v4/cmd/podman/common" + "github.com/containers/podman/v4/cmd/podman/registry" + "github.com/containers/podman/v4/cmd/podman/validate" + "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" "github.com/spf13/cobra" ) diff --git a/cmd/podman/pods/pause.go b/cmd/podman/pods/pause.go index c1cc151e0..adc54d171 100644 --- a/cmd/podman/pods/pause.go +++ b/cmd/podman/pods/pause.go @@ -4,11 +4,11 @@ import ( "context" "fmt" - "github.com/containers/podman/v3/cmd/podman/common" - "github.com/containers/podman/v3/cmd/podman/registry" - "github.com/containers/podman/v3/cmd/podman/utils" - "github.com/containers/podman/v3/cmd/podman/validate" - "github.com/containers/podman/v3/pkg/domain/entities" + "github.com/containers/podman/v4/cmd/podman/common" + "github.com/containers/podman/v4/cmd/podman/registry" + "github.com/containers/podman/v4/cmd/podman/utils" + "github.com/containers/podman/v4/cmd/podman/validate" + "github.com/containers/podman/v4/pkg/domain/entities" "github.com/spf13/cobra" ) diff --git a/cmd/podman/pods/pod.go b/cmd/podman/pods/pod.go index e6e23fd1f..4e3994bb7 100644 --- a/cmd/podman/pods/pod.go +++ b/cmd/podman/pods/pod.go @@ -1,9 +1,9 @@ package pods import ( - "github.com/containers/podman/v3/cmd/podman/registry" - "github.com/containers/podman/v3/cmd/podman/validate" - "github.com/containers/podman/v3/pkg/util" + "github.com/containers/podman/v4/cmd/podman/registry" + "github.com/containers/podman/v4/cmd/podman/validate" + "github.com/containers/podman/v4/pkg/util" "github.com/spf13/cobra" ) diff --git a/cmd/podman/pods/prune.go b/cmd/podman/pods/prune.go index 8032c9f12..e3cce7196 100644 --- a/cmd/podman/pods/prune.go +++ b/cmd/podman/pods/prune.go @@ -8,10 +8,10 @@ import ( "strings" "github.com/containers/common/pkg/completion" - "github.com/containers/podman/v3/cmd/podman/registry" - "github.com/containers/podman/v3/cmd/podman/utils" - "github.com/containers/podman/v3/cmd/podman/validate" - "github.com/containers/podman/v3/pkg/domain/entities" + "github.com/containers/podman/v4/cmd/podman/registry" + "github.com/containers/podman/v4/cmd/podman/utils" + "github.com/containers/podman/v4/cmd/podman/validate" + "github.com/containers/podman/v4/pkg/domain/entities" "github.com/spf13/cobra" ) diff --git a/cmd/podman/pods/ps.go b/cmd/podman/pods/ps.go index 0b1c76cb2..4a049541a 100644 --- a/cmd/podman/pods/ps.go +++ b/cmd/podman/pods/ps.go @@ -10,10 +10,10 @@ import ( "github.com/containers/common/pkg/completion" "github.com/containers/common/pkg/report" - "github.com/containers/podman/v3/cmd/podman/common" - "github.com/containers/podman/v3/cmd/podman/registry" - "github.com/containers/podman/v3/cmd/podman/validate" - "github.com/containers/podman/v3/pkg/domain/entities" + "github.com/containers/podman/v4/cmd/podman/common" + "github.com/containers/podman/v4/cmd/podman/registry" + "github.com/containers/podman/v4/cmd/podman/validate" + "github.com/containers/podman/v4/pkg/domain/entities" "github.com/docker/go-units" "github.com/pkg/errors" "github.com/spf13/cobra" diff --git a/cmd/podman/pods/restart.go b/cmd/podman/pods/restart.go index 5b7ea121d..6d624806a 100644 --- a/cmd/podman/pods/restart.go +++ b/cmd/podman/pods/restart.go @@ -4,11 +4,11 @@ import ( "context" "fmt" - "github.com/containers/podman/v3/cmd/podman/common" - "github.com/containers/podman/v3/cmd/podman/registry" - "github.com/containers/podman/v3/cmd/podman/utils" - "github.com/containers/podman/v3/cmd/podman/validate" - "github.com/containers/podman/v3/pkg/domain/entities" + "github.com/containers/podman/v4/cmd/podman/common" + "github.com/containers/podman/v4/cmd/podman/registry" + "github.com/containers/podman/v4/cmd/podman/utils" + "github.com/containers/podman/v4/cmd/podman/validate" + "github.com/containers/podman/v4/pkg/domain/entities" "github.com/spf13/cobra" ) diff --git a/cmd/podman/pods/rm.go b/cmd/podman/pods/rm.go index d8a09d774..52a815534 100644 --- a/cmd/podman/pods/rm.go +++ b/cmd/podman/pods/rm.go @@ -6,13 +6,13 @@ import ( "strings" "github.com/containers/common/pkg/completion" - "github.com/containers/podman/v3/cmd/podman/common" - "github.com/containers/podman/v3/cmd/podman/registry" - "github.com/containers/podman/v3/cmd/podman/utils" - "github.com/containers/podman/v3/cmd/podman/validate" - "github.com/containers/podman/v3/libpod/define" - "github.com/containers/podman/v3/pkg/domain/entities" - "github.com/containers/podman/v3/pkg/specgenutil" + "github.com/containers/podman/v4/cmd/podman/common" + "github.com/containers/podman/v4/cmd/podman/registry" + "github.com/containers/podman/v4/cmd/podman/utils" + "github.com/containers/podman/v4/cmd/podman/validate" + "github.com/containers/podman/v4/libpod/define" + "github.com/containers/podman/v4/pkg/domain/entities" + "github.com/containers/podman/v4/pkg/specgenutil" "github.com/pkg/errors" "github.com/spf13/cobra" ) diff --git a/cmd/podman/pods/start.go b/cmd/podman/pods/start.go index e5f9eaa84..b668cdd61 100644 --- a/cmd/podman/pods/start.go +++ b/cmd/podman/pods/start.go @@ -5,12 +5,12 @@ import ( "fmt" "github.com/containers/common/pkg/completion" - "github.com/containers/podman/v3/cmd/podman/common" - "github.com/containers/podman/v3/cmd/podman/registry" - "github.com/containers/podman/v3/cmd/podman/utils" - "github.com/containers/podman/v3/cmd/podman/validate" - "github.com/containers/podman/v3/pkg/domain/entities" - "github.com/containers/podman/v3/pkg/specgenutil" + "github.com/containers/podman/v4/cmd/podman/common" + "github.com/containers/podman/v4/cmd/podman/registry" + "github.com/containers/podman/v4/cmd/podman/utils" + "github.com/containers/podman/v4/cmd/podman/validate" + "github.com/containers/podman/v4/pkg/domain/entities" + "github.com/containers/podman/v4/pkg/specgenutil" "github.com/spf13/cobra" ) diff --git a/cmd/podman/pods/stats.go b/cmd/podman/pods/stats.go index fbb9e0b52..f7a56d3f3 100644 --- a/cmd/podman/pods/stats.go +++ b/cmd/podman/pods/stats.go @@ -8,10 +8,10 @@ import ( "github.com/buger/goterm" "github.com/containers/common/pkg/report" - "github.com/containers/podman/v3/cmd/podman/common" - "github.com/containers/podman/v3/cmd/podman/registry" - "github.com/containers/podman/v3/cmd/podman/validate" - "github.com/containers/podman/v3/pkg/domain/entities" + "github.com/containers/podman/v4/cmd/podman/common" + "github.com/containers/podman/v4/cmd/podman/registry" + "github.com/containers/podman/v4/cmd/podman/validate" + "github.com/containers/podman/v4/pkg/domain/entities" "github.com/spf13/cobra" ) diff --git a/cmd/podman/pods/stop.go b/cmd/podman/pods/stop.go index 41325649f..c8c3d2732 100644 --- a/cmd/podman/pods/stop.go +++ b/cmd/podman/pods/stop.go @@ -5,12 +5,12 @@ import ( "fmt" "github.com/containers/common/pkg/completion" - "github.com/containers/podman/v3/cmd/podman/common" - "github.com/containers/podman/v3/cmd/podman/registry" - "github.com/containers/podman/v3/cmd/podman/utils" - "github.com/containers/podman/v3/cmd/podman/validate" - "github.com/containers/podman/v3/pkg/domain/entities" - "github.com/containers/podman/v3/pkg/specgenutil" + "github.com/containers/podman/v4/cmd/podman/common" + "github.com/containers/podman/v4/cmd/podman/registry" + "github.com/containers/podman/v4/cmd/podman/utils" + "github.com/containers/podman/v4/cmd/podman/validate" + "github.com/containers/podman/v4/pkg/domain/entities" + "github.com/containers/podman/v4/pkg/specgenutil" "github.com/spf13/cobra" ) diff --git a/cmd/podman/pods/top.go b/cmd/podman/pods/top.go index a6e442b96..4e9c7a3ee 100644 --- a/cmd/podman/pods/top.go +++ b/cmd/podman/pods/top.go @@ -7,11 +7,11 @@ import ( "strings" "github.com/containers/common/pkg/report" - "github.com/containers/podman/v3/cmd/podman/common" - "github.com/containers/podman/v3/cmd/podman/registry" - "github.com/containers/podman/v3/cmd/podman/validate" - "github.com/containers/podman/v3/pkg/domain/entities" - "github.com/containers/podman/v3/pkg/util" + "github.com/containers/podman/v4/cmd/podman/common" + "github.com/containers/podman/v4/cmd/podman/registry" + "github.com/containers/podman/v4/cmd/podman/validate" + "github.com/containers/podman/v4/pkg/domain/entities" + "github.com/containers/podman/v4/pkg/util" "github.com/pkg/errors" "github.com/spf13/cobra" ) diff --git a/cmd/podman/pods/unpause.go b/cmd/podman/pods/unpause.go index ef1aea7c8..a308a82c3 100644 --- a/cmd/podman/pods/unpause.go +++ b/cmd/podman/pods/unpause.go @@ -4,11 +4,11 @@ import ( "context" "fmt" - "github.com/containers/podman/v3/cmd/podman/common" - "github.com/containers/podman/v3/cmd/podman/registry" - "github.com/containers/podman/v3/cmd/podman/utils" - "github.com/containers/podman/v3/cmd/podman/validate" - "github.com/containers/podman/v3/pkg/domain/entities" + "github.com/containers/podman/v4/cmd/podman/common" + "github.com/containers/podman/v4/cmd/podman/registry" + "github.com/containers/podman/v4/cmd/podman/utils" + "github.com/containers/podman/v4/cmd/podman/validate" + "github.com/containers/podman/v4/pkg/domain/entities" "github.com/spf13/cobra" ) diff --git a/cmd/podman/registry/config.go b/cmd/podman/registry/config.go index b512ba341..f5822d33e 100644 --- a/cmd/podman/registry/config.go +++ b/cmd/podman/registry/config.go @@ -8,9 +8,9 @@ import ( "sync" "github.com/containers/common/pkg/config" - "github.com/containers/podman/v3/pkg/domain/entities" - "github.com/containers/podman/v3/pkg/rootless" - "github.com/containers/podman/v3/pkg/util" + "github.com/containers/podman/v4/pkg/domain/entities" + "github.com/containers/podman/v4/pkg/rootless" + "github.com/containers/podman/v4/pkg/util" "github.com/pkg/errors" ) diff --git a/cmd/podman/registry/registry.go b/cmd/podman/registry/registry.go index e1ab14297..3ea9b35f4 100644 --- a/cmd/podman/registry/registry.go +++ b/cmd/podman/registry/registry.go @@ -4,10 +4,10 @@ import ( "context" "path/filepath" - "github.com/containers/podman/v3/pkg/domain/entities" - "github.com/containers/podman/v3/pkg/domain/infra" - "github.com/containers/podman/v3/pkg/rootless" - "github.com/containers/podman/v3/pkg/util" + "github.com/containers/podman/v4/pkg/domain/entities" + "github.com/containers/podman/v4/pkg/domain/infra" + "github.com/containers/podman/v4/pkg/rootless" + "github.com/containers/podman/v4/pkg/util" "github.com/sirupsen/logrus" "github.com/spf13/cobra" ) diff --git a/cmd/podman/registry/remote.go b/cmd/podman/registry/remote.go index c78930574..f05d8f7b4 100644 --- a/cmd/podman/registry/remote.go +++ b/cmd/podman/registry/remote.go @@ -4,7 +4,7 @@ import ( "os" "sync" - "github.com/containers/podman/v3/pkg/domain/entities" + "github.com/containers/podman/v4/pkg/domain/entities" "github.com/spf13/cobra" "github.com/spf13/pflag" ) diff --git a/cmd/podman/root.go b/cmd/podman/root.go index 1de937ca5..7989f9cd5 100644 --- a/cmd/podman/root.go +++ b/cmd/podman/root.go @@ -11,15 +11,15 @@ import ( "github.com/containers/common/pkg/completion" "github.com/containers/common/pkg/config" - "github.com/containers/podman/v3/cmd/podman/common" - "github.com/containers/podman/v3/cmd/podman/registry" - "github.com/containers/podman/v3/cmd/podman/validate" - "github.com/containers/podman/v3/libpod/define" - "github.com/containers/podman/v3/pkg/checkpoint/crutils" - "github.com/containers/podman/v3/pkg/domain/entities" - "github.com/containers/podman/v3/pkg/parallel" - "github.com/containers/podman/v3/pkg/rootless" - "github.com/containers/podman/v3/version" + "github.com/containers/podman/v4/cmd/podman/common" + "github.com/containers/podman/v4/cmd/podman/registry" + "github.com/containers/podman/v4/cmd/podman/validate" + "github.com/containers/podman/v4/libpod/define" + "github.com/containers/podman/v4/pkg/checkpoint/crutils" + "github.com/containers/podman/v4/pkg/domain/entities" + "github.com/containers/podman/v4/pkg/parallel" + "github.com/containers/podman/v4/pkg/rootless" + "github.com/containers/podman/v4/version" "github.com/pkg/errors" "github.com/sirupsen/logrus" "github.com/spf13/cobra" diff --git a/cmd/podman/root_test.go b/cmd/podman/root_test.go index f2826a304..0a73afdc4 100644 --- a/cmd/podman/root_test.go +++ b/cmd/podman/root_test.go @@ -5,7 +5,7 @@ import ( "strings" "testing" - "github.com/containers/podman/v3/libpod/define" + "github.com/containers/podman/v4/libpod/define" "github.com/pkg/errors" ) diff --git a/cmd/podman/secrets/create.go b/cmd/podman/secrets/create.go index f9846f9fb..069e2a1dc 100644 --- a/cmd/podman/secrets/create.go +++ b/cmd/podman/secrets/create.go @@ -8,9 +8,9 @@ import ( "strings" "github.com/containers/common/pkg/completion" - "github.com/containers/podman/v3/cmd/podman/common" - "github.com/containers/podman/v3/cmd/podman/registry" - "github.com/containers/podman/v3/pkg/domain/entities" + "github.com/containers/podman/v4/cmd/podman/common" + "github.com/containers/podman/v4/cmd/podman/registry" + "github.com/containers/podman/v4/pkg/domain/entities" "github.com/pkg/errors" "github.com/spf13/cobra" ) diff --git a/cmd/podman/secrets/inspect.go b/cmd/podman/secrets/inspect.go index d0a5328d8..1948fef49 100644 --- a/cmd/podman/secrets/inspect.go +++ b/cmd/podman/secrets/inspect.go @@ -7,9 +7,9 @@ import ( "os" "github.com/containers/common/pkg/report" - "github.com/containers/podman/v3/cmd/podman/common" - "github.com/containers/podman/v3/cmd/podman/registry" - "github.com/containers/podman/v3/pkg/domain/entities" + "github.com/containers/podman/v4/cmd/podman/common" + "github.com/containers/podman/v4/cmd/podman/registry" + "github.com/containers/podman/v4/pkg/domain/entities" "github.com/pkg/errors" "github.com/spf13/cobra" ) diff --git a/cmd/podman/secrets/list.go b/cmd/podman/secrets/list.go index 2074ab973..2ef84cd48 100644 --- a/cmd/podman/secrets/list.go +++ b/cmd/podman/secrets/list.go @@ -7,11 +7,11 @@ import ( "github.com/containers/common/pkg/completion" "github.com/containers/common/pkg/report" - "github.com/containers/podman/v3/cmd/podman/common" - "github.com/containers/podman/v3/cmd/podman/parse" - "github.com/containers/podman/v3/cmd/podman/registry" - "github.com/containers/podman/v3/cmd/podman/validate" - "github.com/containers/podman/v3/pkg/domain/entities" + "github.com/containers/podman/v4/cmd/podman/common" + "github.com/containers/podman/v4/cmd/podman/parse" + "github.com/containers/podman/v4/cmd/podman/registry" + "github.com/containers/podman/v4/cmd/podman/validate" + "github.com/containers/podman/v4/pkg/domain/entities" "github.com/docker/go-units" "github.com/pkg/errors" "github.com/spf13/cobra" diff --git a/cmd/podman/secrets/rm.go b/cmd/podman/secrets/rm.go index dd3f5d9b9..3cf23ce3c 100644 --- a/cmd/podman/secrets/rm.go +++ b/cmd/podman/secrets/rm.go @@ -5,10 +5,10 @@ import ( "errors" "fmt" - "github.com/containers/podman/v3/cmd/podman/common" - "github.com/containers/podman/v3/cmd/podman/registry" - "github.com/containers/podman/v3/cmd/podman/utils" - "github.com/containers/podman/v3/pkg/domain/entities" + "github.com/containers/podman/v4/cmd/podman/common" + "github.com/containers/podman/v4/cmd/podman/registry" + "github.com/containers/podman/v4/cmd/podman/utils" + "github.com/containers/podman/v4/pkg/domain/entities" "github.com/spf13/cobra" ) diff --git a/cmd/podman/secrets/secret.go b/cmd/podman/secrets/secret.go index 610b331d1..9d012325e 100644 --- a/cmd/podman/secrets/secret.go +++ b/cmd/podman/secrets/secret.go @@ -1,8 +1,8 @@ package secrets import ( - "github.com/containers/podman/v3/cmd/podman/registry" - "github.com/containers/podman/v3/cmd/podman/validate" + "github.com/containers/podman/v4/cmd/podman/registry" + "github.com/containers/podman/v4/cmd/podman/validate" "github.com/spf13/cobra" ) diff --git a/cmd/podman/shell_completion_test.go b/cmd/podman/shell_completion_test.go index 792beeb19..f48899b63 100644 --- a/cmd/podman/shell_completion_test.go +++ b/cmd/podman/shell_completion_test.go @@ -6,7 +6,7 @@ function set. (except boolean, hidden and deprecated flags) Shell completion functions are defined in: - - "github.com/containers/podman/v3/cmd/podman/common/completion.go" + - "github.com/containers/podman/v4/cmd/podman/common/completion.go" - "github.com/containers/common/pkg/completion" and are called Autocomplete... diff --git a/cmd/podman/system/connection.go b/cmd/podman/system/connection.go index 1f8e8f13f..5164de78c 100644 --- a/cmd/podman/system/connection.go +++ b/cmd/podman/system/connection.go @@ -1,8 +1,8 @@ package system import ( - "github.com/containers/podman/v3/cmd/podman/registry" - "github.com/containers/podman/v3/cmd/podman/validate" + "github.com/containers/podman/v4/cmd/podman/registry" + "github.com/containers/podman/v4/cmd/podman/validate" "github.com/spf13/cobra" ) diff --git a/cmd/podman/system/connection/add.go b/cmd/podman/system/connection/add.go index ee237d7d0..324e02db4 100644 --- a/cmd/podman/system/connection/add.go +++ b/cmd/podman/system/connection/add.go @@ -12,10 +12,10 @@ import ( "github.com/containers/common/pkg/completion" "github.com/containers/common/pkg/config" - "github.com/containers/podman/v3/cmd/podman/registry" - "github.com/containers/podman/v3/cmd/podman/system" - "github.com/containers/podman/v3/libpod/define" - "github.com/containers/podman/v3/pkg/terminal" + "github.com/containers/podman/v4/cmd/podman/registry" + "github.com/containers/podman/v4/cmd/podman/system" + "github.com/containers/podman/v4/libpod/define" + "github.com/containers/podman/v4/pkg/terminal" "github.com/pkg/errors" "github.com/sirupsen/logrus" "github.com/spf13/cobra" diff --git a/cmd/podman/system/connection/default.go b/cmd/podman/system/connection/default.go index cfedc337b..c59ff36af 100644 --- a/cmd/podman/system/connection/default.go +++ b/cmd/podman/system/connection/default.go @@ -4,9 +4,9 @@ import ( "fmt" "github.com/containers/common/pkg/config" - "github.com/containers/podman/v3/cmd/podman/common" - "github.com/containers/podman/v3/cmd/podman/registry" - "github.com/containers/podman/v3/cmd/podman/system" + "github.com/containers/podman/v4/cmd/podman/common" + "github.com/containers/podman/v4/cmd/podman/registry" + "github.com/containers/podman/v4/cmd/podman/system" "github.com/spf13/cobra" ) diff --git a/cmd/podman/system/connection/list.go b/cmd/podman/system/connection/list.go index fbae1e4eb..fe37677df 100644 --- a/cmd/podman/system/connection/list.go +++ b/cmd/podman/system/connection/list.go @@ -8,10 +8,10 @@ import ( "github.com/containers/common/pkg/completion" "github.com/containers/common/pkg/config" "github.com/containers/common/pkg/report" - "github.com/containers/podman/v3/cmd/podman/common" - "github.com/containers/podman/v3/cmd/podman/registry" - "github.com/containers/podman/v3/cmd/podman/system" - "github.com/containers/podman/v3/cmd/podman/validate" + "github.com/containers/podman/v4/cmd/podman/common" + "github.com/containers/podman/v4/cmd/podman/registry" + "github.com/containers/podman/v4/cmd/podman/system" + "github.com/containers/podman/v4/cmd/podman/validate" "github.com/spf13/cobra" ) diff --git a/cmd/podman/system/connection/remove.go b/cmd/podman/system/connection/remove.go index ffbea76c5..84ec3e2ee 100644 --- a/cmd/podman/system/connection/remove.go +++ b/cmd/podman/system/connection/remove.go @@ -2,9 +2,9 @@ package connection import ( "github.com/containers/common/pkg/config" - "github.com/containers/podman/v3/cmd/podman/common" - "github.com/containers/podman/v3/cmd/podman/registry" - "github.com/containers/podman/v3/cmd/podman/system" + "github.com/containers/podman/v4/cmd/podman/common" + "github.com/containers/podman/v4/cmd/podman/registry" + "github.com/containers/podman/v4/cmd/podman/system" "github.com/pkg/errors" "github.com/spf13/cobra" ) diff --git a/cmd/podman/system/connection/rename.go b/cmd/podman/system/connection/rename.go index 898457d38..8a4552e5e 100644 --- a/cmd/podman/system/connection/rename.go +++ b/cmd/podman/system/connection/rename.go @@ -4,9 +4,9 @@ import ( "fmt" "github.com/containers/common/pkg/config" - "github.com/containers/podman/v3/cmd/podman/common" - "github.com/containers/podman/v3/cmd/podman/registry" - "github.com/containers/podman/v3/cmd/podman/system" + "github.com/containers/podman/v4/cmd/podman/common" + "github.com/containers/podman/v4/cmd/podman/registry" + "github.com/containers/podman/v4/cmd/podman/system" "github.com/spf13/cobra" ) diff --git a/cmd/podman/system/df.go b/cmd/podman/system/df.go index b65a1ca55..b2325507a 100644 --- a/cmd/podman/system/df.go +++ b/cmd/podman/system/df.go @@ -8,9 +8,9 @@ import ( "github.com/containers/common/pkg/completion" "github.com/containers/common/pkg/report" - "github.com/containers/podman/v3/cmd/podman/registry" - "github.com/containers/podman/v3/cmd/podman/validate" - "github.com/containers/podman/v3/pkg/domain/entities" + "github.com/containers/podman/v4/cmd/podman/registry" + "github.com/containers/podman/v4/cmd/podman/validate" + "github.com/containers/podman/v4/pkg/domain/entities" "github.com/docker/go-units" "github.com/spf13/cobra" ) diff --git a/cmd/podman/system/dial_stdio.go b/cmd/podman/system/dial_stdio.go index eae89f38e..f3445a49d 100644 --- a/cmd/podman/system/dial_stdio.go +++ b/cmd/podman/system/dial_stdio.go @@ -5,9 +5,9 @@ import ( "io" "os" - "github.com/containers/podman/v3/cmd/podman/registry" - "github.com/containers/podman/v3/cmd/podman/validate" - "github.com/containers/podman/v3/pkg/bindings" + "github.com/containers/podman/v4/cmd/podman/registry" + "github.com/containers/podman/v4/cmd/podman/validate" + "github.com/containers/podman/v4/pkg/bindings" "github.com/pkg/errors" "github.com/sirupsen/logrus" "github.com/spf13/cobra" diff --git a/cmd/podman/system/events.go b/cmd/podman/system/events.go index 881b9b8f4..2723adc43 100644 --- a/cmd/podman/system/events.go +++ b/cmd/podman/system/events.go @@ -7,11 +7,11 @@ import ( "github.com/containers/common/pkg/completion" "github.com/containers/common/pkg/report" - "github.com/containers/podman/v3/cmd/podman/common" - "github.com/containers/podman/v3/cmd/podman/registry" - "github.com/containers/podman/v3/cmd/podman/validate" - "github.com/containers/podman/v3/libpod/events" - "github.com/containers/podman/v3/pkg/domain/entities" + "github.com/containers/podman/v4/cmd/podman/common" + "github.com/containers/podman/v4/cmd/podman/registry" + "github.com/containers/podman/v4/cmd/podman/validate" + "github.com/containers/podman/v4/libpod/events" + "github.com/containers/podman/v4/pkg/domain/entities" "github.com/spf13/cobra" ) diff --git a/cmd/podman/system/info.go b/cmd/podman/system/info.go index c323ee276..e95e9336d 100644 --- a/cmd/podman/system/info.go +++ b/cmd/podman/system/info.go @@ -7,10 +7,10 @@ import ( "github.com/containers/common/pkg/completion" "github.com/containers/common/pkg/report" - "github.com/containers/podman/v3/cmd/podman/common" - "github.com/containers/podman/v3/cmd/podman/registry" - "github.com/containers/podman/v3/cmd/podman/validate" - "github.com/containers/podman/v3/libpod/define" + "github.com/containers/podman/v4/cmd/podman/common" + "github.com/containers/podman/v4/cmd/podman/registry" + "github.com/containers/podman/v4/cmd/podman/validate" + "github.com/containers/podman/v4/libpod/define" "github.com/ghodss/yaml" "github.com/spf13/cobra" ) diff --git a/cmd/podman/system/migrate.go b/cmd/podman/system/migrate.go index d78ac7286..c6b6546e7 100644 --- a/cmd/podman/system/migrate.go +++ b/cmd/podman/system/migrate.go @@ -7,11 +7,11 @@ import ( "os" "github.com/containers/common/pkg/completion" - "github.com/containers/podman/v3/cmd/podman/registry" - "github.com/containers/podman/v3/cmd/podman/validate" - "github.com/containers/podman/v3/libpod/define" - "github.com/containers/podman/v3/pkg/domain/entities" - "github.com/containers/podman/v3/pkg/domain/infra" + "github.com/containers/podman/v4/cmd/podman/registry" + "github.com/containers/podman/v4/cmd/podman/validate" + "github.com/containers/podman/v4/libpod/define" + "github.com/containers/podman/v4/pkg/domain/entities" + "github.com/containers/podman/v4/pkg/domain/infra" "github.com/spf13/cobra" ) diff --git a/cmd/podman/system/prune.go b/cmd/podman/system/prune.go index 5565ea2f9..ff78f93bb 100644 --- a/cmd/podman/system/prune.go +++ b/cmd/podman/system/prune.go @@ -8,12 +8,12 @@ import ( "strings" "github.com/containers/common/pkg/completion" - "github.com/containers/podman/v3/cmd/podman/common" - "github.com/containers/podman/v3/cmd/podman/parse" - "github.com/containers/podman/v3/cmd/podman/registry" - "github.com/containers/podman/v3/cmd/podman/utils" - "github.com/containers/podman/v3/cmd/podman/validate" - "github.com/containers/podman/v3/pkg/domain/entities" + "github.com/containers/podman/v4/cmd/podman/common" + "github.com/containers/podman/v4/cmd/podman/parse" + "github.com/containers/podman/v4/cmd/podman/registry" + "github.com/containers/podman/v4/cmd/podman/utils" + "github.com/containers/podman/v4/cmd/podman/validate" + "github.com/containers/podman/v4/pkg/domain/entities" "github.com/docker/go-units" "github.com/spf13/cobra" ) diff --git a/cmd/podman/system/renumber.go b/cmd/podman/system/renumber.go index f27abf570..b310dc607 100644 --- a/cmd/podman/system/renumber.go +++ b/cmd/podman/system/renumber.go @@ -7,11 +7,11 @@ import ( "os" "github.com/containers/common/pkg/completion" - "github.com/containers/podman/v3/cmd/podman/registry" - "github.com/containers/podman/v3/cmd/podman/validate" - "github.com/containers/podman/v3/libpod/define" - "github.com/containers/podman/v3/pkg/domain/entities" - "github.com/containers/podman/v3/pkg/domain/infra" + "github.com/containers/podman/v4/cmd/podman/registry" + "github.com/containers/podman/v4/cmd/podman/validate" + "github.com/containers/podman/v4/libpod/define" + "github.com/containers/podman/v4/pkg/domain/entities" + "github.com/containers/podman/v4/pkg/domain/infra" "github.com/spf13/cobra" ) diff --git a/cmd/podman/system/reset.go b/cmd/podman/system/reset.go index 8a05bb09f..85ee8557a 100644 --- a/cmd/podman/system/reset.go +++ b/cmd/podman/system/reset.go @@ -9,11 +9,11 @@ import ( "strings" "github.com/containers/common/pkg/completion" - "github.com/containers/podman/v3/cmd/podman/registry" - "github.com/containers/podman/v3/cmd/podman/validate" - "github.com/containers/podman/v3/libpod/define" - "github.com/containers/podman/v3/pkg/domain/entities" - "github.com/containers/podman/v3/pkg/domain/infra" + "github.com/containers/podman/v4/cmd/podman/registry" + "github.com/containers/podman/v4/cmd/podman/validate" + "github.com/containers/podman/v4/libpod/define" + "github.com/containers/podman/v4/pkg/domain/entities" + "github.com/containers/podman/v4/pkg/domain/infra" "github.com/sirupsen/logrus" "github.com/spf13/cobra" ) diff --git a/cmd/podman/system/service.go b/cmd/podman/system/service.go index 41d20d9fd..daf252401 100644 --- a/cmd/podman/system/service.go +++ b/cmd/podman/system/service.go @@ -10,12 +10,12 @@ import ( "time" "github.com/containers/common/pkg/completion" - "github.com/containers/podman/v3/cmd/podman/common" - "github.com/containers/podman/v3/cmd/podman/registry" - "github.com/containers/podman/v3/pkg/domain/entities" - "github.com/containers/podman/v3/pkg/rootless" - "github.com/containers/podman/v3/pkg/systemd" - "github.com/containers/podman/v3/pkg/util" + "github.com/containers/podman/v4/cmd/podman/common" + "github.com/containers/podman/v4/cmd/podman/registry" + "github.com/containers/podman/v4/pkg/domain/entities" + "github.com/containers/podman/v4/pkg/rootless" + "github.com/containers/podman/v4/pkg/systemd" + "github.com/containers/podman/v4/pkg/util" "github.com/sirupsen/logrus" "github.com/spf13/cobra" "github.com/spf13/pflag" diff --git a/cmd/podman/system/service_abi.go b/cmd/podman/system/service_abi.go index b9bd7538f..560cce847 100644 --- a/cmd/podman/system/service_abi.go +++ b/cmd/podman/system/service_abi.go @@ -9,11 +9,11 @@ import ( "os" "path/filepath" - api "github.com/containers/podman/v3/pkg/api/server" - "github.com/containers/podman/v3/pkg/domain/entities" - "github.com/containers/podman/v3/pkg/domain/infra" - "github.com/containers/podman/v3/pkg/servicereaper" - "github.com/containers/podman/v3/pkg/util" + api "github.com/containers/podman/v4/pkg/api/server" + "github.com/containers/podman/v4/pkg/domain/entities" + "github.com/containers/podman/v4/pkg/domain/infra" + "github.com/containers/podman/v4/pkg/servicereaper" + "github.com/containers/podman/v4/pkg/util" "github.com/pkg/errors" "github.com/sirupsen/logrus" "github.com/spf13/pflag" diff --git a/cmd/podman/system/system.go b/cmd/podman/system/system.go index 1947decaf..a30bb5ab2 100644 --- a/cmd/podman/system/system.go +++ b/cmd/podman/system/system.go @@ -1,8 +1,8 @@ package system import ( - "github.com/containers/podman/v3/cmd/podman/registry" - "github.com/containers/podman/v3/cmd/podman/validate" + "github.com/containers/podman/v4/cmd/podman/registry" + "github.com/containers/podman/v4/cmd/podman/validate" "github.com/spf13/cobra" ) diff --git a/cmd/podman/system/unshare.go b/cmd/podman/system/unshare.go index 9b777dd8f..0ae5b81ad 100644 --- a/cmd/podman/system/unshare.go +++ b/cmd/podman/system/unshare.go @@ -5,9 +5,9 @@ import ( "os/exec" "github.com/containers/common/pkg/completion" - "github.com/containers/podman/v3/cmd/podman/registry" - "github.com/containers/podman/v3/pkg/domain/entities" - "github.com/containers/podman/v3/pkg/rootless" + "github.com/containers/podman/v4/cmd/podman/registry" + "github.com/containers/podman/v4/pkg/domain/entities" + "github.com/containers/podman/v4/pkg/rootless" "github.com/pkg/errors" "github.com/spf13/cobra" "github.com/spf13/pflag" diff --git a/cmd/podman/system/version.go b/cmd/podman/system/version.go index 521bb8774..6239482b5 100644 --- a/cmd/podman/system/version.go +++ b/cmd/podman/system/version.go @@ -8,10 +8,10 @@ import ( "github.com/containers/common/pkg/completion" "github.com/containers/common/pkg/report" - "github.com/containers/podman/v3/cmd/podman/common" - "github.com/containers/podman/v3/cmd/podman/registry" - "github.com/containers/podman/v3/cmd/podman/validate" - "github.com/containers/podman/v3/pkg/domain/entities" + "github.com/containers/podman/v4/cmd/podman/common" + "github.com/containers/podman/v4/cmd/podman/registry" + "github.com/containers/podman/v4/cmd/podman/validate" + "github.com/containers/podman/v4/pkg/domain/entities" "github.com/spf13/cobra" ) diff --git a/cmd/podman/utils/utils.go b/cmd/podman/utils/utils.go index e38c9d49c..6fd6647d0 100644 --- a/cmd/podman/utils/utils.go +++ b/cmd/podman/utils/utils.go @@ -4,8 +4,8 @@ import ( "fmt" "os" - "github.com/containers/podman/v3/pkg/domain/entities" - "github.com/containers/podman/v3/pkg/domain/entities/reports" + "github.com/containers/podman/v4/pkg/domain/entities" + "github.com/containers/podman/v4/pkg/domain/entities/reports" ) // IsDir returns true if the specified path refers to a directory. diff --git a/cmd/podman/validate/args.go b/cmd/podman/validate/args.go index 6b5425a69..1642e2280 100644 --- a/cmd/podman/validate/args.go +++ b/cmd/podman/validate/args.go @@ -5,7 +5,7 @@ import ( "strconv" "strings" - "github.com/containers/podman/v3/cmd/podman/registry" + "github.com/containers/podman/v4/cmd/podman/registry" "github.com/pkg/errors" "github.com/spf13/cobra" ) diff --git a/cmd/podman/validate/latest.go b/cmd/podman/validate/latest.go index 8937074b5..a340d30a8 100644 --- a/cmd/podman/validate/latest.go +++ b/cmd/podman/validate/latest.go @@ -1,7 +1,7 @@ package validate import ( - "github.com/containers/podman/v3/cmd/podman/registry" + "github.com/containers/podman/v4/cmd/podman/registry" "github.com/spf13/cobra" ) diff --git a/cmd/podman/volumes/create.go b/cmd/podman/volumes/create.go index 70373d69d..1668c72de 100644 --- a/cmd/podman/volumes/create.go +++ b/cmd/podman/volumes/create.go @@ -5,9 +5,9 @@ import ( "fmt" "github.com/containers/common/pkg/completion" - "github.com/containers/podman/v3/cmd/podman/parse" - "github.com/containers/podman/v3/cmd/podman/registry" - "github.com/containers/podman/v3/pkg/domain/entities" + "github.com/containers/podman/v4/cmd/podman/parse" + "github.com/containers/podman/v4/cmd/podman/registry" + "github.com/containers/podman/v4/pkg/domain/entities" "github.com/pkg/errors" "github.com/spf13/cobra" ) diff --git a/cmd/podman/volumes/exists.go b/cmd/podman/volumes/exists.go index 85bbcb29a..3cac27220 100644 --- a/cmd/podman/volumes/exists.go +++ b/cmd/podman/volumes/exists.go @@ -1,8 +1,8 @@ package volumes import ( - "github.com/containers/podman/v3/cmd/podman/common" - "github.com/containers/podman/v3/cmd/podman/registry" + "github.com/containers/podman/v4/cmd/podman/common" + "github.com/containers/podman/v4/cmd/podman/registry" "github.com/spf13/cobra" ) diff --git a/cmd/podman/volumes/export.go b/cmd/podman/volumes/export.go index 9e4fecdfa..1011604de 100644 --- a/cmd/podman/volumes/export.go +++ b/cmd/podman/volumes/export.go @@ -5,11 +5,11 @@ import ( "fmt" "github.com/containers/common/pkg/completion" - "github.com/containers/podman/v3/cmd/podman/common" - "github.com/containers/podman/v3/cmd/podman/inspect" - "github.com/containers/podman/v3/cmd/podman/registry" - "github.com/containers/podman/v3/pkg/domain/entities" - "github.com/containers/podman/v3/utils" + "github.com/containers/podman/v4/cmd/podman/common" + "github.com/containers/podman/v4/cmd/podman/inspect" + "github.com/containers/podman/v4/cmd/podman/registry" + "github.com/containers/podman/v4/pkg/domain/entities" + "github.com/containers/podman/v4/utils" "github.com/pkg/errors" "github.com/sirupsen/logrus" "github.com/spf13/cobra" diff --git a/cmd/podman/volumes/import.go b/cmd/podman/volumes/import.go index 441bd0fe4..9ff17e5b1 100644 --- a/cmd/podman/volumes/import.go +++ b/cmd/podman/volumes/import.go @@ -4,12 +4,12 @@ import ( "fmt" "os" - "github.com/containers/podman/v3/cmd/podman/common" - "github.com/containers/podman/v3/cmd/podman/inspect" - "github.com/containers/podman/v3/cmd/podman/parse" - "github.com/containers/podman/v3/cmd/podman/registry" - "github.com/containers/podman/v3/pkg/domain/entities" - "github.com/containers/podman/v3/utils" + "github.com/containers/podman/v4/cmd/podman/common" + "github.com/containers/podman/v4/cmd/podman/inspect" + "github.com/containers/podman/v4/cmd/podman/parse" + "github.com/containers/podman/v4/cmd/podman/registry" + "github.com/containers/podman/v4/pkg/domain/entities" + "github.com/containers/podman/v4/utils" "github.com/pkg/errors" "github.com/spf13/cobra" ) diff --git a/cmd/podman/volumes/inspect.go b/cmd/podman/volumes/inspect.go index 7510f8a1c..2230a2818 100644 --- a/cmd/podman/volumes/inspect.go +++ b/cmd/podman/volumes/inspect.go @@ -1,11 +1,11 @@ package volumes import ( - "github.com/containers/podman/v3/cmd/podman/common" - "github.com/containers/podman/v3/cmd/podman/inspect" - "github.com/containers/podman/v3/cmd/podman/registry" - "github.com/containers/podman/v3/libpod/define" - "github.com/containers/podman/v3/pkg/domain/entities" + "github.com/containers/podman/v4/cmd/podman/common" + "github.com/containers/podman/v4/cmd/podman/inspect" + "github.com/containers/podman/v4/cmd/podman/registry" + "github.com/containers/podman/v4/libpod/define" + "github.com/containers/podman/v4/pkg/domain/entities" "github.com/pkg/errors" "github.com/spf13/cobra" ) diff --git a/cmd/podman/volumes/list.go b/cmd/podman/volumes/list.go index 97fa2c61f..2edf04097 100644 --- a/cmd/podman/volumes/list.go +++ b/cmd/podman/volumes/list.go @@ -7,12 +7,12 @@ import ( "github.com/containers/common/pkg/completion" "github.com/containers/common/pkg/report" - "github.com/containers/podman/v3/cmd/podman/common" - "github.com/containers/podman/v3/cmd/podman/parse" - "github.com/containers/podman/v3/cmd/podman/registry" - "github.com/containers/podman/v3/cmd/podman/validate" - "github.com/containers/podman/v3/libpod/define" - "github.com/containers/podman/v3/pkg/domain/entities" + "github.com/containers/podman/v4/cmd/podman/common" + "github.com/containers/podman/v4/cmd/podman/parse" + "github.com/containers/podman/v4/cmd/podman/registry" + "github.com/containers/podman/v4/cmd/podman/validate" + "github.com/containers/podman/v4/libpod/define" + "github.com/containers/podman/v4/pkg/domain/entities" "github.com/pkg/errors" "github.com/spf13/cobra" ) diff --git a/cmd/podman/volumes/prune.go b/cmd/podman/volumes/prune.go index 43b529768..b821df8be 100644 --- a/cmd/podman/volumes/prune.go +++ b/cmd/podman/volumes/prune.go @@ -8,12 +8,12 @@ import ( "strings" "github.com/containers/common/pkg/completion" - "github.com/containers/podman/v3/cmd/podman/common" - "github.com/containers/podman/v3/cmd/podman/parse" - "github.com/containers/podman/v3/cmd/podman/registry" - "github.com/containers/podman/v3/cmd/podman/utils" - "github.com/containers/podman/v3/cmd/podman/validate" - "github.com/containers/podman/v3/pkg/domain/entities" + "github.com/containers/podman/v4/cmd/podman/common" + "github.com/containers/podman/v4/cmd/podman/parse" + "github.com/containers/podman/v4/cmd/podman/registry" + "github.com/containers/podman/v4/cmd/podman/utils" + "github.com/containers/podman/v4/cmd/podman/validate" + "github.com/containers/podman/v4/pkg/domain/entities" "github.com/spf13/cobra" ) diff --git a/cmd/podman/volumes/rm.go b/cmd/podman/volumes/rm.go index fd5df20b7..2012b7d3a 100644 --- a/cmd/podman/volumes/rm.go +++ b/cmd/podman/volumes/rm.go @@ -6,11 +6,11 @@ import ( "strings" "github.com/containers/common/pkg/completion" - "github.com/containers/podman/v3/cmd/podman/common" - "github.com/containers/podman/v3/cmd/podman/registry" - "github.com/containers/podman/v3/cmd/podman/utils" - "github.com/containers/podman/v3/libpod/define" - "github.com/containers/podman/v3/pkg/domain/entities" + "github.com/containers/podman/v4/cmd/podman/common" + "github.com/containers/podman/v4/cmd/podman/registry" + "github.com/containers/podman/v4/cmd/podman/utils" + "github.com/containers/podman/v4/libpod/define" + "github.com/containers/podman/v4/pkg/domain/entities" "github.com/pkg/errors" "github.com/spf13/cobra" ) diff --git a/cmd/podman/volumes/volume.go b/cmd/podman/volumes/volume.go index 2f06abd4e..1ba1f2686 100644 --- a/cmd/podman/volumes/volume.go +++ b/cmd/podman/volumes/volume.go @@ -1,9 +1,9 @@ package volumes import ( - "github.com/containers/podman/v3/cmd/podman/registry" - "github.com/containers/podman/v3/cmd/podman/validate" - "github.com/containers/podman/v3/pkg/util" + "github.com/containers/podman/v4/cmd/podman/registry" + "github.com/containers/podman/v4/cmd/podman/validate" + "github.com/containers/podman/v4/pkg/util" "github.com/spf13/cobra" ) diff --git a/cmd/rootlessport/main.go b/cmd/rootlessport/main.go index 8ac4fe1be..37e91fca8 100644 --- a/cmd/rootlessport/main.go +++ b/cmd/rootlessport/main.go @@ -14,7 +14,7 @@ import ( "github.com/containernetworking/plugins/pkg/ns" "github.com/containers/common/libnetwork/types" - "github.com/containers/podman/v3/pkg/rootlessport" + "github.com/containers/podman/v4/pkg/rootlessport" "github.com/pkg/errors" rkport "github.com/rootless-containers/rootlesskit/pkg/port" rkbuiltin "github.com/rootless-containers/rootlesskit/pkg/port/builtin" @@ -1,4 +1,4 @@ -module github.com/containers/podman/v3 +module github.com/containers/podman/v4 go 1.16 diff --git a/hack/podman-registry-go/registry.go b/hack/podman-registry-go/registry.go index 92e3008f3..143a83fa1 100644 --- a/hack/podman-registry-go/registry.go +++ b/hack/podman-registry-go/registry.go @@ -3,7 +3,7 @@ package registry import ( "strings" - "github.com/containers/podman/v3/utils" + "github.com/containers/podman/v4/utils" "github.com/pkg/errors" "github.com/sirupsen/logrus" ) diff --git a/libpod/boltdb_state.go b/libpod/boltdb_state.go index 68e35f79f..6389431ab 100644 --- a/libpod/boltdb_state.go +++ b/libpod/boltdb_state.go @@ -9,7 +9,7 @@ import ( "sync" "github.com/containers/common/libnetwork/types" - "github.com/containers/podman/v3/libpod/define" + "github.com/containers/podman/v4/libpod/define" jsoniter "github.com/json-iterator/go" "github.com/pkg/errors" "github.com/sirupsen/logrus" diff --git a/libpod/boltdb_state_internal.go b/libpod/boltdb_state_internal.go index 5f0f6ba7d..e43226490 100644 --- a/libpod/boltdb_state_internal.go +++ b/libpod/boltdb_state_internal.go @@ -7,8 +7,8 @@ import ( "runtime" "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" "github.com/containers/storage" "github.com/pkg/errors" "github.com/sirupsen/logrus" diff --git a/libpod/boltdb_state_linux.go b/libpod/boltdb_state_linux.go index 4fb3236a0..63ce9784e 100644 --- a/libpod/boltdb_state_linux.go +++ b/libpod/boltdb_state_linux.go @@ -3,7 +3,7 @@ package libpod import ( - "github.com/containers/podman/v3/libpod/define" + "github.com/containers/podman/v4/libpod/define" "github.com/pkg/errors" "github.com/sirupsen/logrus" ) diff --git a/libpod/common_test.go b/libpod/common_test.go index d64168284..61bba031e 100644 --- a/libpod/common_test.go +++ b/libpod/common_test.go @@ -9,8 +9,8 @@ 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/libpod/lock" + "github.com/containers/podman/v4/libpod/define" + "github.com/containers/podman/v4/libpod/lock" "github.com/opencontainers/runtime-tools/generate" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/libpod/container.go b/libpod/container.go index 51a3ffd3d..e280b87a8 100644 --- a/libpod/container.go +++ b/libpod/container.go @@ -15,8 +15,8 @@ import ( "github.com/containers/common/pkg/config" "github.com/containers/common/pkg/secrets" "github.com/containers/image/v5/manifest" - "github.com/containers/podman/v3/libpod/define" - "github.com/containers/podman/v3/libpod/lock" + "github.com/containers/podman/v4/libpod/define" + "github.com/containers/podman/v4/libpod/lock" "github.com/containers/storage" spec "github.com/opencontainers/runtime-spec/specs-go" "github.com/pkg/errors" diff --git a/libpod/container_api.go b/libpod/container_api.go index 7ae9f497c..03b3dcc04 100644 --- a/libpod/container_api.go +++ b/libpod/container_api.go @@ -9,9 +9,9 @@ import ( "sync" "time" - "github.com/containers/podman/v3/libpod/define" - "github.com/containers/podman/v3/libpod/events" - "github.com/containers/podman/v3/pkg/signal" + "github.com/containers/podman/v4/libpod/define" + "github.com/containers/podman/v4/libpod/events" + "github.com/containers/podman/v4/pkg/signal" "github.com/containers/storage/pkg/archive" "github.com/pkg/errors" "github.com/sirupsen/logrus" diff --git a/libpod/container_commit.go b/libpod/container_commit.go index 6ae225cbc..99d08ccf1 100644 --- a/libpod/container_commit.go +++ b/libpod/container_commit.go @@ -9,9 +9,9 @@ import ( "github.com/containers/common/libimage" is "github.com/containers/image/v5/storage" "github.com/containers/image/v5/types" - "github.com/containers/podman/v3/libpod/define" - "github.com/containers/podman/v3/libpod/events" - libpodutil "github.com/containers/podman/v3/pkg/util" + "github.com/containers/podman/v4/libpod/define" + "github.com/containers/podman/v4/libpod/events" + libpodutil "github.com/containers/podman/v4/pkg/util" "github.com/pkg/errors" "github.com/sirupsen/logrus" ) diff --git a/libpod/container_config.go b/libpod/container_config.go index 725e27c2a..d5374aaaf 100644 --- a/libpod/container_config.go +++ b/libpod/container_config.go @@ -7,7 +7,7 @@ import ( "github.com/containers/common/libnetwork/types" "github.com/containers/common/pkg/secrets" "github.com/containers/image/v5/manifest" - "github.com/containers/podman/v3/pkg/namespaces" + "github.com/containers/podman/v4/pkg/namespaces" "github.com/containers/storage" spec "github.com/opencontainers/runtime-spec/specs-go" ) diff --git a/libpod/container_copy_linux.go b/libpod/container_copy_linux.go index 954d54a1d..d16d635b7 100644 --- a/libpod/container_copy_linux.go +++ b/libpod/container_copy_linux.go @@ -13,8 +13,8 @@ import ( buildahCopiah "github.com/containers/buildah/copier" "github.com/containers/buildah/pkg/chrootuser" "github.com/containers/buildah/util" - "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" "github.com/containers/storage/pkg/archive" "github.com/containers/storage/pkg/idtools" "github.com/opencontainers/runtime-spec/specs-go" diff --git a/libpod/container_exec.go b/libpod/container_exec.go index f99fb7d3f..7d4e28d5d 100644 --- a/libpod/container_exec.go +++ b/libpod/container_exec.go @@ -9,8 +9,8 @@ import ( "strconv" "time" - "github.com/containers/podman/v3/libpod/define" - "github.com/containers/podman/v3/libpod/events" + "github.com/containers/podman/v4/libpod/define" + "github.com/containers/podman/v4/libpod/events" "github.com/containers/storage/pkg/stringid" "github.com/pkg/errors" "github.com/sirupsen/logrus" diff --git a/libpod/container_graph.go b/libpod/container_graph.go index 32fb264f1..eeb0f02fa 100644 --- a/libpod/container_graph.go +++ b/libpod/container_graph.go @@ -4,7 +4,7 @@ import ( "context" "strings" - "github.com/containers/podman/v3/libpod/define" + "github.com/containers/podman/v4/libpod/define" "github.com/pkg/errors" "github.com/sirupsen/logrus" ) diff --git a/libpod/container_graph_test.go b/libpod/container_graph_test.go index 7ad7359bb..7a265ecae 100644 --- a/libpod/container_graph_test.go +++ b/libpod/container_graph_test.go @@ -3,7 +3,7 @@ package libpod import ( "testing" - "github.com/containers/podman/v3/libpod/lock" + "github.com/containers/podman/v4/libpod/lock" "github.com/stretchr/testify/assert" ) diff --git a/libpod/container_inspect.go b/libpod/container_inspect.go index 086d51f04..5389d05a4 100644 --- a/libpod/container_inspect.go +++ b/libpod/container_inspect.go @@ -6,9 +6,9 @@ import ( "strings" "github.com/containers/common/pkg/config" - "github.com/containers/podman/v3/libpod/define" - "github.com/containers/podman/v3/libpod/driver" - "github.com/containers/podman/v3/pkg/util" + "github.com/containers/podman/v4/libpod/define" + "github.com/containers/podman/v4/libpod/driver" + "github.com/containers/podman/v4/pkg/util" "github.com/containers/storage/types" units "github.com/docker/go-units" spec "github.com/opencontainers/runtime-spec/specs-go" diff --git a/libpod/container_internal.go b/libpod/container_internal.go index d0c8ccc4c..51533b3bf 100644 --- a/libpod/container_internal.go +++ b/libpod/container_internal.go @@ -19,15 +19,15 @@ import ( butil "github.com/containers/buildah/util" "github.com/containers/common/pkg/cgroups" "github.com/containers/common/pkg/chown" - "github.com/containers/podman/v3/libpod/define" - "github.com/containers/podman/v3/libpod/events" - "github.com/containers/podman/v3/pkg/ctime" - "github.com/containers/podman/v3/pkg/hooks" - "github.com/containers/podman/v3/pkg/hooks/exec" - "github.com/containers/podman/v3/pkg/lookup" - "github.com/containers/podman/v3/pkg/rootless" - "github.com/containers/podman/v3/pkg/selinux" - "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/ctime" + "github.com/containers/podman/v4/pkg/hooks" + "github.com/containers/podman/v4/pkg/hooks/exec" + "github.com/containers/podman/v4/pkg/lookup" + "github.com/containers/podman/v4/pkg/rootless" + "github.com/containers/podman/v4/pkg/selinux" + "github.com/containers/podman/v4/pkg/util" "github.com/containers/storage" "github.com/containers/storage/pkg/archive" "github.com/containers/storage/pkg/idtools" diff --git a/libpod/container_internal_linux.go b/libpod/container_internal_linux.go index 0f89daab0..84293ccb2 100644 --- a/libpod/container_internal_linux.go +++ b/libpod/container_internal_linux.go @@ -34,17 +34,17 @@ import ( "github.com/containers/common/pkg/config" "github.com/containers/common/pkg/subscriptions" "github.com/containers/common/pkg/umask" - "github.com/containers/podman/v3/libpod/define" - "github.com/containers/podman/v3/libpod/events" - "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/lookup" - "github.com/containers/podman/v3/pkg/resolvconf" - "github.com/containers/podman/v3/pkg/rootless" - "github.com/containers/podman/v3/pkg/util" - "github.com/containers/podman/v3/utils" - "github.com/containers/podman/v3/version" + "github.com/containers/podman/v4/libpod/define" + "github.com/containers/podman/v4/libpod/events" + "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/lookup" + "github.com/containers/podman/v4/pkg/resolvconf" + "github.com/containers/podman/v4/pkg/rootless" + "github.com/containers/podman/v4/pkg/util" + "github.com/containers/podman/v4/utils" + "github.com/containers/podman/v4/version" "github.com/containers/storage/pkg/archive" "github.com/containers/storage/pkg/idtools" securejoin "github.com/cyphar/filepath-securejoin" diff --git a/libpod/container_internal_linux_test.go b/libpod/container_internal_linux_test.go index 899f9bffd..a7dd0fc31 100644 --- a/libpod/container_internal_linux_test.go +++ b/libpod/container_internal_linux_test.go @@ -8,7 +8,7 @@ import ( "os" "testing" - "github.com/containers/podman/v3/pkg/namespaces" + "github.com/containers/podman/v4/pkg/namespaces" spec "github.com/opencontainers/runtime-spec/specs-go" "github.com/stretchr/testify/assert" ) diff --git a/libpod/container_log.go b/libpod/container_log.go index 18840bff2..47877951d 100644 --- a/libpod/container_log.go +++ b/libpod/container_log.go @@ -6,9 +6,9 @@ import ( "os" "time" - "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/v4/libpod/define" + "github.com/containers/podman/v4/libpod/events" + "github.com/containers/podman/v4/libpod/logs" "github.com/hpcloud/tail/watch" "github.com/pkg/errors" "github.com/sirupsen/logrus" diff --git a/libpod/container_log_linux.go b/libpod/container_log_linux.go index d3d7c8397..6b7cb4aa6 100644 --- a/libpod/container_log_linux.go +++ b/libpod/container_log_linux.go @@ -9,9 +9,9 @@ import ( "strings" "time" - "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/v4/libpod/define" + "github.com/containers/podman/v4/libpod/events" + "github.com/containers/podman/v4/libpod/logs" "github.com/coreos/go-systemd/v22/journal" "github.com/coreos/go-systemd/v22/sdjournal" "github.com/pkg/errors" diff --git a/libpod/container_log_unsupported.go b/libpod/container_log_unsupported.go index a551df942..f9ca26966 100644 --- a/libpod/container_log_unsupported.go +++ b/libpod/container_log_unsupported.go @@ -5,8 +5,8 @@ package libpod import ( "context" - "github.com/containers/podman/v3/libpod/define" - "github.com/containers/podman/v3/libpod/logs" + "github.com/containers/podman/v4/libpod/define" + "github.com/containers/podman/v4/libpod/logs" "github.com/pkg/errors" ) diff --git a/libpod/container_stat_linux.go b/libpod/container_stat_linux.go index 0b4d9e2df..d90684197 100644 --- a/libpod/container_stat_linux.go +++ b/libpod/container_stat_linux.go @@ -9,8 +9,8 @@ import ( "strings" "github.com/containers/buildah/copier" - "github.com/containers/podman/v3/libpod/define" - "github.com/containers/podman/v3/pkg/copy" + "github.com/containers/podman/v4/libpod/define" + "github.com/containers/podman/v4/pkg/copy" "github.com/pkg/errors" ) diff --git a/libpod/container_top_linux.go b/libpod/container_top_linux.go index d4f4ddfc1..41300a708 100644 --- a/libpod/container_top_linux.go +++ b/libpod/container_top_linux.go @@ -9,8 +9,8 @@ import ( "strconv" "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" "github.com/containers/psgo" "github.com/google/shlex" "github.com/pkg/errors" diff --git a/libpod/container_validate.go b/libpod/container_validate.go index 492225401..c6c9a4c6d 100644 --- a/libpod/container_validate.go +++ b/libpod/container_validate.go @@ -1,7 +1,7 @@ package libpod import ( - "github.com/containers/podman/v3/libpod/define" + "github.com/containers/podman/v4/libpod/define" spec "github.com/opencontainers/runtime-spec/specs-go" "github.com/pkg/errors" ) diff --git a/libpod/define/version.go b/libpod/define/version.go index 5249b5d84..039b0ff27 100644 --- a/libpod/define/version.go +++ b/libpod/define/version.go @@ -5,7 +5,7 @@ import ( "strconv" "time" - "github.com/containers/podman/v3/version" + "github.com/containers/podman/v4/version" ) // Overwritten at build time diff --git a/libpod/diff.go b/libpod/diff.go index 6a50bef32..794b26b48 100644 --- a/libpod/diff.go +++ b/libpod/diff.go @@ -1,8 +1,8 @@ package libpod import ( - "github.com/containers/podman/v3/libpod/define" - "github.com/containers/podman/v3/libpod/layers" + "github.com/containers/podman/v4/libpod/define" + "github.com/containers/podman/v4/libpod/layers" "github.com/containers/storage/pkg/archive" "github.com/pkg/errors" ) diff --git a/libpod/driver/driver.go b/libpod/driver/driver.go index 6fe2cf8ac..8694685ff 100644 --- a/libpod/driver/driver.go +++ b/libpod/driver/driver.go @@ -1,7 +1,7 @@ package driver import ( - "github.com/containers/podman/v3/libpod/define" + "github.com/containers/podman/v4/libpod/define" "github.com/containers/storage" ) diff --git a/libpod/events.go b/libpod/events.go index 342af02d2..d6595180a 100644 --- a/libpod/events.go +++ b/libpod/events.go @@ -5,7 +5,7 @@ import ( "fmt" "sync" - "github.com/containers/podman/v3/libpod/events" + "github.com/containers/podman/v4/libpod/events" "github.com/pkg/errors" "github.com/sirupsen/logrus" ) diff --git a/libpod/events/filters.go b/libpod/events/filters.go index d5e2b81f3..64c162db2 100644 --- a/libpod/events/filters.go +++ b/libpod/events/filters.go @@ -4,7 +4,7 @@ import ( "strings" "time" - "github.com/containers/podman/v3/pkg/util" + "github.com/containers/podman/v4/pkg/util" "github.com/pkg/errors" ) diff --git a/libpod/events/journal_linux.go b/libpod/events/journal_linux.go index 72e03355a..cc63df120 100644 --- a/libpod/events/journal_linux.go +++ b/libpod/events/journal_linux.go @@ -8,7 +8,7 @@ import ( "strconv" "time" - "github.com/containers/podman/v3/pkg/util" + "github.com/containers/podman/v4/pkg/util" "github.com/coreos/go-systemd/v22/journal" "github.com/coreos/go-systemd/v22/sdjournal" "github.com/pkg/errors" diff --git a/libpod/events/logfile.go b/libpod/events/logfile.go index e3f0ab8f0..be2aaacca 100644 --- a/libpod/events/logfile.go +++ b/libpod/events/logfile.go @@ -6,7 +6,7 @@ import ( "os" "time" - "github.com/containers/podman/v3/pkg/util" + "github.com/containers/podman/v4/pkg/util" "github.com/containers/storage/pkg/lockfile" "github.com/pkg/errors" ) diff --git a/libpod/healthcheck.go b/libpod/healthcheck.go index 91f031513..53bad47b4 100644 --- a/libpod/healthcheck.go +++ b/libpod/healthcheck.go @@ -9,7 +9,7 @@ import ( "strings" "time" - "github.com/containers/podman/v3/libpod/define" + "github.com/containers/podman/v4/libpod/define" "github.com/pkg/errors" "github.com/sirupsen/logrus" ) diff --git a/libpod/healthcheck_linux.go b/libpod/healthcheck_linux.go index a1f3e8491..51def1927 100644 --- a/libpod/healthcheck_linux.go +++ b/libpod/healthcheck_linux.go @@ -7,8 +7,8 @@ import ( "os/exec" "strings" - "github.com/containers/podman/v3/pkg/rootless" - "github.com/containers/podman/v3/pkg/systemd" + "github.com/containers/podman/v4/pkg/rootless" + "github.com/containers/podman/v4/pkg/systemd" "github.com/pkg/errors" "github.com/sirupsen/logrus" ) diff --git a/libpod/info.go b/libpod/info.go index de675859e..e0b490768 100644 --- a/libpod/info.go +++ b/libpod/info.go @@ -17,9 +17,9 @@ import ( "github.com/containers/common/pkg/cgroups" "github.com/containers/common/pkg/seccomp" "github.com/containers/image/v5/pkg/sysregistriesv2" - "github.com/containers/podman/v3/libpod/define" - "github.com/containers/podman/v3/libpod/linkmode" - "github.com/containers/podman/v3/pkg/rootless" + "github.com/containers/podman/v4/libpod/define" + "github.com/containers/podman/v4/libpod/linkmode" + "github.com/containers/podman/v4/pkg/rootless" "github.com/containers/storage" "github.com/containers/storage/pkg/system" "github.com/opencontainers/selinux/go-selinux" diff --git a/libpod/kube.go b/libpod/kube.go index 2ed7ddf0b..d68d46415 100644 --- a/libpod/kube.go +++ b/libpod/kube.go @@ -13,12 +13,12 @@ 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/env" - "github.com/containers/podman/v3/pkg/lookup" - "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/define" + "github.com/containers/podman/v4/pkg/env" + "github.com/containers/podman/v4/pkg/lookup" + "github.com/containers/podman/v4/pkg/namespaces" + "github.com/containers/podman/v4/pkg/specgen" + "github.com/containers/podman/v4/pkg/util" "github.com/opencontainers/runtime-spec/specs-go" "github.com/opencontainers/runtime-tools/generate" "github.com/pkg/errors" diff --git a/libpod/lock/file_lock_manager.go b/libpod/lock/file_lock_manager.go index 155606642..d89b0cc98 100644 --- a/libpod/lock/file_lock_manager.go +++ b/libpod/lock/file_lock_manager.go @@ -1,7 +1,7 @@ package lock import ( - "github.com/containers/podman/v3/libpod/lock/file" + "github.com/containers/podman/v4/libpod/lock/file" ) // FileLockManager manages shared memory locks. diff --git a/libpod/lock/shm_lock_manager_linux.go b/libpod/lock/shm_lock_manager_linux.go index ecccb2bcb..8f3b6df7f 100644 --- a/libpod/lock/shm_lock_manager_linux.go +++ b/libpod/lock/shm_lock_manager_linux.go @@ -5,7 +5,7 @@ package lock import ( "syscall" - "github.com/containers/podman/v3/libpod/lock/shm" + "github.com/containers/podman/v4/libpod/lock/shm" "github.com/pkg/errors" ) diff --git a/libpod/logs/log.go b/libpod/logs/log.go index 19a121fe9..886911f2d 100644 --- a/libpod/logs/log.go +++ b/libpod/logs/log.go @@ -8,7 +8,7 @@ import ( "sync" "time" - "github.com/containers/podman/v3/libpod/logs/reversereader" + "github.com/containers/podman/v4/libpod/logs/reversereader" "github.com/hpcloud/tail" "github.com/pkg/errors" "github.com/sirupsen/logrus" diff --git a/libpod/networking_linux.go b/libpod/networking_linux.go index e98e143a6..110f37b91 100644 --- a/libpod/networking_linux.go +++ b/libpod/networking_linux.go @@ -21,13 +21,13 @@ import ( "github.com/containernetworking/plugins/pkg/ns" "github.com/containers/common/libnetwork/types" "github.com/containers/common/pkg/netns" - "github.com/containers/podman/v3/libpod/define" - "github.com/containers/podman/v3/libpod/events" - "github.com/containers/podman/v3/pkg/errorhandling" - "github.com/containers/podman/v3/pkg/namespaces" - "github.com/containers/podman/v3/pkg/resolvconf" - "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/libpod/events" + "github.com/containers/podman/v4/pkg/errorhandling" + "github.com/containers/podman/v4/pkg/namespaces" + "github.com/containers/podman/v4/pkg/resolvconf" + "github.com/containers/podman/v4/pkg/rootless" + "github.com/containers/podman/v4/pkg/util" "github.com/containers/storage/pkg/lockfile" "github.com/opencontainers/selinux/go-selinux/label" "github.com/pkg/errors" diff --git a/libpod/networking_linux_test.go b/libpod/networking_linux_test.go index f19f50a3c..a21494824 100644 --- a/libpod/networking_linux_test.go +++ b/libpod/networking_linux_test.go @@ -9,7 +9,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/containers/common/libnetwork/types" - "github.com/containers/podman/v3/libpod/define" + "github.com/containers/podman/v4/libpod/define" ) func Test_ocicniPortsToNetTypesPorts(t *testing.T) { diff --git a/libpod/networking_slirp4netns.go b/libpod/networking_slirp4netns.go index 8b8bcf8c8..690f0c1fa 100644 --- a/libpod/networking_slirp4netns.go +++ b/libpod/networking_slirp4netns.go @@ -18,10 +18,10 @@ import ( "github.com/containernetworking/plugins/pkg/ns" "github.com/containers/common/libnetwork/types" - "github.com/containers/podman/v3/pkg/errorhandling" - "github.com/containers/podman/v3/pkg/rootless" - "github.com/containers/podman/v3/pkg/rootlessport" - "github.com/containers/podman/v3/pkg/servicereaper" + "github.com/containers/podman/v4/pkg/errorhandling" + "github.com/containers/podman/v4/pkg/rootless" + "github.com/containers/podman/v4/pkg/rootlessport" + "github.com/containers/podman/v4/pkg/servicereaper" "github.com/pkg/errors" "github.com/sirupsen/logrus" ) diff --git a/libpod/oci.go b/libpod/oci.go index f45c1a105..09f856ac7 100644 --- a/libpod/oci.go +++ b/libpod/oci.go @@ -3,7 +3,7 @@ package libpod import ( "net/http" - "github.com/containers/podman/v3/libpod/define" + "github.com/containers/podman/v4/libpod/define" ) // OCIRuntime is an implementation of an OCI runtime. diff --git a/libpod/oci_attach_linux.go b/libpod/oci_attach_linux.go index a382f6043..1c15d567c 100644 --- a/libpod/oci_attach_linux.go +++ b/libpod/oci_attach_linux.go @@ -10,10 +10,10 @@ import ( "path/filepath" "github.com/containers/common/pkg/config" - "github.com/containers/podman/v3/libpod/define" - "github.com/containers/podman/v3/pkg/errorhandling" - "github.com/containers/podman/v3/pkg/kubeutils" - "github.com/containers/podman/v3/utils" + "github.com/containers/podman/v4/libpod/define" + "github.com/containers/podman/v4/pkg/errorhandling" + "github.com/containers/podman/v4/pkg/kubeutils" + "github.com/containers/podman/v4/utils" "github.com/moby/term" "github.com/pkg/errors" "github.com/sirupsen/logrus" diff --git a/libpod/oci_conmon_exec_linux.go b/libpod/oci_conmon_exec_linux.go index e58d4d6f9..29c600109 100644 --- a/libpod/oci_conmon_exec_linux.go +++ b/libpod/oci_conmon_exec_linux.go @@ -13,11 +13,11 @@ import ( "github.com/containers/common/pkg/capabilities" "github.com/containers/common/pkg/config" - "github.com/containers/podman/v3/libpod/define" - "github.com/containers/podman/v3/pkg/errorhandling" - "github.com/containers/podman/v3/pkg/lookup" - "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/errorhandling" + "github.com/containers/podman/v4/pkg/lookup" + "github.com/containers/podman/v4/pkg/util" + "github.com/containers/podman/v4/utils" spec "github.com/opencontainers/runtime-spec/specs-go" "github.com/pkg/errors" "github.com/sirupsen/logrus" diff --git a/libpod/oci_conmon_linux.go b/libpod/oci_conmon_linux.go index 8d6a23ecc..3fa43aed9 100644 --- a/libpod/oci_conmon_linux.go +++ b/libpod/oci_conmon_linux.go @@ -25,14 +25,14 @@ import ( "github.com/containers/common/pkg/cgroups" "github.com/containers/common/pkg/config" conmonConfig "github.com/containers/conmon/runner/config" - "github.com/containers/podman/v3/libpod/define" - "github.com/containers/podman/v3/libpod/logs" - "github.com/containers/podman/v3/pkg/checkpoint/crutils" - "github.com/containers/podman/v3/pkg/errorhandling" - "github.com/containers/podman/v3/pkg/rootless" - "github.com/containers/podman/v3/pkg/specgenutil" - "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/libpod/logs" + "github.com/containers/podman/v4/pkg/checkpoint/crutils" + "github.com/containers/podman/v4/pkg/errorhandling" + "github.com/containers/podman/v4/pkg/rootless" + "github.com/containers/podman/v4/pkg/specgenutil" + "github.com/containers/podman/v4/pkg/util" + "github.com/containers/podman/v4/utils" "github.com/containers/storage/pkg/homedir" pmount "github.com/containers/storage/pkg/mount" "github.com/coreos/go-systemd/v22/daemon" diff --git a/libpod/oci_missing.go b/libpod/oci_missing.go index 65ff818b4..86f54c02e 100644 --- a/libpod/oci_missing.go +++ b/libpod/oci_missing.go @@ -6,7 +6,7 @@ import ( "path/filepath" "sync" - "github.com/containers/podman/v3/libpod/define" + "github.com/containers/podman/v4/libpod/define" "github.com/pkg/errors" "github.com/sirupsen/logrus" ) diff --git a/libpod/oci_util.go b/libpod/oci_util.go index de20c1915..64edfdef2 100644 --- a/libpod/oci_util.go +++ b/libpod/oci_util.go @@ -9,7 +9,7 @@ import ( "time" "github.com/containers/common/libnetwork/types" - "github.com/containers/podman/v3/libpod/define" + "github.com/containers/podman/v4/libpod/define" "github.com/pkg/errors" "github.com/sirupsen/logrus" ) diff --git a/libpod/options.go b/libpod/options.go index f32eb279d..4f9e49d0f 100644 --- a/libpod/options.go +++ b/libpod/options.go @@ -13,12 +13,12 @@ import ( "github.com/containers/common/pkg/secrets" "github.com/containers/image/v5/manifest" "github.com/containers/image/v5/types" - "github.com/containers/podman/v3/libpod/define" - "github.com/containers/podman/v3/libpod/events" - "github.com/containers/podman/v3/pkg/namespaces" - "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/define" + "github.com/containers/podman/v4/libpod/events" + "github.com/containers/podman/v4/pkg/namespaces" + "github.com/containers/podman/v4/pkg/rootless" + "github.com/containers/podman/v4/pkg/specgen" + "github.com/containers/podman/v4/pkg/util" "github.com/containers/storage" "github.com/containers/storage/pkg/idtools" "github.com/opencontainers/runtime-spec/specs-go" diff --git a/libpod/plugin/volume_api.go b/libpod/plugin/volume_api.go index fafd26dac..a6d66a034 100644 --- a/libpod/plugin/volume_api.go +++ b/libpod/plugin/volume_api.go @@ -12,7 +12,7 @@ import ( "sync" "time" - "github.com/containers/podman/v3/libpod/define" + "github.com/containers/podman/v4/libpod/define" "github.com/docker/go-plugins-helpers/sdk" "github.com/docker/go-plugins-helpers/volume" jsoniter "github.com/json-iterator/go" diff --git a/libpod/pod.go b/libpod/pod.go index b159f6bc7..6273ff247 100644 --- a/libpod/pod.go +++ b/libpod/pod.go @@ -7,8 +7,8 @@ import ( "strings" "time" - "github.com/containers/podman/v3/libpod/define" - "github.com/containers/podman/v3/libpod/lock" + "github.com/containers/podman/v4/libpod/define" + "github.com/containers/podman/v4/libpod/lock" "github.com/opencontainers/runtime-spec/specs-go" "github.com/pkg/errors" ) diff --git a/libpod/pod_api.go b/libpod/pod_api.go index 526e0c28b..be726d8d1 100644 --- a/libpod/pod_api.go +++ b/libpod/pod_api.go @@ -4,10 +4,10 @@ import ( "context" "github.com/containers/common/pkg/cgroups" - "github.com/containers/podman/v3/libpod/define" - "github.com/containers/podman/v3/libpod/events" - "github.com/containers/podman/v3/pkg/parallel" - "github.com/containers/podman/v3/pkg/rootless" + "github.com/containers/podman/v4/libpod/define" + "github.com/containers/podman/v4/libpod/events" + "github.com/containers/podman/v4/pkg/parallel" + "github.com/containers/podman/v4/pkg/rootless" "github.com/pkg/errors" "github.com/sirupsen/logrus" ) diff --git a/libpod/pod_internal.go b/libpod/pod_internal.go index eaa6eb14b..41f745e6c 100644 --- a/libpod/pod_internal.go +++ b/libpod/pod_internal.go @@ -6,8 +6,8 @@ import ( "time" "github.com/containers/common/pkg/config" - "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" "github.com/containers/storage/pkg/stringid" "github.com/pkg/errors" "github.com/sirupsen/logrus" diff --git a/libpod/pod_status.go b/libpod/pod_status.go index 8552f5681..aabdfe50e 100644 --- a/libpod/pod_status.go +++ b/libpod/pod_status.go @@ -1,6 +1,6 @@ package libpod -import "github.com/containers/podman/v3/libpod/define" +import "github.com/containers/podman/v4/libpod/define" // GetPodStatus determines the status of the pod based on the // statuses of the containers in the pod. diff --git a/libpod/pod_top_linux.go b/libpod/pod_top_linux.go index aee62d832..43823a106 100644 --- a/libpod/pod_top_linux.go +++ b/libpod/pod_top_linux.go @@ -6,8 +6,8 @@ import ( "strconv" "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" "github.com/containers/psgo" ) diff --git a/libpod/reset.go b/libpod/reset.go index 5d9bb0e90..2b2b586bc 100644 --- a/libpod/reset.go +++ b/libpod/reset.go @@ -7,10 +7,10 @@ import ( "path/filepath" "github.com/containers/common/libimage" - "github.com/containers/podman/v3/libpod/define" - "github.com/containers/podman/v3/pkg/errorhandling" - "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/errorhandling" + "github.com/containers/podman/v4/pkg/rootless" + "github.com/containers/podman/v4/pkg/util" "github.com/containers/storage" "github.com/pkg/errors" "github.com/sirupsen/logrus" diff --git a/libpod/runtime.go b/libpod/runtime.go index 077fce999..dcf8c83f1 100644 --- a/libpod/runtime.go +++ b/libpod/runtime.go @@ -27,15 +27,15 @@ import ( "github.com/containers/image/v5/pkg/sysregistriesv2" is "github.com/containers/image/v5/storage" "github.com/containers/image/v5/types" - "github.com/containers/podman/v3/libpod/define" - "github.com/containers/podman/v3/libpod/events" - "github.com/containers/podman/v3/libpod/lock" - "github.com/containers/podman/v3/libpod/plugin" - "github.com/containers/podman/v3/libpod/shutdown" - "github.com/containers/podman/v3/pkg/rootless" - "github.com/containers/podman/v3/pkg/systemd" - "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/libpod/events" + "github.com/containers/podman/v4/libpod/lock" + "github.com/containers/podman/v4/libpod/plugin" + "github.com/containers/podman/v4/libpod/shutdown" + "github.com/containers/podman/v4/pkg/rootless" + "github.com/containers/podman/v4/pkg/systemd" + "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/docker/docker/pkg/namesgenerator" diff --git a/libpod/runtime_cstorage.go b/libpod/runtime_cstorage.go index 5694967aa..026cab3c5 100644 --- a/libpod/runtime_cstorage.go +++ b/libpod/runtime_cstorage.go @@ -3,7 +3,7 @@ package libpod import ( "time" - "github.com/containers/podman/v3/libpod/define" + "github.com/containers/podman/v4/libpod/define" "github.com/containers/storage" "github.com/pkg/errors" "github.com/sirupsen/logrus" diff --git a/libpod/runtime_ctr.go b/libpod/runtime_ctr.go index 15bca6133..6ee25c0ec 100644 --- a/libpod/runtime_ctr.go +++ b/libpod/runtime_ctr.go @@ -13,13 +13,13 @@ import ( "github.com/containers/common/libnetwork/types" "github.com/containers/common/pkg/cgroups" "github.com/containers/common/pkg/config" - "github.com/containers/podman/v3/libpod/define" - "github.com/containers/podman/v3/libpod/events" - "github.com/containers/podman/v3/libpod/shutdown" - "github.com/containers/podman/v3/pkg/domain/entities/reports" - "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/define" + "github.com/containers/podman/v4/libpod/events" + "github.com/containers/podman/v4/libpod/shutdown" + "github.com/containers/podman/v4/pkg/domain/entities/reports" + "github.com/containers/podman/v4/pkg/rootless" + "github.com/containers/podman/v4/pkg/specgen" + "github.com/containers/podman/v4/pkg/util" "github.com/containers/storage" "github.com/containers/storage/pkg/stringid" "github.com/docker/go-units" diff --git a/libpod/runtime_img.go b/libpod/runtime_img.go index 83d4af9ba..e3b439dd1 100644 --- a/libpod/runtime_img.go +++ b/libpod/runtime_img.go @@ -10,9 +10,9 @@ import ( "github.com/containers/buildah/imagebuildah" "github.com/containers/common/libimage" "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/util" + "github.com/containers/podman/v4/libpod/define" + "github.com/containers/podman/v4/libpod/events" + "github.com/containers/podman/v4/pkg/util" "github.com/pkg/errors" "github.com/sirupsen/logrus" ) diff --git a/libpod/runtime_migrate.go b/libpod/runtime_migrate.go index 087991e6f..32fdc7b5d 100644 --- a/libpod/runtime_migrate.go +++ b/libpod/runtime_migrate.go @@ -11,9 +11,9 @@ import ( "strconv" "syscall" - "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/pkg/errors" "github.com/sirupsen/logrus" ) diff --git a/libpod/runtime_pod.go b/libpod/runtime_pod.go index 2389ee6d9..11891630a 100644 --- a/libpod/runtime_pod.go +++ b/libpod/runtime_pod.go @@ -4,8 +4,8 @@ import ( "context" "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/pkg/errors" ) diff --git a/libpod/runtime_pod_linux.go b/libpod/runtime_pod_linux.go index ea3eb53c4..7bc675af7 100644 --- a/libpod/runtime_pod_linux.go +++ b/libpod/runtime_pod_linux.go @@ -11,10 +11,10 @@ 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/libpod/events" - "github.com/containers/podman/v3/pkg/rootless" - "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/rootless" + "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/libpod/runtime_renumber.go b/libpod/runtime_renumber.go index b19cc921f..17e1d97e5 100644 --- a/libpod/runtime_renumber.go +++ b/libpod/runtime_renumber.go @@ -1,7 +1,7 @@ package libpod import ( - "github.com/containers/podman/v3/libpod/events" + "github.com/containers/podman/v4/libpod/events" "github.com/pkg/errors" ) diff --git a/libpod/runtime_volume.go b/libpod/runtime_volume.go index 2b3ad10b4..a3be0ff5b 100644 --- a/libpod/runtime_volume.go +++ b/libpod/runtime_volume.go @@ -3,9 +3,9 @@ package libpod import ( "context" - "github.com/containers/podman/v3/libpod/define" - "github.com/containers/podman/v3/libpod/events" - "github.com/containers/podman/v3/pkg/domain/entities/reports" + "github.com/containers/podman/v4/libpod/define" + "github.com/containers/podman/v4/libpod/events" + "github.com/containers/podman/v4/pkg/domain/entities/reports" "github.com/pkg/errors" ) diff --git a/libpod/runtime_volume_linux.go b/libpod/runtime_volume_linux.go index d4d9a4438..5fd68fffb 100644 --- a/libpod/runtime_volume_linux.go +++ b/libpod/runtime_volume_linux.go @@ -9,9 +9,9 @@ import ( "strings" "time" - "github.com/containers/podman/v3/libpod/define" - "github.com/containers/podman/v3/libpod/events" - volplugin "github.com/containers/podman/v3/libpod/plugin" + "github.com/containers/podman/v4/libpod/define" + "github.com/containers/podman/v4/libpod/events" + volplugin "github.com/containers/podman/v4/libpod/plugin" "github.com/containers/storage/drivers/quota" "github.com/containers/storage/pkg/stringid" pluginapi "github.com/docker/go-plugins-helpers/volume" diff --git a/libpod/state_test.go b/libpod/state_test.go index 0b805b0f1..3c1fe8f63 100644 --- a/libpod/state_test.go +++ b/libpod/state_test.go @@ -10,8 +10,8 @@ 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/libpod/lock" + "github.com/containers/podman/v4/libpod/define" + "github.com/containers/podman/v4/libpod/lock" "github.com/containers/storage" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/libpod/stats.go b/libpod/stats.go index 879ae7207..dbb10a27e 100644 --- a/libpod/stats.go +++ b/libpod/stats.go @@ -9,7 +9,7 @@ import ( "time" "github.com/containers/common/pkg/cgroups" - "github.com/containers/podman/v3/libpod/define" + "github.com/containers/podman/v4/libpod/define" "github.com/pkg/errors" ) diff --git a/libpod/storage.go b/libpod/storage.go index 5c265df40..a85348729 100644 --- a/libpod/storage.go +++ b/libpod/storage.go @@ -6,7 +6,7 @@ import ( istorage "github.com/containers/image/v5/storage" "github.com/containers/image/v5/types" - "github.com/containers/podman/v3/libpod/define" + "github.com/containers/podman/v4/libpod/define" "github.com/containers/storage" "github.com/containers/storage/pkg/idtools" v1 "github.com/opencontainers/image-spec/specs-go/v1" diff --git a/libpod/util.go b/libpod/util.go index 2cd9ccfdc..2b96a9449 100644 --- a/libpod/util.go +++ b/libpod/util.go @@ -15,8 +15,8 @@ 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/utils" + "github.com/containers/podman/v4/libpod/define" + "github.com/containers/podman/v4/utils" "github.com/fsnotify/fsnotify" spec "github.com/opencontainers/runtime-spec/specs-go" "github.com/opencontainers/selinux/go-selinux/label" diff --git a/libpod/util_linux.go b/libpod/util_linux.go index 9fee35823..dd115c7fb 100644 --- a/libpod/util_linux.go +++ b/libpod/util_linux.go @@ -8,8 +8,8 @@ import ( "syscall" "github.com/containers/common/pkg/cgroups" - "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" "github.com/opencontainers/selinux/go-selinux/label" "github.com/pkg/errors" "github.com/sirupsen/logrus" diff --git a/libpod/util_test.go b/libpod/util_test.go index 160dca408..dc3b8e673 100644 --- a/libpod/util_test.go +++ b/libpod/util_test.go @@ -3,7 +3,7 @@ package libpod import ( "testing" - "github.com/containers/podman/v3/utils" + "github.com/containers/podman/v4/utils" "github.com/stretchr/testify/assert" ) diff --git a/libpod/volume.go b/libpod/volume.go index 90b423f1d..d60d978ed 100644 --- a/libpod/volume.go +++ b/libpod/volume.go @@ -5,9 +5,9 @@ import ( "path/filepath" "time" - "github.com/containers/podman/v3/libpod/define" - "github.com/containers/podman/v3/libpod/lock" - "github.com/containers/podman/v3/libpod/plugin" + "github.com/containers/podman/v4/libpod/define" + "github.com/containers/podman/v4/libpod/lock" + "github.com/containers/podman/v4/libpod/plugin" ) // Volume is a libpod named volume. diff --git a/libpod/volume_inspect.go b/libpod/volume_inspect.go index 70098df5a..3d721410b 100644 --- a/libpod/volume_inspect.go +++ b/libpod/volume_inspect.go @@ -1,7 +1,7 @@ package libpod import ( - "github.com/containers/podman/v3/libpod/define" + "github.com/containers/podman/v4/libpod/define" pluginapi "github.com/docker/go-plugins-helpers/volume" "github.com/pkg/errors" "github.com/sirupsen/logrus" diff --git a/libpod/volume_internal.go b/libpod/volume_internal.go index f9e1ea87d..9850c2ea1 100644 --- a/libpod/volume_internal.go +++ b/libpod/volume_internal.go @@ -4,7 +4,7 @@ import ( "os" "path/filepath" - "github.com/containers/podman/v3/libpod/define" + "github.com/containers/podman/v4/libpod/define" "github.com/pkg/errors" ) diff --git a/libpod/volume_internal_linux.go b/libpod/volume_internal_linux.go index abd31df0f..60d3667a9 100644 --- a/libpod/volume_internal_linux.go +++ b/libpod/volume_internal_linux.go @@ -6,7 +6,7 @@ import ( "os/exec" "strings" - "github.com/containers/podman/v3/libpod/define" + "github.com/containers/podman/v4/libpod/define" pluginapi "github.com/docker/go-plugins-helpers/volume" "github.com/pkg/errors" "github.com/sirupsen/logrus" 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" ) diff --git a/test/e2e/attach_test.go b/test/e2e/attach_test.go index 5843462f2..a7af76529 100644 --- a/test/e2e/attach_test.go +++ b/test/e2e/attach_test.go @@ -5,7 +5,7 @@ import ( "syscall" "time" - . "github.com/containers/podman/v3/test/utils" + . "github.com/containers/podman/v4/test/utils" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/test/e2e/build_test.go b/test/e2e/build_test.go index c05dc6f3f..5dabe728a 100644 --- a/test/e2e/build_test.go +++ b/test/e2e/build_test.go @@ -9,7 +9,7 @@ import ( "strings" "github.com/containers/buildah" - . "github.com/containers/podman/v3/test/utils" + . "github.com/containers/podman/v4/test/utils" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/test/e2e/checkpoint_test.go b/test/e2e/checkpoint_test.go index 4771f8e58..5f1e4b1d1 100644 --- a/test/e2e/checkpoint_test.go +++ b/test/e2e/checkpoint_test.go @@ -11,11 +11,11 @@ import ( "time" "github.com/checkpoint-restore/go-criu/v5/stats" - "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/test/utils" - "github.com/containers/podman/v3/utils" + "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/test/utils" + "github.com/containers/podman/v4/utils" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/test/e2e/commit_test.go b/test/e2e/commit_test.go index d9411b146..495e31520 100644 --- a/test/e2e/commit_test.go +++ b/test/e2e/commit_test.go @@ -5,7 +5,7 @@ import ( "os" "path/filepath" - . "github.com/containers/podman/v3/test/utils" + . "github.com/containers/podman/v4/test/utils" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/test/e2e/common_test.go b/test/e2e/common_test.go index bd744aa78..64f40d2ed 100644 --- a/test/e2e/common_test.go +++ b/test/e2e/common_test.go @@ -16,10 +16,10 @@ import ( "time" "github.com/containers/common/pkg/cgroups" - "github.com/containers/podman/v3/libpod/define" - "github.com/containers/podman/v3/pkg/inspect" - "github.com/containers/podman/v3/pkg/rootless" - . "github.com/containers/podman/v3/test/utils" + "github.com/containers/podman/v4/libpod/define" + "github.com/containers/podman/v4/pkg/inspect" + "github.com/containers/podman/v4/pkg/rootless" + . "github.com/containers/podman/v4/test/utils" "github.com/containers/storage" "github.com/containers/storage/pkg/reexec" "github.com/containers/storage/pkg/stringid" diff --git a/test/e2e/container_create_volume_test.go b/test/e2e/container_create_volume_test.go index df1d9a371..62a2541b9 100644 --- a/test/e2e/container_create_volume_test.go +++ b/test/e2e/container_create_volume_test.go @@ -6,7 +6,7 @@ import ( "os" "path/filepath" - . "github.com/containers/podman/v3/test/utils" + . "github.com/containers/podman/v4/test/utils" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/test/e2e/container_inspect_test.go b/test/e2e/container_inspect_test.go index 597eeb1a4..f58f2de29 100644 --- a/test/e2e/container_inspect_test.go +++ b/test/e2e/container_inspect_test.go @@ -3,9 +3,9 @@ package integration import ( "os" - "github.com/containers/podman/v3/libpod/define" - "github.com/containers/podman/v3/pkg/annotations" - . "github.com/containers/podman/v3/test/utils" + "github.com/containers/podman/v4/libpod/define" + "github.com/containers/podman/v4/pkg/annotations" + . "github.com/containers/podman/v4/test/utils" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/test/e2e/containers_conf_test.go b/test/e2e/containers_conf_test.go index d6bf66a50..57279ae9c 100644 --- a/test/e2e/containers_conf_test.go +++ b/test/e2e/containers_conf_test.go @@ -8,7 +8,7 @@ import ( "path/filepath" "strings" - . "github.com/containers/podman/v3/test/utils" + . "github.com/containers/podman/v4/test/utils" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/test/e2e/cp_test.go b/test/e2e/cp_test.go index 70b559222..ede6036b9 100644 --- a/test/e2e/cp_test.go +++ b/test/e2e/cp_test.go @@ -7,7 +7,7 @@ import ( "os/user" "path/filepath" - . "github.com/containers/podman/v3/test/utils" + . "github.com/containers/podman/v4/test/utils" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/test/e2e/create_staticip_test.go b/test/e2e/create_staticip_test.go index ded4c03e0..5d234d717 100644 --- a/test/e2e/create_staticip_test.go +++ b/test/e2e/create_staticip_test.go @@ -4,8 +4,8 @@ import ( "os" "time" - "github.com/containers/podman/v3/pkg/rootless" - . "github.com/containers/podman/v3/test/utils" + "github.com/containers/podman/v4/pkg/rootless" + . "github.com/containers/podman/v4/test/utils" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/test/e2e/create_staticmac_test.go b/test/e2e/create_staticmac_test.go index 7cb638e47..c6694ff7f 100644 --- a/test/e2e/create_staticmac_test.go +++ b/test/e2e/create_staticmac_test.go @@ -3,8 +3,8 @@ package integration import ( "os" - "github.com/containers/podman/v3/pkg/rootless" - . "github.com/containers/podman/v3/test/utils" + "github.com/containers/podman/v4/pkg/rootless" + . "github.com/containers/podman/v4/test/utils" "github.com/containers/storage/pkg/stringid" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" diff --git a/test/e2e/create_test.go b/test/e2e/create_test.go index a482c0068..addf0ded0 100644 --- a/test/e2e/create_test.go +++ b/test/e2e/create_test.go @@ -8,7 +8,7 @@ import ( "runtime" "strings" - . "github.com/containers/podman/v3/test/utils" + . "github.com/containers/podman/v4/test/utils" "github.com/containers/storage/pkg/stringid" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" diff --git a/test/e2e/diff_test.go b/test/e2e/diff_test.go index a872a9713..fb6df8f45 100644 --- a/test/e2e/diff_test.go +++ b/test/e2e/diff_test.go @@ -5,7 +5,7 @@ import ( "os" "sort" - . "github.com/containers/podman/v3/test/utils" + . "github.com/containers/podman/v4/test/utils" "github.com/containers/storage/pkg/stringid" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" diff --git a/test/e2e/events_test.go b/test/e2e/events_test.go index 3b5b8ac6c..1d4560e8e 100644 --- a/test/e2e/events_test.go +++ b/test/e2e/events_test.go @@ -7,8 +7,8 @@ import ( "sync" "time" - "github.com/containers/podman/v3/libpod/events" - . "github.com/containers/podman/v3/test/utils" + "github.com/containers/podman/v4/libpod/events" + . "github.com/containers/podman/v4/test/utils" "github.com/containers/storage/pkg/stringid" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" diff --git a/test/e2e/exec_test.go b/test/e2e/exec_test.go index 121d0b234..3987746d0 100644 --- a/test/e2e/exec_test.go +++ b/test/e2e/exec_test.go @@ -7,7 +7,7 @@ import ( "path/filepath" "strings" - . "github.com/containers/podman/v3/test/utils" + . "github.com/containers/podman/v4/test/utils" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/test/e2e/exists_test.go b/test/e2e/exists_test.go index 260b6d5f2..9dde46478 100644 --- a/test/e2e/exists_test.go +++ b/test/e2e/exists_test.go @@ -3,7 +3,7 @@ package integration import ( "os" - . "github.com/containers/podman/v3/test/utils" + . "github.com/containers/podman/v4/test/utils" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/test/e2e/export_test.go b/test/e2e/export_test.go index a9dd09d8e..78811f1b5 100644 --- a/test/e2e/export_test.go +++ b/test/e2e/export_test.go @@ -4,7 +4,7 @@ import ( "os" "path/filepath" - . "github.com/containers/podman/v3/test/utils" + . "github.com/containers/podman/v4/test/utils" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/test/e2e/generate_kube_test.go b/test/e2e/generate_kube_test.go index 16f2c4272..53829e89b 100644 --- a/test/e2e/generate_kube_test.go +++ b/test/e2e/generate_kube_test.go @@ -7,10 +7,10 @@ import ( "strconv" "strings" - "github.com/containers/podman/v3/libpod/define" + "github.com/containers/podman/v4/libpod/define" - "github.com/containers/podman/v3/pkg/util" - . "github.com/containers/podman/v3/test/utils" + "github.com/containers/podman/v4/pkg/util" + . "github.com/containers/podman/v4/test/utils" "github.com/ghodss/yaml" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" diff --git a/test/e2e/generate_systemd_test.go b/test/e2e/generate_systemd_test.go index fd9ae5037..976048886 100644 --- a/test/e2e/generate_systemd_test.go +++ b/test/e2e/generate_systemd_test.go @@ -4,7 +4,7 @@ import ( "io/ioutil" "os" - . "github.com/containers/podman/v3/test/utils" + . "github.com/containers/podman/v4/test/utils" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/test/e2e/healthcheck_run_test.go b/test/e2e/healthcheck_run_test.go index 6a79006b6..c84488145 100644 --- a/test/e2e/healthcheck_run_test.go +++ b/test/e2e/healthcheck_run_test.go @@ -7,8 +7,8 @@ import ( "path/filepath" "time" - define "github.com/containers/podman/v3/libpod/define" - . "github.com/containers/podman/v3/test/utils" + define "github.com/containers/podman/v4/libpod/define" + . "github.com/containers/podman/v4/test/utils" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/test/e2e/history_test.go b/test/e2e/history_test.go index c6e9579ae..92e0e1b08 100644 --- a/test/e2e/history_test.go +++ b/test/e2e/history_test.go @@ -3,7 +3,7 @@ package integration import ( "os" - . "github.com/containers/podman/v3/test/utils" + . "github.com/containers/podman/v4/test/utils" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/test/e2e/image_scp_test.go b/test/e2e/image_scp_test.go index 767b355d9..5abdf74f8 100644 --- a/test/e2e/image_scp_test.go +++ b/test/e2e/image_scp_test.go @@ -5,7 +5,7 @@ import ( "os" "github.com/containers/common/pkg/config" - . "github.com/containers/podman/v3/test/utils" + . "github.com/containers/podman/v4/test/utils" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/test/e2e/image_sign_test.go b/test/e2e/image_sign_test.go index 09e156e02..dbf697bb0 100644 --- a/test/e2e/image_sign_test.go +++ b/test/e2e/image_sign_test.go @@ -6,7 +6,7 @@ import ( "os/exec" "path/filepath" - . "github.com/containers/podman/v3/test/utils" + . "github.com/containers/podman/v4/test/utils" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/test/e2e/images_test.go b/test/e2e/images_test.go index a3cc1ce99..0a4d9b134 100644 --- a/test/e2e/images_test.go +++ b/test/e2e/images_test.go @@ -6,7 +6,7 @@ import ( "sort" "strings" - . "github.com/containers/podman/v3/test/utils" + . "github.com/containers/podman/v4/test/utils" "github.com/docker/go-units" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" diff --git a/test/e2e/import_test.go b/test/e2e/import_test.go index 87aa7d438..884eae18e 100644 --- a/test/e2e/import_test.go +++ b/test/e2e/import_test.go @@ -4,7 +4,7 @@ import ( "os" "path/filepath" - . "github.com/containers/podman/v3/test/utils" + . "github.com/containers/podman/v4/test/utils" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/test/e2e/info_test.go b/test/e2e/info_test.go index bc3ae4443..f989a9d29 100644 --- a/test/e2e/info_test.go +++ b/test/e2e/info_test.go @@ -8,7 +8,7 @@ import ( "os/user" "path/filepath" - . "github.com/containers/podman/v3/test/utils" + . "github.com/containers/podman/v4/test/utils" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/test/e2e/init_test.go b/test/e2e/init_test.go index 729cc7a5a..c4c090daf 100644 --- a/test/e2e/init_test.go +++ b/test/e2e/init_test.go @@ -3,7 +3,7 @@ package integration import ( "os" - . "github.com/containers/podman/v3/test/utils" + . "github.com/containers/podman/v4/test/utils" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/test/e2e/inspect_test.go b/test/e2e/inspect_test.go index 127e26b11..3943a5e87 100644 --- a/test/e2e/inspect_test.go +++ b/test/e2e/inspect_test.go @@ -3,7 +3,7 @@ package integration import ( "os" - . "github.com/containers/podman/v3/test/utils" + . "github.com/containers/podman/v4/test/utils" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/test/e2e/kill_test.go b/test/e2e/kill_test.go index 266146bd2..552a7c15d 100644 --- a/test/e2e/kill_test.go +++ b/test/e2e/kill_test.go @@ -4,7 +4,7 @@ import ( "io/ioutil" "os" - . "github.com/containers/podman/v3/test/utils" + . "github.com/containers/podman/v4/test/utils" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/test/e2e/libpod_suite_remote_test.go b/test/e2e/libpod_suite_remote_test.go index 53e1fc8f2..37381a561 100644 --- a/test/e2e/libpod_suite_remote_test.go +++ b/test/e2e/libpod_suite_remote_test.go @@ -16,7 +16,7 @@ import ( "syscall" "time" - "github.com/containers/podman/v3/pkg/rootless" + "github.com/containers/podman/v4/pkg/rootless" ) func IsRemote() bool { diff --git a/test/e2e/libpod_suite_test.go b/test/e2e/libpod_suite_test.go index 4147ba2c3..ccd7c771e 100644 --- a/test/e2e/libpod_suite_test.go +++ b/test/e2e/libpod_suite_test.go @@ -8,7 +8,7 @@ import ( "os" "path/filepath" - "github.com/containers/podman/v3/pkg/rootless" + "github.com/containers/podman/v4/pkg/rootless" ) func IsRemote() bool { diff --git a/test/e2e/load_test.go b/test/e2e/load_test.go index ac70ebd8c..8e9f0ad13 100644 --- a/test/e2e/load_test.go +++ b/test/e2e/load_test.go @@ -5,7 +5,7 @@ import ( "os" "path/filepath" - . "github.com/containers/podman/v3/test/utils" + . "github.com/containers/podman/v4/test/utils" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/test/e2e/login_logout_test.go b/test/e2e/login_logout_test.go index d8ca9cbd9..3d0f44dc1 100644 --- a/test/e2e/login_logout_test.go +++ b/test/e2e/login_logout_test.go @@ -9,7 +9,7 @@ import ( "strconv" "strings" - . "github.com/containers/podman/v3/test/utils" + . "github.com/containers/podman/v4/test/utils" . "github.com/onsi/ginkgo" "github.com/onsi/ginkgo/config" . "github.com/onsi/gomega" diff --git a/test/e2e/logs_test.go b/test/e2e/logs_test.go index dc00491cd..7c0fcc8ee 100644 --- a/test/e2e/logs_test.go +++ b/test/e2e/logs_test.go @@ -7,7 +7,7 @@ import ( "strings" "time" - . "github.com/containers/podman/v3/test/utils" + . "github.com/containers/podman/v4/test/utils" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/test/e2e/manifest_test.go b/test/e2e/manifest_test.go index b86d5ecbe..eaa9cdae6 100644 --- a/test/e2e/manifest_test.go +++ b/test/e2e/manifest_test.go @@ -5,7 +5,7 @@ import ( "path/filepath" "strings" - . "github.com/containers/podman/v3/test/utils" + . "github.com/containers/podman/v4/test/utils" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/test/e2e/mount_rootless_test.go b/test/e2e/mount_rootless_test.go index b66826b31..30d7ce8a9 100644 --- a/test/e2e/mount_rootless_test.go +++ b/test/e2e/mount_rootless_test.go @@ -3,7 +3,7 @@ package integration import ( "os" - . "github.com/containers/podman/v3/test/utils" + . "github.com/containers/podman/v4/test/utils" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/test/e2e/mount_test.go b/test/e2e/mount_test.go index cd7f73337..2434e8008 100644 --- a/test/e2e/mount_test.go +++ b/test/e2e/mount_test.go @@ -3,7 +3,7 @@ package integration import ( "os" - . "github.com/containers/podman/v3/test/utils" + . "github.com/containers/podman/v4/test/utils" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/test/e2e/namespace_test.go b/test/e2e/namespace_test.go index 43edee1a5..c3e0e2d23 100644 --- a/test/e2e/namespace_test.go +++ b/test/e2e/namespace_test.go @@ -3,7 +3,7 @@ package integration import ( "os" - . "github.com/containers/podman/v3/test/utils" + . "github.com/containers/podman/v4/test/utils" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/test/e2e/negative_test.go b/test/e2e/negative_test.go index c3cef2e8e..b8b8df86e 100644 --- a/test/e2e/negative_test.go +++ b/test/e2e/negative_test.go @@ -3,7 +3,7 @@ package integration import ( "os" - . "github.com/containers/podman/v3/test/utils" + . "github.com/containers/podman/v4/test/utils" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" ) diff --git a/test/e2e/network_connect_disconnect_test.go b/test/e2e/network_connect_disconnect_test.go index 23281fe05..82b9dcd09 100644 --- a/test/e2e/network_connect_disconnect_test.go +++ b/test/e2e/network_connect_disconnect_test.go @@ -3,7 +3,7 @@ package integration import ( "os" - . "github.com/containers/podman/v3/test/utils" + . "github.com/containers/podman/v4/test/utils" "github.com/containers/storage/pkg/stringid" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" diff --git a/test/e2e/network_create_test.go b/test/e2e/network_create_test.go index 194510f32..ade78a308 100644 --- a/test/e2e/network_create_test.go +++ b/test/e2e/network_create_test.go @@ -6,7 +6,7 @@ import ( "os" "github.com/containers/common/libnetwork/types" - . "github.com/containers/podman/v3/test/utils" + . "github.com/containers/podman/v4/test/utils" "github.com/containers/storage/pkg/stringid" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" diff --git a/test/e2e/network_test.go b/test/e2e/network_test.go index 1c99d0f36..877ad37b8 100644 --- a/test/e2e/network_test.go +++ b/test/e2e/network_test.go @@ -7,8 +7,8 @@ import ( "time" "github.com/containers/common/libnetwork/types" - "github.com/containers/podman/v3/pkg/rootless" - . "github.com/containers/podman/v3/test/utils" + "github.com/containers/podman/v4/pkg/rootless" + . "github.com/containers/podman/v4/test/utils" "github.com/containers/storage/pkg/stringid" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" diff --git a/test/e2e/pause_test.go b/test/e2e/pause_test.go index c9182960a..66638d71c 100644 --- a/test/e2e/pause_test.go +++ b/test/e2e/pause_test.go @@ -7,7 +7,7 @@ import ( "path/filepath" "strings" - . "github.com/containers/podman/v3/test/utils" + . "github.com/containers/podman/v4/test/utils" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/test/e2e/play_build_test.go b/test/e2e/play_build_test.go index a56560634..bbebf7949 100644 --- a/test/e2e/play_build_test.go +++ b/test/e2e/play_build_test.go @@ -8,7 +8,7 @@ import ( "os" "path/filepath" - . "github.com/containers/podman/v3/test/utils" + . "github.com/containers/podman/v4/test/utils" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/test/e2e/play_kube_test.go b/test/e2e/play_kube_test.go index 71bfd1e99..63c9bf7f3 100644 --- a/test/e2e/play_kube_test.go +++ b/test/e2e/play_kube_test.go @@ -14,11 +14,11 @@ import ( "text/template" "time" - "github.com/containers/podman/v3/libpod/define" - "github.com/containers/podman/v3/pkg/bindings" - "github.com/containers/podman/v3/pkg/bindings/play" - "github.com/containers/podman/v3/pkg/util" - . "github.com/containers/podman/v3/test/utils" + "github.com/containers/podman/v4/libpod/define" + "github.com/containers/podman/v4/pkg/bindings" + "github.com/containers/podman/v4/pkg/bindings/play" + "github.com/containers/podman/v4/pkg/util" + . "github.com/containers/podman/v4/test/utils" "github.com/containers/storage/pkg/stringid" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" diff --git a/test/e2e/pod_create_test.go b/test/e2e/pod_create_test.go index 623377ea1..f0abfd80c 100644 --- a/test/e2e/pod_create_test.go +++ b/test/e2e/pod_create_test.go @@ -12,9 +12,9 @@ import ( "github.com/containers/common/pkg/apparmor" "github.com/containers/common/pkg/seccomp" "github.com/containers/common/pkg/sysinfo" - "github.com/containers/podman/v3/pkg/rootless" - "github.com/containers/podman/v3/pkg/util" - . "github.com/containers/podman/v3/test/utils" + "github.com/containers/podman/v4/pkg/rootless" + "github.com/containers/podman/v4/pkg/util" + . "github.com/containers/podman/v4/test/utils" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/test/e2e/pod_infra_container_test.go b/test/e2e/pod_infra_container_test.go index f4b99bb6b..db366b612 100644 --- a/test/e2e/pod_infra_container_test.go +++ b/test/e2e/pod_infra_container_test.go @@ -4,7 +4,7 @@ import ( "os" "strconv" - . "github.com/containers/podman/v3/test/utils" + . "github.com/containers/podman/v4/test/utils" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/test/e2e/pod_initcontainers_test.go b/test/e2e/pod_initcontainers_test.go index e73f28a7a..a99e24908 100644 --- a/test/e2e/pod_initcontainers_test.go +++ b/test/e2e/pod_initcontainers_test.go @@ -5,8 +5,8 @@ import ( "os" "path/filepath" - "github.com/containers/podman/v3/libpod/define" - . "github.com/containers/podman/v3/test/utils" + "github.com/containers/podman/v4/libpod/define" + . "github.com/containers/podman/v4/test/utils" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/test/e2e/pod_inspect_test.go b/test/e2e/pod_inspect_test.go index 0fc16b507..19a2772fd 100644 --- a/test/e2e/pod_inspect_test.go +++ b/test/e2e/pod_inspect_test.go @@ -4,8 +4,8 @@ import ( "encoding/json" "os" - "github.com/containers/podman/v3/libpod/define" - . "github.com/containers/podman/v3/test/utils" + "github.com/containers/podman/v4/libpod/define" + . "github.com/containers/podman/v4/test/utils" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/test/e2e/pod_kill_test.go b/test/e2e/pod_kill_test.go index 0bd9aa0f1..18f9769a1 100644 --- a/test/e2e/pod_kill_test.go +++ b/test/e2e/pod_kill_test.go @@ -4,7 +4,7 @@ import ( "fmt" "os" - . "github.com/containers/podman/v3/test/utils" + . "github.com/containers/podman/v4/test/utils" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/test/e2e/pod_pause_test.go b/test/e2e/pod_pause_test.go index daf706ec4..57ae75926 100644 --- a/test/e2e/pod_pause_test.go +++ b/test/e2e/pod_pause_test.go @@ -3,7 +3,7 @@ package integration import ( "os" - . "github.com/containers/podman/v3/test/utils" + . "github.com/containers/podman/v4/test/utils" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/test/e2e/pod_pod_namespaces_test.go b/test/e2e/pod_pod_namespaces_test.go index 293fd02ae..667a54861 100644 --- a/test/e2e/pod_pod_namespaces_test.go +++ b/test/e2e/pod_pod_namespaces_test.go @@ -4,7 +4,7 @@ import ( "fmt" "os" - . "github.com/containers/podman/v3/test/utils" + . "github.com/containers/podman/v4/test/utils" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/test/e2e/pod_prune_test.go b/test/e2e/pod_prune_test.go index 84348f30c..55ecc1593 100644 --- a/test/e2e/pod_prune_test.go +++ b/test/e2e/pod_prune_test.go @@ -3,7 +3,7 @@ package integration import ( "os" - . "github.com/containers/podman/v3/test/utils" + . "github.com/containers/podman/v4/test/utils" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/test/e2e/pod_ps_test.go b/test/e2e/pod_ps_test.go index 281aea9a9..29ee73d35 100644 --- a/test/e2e/pod_ps_test.go +++ b/test/e2e/pod_ps_test.go @@ -5,7 +5,7 @@ import ( "os" "sort" - . "github.com/containers/podman/v3/test/utils" + . "github.com/containers/podman/v4/test/utils" "github.com/containers/storage/pkg/stringid" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" diff --git a/test/e2e/pod_restart_test.go b/test/e2e/pod_restart_test.go index 448c110ce..1897104cc 100644 --- a/test/e2e/pod_restart_test.go +++ b/test/e2e/pod_restart_test.go @@ -3,7 +3,7 @@ package integration import ( "os" - . "github.com/containers/podman/v3/test/utils" + . "github.com/containers/podman/v4/test/utils" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/test/e2e/pod_rm_test.go b/test/e2e/pod_rm_test.go index 636503a0c..7a0d97d28 100644 --- a/test/e2e/pod_rm_test.go +++ b/test/e2e/pod_rm_test.go @@ -7,7 +7,7 @@ import ( "path/filepath" "strings" - . "github.com/containers/podman/v3/test/utils" + . "github.com/containers/podman/v4/test/utils" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/test/e2e/pod_start_test.go b/test/e2e/pod_start_test.go index e895b5598..2f3ef3a11 100644 --- a/test/e2e/pod_start_test.go +++ b/test/e2e/pod_start_test.go @@ -7,7 +7,7 @@ import ( "strconv" "strings" - . "github.com/containers/podman/v3/test/utils" + . "github.com/containers/podman/v4/test/utils" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/test/e2e/pod_stats_test.go b/test/e2e/pod_stats_test.go index bb145088e..0e94406f8 100644 --- a/test/e2e/pod_stats_test.go +++ b/test/e2e/pod_stats_test.go @@ -3,7 +3,7 @@ package integration import ( "os" - . "github.com/containers/podman/v3/test/utils" + . "github.com/containers/podman/v4/test/utils" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/test/e2e/pod_stop_test.go b/test/e2e/pod_stop_test.go index 27ac7d965..fc78f9ed6 100644 --- a/test/e2e/pod_stop_test.go +++ b/test/e2e/pod_stop_test.go @@ -4,7 +4,7 @@ import ( "io/ioutil" "os" - . "github.com/containers/podman/v3/test/utils" + . "github.com/containers/podman/v4/test/utils" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/test/e2e/pod_top_test.go b/test/e2e/pod_top_test.go index 602546141..564170412 100644 --- a/test/e2e/pod_top_test.go +++ b/test/e2e/pod_top_test.go @@ -5,7 +5,7 @@ import ( "os" "time" - . "github.com/containers/podman/v3/test/utils" + . "github.com/containers/podman/v4/test/utils" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/test/e2e/port_test.go b/test/e2e/port_test.go index 776687113..d81c03e5b 100644 --- a/test/e2e/port_test.go +++ b/test/e2e/port_test.go @@ -5,7 +5,7 @@ import ( "os" "strings" - . "github.com/containers/podman/v3/test/utils" + . "github.com/containers/podman/v4/test/utils" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/test/e2e/prune_test.go b/test/e2e/prune_test.go index 6a70fd556..01f987b92 100644 --- a/test/e2e/prune_test.go +++ b/test/e2e/prune_test.go @@ -4,7 +4,7 @@ import ( "fmt" "os" - . "github.com/containers/podman/v3/test/utils" + . "github.com/containers/podman/v4/test/utils" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/test/e2e/ps_test.go b/test/e2e/ps_test.go index a9f334f5c..0c93c430b 100644 --- a/test/e2e/ps_test.go +++ b/test/e2e/ps_test.go @@ -7,7 +7,7 @@ import ( "sort" "strconv" - . "github.com/containers/podman/v3/test/utils" + . "github.com/containers/podman/v4/test/utils" "github.com/containers/storage/pkg/stringid" "github.com/docker/go-units" . "github.com/onsi/ginkgo" diff --git a/test/e2e/pull_test.go b/test/e2e/pull_test.go index 38afff9bd..231869e8c 100644 --- a/test/e2e/pull_test.go +++ b/test/e2e/pull_test.go @@ -7,7 +7,7 @@ import ( "runtime" "strings" - . "github.com/containers/podman/v3/test/utils" + . "github.com/containers/podman/v4/test/utils" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/test/e2e/push_test.go b/test/e2e/push_test.go index a3b5e31bb..a8a98fc07 100644 --- a/test/e2e/push_test.go +++ b/test/e2e/push_test.go @@ -7,8 +7,8 @@ import ( "path/filepath" "strings" - "github.com/containers/podman/v3/pkg/rootless" - . "github.com/containers/podman/v3/test/utils" + "github.com/containers/podman/v4/pkg/rootless" + . "github.com/containers/podman/v4/test/utils" "github.com/containers/storage/pkg/archive" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" diff --git a/test/e2e/rename_test.go b/test/e2e/rename_test.go index e5e69c25c..c146eb410 100644 --- a/test/e2e/rename_test.go +++ b/test/e2e/rename_test.go @@ -4,7 +4,7 @@ import ( "fmt" "os" - . "github.com/containers/podman/v3/test/utils" + . "github.com/containers/podman/v4/test/utils" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/test/e2e/restart_test.go b/test/e2e/restart_test.go index f85a74f47..b8c74d395 100644 --- a/test/e2e/restart_test.go +++ b/test/e2e/restart_test.go @@ -4,7 +4,7 @@ import ( "os" "time" - . "github.com/containers/podman/v3/test/utils" + . "github.com/containers/podman/v4/test/utils" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/test/e2e/rm_test.go b/test/e2e/rm_test.go index e355de42f..f836540b4 100644 --- a/test/e2e/rm_test.go +++ b/test/e2e/rm_test.go @@ -4,7 +4,7 @@ import ( "io/ioutil" "os" - . "github.com/containers/podman/v3/test/utils" + . "github.com/containers/podman/v4/test/utils" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/test/e2e/rmi_test.go b/test/e2e/rmi_test.go index 658155587..cc3cceda5 100644 --- a/test/e2e/rmi_test.go +++ b/test/e2e/rmi_test.go @@ -5,7 +5,7 @@ import ( "os" "sync" - . "github.com/containers/podman/v3/test/utils" + . "github.com/containers/podman/v4/test/utils" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/test/e2e/run_apparmor_test.go b/test/e2e/run_apparmor_test.go index 6532402ed..e6526217a 100644 --- a/test/e2e/run_apparmor_test.go +++ b/test/e2e/run_apparmor_test.go @@ -9,7 +9,7 @@ import ( "path/filepath" "github.com/containers/common/pkg/apparmor" - . "github.com/containers/podman/v3/test/utils" + . "github.com/containers/podman/v4/test/utils" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/test/e2e/run_cgroup_parent_test.go b/test/e2e/run_cgroup_parent_test.go index 6bdc6af08..0aba367f3 100644 --- a/test/e2e/run_cgroup_parent_test.go +++ b/test/e2e/run_cgroup_parent_test.go @@ -7,7 +7,7 @@ import ( "path/filepath" "strings" - . "github.com/containers/podman/v3/test/utils" + . "github.com/containers/podman/v4/test/utils" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/test/e2e/run_cleanup_test.go b/test/e2e/run_cleanup_test.go index cc4e66751..2282ef913 100644 --- a/test/e2e/run_cleanup_test.go +++ b/test/e2e/run_cleanup_test.go @@ -3,7 +3,7 @@ package integration import ( "os" - . "github.com/containers/podman/v3/test/utils" + . "github.com/containers/podman/v4/test/utils" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/test/e2e/run_cpu_test.go b/test/e2e/run_cpu_test.go index dc9c6820b..fda0a7c24 100644 --- a/test/e2e/run_cpu_test.go +++ b/test/e2e/run_cpu_test.go @@ -4,7 +4,7 @@ import ( "io/ioutil" "os" - . "github.com/containers/podman/v3/test/utils" + . "github.com/containers/podman/v4/test/utils" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/test/e2e/run_device_test.go b/test/e2e/run_device_test.go index 4eb03dfff..b8bdc84f8 100644 --- a/test/e2e/run_device_test.go +++ b/test/e2e/run_device_test.go @@ -4,7 +4,7 @@ import ( "os" "os/exec" - . "github.com/containers/podman/v3/test/utils" + . "github.com/containers/podman/v4/test/utils" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/test/e2e/run_dns_test.go b/test/e2e/run_dns_test.go index 8b6d535e5..a313e8d40 100644 --- a/test/e2e/run_dns_test.go +++ b/test/e2e/run_dns_test.go @@ -3,7 +3,7 @@ package integration import ( "os" - . "github.com/containers/podman/v3/test/utils" + . "github.com/containers/podman/v4/test/utils" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/test/e2e/run_entrypoint_test.go b/test/e2e/run_entrypoint_test.go index 4fb6054e2..fde43dfec 100644 --- a/test/e2e/run_entrypoint_test.go +++ b/test/e2e/run_entrypoint_test.go @@ -3,7 +3,7 @@ package integration import ( "os" - . "github.com/containers/podman/v3/test/utils" + . "github.com/containers/podman/v4/test/utils" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/test/e2e/run_env_test.go b/test/e2e/run_env_test.go index f27f5eda7..f4c44c23b 100644 --- a/test/e2e/run_env_test.go +++ b/test/e2e/run_env_test.go @@ -3,7 +3,7 @@ package integration import ( "os" - . "github.com/containers/podman/v3/test/utils" + . "github.com/containers/podman/v4/test/utils" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/test/e2e/run_exit_test.go b/test/e2e/run_exit_test.go index 6c39e5a1f..aa9a4295c 100644 --- a/test/e2e/run_exit_test.go +++ b/test/e2e/run_exit_test.go @@ -4,8 +4,8 @@ import ( "fmt" "os" - "github.com/containers/podman/v3/libpod/define" - . "github.com/containers/podman/v3/test/utils" + "github.com/containers/podman/v4/libpod/define" + . "github.com/containers/podman/v4/test/utils" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/test/e2e/run_memory_test.go b/test/e2e/run_memory_test.go index 04fac6bfb..d6a67da57 100644 --- a/test/e2e/run_memory_test.go +++ b/test/e2e/run_memory_test.go @@ -4,7 +4,7 @@ import ( "fmt" "os" - . "github.com/containers/podman/v3/test/utils" + . "github.com/containers/podman/v4/test/utils" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/test/e2e/run_networking_test.go b/test/e2e/run_networking_test.go index 42fdefabf..87b1f143e 100644 --- a/test/e2e/run_networking_test.go +++ b/test/e2e/run_networking_test.go @@ -5,7 +5,7 @@ import ( "os" "strings" - . "github.com/containers/podman/v3/test/utils" + . "github.com/containers/podman/v4/test/utils" "github.com/containers/storage/pkg/stringid" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" diff --git a/test/e2e/run_ns_test.go b/test/e2e/run_ns_test.go index 7f4b58c0d..23fd298d7 100644 --- a/test/e2e/run_ns_test.go +++ b/test/e2e/run_ns_test.go @@ -5,7 +5,7 @@ import ( "os/exec" "strings" - . "github.com/containers/podman/v3/test/utils" + . "github.com/containers/podman/v4/test/utils" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/test/e2e/run_passwd_test.go b/test/e2e/run_passwd_test.go index 2207a50a8..4c97e665a 100644 --- a/test/e2e/run_passwd_test.go +++ b/test/e2e/run_passwd_test.go @@ -4,7 +4,7 @@ import ( "fmt" "os" - . "github.com/containers/podman/v3/test/utils" + . "github.com/containers/podman/v4/test/utils" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/test/e2e/run_privileged_test.go b/test/e2e/run_privileged_test.go index b894c7b1c..59223c589 100644 --- a/test/e2e/run_privileged_test.go +++ b/test/e2e/run_privileged_test.go @@ -5,7 +5,7 @@ import ( "strconv" "strings" - . "github.com/containers/podman/v3/test/utils" + . "github.com/containers/podman/v4/test/utils" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/test/e2e/run_restart_test.go b/test/e2e/run_restart_test.go index 35768ca51..ec8fbfe98 100644 --- a/test/e2e/run_restart_test.go +++ b/test/e2e/run_restart_test.go @@ -3,7 +3,7 @@ package integration import ( "os" - . "github.com/containers/podman/v3/test/utils" + . "github.com/containers/podman/v4/test/utils" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/test/e2e/run_seccomp_test.go b/test/e2e/run_seccomp_test.go index 3a6adca0e..03212b6dc 100644 --- a/test/e2e/run_seccomp_test.go +++ b/test/e2e/run_seccomp_test.go @@ -3,7 +3,7 @@ package integration import ( "os" - . "github.com/containers/podman/v3/test/utils" + . "github.com/containers/podman/v4/test/utils" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/test/e2e/run_security_labels_test.go b/test/e2e/run_security_labels_test.go index 1da80e61d..8aebeaebb 100644 --- a/test/e2e/run_security_labels_test.go +++ b/test/e2e/run_security_labels_test.go @@ -5,7 +5,7 @@ import ( "os" "strings" - . "github.com/containers/podman/v3/test/utils" + . "github.com/containers/podman/v4/test/utils" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/test/e2e/run_selinux_test.go b/test/e2e/run_selinux_test.go index 5ae49a5c2..b71c68baf 100644 --- a/test/e2e/run_selinux_test.go +++ b/test/e2e/run_selinux_test.go @@ -4,7 +4,7 @@ import ( "os" "path/filepath" - . "github.com/containers/podman/v3/test/utils" + . "github.com/containers/podman/v4/test/utils" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/test/e2e/run_signal_test.go b/test/e2e/run_signal_test.go index 6bb325155..71efa770a 100644 --- a/test/e2e/run_signal_test.go +++ b/test/e2e/run_signal_test.go @@ -9,8 +9,8 @@ import ( "syscall" "time" - "github.com/containers/podman/v3/pkg/rootless" - . "github.com/containers/podman/v3/test/utils" + "github.com/containers/podman/v4/pkg/rootless" + . "github.com/containers/podman/v4/test/utils" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/test/e2e/run_staticip_test.go b/test/e2e/run_staticip_test.go index 2f3c3025a..cf014d46e 100644 --- a/test/e2e/run_staticip_test.go +++ b/test/e2e/run_staticip_test.go @@ -6,7 +6,7 @@ import ( "os" "time" - . "github.com/containers/podman/v3/test/utils" + . "github.com/containers/podman/v4/test/utils" "github.com/containers/storage/pkg/stringid" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" diff --git a/test/e2e/run_test.go b/test/e2e/run_test.go index b461594c1..62a454e29 100644 --- a/test/e2e/run_test.go +++ b/test/e2e/run_test.go @@ -13,8 +13,8 @@ import ( "time" "github.com/containers/common/pkg/cgroups" - "github.com/containers/podman/v3/pkg/rootless" - . "github.com/containers/podman/v3/test/utils" + "github.com/containers/podman/v4/pkg/rootless" + . "github.com/containers/podman/v4/test/utils" "github.com/containers/storage/pkg/stringid" "github.com/mrunalp/fileutils" . "github.com/onsi/ginkgo" diff --git a/test/e2e/run_userns_test.go b/test/e2e/run_userns_test.go index e8ba42cf0..5a046b0a4 100644 --- a/test/e2e/run_userns_test.go +++ b/test/e2e/run_userns_test.go @@ -7,7 +7,7 @@ import ( "os/user" "strings" - . "github.com/containers/podman/v3/test/utils" + . "github.com/containers/podman/v4/test/utils" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/test/e2e/run_volume_test.go b/test/e2e/run_volume_test.go index c2817c551..00faf8089 100644 --- a/test/e2e/run_volume_test.go +++ b/test/e2e/run_volume_test.go @@ -9,8 +9,8 @@ import ( "path/filepath" "strings" - "github.com/containers/podman/v3/pkg/rootless" - . "github.com/containers/podman/v3/test/utils" + "github.com/containers/podman/v4/pkg/rootless" + . "github.com/containers/podman/v4/test/utils" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/test/e2e/run_working_dir_test.go b/test/e2e/run_working_dir_test.go index bcc85dd9b..50d0a2194 100644 --- a/test/e2e/run_working_dir_test.go +++ b/test/e2e/run_working_dir_test.go @@ -4,7 +4,7 @@ import ( "fmt" "os" - . "github.com/containers/podman/v3/test/utils" + . "github.com/containers/podman/v4/test/utils" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/test/e2e/runlabel_test.go b/test/e2e/runlabel_test.go index 36c1f856c..d1e11dd9a 100644 --- a/test/e2e/runlabel_test.go +++ b/test/e2e/runlabel_test.go @@ -4,7 +4,7 @@ import ( "fmt" "os" - . "github.com/containers/podman/v3/test/utils" + . "github.com/containers/podman/v4/test/utils" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/test/e2e/save_test.go b/test/e2e/save_test.go index d17566e8f..39295608e 100644 --- a/test/e2e/save_test.go +++ b/test/e2e/save_test.go @@ -8,8 +8,8 @@ import ( "strconv" "strings" - "github.com/containers/podman/v3/pkg/rootless" - . "github.com/containers/podman/v3/test/utils" + "github.com/containers/podman/v4/pkg/rootless" + . "github.com/containers/podman/v4/test/utils" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/test/e2e/search_test.go b/test/e2e/search_test.go index 24272aae5..f8d6019b0 100644 --- a/test/e2e/search_test.go +++ b/test/e2e/search_test.go @@ -9,8 +9,8 @@ import ( "strconv" "text/template" - "github.com/containers/podman/v3/pkg/domain/entities" - . "github.com/containers/podman/v3/test/utils" + "github.com/containers/podman/v4/pkg/domain/entities" + . "github.com/containers/podman/v4/test/utils" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/test/e2e/secret_test.go b/test/e2e/secret_test.go index f08638b1b..90d760c81 100644 --- a/test/e2e/secret_test.go +++ b/test/e2e/secret_test.go @@ -6,7 +6,7 @@ import ( "os" "path/filepath" - . "github.com/containers/podman/v3/test/utils" + . "github.com/containers/podman/v4/test/utils" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/test/e2e/start_test.go b/test/e2e/start_test.go index 073631ef7..98943c6fc 100644 --- a/test/e2e/start_test.go +++ b/test/e2e/start_test.go @@ -6,7 +6,7 @@ import ( "strconv" "strings" - . "github.com/containers/podman/v3/test/utils" + . "github.com/containers/podman/v4/test/utils" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/test/e2e/stats_test.go b/test/e2e/stats_test.go index 83a4896d5..8788369eb 100644 --- a/test/e2e/stats_test.go +++ b/test/e2e/stats_test.go @@ -6,7 +6,7 @@ import ( "strconv" "time" - . "github.com/containers/podman/v3/test/utils" + . "github.com/containers/podman/v4/test/utils" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/test/e2e/stop_test.go b/test/e2e/stop_test.go index fb8f92e0f..99d7f278c 100644 --- a/test/e2e/stop_test.go +++ b/test/e2e/stop_test.go @@ -5,7 +5,7 @@ import ( "os" "strings" - . "github.com/containers/podman/v3/test/utils" + . "github.com/containers/podman/v4/test/utils" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/test/e2e/system_connection_test.go b/test/e2e/system_connection_test.go index 95c2fe5b6..ac4c5e5ea 100644 --- a/test/e2e/system_connection_test.go +++ b/test/e2e/system_connection_test.go @@ -10,7 +10,7 @@ import ( "path/filepath" "github.com/containers/common/pkg/config" - . "github.com/containers/podman/v3/test/utils" + . "github.com/containers/podman/v4/test/utils" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/test/e2e/system_df_test.go b/test/e2e/system_df_test.go index acb6530cf..2d75316ad 100644 --- a/test/e2e/system_df_test.go +++ b/test/e2e/system_df_test.go @@ -6,7 +6,7 @@ import ( "strconv" "strings" - . "github.com/containers/podman/v3/test/utils" + . "github.com/containers/podman/v4/test/utils" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/test/e2e/system_dial_stdio_test.go b/test/e2e/system_dial_stdio_test.go index afe3d5acd..5fcb20cb8 100644 --- a/test/e2e/system_dial_stdio_test.go +++ b/test/e2e/system_dial_stdio_test.go @@ -4,7 +4,7 @@ import ( "fmt" "os" - . "github.com/containers/podman/v3/test/utils" + . "github.com/containers/podman/v4/test/utils" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/test/e2e/system_reset_test.go b/test/e2e/system_reset_test.go index 812e98cfd..641f98c38 100644 --- a/test/e2e/system_reset_test.go +++ b/test/e2e/system_reset_test.go @@ -4,7 +4,7 @@ import ( "fmt" "os" - . "github.com/containers/podman/v3/test/utils" + . "github.com/containers/podman/v4/test/utils" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/test/e2e/system_service_test.go b/test/e2e/system_service_test.go index a9ed0b11f..dcf5e03b2 100644 --- a/test/e2e/system_service_test.go +++ b/test/e2e/system_service_test.go @@ -8,8 +8,8 @@ import ( "strconv" "time" - . "github.com/containers/podman/v3/test/utils" - "github.com/containers/podman/v3/utils" + . "github.com/containers/podman/v4/test/utils" + "github.com/containers/podman/v4/utils" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/test/e2e/systemd_test.go b/test/e2e/systemd_test.go index 1f237fc9e..f8d8db592 100644 --- a/test/e2e/systemd_test.go +++ b/test/e2e/systemd_test.go @@ -5,7 +5,7 @@ import ( "os" "strings" - . "github.com/containers/podman/v3/test/utils" + . "github.com/containers/podman/v4/test/utils" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/test/e2e/tag_test.go b/test/e2e/tag_test.go index 743f58ea2..52ed8a820 100644 --- a/test/e2e/tag_test.go +++ b/test/e2e/tag_test.go @@ -3,7 +3,7 @@ package integration import ( "os" - . "github.com/containers/podman/v3/test/utils" + . "github.com/containers/podman/v4/test/utils" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/test/e2e/toolbox_test.go b/test/e2e/toolbox_test.go index 72ada5c31..b34fd299c 100644 --- a/test/e2e/toolbox_test.go +++ b/test/e2e/toolbox_test.go @@ -35,8 +35,8 @@ import ( "strings" "syscall" - "github.com/containers/podman/v3/pkg/rootless" - . "github.com/containers/podman/v3/test/utils" + "github.com/containers/podman/v4/pkg/rootless" + . "github.com/containers/podman/v4/test/utils" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/test/e2e/top_test.go b/test/e2e/top_test.go index 1a71ebf33..344568da5 100644 --- a/test/e2e/top_test.go +++ b/test/e2e/top_test.go @@ -3,7 +3,7 @@ package integration import ( "os" - . "github.com/containers/podman/v3/test/utils" + . "github.com/containers/podman/v4/test/utils" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/test/e2e/tree_test.go b/test/e2e/tree_test.go index 492dc50b2..ab6e49e88 100644 --- a/test/e2e/tree_test.go +++ b/test/e2e/tree_test.go @@ -4,7 +4,7 @@ import ( "fmt" "os" - . "github.com/containers/podman/v3/test/utils" + . "github.com/containers/podman/v4/test/utils" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/test/e2e/trust_test.go b/test/e2e/trust_test.go index 9909c0653..251fdbf77 100644 --- a/test/e2e/trust_test.go +++ b/test/e2e/trust_test.go @@ -6,7 +6,7 @@ import ( "os" "path/filepath" - . "github.com/containers/podman/v3/test/utils" + . "github.com/containers/podman/v4/test/utils" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/test/e2e/unshare_test.go b/test/e2e/unshare_test.go index cf1b8db53..ac4fa46bf 100644 --- a/test/e2e/unshare_test.go +++ b/test/e2e/unshare_test.go @@ -3,7 +3,7 @@ package integration import ( "os" - . "github.com/containers/podman/v3/test/utils" + . "github.com/containers/podman/v4/test/utils" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/test/e2e/untag_test.go b/test/e2e/untag_test.go index b247ad5da..90b0cc95f 100644 --- a/test/e2e/untag_test.go +++ b/test/e2e/untag_test.go @@ -3,7 +3,7 @@ package integration import ( "os" - . "github.com/containers/podman/v3/test/utils" + . "github.com/containers/podman/v4/test/utils" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/test/e2e/version_test.go b/test/e2e/version_test.go index 9398248b8..6f93beff6 100644 --- a/test/e2e/version_test.go +++ b/test/e2e/version_test.go @@ -4,8 +4,8 @@ import ( "fmt" "os" - . "github.com/containers/podman/v3/test/utils" - "github.com/containers/podman/v3/version" + . "github.com/containers/podman/v4/test/utils" + "github.com/containers/podman/v4/version" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/test/e2e/volume_create_test.go b/test/e2e/volume_create_test.go index bd609943c..966bc932a 100644 --- a/test/e2e/volume_create_test.go +++ b/test/e2e/volume_create_test.go @@ -4,7 +4,7 @@ import ( "fmt" "os" - . "github.com/containers/podman/v3/test/utils" + . "github.com/containers/podman/v4/test/utils" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/test/e2e/volume_exists_test.go b/test/e2e/volume_exists_test.go index 2118eb307..fdadbda27 100644 --- a/test/e2e/volume_exists_test.go +++ b/test/e2e/volume_exists_test.go @@ -3,7 +3,7 @@ package integration import ( "os" - . "github.com/containers/podman/v3/test/utils" + . "github.com/containers/podman/v4/test/utils" "github.com/containers/storage/pkg/stringid" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" diff --git a/test/e2e/volume_inspect_test.go b/test/e2e/volume_inspect_test.go index 3fcdb7728..5e3edfe24 100644 --- a/test/e2e/volume_inspect_test.go +++ b/test/e2e/volume_inspect_test.go @@ -3,7 +3,7 @@ package integration import ( "os" - . "github.com/containers/podman/v3/test/utils" + . "github.com/containers/podman/v4/test/utils" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/test/e2e/volume_ls_test.go b/test/e2e/volume_ls_test.go index 52b805718..ce4cfc77d 100644 --- a/test/e2e/volume_ls_test.go +++ b/test/e2e/volume_ls_test.go @@ -4,7 +4,7 @@ import ( "fmt" "os" - . "github.com/containers/podman/v3/test/utils" + . "github.com/containers/podman/v4/test/utils" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/test/e2e/volume_plugin_test.go b/test/e2e/volume_plugin_test.go index a3a445866..959a44bb8 100644 --- a/test/e2e/volume_plugin_test.go +++ b/test/e2e/volume_plugin_test.go @@ -5,7 +5,7 @@ import ( "os" "path/filepath" - . "github.com/containers/podman/v3/test/utils" + . "github.com/containers/podman/v4/test/utils" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/test/e2e/volume_prune_test.go b/test/e2e/volume_prune_test.go index 9ea8b1d25..0b4c30a48 100644 --- a/test/e2e/volume_prune_test.go +++ b/test/e2e/volume_prune_test.go @@ -3,7 +3,7 @@ package integration import ( "os" - . "github.com/containers/podman/v3/test/utils" + . "github.com/containers/podman/v4/test/utils" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/test/e2e/volume_rm_test.go b/test/e2e/volume_rm_test.go index 68d94963a..2a2de0920 100644 --- a/test/e2e/volume_rm_test.go +++ b/test/e2e/volume_rm_test.go @@ -3,7 +3,7 @@ package integration import ( "os" - . "github.com/containers/podman/v3/test/utils" + . "github.com/containers/podman/v4/test/utils" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/test/e2e/wait_test.go b/test/e2e/wait_test.go index 96bc8dbde..098780c70 100644 --- a/test/e2e/wait_test.go +++ b/test/e2e/wait_test.go @@ -3,7 +3,7 @@ package integration import ( "os" - . "github.com/containers/podman/v3/test/utils" + . "github.com/containers/podman/v4/test/utils" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/test/utils/common_function_test.go b/test/utils/common_function_test.go index c996a302c..810d9f2a5 100644 --- a/test/utils/common_function_test.go +++ b/test/utils/common_function_test.go @@ -8,7 +8,7 @@ import ( "reflect" "strings" - . "github.com/containers/podman/v3/test/utils" + . "github.com/containers/podman/v4/test/utils" . "github.com/onsi/ginkgo" . "github.com/onsi/ginkgo/extensions/table" . "github.com/onsi/gomega" diff --git a/test/utils/podmansession_test.go b/test/utils/podmansession_test.go index d85f27bbb..5cfa30a53 100644 --- a/test/utils/podmansession_test.go +++ b/test/utils/podmansession_test.go @@ -1,7 +1,7 @@ package utils_test import ( - . "github.com/containers/podman/v3/test/utils" + . "github.com/containers/podman/v4/test/utils" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" ) diff --git a/test/utils/podmantest_test.go b/test/utils/podmantest_test.go index 1bb9ecb6b..a9b5aef1f 100644 --- a/test/utils/podmantest_test.go +++ b/test/utils/podmantest_test.go @@ -3,7 +3,7 @@ package utils_test import ( "os" - . "github.com/containers/podman/v3/test/utils" + . "github.com/containers/podman/v4/test/utils" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" ) diff --git a/test/utils/utils_suite_test.go b/test/utils/utils_suite_test.go index d5f9cbce4..7478c12b9 100644 --- a/test/utils/utils_suite_test.go +++ b/test/utils/utils_suite_test.go @@ -7,7 +7,7 @@ import ( "strings" "testing" - . "github.com/containers/podman/v3/test/utils" + . "github.com/containers/podman/v4/test/utils" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" "github.com/onsi/gomega/gexec" diff --git a/test/version/main.go b/test/version/main.go index 2a751de78..8f2904405 100644 --- a/test/version/main.go +++ b/test/version/main.go @@ -3,7 +3,7 @@ package main import ( "fmt" - "github.com/containers/podman/v3/version" + "github.com/containers/podman/v4/version" ) func main() { diff --git a/utils/utils.go b/utils/utils.go index 4c04b939d..caf63c975 100644 --- a/utils/utils.go +++ b/utils/utils.go @@ -13,7 +13,7 @@ import ( "sync" "github.com/containers/common/pkg/cgroups" - "github.com/containers/podman/v3/libpod/define" + "github.com/containers/podman/v4/libpod/define" "github.com/containers/storage/pkg/archive" "github.com/godbus/dbus/v5" "github.com/pkg/errors" diff --git a/utils/utils_supported.go b/utils/utils_supported.go index 064d9e024..561372607 100644 --- a/utils/utils_supported.go +++ b/utils/utils_supported.go @@ -12,7 +12,7 @@ import ( "strings" "github.com/containers/common/pkg/cgroups" - "github.com/containers/podman/v3/pkg/rootless" + "github.com/containers/podman/v4/pkg/rootless" systemdDbus "github.com/coreos/go-systemd/v22/dbus" "github.com/godbus/dbus/v5" "github.com/pkg/errors" |