diff options
Diffstat (limited to 'libpod')
73 files changed, 186 insertions, 186 deletions
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" |