From 28ba2bb32ccc7baf87adbd32b640e3305bf24b93 Mon Sep 17 00:00:00 2001 From: Matt Heon Date: Thu, 1 Feb 2024 11:35:50 -0500 Subject: [PATCH] To prepare for Podman 5.0.0-rc1, bump go module Moving from Go module v4 to v5 prepares us for public releases. Move done using gomove [1] as with the v3 and v4 moves. [1] https://github.com/KSubedi/gomove Signed-off-by: Matt Heon --- cmd/podman-wslkerninst/main.go | 2 +- cmd/podman/auto-update.go | 8 ++-- cmd/podman/client.go | 2 +- cmd/podman/client_supported.go | 2 +- cmd/podman/common/build.go | 8 ++-- cmd/podman/common/completion.go | 16 ++++---- cmd/podman/common/completion_test.go | 2 +- cmd/podman/common/create.go | 6 +-- cmd/podman/common/create_opts.go | 6 +-- cmd/podman/common/create_test.go | 4 +- cmd/podman/common/default.go | 2 +- cmd/podman/common/netflags.go | 10 ++--- cmd/podman/common/sign.go | 2 +- cmd/podman/completion/completion.go | 2 +- cmd/podman/compose.go | 10 ++--- cmd/podman/containers/attach.go | 8 ++-- cmd/podman/containers/checkpoint.go | 14 +++---- cmd/podman/containers/cleanup.go | 10 ++--- cmd/podman/containers/clone.go | 8 ++-- cmd/podman/containers/commit.go | 8 ++-- cmd/podman/containers/container.go | 6 +-- cmd/podman/containers/cp.go | 10 ++--- cmd/podman/containers/create.go | 16 ++++---- cmd/podman/containers/diff.go | 12 +++--- cmd/podman/containers/exec.go | 14 +++---- cmd/podman/containers/exists.go | 6 +-- cmd/podman/containers/export.go | 8 ++-- cmd/podman/containers/init.go | 10 ++--- cmd/podman/containers/inspect.go | 12 +++--- cmd/podman/containers/kill.go | 12 +++--- cmd/podman/containers/list.go | 4 +- cmd/podman/containers/logs.go | 12 +++--- cmd/podman/containers/mount.go | 10 ++--- cmd/podman/containers/pause.go | 10 ++--- cmd/podman/containers/port.go | 8 ++-- cmd/podman/containers/prune.go | 12 +++--- cmd/podman/containers/ps.go | 10 ++--- cmd/podman/containers/rename.go | 8 ++-- cmd/podman/containers/restart.go | 10 ++--- cmd/podman/containers/restore.go | 12 +++--- cmd/podman/containers/rm.go | 12 +++--- cmd/podman/containers/run.go | 16 ++++---- cmd/podman/containers/runlabel.go | 6 +-- cmd/podman/containers/start.go | 12 +++--- cmd/podman/containers/stats.go | 14 +++---- cmd/podman/containers/stop.go | 10 ++--- cmd/podman/containers/top.go | 10 ++--- cmd/podman/containers/unmount.go | 10 ++--- cmd/podman/containers/unpause.go | 12 +++--- cmd/podman/containers/update.go | 10 ++--- cmd/podman/containers/wait.go | 10 ++--- cmd/podman/diff.go | 12 +++--- cmd/podman/diff/diff.go | 4 +- cmd/podman/early_init_linux.go | 2 +- cmd/podman/farm/build.go | 8 ++-- cmd/podman/farm/create.go | 4 +- cmd/podman/farm/farm.go | 4 +- cmd/podman/farm/list.go | 6 +-- cmd/podman/farm/remove.go | 6 +-- cmd/podman/farm/update.go | 6 +-- cmd/podman/generate/generate.go | 6 +-- cmd/podman/generate/spec.go | 8 ++-- cmd/podman/generate/systemd.go | 12 +++--- cmd/podman/healthcheck/healthcheck.go | 4 +- cmd/podman/healthcheck/run.go | 8 ++-- cmd/podman/images/build.go | 6 +-- cmd/podman/images/buildx.go | 4 +- cmd/podman/images/diff.go | 10 ++--- cmd/podman/images/exists.go | 4 +- cmd/podman/images/history.go | 8 ++-- cmd/podman/images/image.go | 4 +- cmd/podman/images/import.go | 8 ++-- cmd/podman/images/inspect.go | 10 ++--- cmd/podman/images/list.go | 6 +-- cmd/podman/images/load.go | 8 ++-- cmd/podman/images/mount.go | 6 +-- cmd/podman/images/prune.go | 12 +++--- cmd/podman/images/pull.go | 10 ++--- cmd/podman/images/push.go | 8 ++-- cmd/podman/images/rm.go | 10 ++--- cmd/podman/images/save.go | 10 ++--- cmd/podman/images/scp.go | 4 +- cmd/podman/images/search.go | 8 ++-- cmd/podman/images/sign.go | 6 +-- cmd/podman/images/tag.go | 6 +-- cmd/podman/images/tree.go | 6 +-- cmd/podman/images/trust.go | 4 +- cmd/podman/images/trust_set.go | 6 +-- cmd/podman/images/trust_show.go | 6 +-- cmd/podman/images/unmount.go | 8 ++-- cmd/podman/images/untag.go | 6 +-- cmd/podman/images/version.go | 4 +- cmd/podman/inspect.go | 8 ++-- cmd/podman/inspect/inspect.go | 8 ++-- cmd/podman/kube/apply.go | 8 ++-- cmd/podman/kube/down.go | 8 ++-- cmd/podman/kube/generate.go | 10 ++--- cmd/podman/kube/kube.go | 4 +- cmd/podman/kube/play.go | 18 ++++----- cmd/podman/login.go | 6 +-- cmd/podman/logout.go | 4 +- cmd/podman/machine/client9p.go | 2 +- cmd/podman/machine/info.go | 12 +++--- cmd/podman/machine/init.go | 8 ++-- cmd/podman/machine/inspect.go | 8 ++-- cmd/podman/machine/list.go | 10 ++--- cmd/podman/machine/machine.go | 12 +++--- cmd/podman/machine/machine_unix.go | 2 +- cmd/podman/machine/os.go | 4 +- cmd/podman/machine/os/apply.go | 10 ++--- cmd/podman/machine/os/manager.go | 6 +-- cmd/podman/machine/rm.go | 6 +-- cmd/podman/machine/server9p.go | 4 +- cmd/podman/machine/set.go | 4 +- cmd/podman/machine/ssh.go | 6 +-- cmd/podman/machine/start.go | 6 +-- cmd/podman/machine/stop.go | 6 +-- cmd/podman/main.go | 40 +++++++++---------- cmd/podman/manifest/add.go | 8 ++-- cmd/podman/manifest/annotate.go | 6 +-- cmd/podman/manifest/create.go | 6 +-- cmd/podman/manifest/exists.go | 4 +- cmd/podman/manifest/inspect.go | 6 +-- cmd/podman/manifest/manifest.go | 4 +- cmd/podman/manifest/push.go | 10 ++--- cmd/podman/manifest/remove.go | 4 +- cmd/podman/manifest/rm.go | 6 +-- cmd/podman/networks/connect.go | 6 +-- cmd/podman/networks/create.go | 8 ++-- cmd/podman/networks/disconnect.go | 6 +-- cmd/podman/networks/exists.go | 4 +- cmd/podman/networks/inspect.go | 8 ++-- cmd/podman/networks/list.go | 10 ++--- cmd/podman/networks/network.go | 6 +-- cmd/podman/networks/prune.go | 12 +++--- cmd/podman/networks/reload.go | 10 ++--- cmd/podman/networks/rm.go | 10 ++--- cmd/podman/networks/update.go | 6 +-- cmd/podman/pods/clone.go | 8 ++-- cmd/podman/pods/create.go | 20 +++++----- cmd/podman/pods/exists.go | 4 +- cmd/podman/pods/inspect.go | 10 ++--- cmd/podman/pods/kill.go | 10 ++--- cmd/podman/pods/logs.go | 12 +++--- cmd/podman/pods/pause.go | 10 ++--- cmd/podman/pods/pod.go | 6 +-- cmd/podman/pods/prune.go | 8 ++-- cmd/podman/pods/ps.go | 10 ++--- cmd/podman/pods/restart.go | 10 ++--- cmd/podman/pods/rm.go | 14 +++---- cmd/podman/pods/start.go | 12 +++--- cmd/podman/pods/stats.go | 8 ++-- cmd/podman/pods/stop.go | 12 +++--- cmd/podman/pods/top.go | 10 ++--- cmd/podman/pods/unpause.go | 10 ++--- cmd/podman/registry/config.go | 6 +-- cmd/podman/registry/registry.go | 8 ++-- cmd/podman/registry/remote.go | 2 +- cmd/podman/root.go | 18 ++++----- cmd/podman/root_test.go | 2 +- cmd/podman/secrets/create.go | 8 ++-- cmd/podman/secrets/exists.go | 4 +- cmd/podman/secrets/inspect.go | 6 +-- cmd/podman/secrets/list.go | 10 ++--- cmd/podman/secrets/rm.go | 8 ++-- cmd/podman/secrets/secret.go | 4 +- cmd/podman/syslog_common.go | 2 +- cmd/podman/syslog_unsupported.go | 2 +- cmd/podman/system/connection.go | 4 +- cmd/podman/system/connection/add.go | 6 +-- cmd/podman/system/connection/default.go | 6 +-- cmd/podman/system/connection/list.go | 8 ++-- cmd/podman/system/connection/remove.go | 6 +-- cmd/podman/system/connection/rename.go | 6 +-- cmd/podman/system/context.go | 4 +- cmd/podman/system/df.go | 8 ++-- cmd/podman/system/dial_stdio.go | 6 +-- cmd/podman/system/events.go | 10 ++--- cmd/podman/system/info.go | 8 ++-- cmd/podman/system/locks.go | 4 +- cmd/podman/system/migrate.go | 8 ++-- cmd/podman/system/prune.go | 12 +++--- cmd/podman/system/renumber.go | 6 +-- cmd/podman/system/reset.go | 4 +- cmd/podman/system/reset_machine.go | 2 +- cmd/podman/system/service.go | 12 +++--- cmd/podman/system/service_abi.go | 8 ++-- cmd/podman/system/service_abi_linux.go | 2 +- cmd/podman/system/system.go | 4 +- cmd/podman/system/unshare.go | 8 ++-- cmd/podman/system/version.go | 8 ++-- cmd/podman/utils/error.go | 2 +- cmd/podman/utils/utils.go | 8 ++-- cmd/podman/validate/args.go | 2 +- cmd/podman/validate/latest.go | 2 +- cmd/podman/volumes/create.go | 6 +-- cmd/podman/volumes/exists.go | 4 +- cmd/podman/volumes/export.go | 10 ++--- cmd/podman/volumes/import.go | 12 +++--- cmd/podman/volumes/inspect.go | 10 ++--- cmd/podman/volumes/list.go | 10 ++--- cmd/podman/volumes/mount.go | 6 +-- cmd/podman/volumes/prune.go | 12 +++--- cmd/podman/volumes/reload.go | 6 +-- cmd/podman/volumes/rm.go | 10 ++--- cmd/podman/volumes/unmount.go | 6 +-- cmd/podman/volumes/volume.go | 6 +-- cmd/quadlet/main.go | 6 +-- cmd/quadlet/main_test.go | 2 +- go.mod | 2 +- hack/podman-registry-go/registry.go | 2 +- libpod/boltdb_state.go | 2 +- libpod/boltdb_state_internal.go | 2 +- libpod/common_test.go | 4 +- libpod/container.go | 4 +- libpod/container_api.go | 6 +-- libpod/container_commit.go | 4 +- libpod/container_config.go | 6 +-- libpod/container_copy_common.go | 4 +- libpod/container_copy_linux.go | 2 +- libpod/container_exec.go | 4 +- libpod/container_graph.go | 2 +- libpod/container_graph_test.go | 2 +- libpod/container_inspect.go | 6 +-- libpod/container_inspect_freebsd.go | 2 +- libpod/container_inspect_linux.go | 4 +- libpod/container_internal.go | 18 ++++----- libpod/container_internal_common.go | 18 ++++----- libpod/container_internal_freebsd.go | 2 +- libpod/container_internal_linux.go | 4 +- libpod/container_log.go | 8 ++-- libpod/container_log_linux.go | 8 ++-- libpod/container_log_unsupported.go | 4 +- libpod/container_path_resolution.go | 2 +- libpod/container_stat_common.go | 4 +- libpod/container_stat_linux.go | 2 +- libpod/container_top_freebsd.go | 4 +- libpod/container_top_linux.go | 4 +- libpod/container_validate.go | 2 +- libpod/define/version.go | 2 +- libpod/diff.go | 4 +- libpod/driver/driver.go | 2 +- libpod/events.go | 2 +- libpod/events/filters.go | 2 +- libpod/events/journal_linux.go | 4 +- libpod/events/logfile.go | 2 +- libpod/healthcheck.go | 4 +- libpod/healthcheck_linux.go | 6 +-- libpod/info.go | 4 +- libpod/info_freebsd.go | 2 +- libpod/info_linux.go | 4 +- libpod/info_test.go | 2 +- libpod/kube.go | 24 +++++------ libpod/lock/file_lock_manager.go | 4 +- libpod/lock/shm_lock_manager_linux.go | 2 +- libpod/logs/log.go | 2 +- libpod/networking_common.go | 8 ++-- libpod/networking_linux.go | 2 +- libpod/networking_linux_test.go | 2 +- libpod/networking_slirp4netns.go | 2 +- libpod/oci.go | 2 +- libpod/oci_conmon_attach_common.go | 4 +- libpod/oci_conmon_common.go | 16 ++++---- libpod/oci_conmon_exec_common.go | 6 +-- libpod/oci_conmon_linux.go | 4 +- libpod/oci_missing.go | 2 +- libpod/oci_util.go | 2 +- libpod/options.go | 10 ++--- libpod/plugin/volume_api.go | 2 +- libpod/pod.go | 4 +- libpod/pod_api.go | 8 ++-- libpod/pod_internal.go | 2 +- libpod/pod_internal_linux.go | 4 +- libpod/pod_status.go | 2 +- libpod/pod_top_freebsd.go | 2 +- libpod/pod_top_linux.go | 4 +- libpod/reset.go | 6 +-- libpod/runtime.go | 16 ++++---- libpod/runtime_cstorage.go | 2 +- libpod/runtime_ctr.go | 14 +++---- libpod/runtime_img.go | 6 +-- libpod/runtime_migrate_linux.go | 6 +-- libpod/runtime_pod.go | 2 +- libpod/runtime_pod_common.go | 6 +-- libpod/runtime_pod_linux.go | 4 +- libpod/runtime_renumber.go | 4 +- libpod/runtime_volume.go | 6 +-- libpod/runtime_volume_common.go | 6 +-- libpod/service.go | 2 +- libpod/sqlite_state.go | 2 +- libpod/sqlite_state_internal.go | 2 +- libpod/state_test.go | 4 +- libpod/stats_common.go | 2 +- libpod/stats_freebsd.go | 4 +- libpod/stats_linux.go | 2 +- libpod/storage.go | 2 +- libpod/util.go | 4 +- libpod/util_linux.go | 4 +- libpod/util_test.go | 2 +- libpod/volume.go | 6 +-- libpod/volume_inspect.go | 2 +- libpod/volume_internal.go | 2 +- libpod/volume_internal_common.go | 2 +- pkg/api/handlers/compat/auth.go | 8 ++-- pkg/api/handlers/compat/changes.go | 8 ++-- pkg/api/handlers/compat/containers.go | 22 +++++----- pkg/api/handlers/compat/containers_archive.go | 14 +++---- pkg/api/handlers/compat/containers_attach.go | 10 ++--- pkg/api/handlers/compat/containers_create.go | 20 +++++----- pkg/api/handlers/compat/containers_export.go | 6 +-- pkg/api/handlers/compat/containers_logs.go | 10 ++--- pkg/api/handlers/compat/containers_pause.go | 6 +-- pkg/api/handlers/compat/containers_prune.go | 14 +++---- pkg/api/handlers/compat/containers_restart.go | 12 +++--- pkg/api/handlers/compat/containers_start.go | 8 ++-- .../compat/containers_stats_freebsd.go | 2 +- .../handlers/compat/containers_stats_linux.go | 8 ++-- pkg/api/handlers/compat/containers_stop.go | 14 +++---- pkg/api/handlers/compat/containers_top.go | 8 ++-- pkg/api/handlers/compat/containers_unpause.go | 6 +-- pkg/api/handlers/compat/events.go | 12 +++--- pkg/api/handlers/compat/exec.go | 18 ++++----- pkg/api/handlers/compat/images.go | 16 ++++---- pkg/api/handlers/compat/images_build.go | 16 ++++---- pkg/api/handlers/compat/images_history.go | 8 ++-- pkg/api/handlers/compat/images_prune.go | 14 +++---- pkg/api/handlers/compat/images_push.go | 12 +++--- pkg/api/handlers/compat/images_remove.go | 10 ++--- pkg/api/handlers/compat/images_search.go | 12 +++--- pkg/api/handlers/compat/images_tag.go | 6 +-- pkg/api/handlers/compat/info.go | 12 +++--- pkg/api/handlers/compat/networks.go | 14 +++---- pkg/api/handlers/compat/resize.go | 8 ++-- pkg/api/handlers/compat/secrets.go | 12 +++--- pkg/api/handlers/compat/system.go | 12 +++--- pkg/api/handlers/compat/unsupported.go | 4 +- pkg/api/handlers/compat/version.go | 14 +++---- pkg/api/handlers/compat/volumes.go | 16 ++++---- pkg/api/handlers/decoder.go | 4 +- pkg/api/handlers/libpod/containers.go | 18 ++++----- pkg/api/handlers/libpod/containers_create.go | 14 +++---- pkg/api/handlers/libpod/containers_stats.go | 12 +++--- pkg/api/handlers/libpod/generate.go | 12 +++--- pkg/api/handlers/libpod/healthcheck.go | 8 ++-- pkg/api/handlers/libpod/images.go | 28 ++++++------- pkg/api/handlers/libpod/images_pull.go | 12 +++--- pkg/api/handlers/libpod/images_push.go | 14 +++---- pkg/api/handlers/libpod/info.go | 8 ++-- pkg/api/handlers/libpod/kube.go | 12 +++--- pkg/api/handlers/libpod/manifests.go | 22 +++++----- pkg/api/handlers/libpod/networks.go | 14 +++---- pkg/api/handlers/libpod/pods.go | 22 +++++----- pkg/api/handlers/libpod/secrets.go | 10 ++--- pkg/api/handlers/libpod/swagger_spec.go | 2 +- pkg/api/handlers/libpod/system.go | 12 +++--- pkg/api/handlers/libpod/volumes.go | 20 +++++----- pkg/api/handlers/swagger/errors.go | 2 +- pkg/api/handlers/swagger/models.go | 2 +- pkg/api/handlers/swagger/responses.go | 10 ++--- pkg/api/handlers/types.go | 2 +- pkg/api/handlers/types/types.go | 2 +- pkg/api/handlers/utils/apiutil/apiutil.go | 2 +- .../handlers/utils/apiutil/apiutil_test.go | 2 +- pkg/api/handlers/utils/containers.go | 14 +++---- pkg/api/handlers/utils/errors.go | 4 +- pkg/api/handlers/utils/handler.go | 4 +- pkg/api/handlers/utils/images.go | 8 ++-- pkg/api/server/handler_api.go | 2 +- pkg/api/server/handler_panic.go | 2 +- pkg/api/server/handler_rid.go | 2 +- pkg/api/server/register_archive.go | 2 +- pkg/api/server/register_auth.go | 2 +- pkg/api/server/register_containers.go | 4 +- pkg/api/server/register_distribution.go | 2 +- pkg/api/server/register_events.go | 2 +- pkg/api/server/register_exec.go | 2 +- pkg/api/server/register_generate.go | 2 +- pkg/api/server/register_healthcheck.go | 2 +- pkg/api/server/register_images.go | 4 +- pkg/api/server/register_info.go | 4 +- pkg/api/server/register_kube.go | 2 +- pkg/api/server/register_manifest.go | 2 +- pkg/api/server/register_monitor.go | 2 +- pkg/api/server/register_networks.go | 4 +- pkg/api/server/register_ping.go | 2 +- pkg/api/server/register_plugins.go | 2 +- pkg/api/server/register_pods.go | 2 +- pkg/api/server/register_secrets.go | 4 +- pkg/api/server/register_swagger.go | 2 +- pkg/api/server/register_swarm.go | 2 +- pkg/api/server/register_system.go | 4 +- pkg/api/server/register_version.go | 2 +- pkg/api/server/register_volumes.go | 4 +- pkg/api/server/server.go | 12 +++--- pkg/autoupdate/autoupdate.go | 12 +++--- pkg/bindings/connection.go | 2 +- pkg/bindings/containers/archive.go | 6 +-- pkg/bindings/containers/attach.go | 4 +- pkg/bindings/containers/checkpoint.go | 4 +- pkg/bindings/containers/commit.go | 4 +- pkg/bindings/containers/containers.go | 10 ++--- pkg/bindings/containers/create.go | 6 +-- pkg/bindings/containers/diff.go | 2 +- pkg/bindings/containers/exec.go | 6 +-- pkg/bindings/containers/healthcheck.go | 4 +- pkg/bindings/containers/logs.go | 2 +- pkg/bindings/containers/mount.go | 2 +- pkg/bindings/containers/rename.go | 2 +- pkg/bindings/containers/term_unix.go | 2 +- pkg/bindings/containers/term_windows.go | 2 +- pkg/bindings/containers/types.go | 2 +- .../containers/types_attach_options.go | 2 +- .../containers/types_checkpoint_options.go | 2 +- .../containers/types_commit_options.go | 2 +- pkg/bindings/containers/types_copy_options.go | 2 +- .../containers/types_create_options.go | 2 +- pkg/bindings/containers/types_diff_options.go | 2 +- .../containers/types_execinspect_options.go | 2 +- .../containers/types_execremove_options.go | 2 +- .../containers/types_execstart_options.go | 2 +- .../types_execstartandattach_options.go | 2 +- .../containers/types_exists_options.go | 2 +- .../containers/types_export_options.go | 2 +- .../containers/types_healthcheck_options.go | 2 +- pkg/bindings/containers/types_init_options.go | 2 +- .../containers/types_inspect_options.go | 2 +- pkg/bindings/containers/types_kill_options.go | 2 +- pkg/bindings/containers/types_list_options.go | 2 +- pkg/bindings/containers/types_log_options.go | 2 +- .../containers/types_mount_options.go | 2 +- .../types_mountedcontainerpaths_options.go | 2 +- .../containers/types_pause_options.go | 2 +- .../containers/types_prune_options.go | 2 +- .../containers/types_remove_options.go | 2 +- .../containers/types_rename_options.go | 2 +- .../containers/types_resizeexectty_options.go | 2 +- .../containers/types_resizetty_options.go | 2 +- .../containers/types_restart_options.go | 2 +- .../containers/types_restore_options.go | 2 +- .../containers/types_shouldrestart_options.go | 2 +- .../containers/types_start_options.go | 2 +- .../containers/types_stats_options.go | 2 +- pkg/bindings/containers/types_stop_options.go | 2 +- pkg/bindings/containers/types_top_options.go | 2 +- .../containers/types_unmount_options.go | 2 +- .../containers/types_unpause_options.go | 2 +- pkg/bindings/containers/types_wait_options.go | 4 +- pkg/bindings/containers/update.go | 4 +- pkg/bindings/errors.go | 2 +- pkg/bindings/generate/generate.go | 4 +- pkg/bindings/generate/types_kube_options.go | 2 +- .../generate/types_systemd_options.go | 2 +- pkg/bindings/images/build.go | 10 ++--- pkg/bindings/images/diff.go | 2 +- pkg/bindings/images/images.go | 10 ++--- pkg/bindings/images/pull.go | 8 ++-- pkg/bindings/images/push.go | 6 +-- pkg/bindings/images/rm.go | 8 ++-- pkg/bindings/images/types.go | 2 +- pkg/bindings/images/types_diff_options.go | 2 +- pkg/bindings/images/types_exists_options.go | 2 +- pkg/bindings/images/types_export_options.go | 2 +- pkg/bindings/images/types_get_options.go | 2 +- pkg/bindings/images/types_history_options.go | 2 +- pkg/bindings/images/types_import_options.go | 2 +- pkg/bindings/images/types_list_options.go | 2 +- pkg/bindings/images/types_load_options.go | 2 +- pkg/bindings/images/types_prune_options.go | 2 +- pkg/bindings/images/types_pull_options.go | 2 +- pkg/bindings/images/types_push_options.go | 2 +- pkg/bindings/images/types_remove_options.go | 2 +- pkg/bindings/images/types_scp_options.go | 2 +- pkg/bindings/images/types_search_options.go | 2 +- pkg/bindings/images/types_tag_options.go | 2 +- pkg/bindings/images/types_tree_options.go | 2 +- pkg/bindings/images/types_untag_options.go | 2 +- pkg/bindings/kube/kube.go | 8 ++-- pkg/bindings/kube/types_apply_options.go | 2 +- pkg/bindings/kube/types_down_options.go | 2 +- pkg/bindings/kube/types_play_options.go | 2 +- pkg/bindings/manifests/manifests.go | 10 ++--- pkg/bindings/manifests/types_add_options.go | 2 +- .../manifests/types_create_options.go | 2 +- .../manifests/types_exists_options.go | 2 +- .../manifests/types_inspect_options.go | 2 +- .../manifests/types_modify_options.go | 2 +- .../manifests/types_remove_options.go | 2 +- pkg/bindings/network/network.go | 4 +- pkg/bindings/network/types_create_options.go | 2 +- .../network/types_disconnect_options.go | 2 +- pkg/bindings/network/types_exists_options.go | 2 +- .../network/types_extracreate_options.go | 2 +- pkg/bindings/network/types_inspect_options.go | 2 +- pkg/bindings/network/types_list_options.go | 2 +- pkg/bindings/network/types_prune_options.go | 2 +- pkg/bindings/network/types_remove_options.go | 2 +- pkg/bindings/network/types_update_options.go | 2 +- pkg/bindings/play/play.go | 4 +- pkg/bindings/pods/pods.go | 8 ++-- pkg/bindings/pods/types_create_options.go | 2 +- pkg/bindings/pods/types_exists_options.go | 2 +- pkg/bindings/pods/types_inspect_options.go | 2 +- pkg/bindings/pods/types_kill_options.go | 2 +- pkg/bindings/pods/types_list_options.go | 2 +- pkg/bindings/pods/types_pause_options.go | 2 +- pkg/bindings/pods/types_prune_options.go | 2 +- pkg/bindings/pods/types_remove_options.go | 2 +- pkg/bindings/pods/types_restart_options.go | 2 +- pkg/bindings/pods/types_start_options.go | 2 +- pkg/bindings/pods/types_stats_options.go | 2 +- pkg/bindings/pods/types_stop_options.go | 2 +- pkg/bindings/pods/types_top_options.go | 2 +- pkg/bindings/pods/types_unpause_options.go | 2 +- pkg/bindings/secrets/secrets.go | 4 +- pkg/bindings/secrets/types_create_options.go | 2 +- pkg/bindings/secrets/types_inspect_options.go | 2 +- pkg/bindings/secrets/types_list_options.go | 2 +- pkg/bindings/secrets/types_remove_options.go | 2 +- pkg/bindings/system/info.go | 4 +- pkg/bindings/system/system.go | 6 +-- pkg/bindings/system/types_disk_options.go | 2 +- pkg/bindings/system/types_events_options.go | 2 +- pkg/bindings/system/types_info_options.go | 2 +- pkg/bindings/system/types_prune_options.go | 2 +- pkg/bindings/system/types_version_options.go | 2 +- pkg/bindings/test/attach_test.go | 6 +-- pkg/bindings/test/auth_test.go | 4 +- pkg/bindings/test/common_test.go | 8 ++-- pkg/bindings/test/connection_test.go | 4 +- pkg/bindings/test/containers_test.go | 10 ++--- pkg/bindings/test/create_test.go | 4 +- pkg/bindings/test/exec_test.go | 4 +- pkg/bindings/test/generator_test.go | 2 +- pkg/bindings/test/images_test.go | 12 +++--- pkg/bindings/test/info_test.go | 8 ++-- pkg/bindings/test/manifests_test.go | 8 ++-- pkg/bindings/test/networks_test.go | 6 +-- pkg/bindings/test/pods_test.go | 14 +++---- pkg/bindings/test/resource_test.go | 10 ++--- pkg/bindings/test/secrets_test.go | 4 +- pkg/bindings/test/system_test.go | 12 +++--- pkg/bindings/test/types_test.go | 6 +-- pkg/bindings/test/volumes_test.go | 10 ++--- pkg/bindings/volumes/types_create_options.go | 2 +- pkg/bindings/volumes/types_exists_options.go | 2 +- pkg/bindings/volumes/types_inspect_options.go | 2 +- pkg/bindings/volumes/types_list_options.go | 2 +- pkg/bindings/volumes/types_prune_options.go | 2 +- pkg/bindings/volumes/types_remove_options.go | 2 +- pkg/bindings/volumes/volumes.go | 6 +-- pkg/checkpoint/checkpoint_restore.go | 14 +++---- pkg/copy/fileinfo.go | 2 +- pkg/domain/entities/container_ps.go | 2 +- pkg/domain/entities/containers.go | 6 +-- pkg/domain/entities/engine_container.go | 8 ++-- pkg/domain/entities/engine_image.go | 2 +- pkg/domain/entities/events.go | 4 +- pkg/domain/entities/generate.go | 2 +- pkg/domain/entities/images.go | 2 +- pkg/domain/entities/machine.go | 2 +- pkg/domain/entities/manifest.go | 2 +- pkg/domain/entities/network.go | 2 +- pkg/domain/entities/play.go | 2 +- pkg/domain/entities/pods.go | 6 +-- pkg/domain/entities/secrets.go | 4 +- pkg/domain/entities/system.go | 2 +- pkg/domain/entities/types.go | 8 ++-- pkg/domain/entities/types/container_ps.go | 2 +- pkg/domain/entities/types/containers.go | 4 +- pkg/domain/entities/types/images.go | 4 +- pkg/domain/entities/types/pods.go | 4 +- pkg/domain/entities/types/system.go | 4 +- pkg/domain/entities/types/volumes.go | 2 +- pkg/domain/entities/volumes.go | 2 +- pkg/domain/filters/containers.go | 4 +- pkg/domain/filters/pods.go | 4 +- pkg/domain/filters/volumes.go | 4 +- pkg/domain/infra/abi/apply.go | 4 +- pkg/domain/infra/abi/archive.go | 2 +- pkg/domain/infra/abi/auto-update.go | 4 +- pkg/domain/infra/abi/containers.go | 36 ++++++++--------- pkg/domain/infra/abi/containers_runlabel.go | 8 ++-- pkg/domain/infra/abi/containers_stat.go | 2 +- pkg/domain/infra/abi/events.go | 4 +- pkg/domain/infra/abi/farm.go | 4 +- pkg/domain/infra/abi/generate.go | 14 +++---- pkg/domain/infra/abi/healthcheck.go | 4 +- pkg/domain/infra/abi/images.go | 12 +++--- pkg/domain/infra/abi/images_list.go | 4 +- pkg/domain/infra/abi/manifest.go | 4 +- pkg/domain/infra/abi/network.go | 4 +- pkg/domain/infra/abi/parse/parse.go | 4 +- pkg/domain/infra/abi/play.go | 30 +++++++------- pkg/domain/infra/abi/play_test.go | 4 +- pkg/domain/infra/abi/play_utils.go | 2 +- pkg/domain/infra/abi/play_utils_test.go | 2 +- pkg/domain/infra/abi/pods.go | 14 +++---- pkg/domain/infra/abi/pods_stats.go | 8 ++-- pkg/domain/infra/abi/runtime.go | 2 +- pkg/domain/infra/abi/secrets.go | 4 +- pkg/domain/infra/abi/secrets_test.go | 2 +- pkg/domain/infra/abi/system.go | 8 ++-- pkg/domain/infra/abi/system_linux.go | 4 +- .../infra/abi/terminal/sigproxy_commn.go | 8 ++-- pkg/domain/infra/abi/terminal/terminal.go | 2 +- .../infra/abi/terminal/terminal_common.go | 4 +- .../abi/terminal/terminal_unsupported.go | 4 +- pkg/domain/infra/abi/trust.go | 4 +- pkg/domain/infra/abi/volumes.go | 12 +++--- pkg/domain/infra/runtime_abi.go | 6 +-- pkg/domain/infra/runtime_libpod.go | 10 ++--- pkg/domain/infra/runtime_proxy.go | 4 +- pkg/domain/infra/runtime_tunnel.go | 6 +-- pkg/domain/infra/tunnel/auto-update.go | 2 +- pkg/domain/infra/tunnel/containers.go | 22 +++++----- pkg/domain/infra/tunnel/events.go | 6 +-- pkg/domain/infra/tunnel/farm.go | 4 +- pkg/domain/infra/tunnel/healthcheck.go | 6 +-- pkg/domain/infra/tunnel/helpers.go | 10 ++--- pkg/domain/infra/tunnel/images.go | 12 +++--- pkg/domain/infra/tunnel/kube.go | 8 ++-- pkg/domain/infra/tunnel/manifest.go | 8 ++-- pkg/domain/infra/tunnel/network.go | 8 ++-- pkg/domain/infra/tunnel/pods.go | 10 ++--- pkg/domain/infra/tunnel/runtime.go | 4 +- pkg/domain/infra/tunnel/secrets.go | 6 +-- pkg/domain/infra/tunnel/system.go | 6 +-- pkg/domain/infra/tunnel/trust.go | 2 +- pkg/domain/infra/tunnel/volumes.go | 8 ++-- pkg/domain/utils/scp.go | 4 +- pkg/domain/utils/scp_test.go | 2 +- pkg/domain/utils/secrets_filters.go | 2 +- pkg/domain/utils/utils_test.go | 2 +- pkg/farm/farm.go | 4 +- pkg/farm/list_builder.go | 2 +- pkg/fileserver/server_windows.go | 2 +- pkg/inspect/inspect.go | 2 +- pkg/k8s.io/api/apps/v1/types.go | 6 +-- pkg/k8s.io/api/core/v1/resource.go | 2 +- pkg/k8s.io/api/core/v1/types.go | 8 ++-- .../apimachinery/pkg/apis/meta/v1/types.go | 2 +- pkg/machine/applehv/config.go | 10 ++--- pkg/machine/applehv/ignition.go | 2 +- pkg/machine/applehv/machine.go | 18 ++++----- pkg/machine/applehv/vfkit.go | 2 +- pkg/machine/applehv/vfkit/config.go | 2 +- pkg/machine/applehv/vfkit/rest.go | 2 +- pkg/machine/compression/decompress.go | 4 +- pkg/machine/config.go | 6 +-- pkg/machine/define/vmfile_test.go | 2 +- pkg/machine/e2e/config_test.go | 4 +- pkg/machine/e2e/config_unix_test.go | 2 +- pkg/machine/e2e/config_windows_test.go | 6 +-- pkg/machine/e2e/info_test.go | 2 +- pkg/machine/e2e/init_test.go | 4 +- pkg/machine/e2e/inspect_test.go | 4 +- pkg/machine/e2e/list_test.go | 2 +- pkg/machine/e2e/machine_test.go | 10 ++--- pkg/machine/e2e/proxy_test.go | 2 +- pkg/machine/e2e/rm_test.go | 2 +- pkg/machine/e2e/set_test.go | 2 +- pkg/machine/e2e/ssh_test.go | 2 +- pkg/machine/e2e/start_test.go | 2 +- pkg/machine/errors.go | 2 +- pkg/machine/fcos.go | 4 +- pkg/machine/gvproxy.go | 2 +- pkg/machine/hyperv/config.go | 8 ++-- pkg/machine/hyperv/machine.go | 16 ++++---- pkg/machine/hyperv/vsock/vsock.go | 4 +- pkg/machine/ignition/ignition.go | 4 +- pkg/machine/ignition/ready.go | 2 +- pkg/machine/machine_windows.go | 2 +- pkg/machine/ocipull/oci.go | 4 +- pkg/machine/ocipull/ocidir.go | 4 +- pkg/machine/ocipull/versioned.go | 6 +-- pkg/machine/os/machine_os.go | 2 +- pkg/machine/provider/platform.go | 6 +-- pkg/machine/provider/platform_darwin.go | 8 ++-- pkg/machine/provider/platform_windows.go | 8 ++-- pkg/machine/pull.go | 8 ++-- pkg/machine/qemu/command/command.go | 2 +- pkg/machine/qemu/command/command_test.go | 2 +- pkg/machine/qemu/command/qemu_command_test.go | 2 +- pkg/machine/qemu/config.go | 16 ++++---- pkg/machine/qemu/config_test.go | 2 +- pkg/machine/qemu/machine.go | 14 +++---- pkg/machine/qemu/machine_test.go | 2 +- pkg/machine/qemu/machine_windows.go | 2 +- pkg/machine/qemu/options_linux.go | 4 +- pkg/machine/sockets/sockets.go | 2 +- pkg/machine/update.go | 2 +- pkg/machine/vmconfigs/config.go | 4 +- pkg/machine/vmconfigs/config_darwin.go | 2 +- pkg/machine/vmconfigs/config_linux.go | 2 +- pkg/machine/vmconfigs/config_windows.go | 2 +- pkg/machine/volumes.go | 2 +- pkg/machine/wsl/config.go | 8 ++-- pkg/machine/wsl/fedora.go | 4 +- pkg/machine/wsl/machine.go | 12 +++--- pkg/machine/wsl/usermodenet.go | 6 +-- pkg/parallel/ctr/ctr.go | 4 +- pkg/ps/ps.go | 10 ++--- pkg/rootless/rootless_linux.go | 2 +- pkg/specgen/container_validate.go | 2 +- pkg/specgen/generate/config_linux.go | 6 +-- pkg/specgen/generate/config_linux_seccomp.go | 4 +- pkg/specgen/generate/container.go | 12 +++--- pkg/specgen/generate/container_create.go | 14 +++---- pkg/specgen/generate/kube/kube.go | 20 +++++----- pkg/specgen/generate/kube/kube_test.go | 4 +- pkg/specgen/generate/kube/play_test.go | 10 ++--- pkg/specgen/generate/kube/seccomp.go | 4 +- pkg/specgen/generate/kube/volume.go | 4 +- pkg/specgen/generate/namespaces.go | 12 +++--- pkg/specgen/generate/namespaces_freebsd.go | 4 +- pkg/specgen/generate/namespaces_linux.go | 6 +-- pkg/specgen/generate/oci.go | 4 +- pkg/specgen/generate/oci_freebsd.go | 6 +-- pkg/specgen/generate/oci_linux.go | 8 ++-- pkg/specgen/generate/pause_image.go | 4 +- pkg/specgen/generate/pod_create.go | 10 ++--- pkg/specgen/generate/pod_create_test.go | 2 +- pkg/specgen/generate/ports.go | 6 +-- pkg/specgen/generate/security_freebsd.go | 4 +- pkg/specgen/generate/security_linux.go | 8 ++-- pkg/specgen/generate/storage.go | 8 ++-- pkg/specgen/generate/validate_freebsd.go | 2 +- pkg/specgen/generate/validate_linux.go | 4 +- pkg/specgen/namespaces.go | 8 ++-- pkg/specgen/pod_validate.go | 2 +- pkg/specgen/specgen.go | 2 +- pkg/specgen/volumes.go | 2 +- pkg/specgenutil/createparse.go | 2 +- pkg/specgenutil/specgen.go | 16 ++++---- pkg/specgenutil/specgenutil_test.go | 4 +- pkg/specgenutil/volumes.go | 10 ++--- pkg/systemd/dbus.go | 2 +- pkg/systemd/generate/common.go | 2 +- pkg/systemd/generate/containers.go | 10 ++--- pkg/systemd/generate/containers_test.go | 4 +- pkg/systemd/generate/pods.go | 8 ++-- pkg/systemd/generate/pods_test.go | 2 +- pkg/systemd/notifyproxy/notifyproxy.go | 2 +- pkg/systemd/quadlet/quadlet.go | 4 +- pkg/util/mountOpts.go | 4 +- pkg/util/utils.go | 10 ++--- pkg/util/utils_linux.go | 4 +- pkg/util/utils_supported.go | 2 +- test/e2e/attach_test.go | 2 +- test/e2e/build_test.go | 2 +- test/e2e/checkpoint_image_test.go | 4 +- test/e2e/checkpoint_test.go | 10 ++--- test/e2e/cleanup_test.go | 2 +- test/e2e/commit_test.go | 2 +- test/e2e/common_test.go | 6 +-- test/e2e/container_clone_test.go | 2 +- test/e2e/container_create_volume_test.go | 2 +- test/e2e/container_inspect_test.go | 6 +-- test/e2e/containers_conf_test.go | 4 +- test/e2e/cp_test.go | 2 +- test/e2e/create_staticip_test.go | 2 +- test/e2e/create_staticmac_test.go | 2 +- test/e2e/create_test.go | 2 +- test/e2e/diff_test.go | 2 +- test/e2e/events_test.go | 4 +- test/e2e/exec_test.go | 2 +- test/e2e/exists_test.go | 2 +- test/e2e/export_test.go | 2 +- test/e2e/farm_test.go | 2 +- test/e2e/generate_kube_test.go | 8 ++-- test/e2e/generate_spec_test.go | 2 +- test/e2e/generate_systemd_test.go | 2 +- test/e2e/healthcheck_run_test.go | 4 +- test/e2e/history_test.go | 2 +- test/e2e/image_scp_test.go | 2 +- test/e2e/image_sign_test.go | 2 +- test/e2e/images_test.go | 2 +- test/e2e/import_test.go | 2 +- test/e2e/info_test.go | 2 +- test/e2e/init_test.go | 2 +- test/e2e/inspect_test.go | 2 +- test/e2e/kill_test.go | 2 +- test/e2e/load_test.go | 2 +- test/e2e/login_logout_test.go | 2 +- test/e2e/logs_test.go | 2 +- test/e2e/manifest_test.go | 4 +- test/e2e/mount_rootless_test.go | 2 +- test/e2e/mount_test.go | 2 +- test/e2e/negative_test.go | 2 +- test/e2e/network_connect_disconnect_test.go | 2 +- test/e2e/network_create_test.go | 2 +- test/e2e/network_test.go | 2 +- test/e2e/pause_test.go | 2 +- test/e2e/play_build_test.go | 2 +- test/e2e/play_kube_test.go | 14 +++---- test/e2e/pod_clone_test.go | 2 +- test/e2e/pod_create_test.go | 4 +- test/e2e/pod_infra_container_test.go | 2 +- test/e2e/pod_initcontainers_test.go | 4 +- test/e2e/pod_inspect_test.go | 4 +- test/e2e/pod_kill_test.go | 2 +- test/e2e/pod_pause_test.go | 2 +- test/e2e/pod_pod_namespaces_test.go | 2 +- test/e2e/pod_prune_test.go | 2 +- test/e2e/pod_ps_test.go | 2 +- test/e2e/pod_restart_test.go | 2 +- test/e2e/pod_rm_test.go | 2 +- test/e2e/pod_start_test.go | 2 +- test/e2e/pod_stats_test.go | 2 +- test/e2e/pod_stop_test.go | 2 +- test/e2e/pod_top_test.go | 2 +- test/e2e/port_test.go | 2 +- test/e2e/prune_test.go | 2 +- test/e2e/ps_test.go | 2 +- test/e2e/pull_test.go | 2 +- test/e2e/push_test.go | 2 +- test/e2e/quadlet_test.go | 6 +-- test/e2e/rename_test.go | 2 +- test/e2e/restart_test.go | 2 +- test/e2e/rm_test.go | 2 +- test/e2e/rmi_test.go | 2 +- test/e2e/run_aardvark_test.go | 2 +- test/e2e/run_apparmor_test.go | 2 +- test/e2e/run_cgroup_parent_test.go | 2 +- test/e2e/run_cleanup_test.go | 2 +- test/e2e/run_cpu_test.go | 2 +- test/e2e/run_device_test.go | 2 +- test/e2e/run_dns_test.go | 2 +- test/e2e/run_entrypoint_test.go | 2 +- test/e2e/run_env_test.go | 2 +- test/e2e/run_exit_test.go | 4 +- test/e2e/run_memory_test.go | 2 +- test/e2e/run_networking_test.go | 2 +- test/e2e/run_ns_test.go | 2 +- test/e2e/run_passwd_test.go | 2 +- test/e2e/run_privileged_test.go | 2 +- test/e2e/run_restart_test.go | 2 +- test/e2e/run_seccomp_test.go | 2 +- test/e2e/run_security_labels_test.go | 2 +- test/e2e/run_selinux_test.go | 2 +- test/e2e/run_signal_test.go | 2 +- test/e2e/run_staticip_test.go | 2 +- test/e2e/run_test.go | 4 +- test/e2e/run_transient_test.go | 2 +- test/e2e/run_userns_test.go | 2 +- test/e2e/run_volume_test.go | 2 +- test/e2e/run_working_dir_test.go | 2 +- test/e2e/runlabel_test.go | 2 +- test/e2e/save_test.go | 2 +- test/e2e/search_test.go | 4 +- test/e2e/secret_test.go | 2 +- test/e2e/start_test.go | 2 +- test/e2e/stats_test.go | 2 +- test/e2e/stop_test.go | 2 +- test/e2e/system_connection_test.go | 2 +- test/e2e/system_df_test.go | 2 +- test/e2e/system_dial_stdio_test.go | 2 +- test/e2e/system_reset_test.go | 2 +- test/e2e/system_service_test.go | 2 +- test/e2e/systemd_activate_test.go | 4 +- test/e2e/systemd_test.go | 2 +- test/e2e/tag_test.go | 2 +- test/e2e/toolbox_test.go | 4 +- test/e2e/top_test.go | 2 +- test/e2e/tree_test.go | 2 +- test/e2e/trust_test.go | 2 +- test/e2e/unshare_test.go | 2 +- test/e2e/untag_test.go | 2 +- test/e2e/update_test.go | 2 +- test/e2e/version_test.go | 4 +- test/e2e/volume_create_test.go | 2 +- test/e2e/volume_exists_test.go | 2 +- test/e2e/volume_inspect_test.go | 4 +- test/e2e/volume_ls_test.go | 2 +- test/e2e/volume_plugin_test.go | 2 +- test/e2e/volume_prune_test.go | 2 +- test/e2e/volume_rm_test.go | 2 +- test/e2e/wait_test.go | 2 +- test/testvol/util.go | 2 +- test/utils/common_function_test.go | 2 +- test/utils/podmansession_test.go | 2 +- test/utils/podmantest_test.go | 2 +- test/utils/utils_suite_test.go | 2 +- test/version/main.go | 2 +- version/version.go | 2 +- 885 files changed, 2367 insertions(+), 2367 deletions(-) diff --git a/cmd/podman-wslkerninst/main.go b/cmd/podman-wslkerninst/main.go index 35fa9b8e57..0259ef34e2 100644 --- a/cmd/podman-wslkerninst/main.go +++ b/cmd/podman-wslkerninst/main.go @@ -10,7 +10,7 @@ import ( "time" "unsafe" - "github.com/containers/podman/v4/pkg/machine/wsl/wutil" + "github.com/containers/podman/v5/pkg/machine/wsl/wutil" "github.com/sirupsen/logrus" "golang.org/x/sys/windows/svc/eventlog" ) diff --git a/cmd/podman/auto-update.go b/cmd/podman/auto-update.go index c4aa25df9f..c8b5f656d1 100644 --- a/cmd/podman/auto-update.go +++ b/cmd/podman/auto-update.go @@ -9,10 +9,10 @@ import ( "github.com/containers/common/pkg/completion" "github.com/containers/common/pkg/report" "github.com/containers/image/v5/types" - "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/containers/podman/v5/cmd/podman/common" + "github.com/containers/podman/v5/cmd/podman/registry" + "github.com/containers/podman/v5/pkg/domain/entities" + "github.com/containers/podman/v5/pkg/errorhandling" "github.com/spf13/cobra" ) diff --git a/cmd/podman/client.go b/cmd/podman/client.go index 9fa9646330..b42a43520d 100644 --- a/cmd/podman/client.go +++ b/cmd/podman/client.go @@ -1,6 +1,6 @@ package main -import "github.com/containers/podman/v4/libpod/define" +import "github.com/containers/podman/v5/libpod/define" type clientInfo struct { OSArch string `json:"OS"` diff --git a/cmd/podman/client_supported.go b/cmd/podman/client_supported.go index c68cdc0496..995154fa09 100644 --- a/cmd/podman/client_supported.go +++ b/cmd/podman/client_supported.go @@ -3,7 +3,7 @@ package main import ( - "github.com/containers/podman/v4/pkg/machine/provider" + "github.com/containers/podman/v5/pkg/machine/provider" ) func getProvider() (string, error) { diff --git a/cmd/podman/common/build.go b/cmd/podman/common/build.go index 3b74910f3c..3411f43ec7 100644 --- a/cmd/podman/common/build.go +++ b/cmd/podman/common/build.go @@ -21,10 +21,10 @@ import ( "github.com/containers/image/v5/types" encconfig "github.com/containers/ocicrypt/config" enchelpers "github.com/containers/ocicrypt/helpers" - "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/env" + "github.com/containers/podman/v5/cmd/podman/registry" + "github.com/containers/podman/v5/cmd/podman/utils" + "github.com/containers/podman/v5/pkg/domain/entities" + "github.com/containers/podman/v5/pkg/env" "github.com/sirupsen/logrus" "github.com/spf13/cobra" ) diff --git a/cmd/podman/common/completion.go b/cmd/podman/common/completion.go index ec548e59a9..a8e9fc0102 100644 --- a/cmd/podman/common/completion.go +++ b/cmd/podman/common/completion.go @@ -16,14 +16,14 @@ import ( "github.com/containers/common/pkg/config" "github.com/containers/common/pkg/ssh" "github.com/containers/image/v5/pkg/sysregistriesv2" - "github.com/containers/podman/v4/cmd/podman/registry" - "github.com/containers/podman/v4/libpod/define" - "github.com/containers/podman/v4/libpod/events" - "github.com/containers/podman/v4/pkg/domain/entities" - "github.com/containers/podman/v4/pkg/inspect" - "github.com/containers/podman/v4/pkg/signal" - systemdDefine "github.com/containers/podman/v4/pkg/systemd/define" - "github.com/containers/podman/v4/pkg/util" + "github.com/containers/podman/v5/cmd/podman/registry" + "github.com/containers/podman/v5/libpod/define" + "github.com/containers/podman/v5/libpod/events" + "github.com/containers/podman/v5/pkg/domain/entities" + "github.com/containers/podman/v5/pkg/inspect" + "github.com/containers/podman/v5/pkg/signal" + systemdDefine "github.com/containers/podman/v5/pkg/systemd/define" + "github.com/containers/podman/v5/pkg/util" securejoin "github.com/cyphar/filepath-securejoin" "github.com/spf13/cobra" ) diff --git a/cmd/podman/common/completion_test.go b/cmd/podman/common/completion_test.go index 0ec8f03f57..755324f3bb 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/v4/cmd/podman/common" + "github.com/containers/podman/v5/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 dd004a5a02..3a1c7e5a6d 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/v4/cmd/podman/registry" - "github.com/containers/podman/v4/libpod/define" - "github.com/containers/podman/v4/pkg/domain/entities" + "github.com/containers/podman/v5/cmd/podman/registry" + "github.com/containers/podman/v5/libpod/define" + "github.com/containers/podman/v5/pkg/domain/entities" "github.com/spf13/cobra" ) diff --git a/cmd/podman/common/create_opts.go b/cmd/podman/common/create_opts.go index 12deada21e..cdcd86514d 100644 --- a/cmd/podman/common/create_opts.go +++ b/cmd/podman/common/create_opts.go @@ -1,9 +1,9 @@ package common import ( - "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/v5/cmd/podman/registry" + "github.com/containers/podman/v5/libpod/define" + "github.com/containers/podman/v5/pkg/domain/entities" ) func ulimits() []string { diff --git a/cmd/podman/common/create_test.go b/cmd/podman/common/create_test.go index c31f214bf1..b777c68235 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/v4/cmd/podman/common" - "github.com/containers/podman/v4/pkg/domain/entities" + "github.com/containers/podman/v5/cmd/podman/common" + "github.com/containers/podman/v5/pkg/domain/entities" "github.com/stretchr/testify/assert" ) diff --git a/cmd/podman/common/default.go b/cmd/podman/common/default.go index 6f78d3d29f..cd73b06889 100644 --- a/cmd/podman/common/default.go +++ b/cmd/podman/common/default.go @@ -1,7 +1,7 @@ package common import ( - "github.com/containers/podman/v4/cmd/podman/registry" + "github.com/containers/podman/v5/cmd/podman/registry" ) var ( diff --git a/cmd/podman/common/netflags.go b/cmd/podman/common/netflags.go index d33642a7d9..49adf0b558 100644 --- a/cmd/podman/common/netflags.go +++ b/cmd/podman/common/netflags.go @@ -7,11 +7,11 @@ import ( "github.com/containers/common/libnetwork/types" "github.com/containers/common/pkg/completion" - "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/containers/podman/v5/cmd/podman/parse" + "github.com/containers/podman/v5/libpod/define" + "github.com/containers/podman/v5/pkg/domain/entities" + "github.com/containers/podman/v5/pkg/specgen" + "github.com/containers/podman/v5/pkg/specgenutil" "github.com/spf13/cobra" "github.com/spf13/pflag" ) diff --git a/cmd/podman/common/sign.go b/cmd/podman/common/sign.go index 602ce2d9ab..33eade4faa 100644 --- a/cmd/podman/common/sign.go +++ b/cmd/podman/common/sign.go @@ -8,7 +8,7 @@ import ( "github.com/containers/image/v5/pkg/cli" "github.com/containers/image/v5/pkg/cli/sigstore" "github.com/containers/image/v5/signature/signer" - "github.com/containers/podman/v4/pkg/domain/entities" + "github.com/containers/podman/v5/pkg/domain/entities" ) // PrepareSigning updates pushOpts.Signers, pushOpts.SignPassphrase and SignSigstorePrivateKeyPassphrase based on a --sign-passphrase-file diff --git a/cmd/podman/completion/completion.go b/cmd/podman/completion/completion.go index 008b8ef90d..48f71dc1f9 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/v4/cmd/podman/registry" + "github.com/containers/podman/v5/cmd/podman/registry" "github.com/spf13/cobra" ) diff --git a/cmd/podman/compose.go b/cmd/podman/compose.go index 3a01d99abd..003da4ce97 100644 --- a/cmd/podman/compose.go +++ b/cmd/podman/compose.go @@ -14,11 +14,11 @@ import ( "strings" "text/template" - "github.com/containers/podman/v4/cmd/podman/registry" - "github.com/containers/podman/v4/pkg/errorhandling" - "github.com/containers/podman/v4/pkg/machine" - "github.com/containers/podman/v4/pkg/machine/define" - "github.com/containers/podman/v4/pkg/machine/provider" + "github.com/containers/podman/v5/cmd/podman/registry" + "github.com/containers/podman/v5/pkg/errorhandling" + "github.com/containers/podman/v5/pkg/machine" + "github.com/containers/podman/v5/pkg/machine/define" + "github.com/containers/podman/v5/pkg/machine/provider" "github.com/sirupsen/logrus" "github.com/spf13/cobra" "github.com/spf13/pflag" diff --git a/cmd/podman/containers/attach.go b/cmd/podman/containers/attach.go index 3b69154d17..5b5e28ac45 100644 --- a/cmd/podman/containers/attach.go +++ b/cmd/podman/containers/attach.go @@ -5,10 +5,10 @@ import ( "os" "strings" - "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/v5/cmd/podman/common" + "github.com/containers/podman/v5/cmd/podman/registry" + "github.com/containers/podman/v5/cmd/podman/validate" + "github.com/containers/podman/v5/pkg/domain/entities" "github.com/spf13/cobra" ) diff --git a/cmd/podman/containers/checkpoint.go b/cmd/podman/containers/checkpoint.go index 494fbb9968..ddd64a1351 100644 --- a/cmd/podman/containers/checkpoint.go +++ b/cmd/podman/containers/checkpoint.go @@ -8,13 +8,13 @@ import ( "time" "github.com/containers/common/pkg/completion" - "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/podman/v5/cmd/podman/common" + "github.com/containers/podman/v5/cmd/podman/registry" + "github.com/containers/podman/v5/cmd/podman/utils" + "github.com/containers/podman/v5/cmd/podman/validate" + "github.com/containers/podman/v5/pkg/criu" + "github.com/containers/podman/v5/pkg/domain/entities" + "github.com/containers/podman/v5/pkg/rootless" "github.com/containers/storage/pkg/archive" "github.com/spf13/cobra" ) diff --git a/cmd/podman/containers/cleanup.go b/cmd/podman/containers/cleanup.go index 3a75967ac3..db15c6d834 100644 --- a/cmd/podman/containers/cleanup.go +++ b/cmd/podman/containers/cleanup.go @@ -5,11 +5,11 @@ import ( "fmt" "github.com/containers/common/pkg/completion" - "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/v5/cmd/podman/common" + "github.com/containers/podman/v5/cmd/podman/registry" + "github.com/containers/podman/v5/cmd/podman/utils" + "github.com/containers/podman/v5/cmd/podman/validate" + "github.com/containers/podman/v5/pkg/domain/entities" "github.com/sirupsen/logrus" "github.com/spf13/cobra" ) diff --git a/cmd/podman/containers/clone.go b/cmd/podman/containers/clone.go index 62bc90a2cf..a34f121c1c 100644 --- a/cmd/podman/containers/clone.go +++ b/cmd/podman/containers/clone.go @@ -3,10 +3,10 @@ package containers import ( "fmt" - "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/containers/podman/v5/cmd/podman/common" + "github.com/containers/podman/v5/cmd/podman/registry" + "github.com/containers/podman/v5/libpod/define" + "github.com/containers/podman/v5/pkg/domain/entities" "github.com/spf13/cobra" ) diff --git a/cmd/podman/containers/commit.go b/cmd/podman/containers/commit.go index c771d4c788..b0cf44fe6d 100644 --- a/cmd/podman/containers/commit.go +++ b/cmd/podman/containers/commit.go @@ -7,10 +7,10 @@ import ( "strings" "github.com/containers/common/pkg/completion" - "github.com/containers/podman/v4/cmd/podman/common" - "github.com/containers/podman/v4/cmd/podman/registry" - "github.com/containers/podman/v4/pkg/api/handlers" - "github.com/containers/podman/v4/pkg/domain/entities" + "github.com/containers/podman/v5/cmd/podman/common" + "github.com/containers/podman/v5/cmd/podman/registry" + "github.com/containers/podman/v5/pkg/api/handlers" + "github.com/containers/podman/v5/pkg/domain/entities" "github.com/spf13/cobra" ) diff --git a/cmd/podman/containers/container.go b/cmd/podman/containers/container.go index d53204ba9c..2599f6aca1 100644 --- a/cmd/podman/containers/container.go +++ b/cmd/podman/containers/container.go @@ -1,9 +1,9 @@ package containers import ( - "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/containers/podman/v5/cmd/podman/registry" + "github.com/containers/podman/v5/cmd/podman/validate" + "github.com/containers/podman/v5/pkg/util" "github.com/spf13/cobra" ) diff --git a/cmd/podman/containers/cp.go b/cmd/podman/containers/cp.go index 38abf799b6..8d53f24abe 100644 --- a/cmd/podman/containers/cp.go +++ b/cmd/podman/containers/cp.go @@ -12,11 +12,11 @@ import ( "errors" buildahCopiah "github.com/containers/buildah/copier" - "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/podman/v5/cmd/podman/common" + "github.com/containers/podman/v5/cmd/podman/registry" + "github.com/containers/podman/v5/pkg/copy" + "github.com/containers/podman/v5/pkg/domain/entities" + "github.com/containers/podman/v5/pkg/errorhandling" "github.com/containers/storage/pkg/archive" "github.com/containers/storage/pkg/idtools" "github.com/sirupsen/logrus" diff --git a/cmd/podman/containers/create.go b/cmd/podman/containers/create.go index d1b0070613..61a3b898e7 100644 --- a/cmd/podman/containers/create.go +++ b/cmd/podman/containers/create.go @@ -13,14 +13,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/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/containers/podman/v5/cmd/podman/common" + "github.com/containers/podman/v5/cmd/podman/registry" + "github.com/containers/podman/v5/cmd/podman/utils" + "github.com/containers/podman/v5/libpod/define" + "github.com/containers/podman/v5/pkg/domain/entities" + "github.com/containers/podman/v5/pkg/specgen" + "github.com/containers/podman/v5/pkg/specgenutil" + "github.com/containers/podman/v5/pkg/util" "github.com/sirupsen/logrus" "github.com/spf13/cobra" "golang.org/x/exp/slices" diff --git a/cmd/podman/containers/diff.go b/cmd/podman/containers/diff.go index ce501f8907..fbf5d88016 100644 --- a/cmd/podman/containers/diff.go +++ b/cmd/podman/containers/diff.go @@ -3,12 +3,12 @@ package containers import ( "errors" - "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/containers/podman/v5/cmd/podman/common" + "github.com/containers/podman/v5/cmd/podman/diff" + "github.com/containers/podman/v5/cmd/podman/registry" + "github.com/containers/podman/v5/cmd/podman/validate" + "github.com/containers/podman/v5/libpod/define" + "github.com/containers/podman/v5/pkg/domain/entities" "github.com/spf13/cobra" ) diff --git a/cmd/podman/containers/exec.go b/cmd/podman/containers/exec.go index 3e9cd63029..428e635409 100644 --- a/cmd/podman/containers/exec.go +++ b/cmd/podman/containers/exec.go @@ -10,13 +10,13 @@ import ( "time" "github.com/containers/common/pkg/completion" - "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/containers/podman/v5/cmd/podman/common" + "github.com/containers/podman/v5/cmd/podman/registry" + "github.com/containers/podman/v5/cmd/podman/validate" + "github.com/containers/podman/v5/libpod/define" + "github.com/containers/podman/v5/pkg/domain/entities" + envLib "github.com/containers/podman/v5/pkg/env" + "github.com/containers/podman/v5/pkg/rootless" "github.com/spf13/cobra" ) diff --git a/cmd/podman/containers/exists.go b/cmd/podman/containers/exists.go index 11d1f35040..94fcded0ee 100644 --- a/cmd/podman/containers/exists.go +++ b/cmd/podman/containers/exists.go @@ -4,9 +4,9 @@ import ( "context" "strings" - "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/v5/cmd/podman/common" + "github.com/containers/podman/v5/cmd/podman/registry" + "github.com/containers/podman/v5/pkg/domain/entities" "github.com/spf13/cobra" ) diff --git a/cmd/podman/containers/export.go b/cmd/podman/containers/export.go index 51d4c3694e..30b14e5482 100644 --- a/cmd/podman/containers/export.go +++ b/cmd/podman/containers/export.go @@ -7,10 +7,10 @@ import ( "strings" "github.com/containers/common/pkg/completion" - "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/containers/podman/v5/cmd/podman/common" + "github.com/containers/podman/v5/cmd/podman/parse" + "github.com/containers/podman/v5/cmd/podman/registry" + "github.com/containers/podman/v5/pkg/domain/entities" "github.com/spf13/cobra" "golang.org/x/term" ) diff --git a/cmd/podman/containers/init.go b/cmd/podman/containers/init.go index aceba4c50a..2c5430acc5 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/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/v5/cmd/podman/common" + "github.com/containers/podman/v5/cmd/podman/registry" + "github.com/containers/podman/v5/cmd/podman/utils" + "github.com/containers/podman/v5/cmd/podman/validate" + "github.com/containers/podman/v5/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 4195cf020c..85d4cd8886 100644 --- a/cmd/podman/containers/inspect.go +++ b/cmd/podman/containers/inspect.go @@ -1,12 +1,12 @@ package containers import ( - "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/containers/podman/v5/cmd/podman/common" + "github.com/containers/podman/v5/cmd/podman/inspect" + "github.com/containers/podman/v5/cmd/podman/registry" + "github.com/containers/podman/v5/cmd/podman/validate" + "github.com/containers/podman/v5/libpod/define" + "github.com/containers/podman/v5/pkg/domain/entities" "github.com/spf13/cobra" ) diff --git a/cmd/podman/containers/kill.go b/cmd/podman/containers/kill.go index 49983f4228..b7ca04953e 100644 --- a/cmd/podman/containers/kill.go +++ b/cmd/podman/containers/kill.go @@ -8,12 +8,12 @@ import ( "strings" "github.com/containers/common/pkg/completion" - "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/containers/podman/v5/cmd/podman/common" + "github.com/containers/podman/v5/cmd/podman/registry" + "github.com/containers/podman/v5/cmd/podman/utils" + "github.com/containers/podman/v5/cmd/podman/validate" + "github.com/containers/podman/v5/pkg/domain/entities" + "github.com/containers/podman/v5/pkg/signal" "github.com/spf13/cobra" ) diff --git a/cmd/podman/containers/list.go b/cmd/podman/containers/list.go index 3dbf4248b4..9c9fafa388 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/v4/cmd/podman/registry" - "github.com/containers/podman/v4/cmd/podman/validate" + "github.com/containers/podman/v5/cmd/podman/registry" + "github.com/containers/podman/v5/cmd/podman/validate" "github.com/spf13/cobra" ) diff --git a/cmd/podman/containers/logs.go b/cmd/podman/containers/logs.go index 2069281073..3b1f25b09c 100644 --- a/cmd/podman/containers/logs.go +++ b/cmd/podman/containers/logs.go @@ -6,12 +6,12 @@ import ( "os" "github.com/containers/common/pkg/completion" - "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/util" + "github.com/containers/podman/v5/cmd/podman/common" + "github.com/containers/podman/v5/cmd/podman/registry" + "github.com/containers/podman/v5/cmd/podman/utils" + "github.com/containers/podman/v5/cmd/podman/validate" + "github.com/containers/podman/v5/pkg/domain/entities" + "github.com/containers/podman/v5/pkg/util" "github.com/spf13/cobra" ) diff --git a/cmd/podman/containers/mount.go b/cmd/podman/containers/mount.go index a60cb4e776..fdbd0dde3c 100644 --- a/cmd/podman/containers/mount.go +++ b/cmd/podman/containers/mount.go @@ -6,11 +6,11 @@ import ( "os" "github.com/containers/common/pkg/report" - "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/v5/cmd/podman/common" + "github.com/containers/podman/v5/cmd/podman/registry" + "github.com/containers/podman/v5/cmd/podman/utils" + "github.com/containers/podman/v5/cmd/podman/validate" + "github.com/containers/podman/v5/pkg/domain/entities" "github.com/spf13/cobra" ) diff --git a/cmd/podman/containers/pause.go b/cmd/podman/containers/pause.go index 402faaa26c..2b576278eb 100644 --- a/cmd/podman/containers/pause.go +++ b/cmd/podman/containers/pause.go @@ -7,11 +7,11 @@ import ( "strings" "github.com/containers/common/pkg/completion" - "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/v5/cmd/podman/common" + "github.com/containers/podman/v5/cmd/podman/registry" + "github.com/containers/podman/v5/cmd/podman/utils" + "github.com/containers/podman/v5/cmd/podman/validate" + "github.com/containers/podman/v5/pkg/domain/entities" "github.com/spf13/cobra" ) diff --git a/cmd/podman/containers/port.go b/cmd/podman/containers/port.go index cbf4d1b355..7dd03b4aaa 100644 --- a/cmd/podman/containers/port.go +++ b/cmd/podman/containers/port.go @@ -6,10 +6,10 @@ import ( "strconv" "strings" - "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/v5/cmd/podman/common" + "github.com/containers/podman/v5/cmd/podman/registry" + "github.com/containers/podman/v5/cmd/podman/validate" + "github.com/containers/podman/v5/pkg/domain/entities" "github.com/spf13/cobra" "github.com/spf13/pflag" ) diff --git a/cmd/podman/containers/prune.go b/cmd/podman/containers/prune.go index e90bd500f9..0c26c4f0bc 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/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/containers/podman/v5/cmd/podman/common" + "github.com/containers/podman/v5/cmd/podman/parse" + "github.com/containers/podman/v5/cmd/podman/registry" + "github.com/containers/podman/v5/cmd/podman/utils" + "github.com/containers/podman/v5/cmd/podman/validate" + "github.com/containers/podman/v5/pkg/domain/entities" "github.com/spf13/cobra" ) diff --git a/cmd/podman/containers/ps.go b/cmd/podman/containers/ps.go index 4848cd6955..bf82cf9de5 100644 --- a/cmd/podman/containers/ps.go +++ b/cmd/podman/containers/ps.go @@ -12,11 +12,11 @@ import ( "github.com/containers/common/libnetwork/types" "github.com/containers/common/pkg/completion" "github.com/containers/common/pkg/report" - "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/v5/cmd/podman/common" + "github.com/containers/podman/v5/cmd/podman/registry" + "github.com/containers/podman/v5/cmd/podman/utils" + "github.com/containers/podman/v5/cmd/podman/validate" + "github.com/containers/podman/v5/pkg/domain/entities" "github.com/docker/go-units" "github.com/sirupsen/logrus" "github.com/spf13/cobra" diff --git a/cmd/podman/containers/rename.go b/cmd/podman/containers/rename.go index 78a1608922..7f53455e66 100644 --- a/cmd/podman/containers/rename.go +++ b/cmd/podman/containers/rename.go @@ -3,10 +3,10 @@ package containers import ( "errors" - "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/v5/cmd/podman/common" + "github.com/containers/podman/v5/cmd/podman/registry" + "github.com/containers/podman/v5/cmd/podman/utils" + "github.com/containers/podman/v5/pkg/domain/entities" "github.com/spf13/cobra" ) diff --git a/cmd/podman/containers/restart.go b/cmd/podman/containers/restart.go index 06da8a0a2a..3b516a3ef3 100644 --- a/cmd/podman/containers/restart.go +++ b/cmd/podman/containers/restart.go @@ -7,11 +7,11 @@ import ( "strings" "github.com/containers/common/pkg/completion" - "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/v5/cmd/podman/common" + "github.com/containers/podman/v5/cmd/podman/registry" + "github.com/containers/podman/v5/cmd/podman/utils" + "github.com/containers/podman/v5/cmd/podman/validate" + "github.com/containers/podman/v5/pkg/domain/entities" "github.com/spf13/cobra" ) diff --git a/cmd/podman/containers/restore.go b/cmd/podman/containers/restore.go index 859ef03943..61b9bab893 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/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/containers/podman/v5/cmd/podman/common" + "github.com/containers/podman/v5/cmd/podman/registry" + "github.com/containers/podman/v5/cmd/podman/utils" + "github.com/containers/podman/v5/cmd/podman/validate" + "github.com/containers/podman/v5/pkg/domain/entities" + "github.com/containers/podman/v5/pkg/rootless" "github.com/spf13/cobra" ) diff --git a/cmd/podman/containers/rm.go b/cmd/podman/containers/rm.go index 74d43da2ec..45b4b4ec58 100644 --- a/cmd/podman/containers/rm.go +++ b/cmd/podman/containers/rm.go @@ -8,12 +8,12 @@ import ( "strings" "github.com/containers/common/pkg/completion" - "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/v5/cmd/podman/common" + "github.com/containers/podman/v5/cmd/podman/registry" + "github.com/containers/podman/v5/cmd/podman/utils" + "github.com/containers/podman/v5/cmd/podman/validate" + "github.com/containers/podman/v5/libpod/define" + "github.com/containers/podman/v5/pkg/domain/entities" "github.com/sirupsen/logrus" "github.com/spf13/cobra" ) diff --git a/cmd/podman/containers/run.go b/cmd/podman/containers/run.go index dc2f1ebbd9..047dabb9c8 100644 --- a/cmd/podman/containers/run.go +++ b/cmd/podman/containers/run.go @@ -8,14 +8,14 @@ import ( "github.com/containers/common/pkg/auth" "github.com/containers/common/pkg/completion" - "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/rootless" - "github.com/containers/podman/v4/pkg/specgen" - "github.com/containers/podman/v4/pkg/specgenutil" + "github.com/containers/podman/v5/cmd/podman/common" + "github.com/containers/podman/v5/cmd/podman/registry" + "github.com/containers/podman/v5/cmd/podman/utils" + "github.com/containers/podman/v5/libpod/define" + "github.com/containers/podman/v5/pkg/domain/entities" + "github.com/containers/podman/v5/pkg/rootless" + "github.com/containers/podman/v5/pkg/specgen" + "github.com/containers/podman/v5/pkg/specgenutil" "github.com/containers/storage/types" "github.com/sirupsen/logrus" "github.com/spf13/cobra" diff --git a/cmd/podman/containers/runlabel.go b/cmd/podman/containers/runlabel.go index a8d7f2b39d..7191dd87de 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/v4/cmd/podman/common" - "github.com/containers/podman/v4/cmd/podman/registry" - "github.com/containers/podman/v4/pkg/domain/entities" + "github.com/containers/podman/v5/cmd/podman/common" + "github.com/containers/podman/v5/cmd/podman/registry" + "github.com/containers/podman/v5/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 709e9d57b6..f9244ff603 100644 --- a/cmd/podman/containers/start.go +++ b/cmd/podman/containers/start.go @@ -6,12 +6,12 @@ import ( "os" "strings" - "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/v5/cmd/podman/common" + "github.com/containers/podman/v5/cmd/podman/registry" + "github.com/containers/podman/v5/cmd/podman/utils" + "github.com/containers/podman/v5/cmd/podman/validate" + "github.com/containers/podman/v5/libpod/define" + "github.com/containers/podman/v5/pkg/domain/entities" "github.com/spf13/cobra" ) diff --git a/cmd/podman/containers/stats.go b/cmd/podman/containers/stats.go index ed462a7af6..9ad0d9c95d 100644 --- a/cmd/podman/containers/stats.go +++ b/cmd/podman/containers/stats.go @@ -9,13 +9,13 @@ import ( tm "github.com/buger/goterm" "github.com/containers/common/pkg/completion" "github.com/containers/common/pkg/report" - "github.com/containers/podman/v4/cmd/podman/common" - "github.com/containers/podman/v4/cmd/podman/registry" - putils "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/utils" + "github.com/containers/podman/v5/cmd/podman/common" + "github.com/containers/podman/v5/cmd/podman/registry" + putils "github.com/containers/podman/v5/cmd/podman/utils" + "github.com/containers/podman/v5/cmd/podman/validate" + "github.com/containers/podman/v5/libpod/define" + "github.com/containers/podman/v5/pkg/domain/entities" + "github.com/containers/podman/v5/utils" "github.com/docker/go-units" "github.com/spf13/cobra" ) diff --git a/cmd/podman/containers/stop.go b/cmd/podman/containers/stop.go index 84822cf53e..9e4147df99 100644 --- a/cmd/podman/containers/stop.go +++ b/cmd/podman/containers/stop.go @@ -8,11 +8,11 @@ import ( "strings" "github.com/containers/common/pkg/completion" - "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/v5/cmd/podman/common" + "github.com/containers/podman/v5/cmd/podman/registry" + "github.com/containers/podman/v5/cmd/podman/utils" + "github.com/containers/podman/v5/cmd/podman/validate" + "github.com/containers/podman/v5/pkg/domain/entities" "github.com/spf13/cobra" ) diff --git a/cmd/podman/containers/top.go b/cmd/podman/containers/top.go index 26bec5a4ab..0df4574464 100644 --- a/cmd/podman/containers/top.go +++ b/cmd/podman/containers/top.go @@ -8,11 +8,11 @@ import ( "strings" "github.com/containers/common/pkg/report" - "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/containers/podman/v5/cmd/podman/common" + "github.com/containers/podman/v5/cmd/podman/registry" + "github.com/containers/podman/v5/cmd/podman/validate" + "github.com/containers/podman/v5/pkg/domain/entities" + "github.com/containers/podman/v5/pkg/util" "github.com/spf13/cobra" "github.com/spf13/pflag" ) diff --git a/cmd/podman/containers/unmount.go b/cmd/podman/containers/unmount.go index 6622a6122e..344726af14 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/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/v5/cmd/podman/common" + "github.com/containers/podman/v5/cmd/podman/registry" + "github.com/containers/podman/v5/cmd/podman/utils" + "github.com/containers/podman/v5/cmd/podman/validate" + "github.com/containers/podman/v5/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 7d04daa578..ec13b54b15 100644 --- a/cmd/podman/containers/unpause.go +++ b/cmd/podman/containers/unpause.go @@ -9,12 +9,12 @@ import ( "github.com/containers/common/pkg/cgroups" "github.com/containers/common/pkg/completion" - "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/containers/podman/v5/cmd/podman/common" + "github.com/containers/podman/v5/cmd/podman/registry" + "github.com/containers/podman/v5/cmd/podman/utils" + "github.com/containers/podman/v5/cmd/podman/validate" + "github.com/containers/podman/v5/pkg/domain/entities" + "github.com/containers/podman/v5/pkg/rootless" "github.com/spf13/cobra" ) diff --git a/cmd/podman/containers/update.go b/cmd/podman/containers/update.go index f1ccbe8908..bcaa735a9c 100644 --- a/cmd/podman/containers/update.go +++ b/cmd/podman/containers/update.go @@ -5,11 +5,11 @@ import ( "fmt" "strings" - "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/specgen" - "github.com/containers/podman/v4/pkg/specgenutil" + "github.com/containers/podman/v5/cmd/podman/common" + "github.com/containers/podman/v5/cmd/podman/registry" + "github.com/containers/podman/v5/pkg/domain/entities" + "github.com/containers/podman/v5/pkg/specgen" + "github.com/containers/podman/v5/pkg/specgenutil" "github.com/opencontainers/runtime-spec/specs-go" "github.com/spf13/cobra" ) diff --git a/cmd/podman/containers/wait.go b/cmd/podman/containers/wait.go index da038db250..e559c0a1e4 100644 --- a/cmd/podman/containers/wait.go +++ b/cmd/podman/containers/wait.go @@ -7,11 +7,11 @@ import ( "time" "github.com/containers/common/pkg/completion" - "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/v5/cmd/podman/common" + "github.com/containers/podman/v5/cmd/podman/registry" + "github.com/containers/podman/v5/cmd/podman/utils" + "github.com/containers/podman/v5/cmd/podman/validate" + "github.com/containers/podman/v5/pkg/domain/entities" "github.com/spf13/cobra" ) diff --git a/cmd/podman/diff.go b/cmd/podman/diff.go index ec98fb5b56..7bc065665f 100644 --- a/cmd/podman/diff.go +++ b/cmd/podman/diff.go @@ -1,12 +1,12 @@ package main import ( - "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/containers/podman/v5/cmd/podman/common" + "github.com/containers/podman/v5/cmd/podman/diff" + "github.com/containers/podman/v5/cmd/podman/registry" + "github.com/containers/podman/v5/cmd/podman/validate" + "github.com/containers/podman/v5/libpod/define" + "github.com/containers/podman/v5/pkg/domain/entities" "github.com/spf13/cobra" ) diff --git a/cmd/podman/diff/diff.go b/cmd/podman/diff/diff.go index 06df767d02..7fa47630a5 100644 --- a/cmd/podman/diff/diff.go +++ b/cmd/podman/diff/diff.go @@ -7,8 +7,8 @@ import ( "os" "github.com/containers/common/pkg/report" - "github.com/containers/podman/v4/cmd/podman/registry" - "github.com/containers/podman/v4/pkg/domain/entities" + "github.com/containers/podman/v5/cmd/podman/registry" + "github.com/containers/podman/v5/pkg/domain/entities" "github.com/containers/storage/pkg/archive" "github.com/spf13/cobra" ) diff --git a/cmd/podman/early_init_linux.go b/cmd/podman/early_init_linux.go index 99046a02be..1298fad401 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/v4/libpod/define" + "github.com/containers/podman/v5/libpod/define" ) func setRLimits() error { diff --git a/cmd/podman/farm/build.go b/cmd/podman/farm/build.go index a787f4bb17..cda7e88ddf 100644 --- a/cmd/podman/farm/build.go +++ b/cmd/podman/farm/build.go @@ -7,10 +7,10 @@ import ( "strings" "github.com/containers/common/pkg/completion" - "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/farm" + "github.com/containers/podman/v5/cmd/podman/common" + "github.com/containers/podman/v5/cmd/podman/registry" + "github.com/containers/podman/v5/cmd/podman/utils" + "github.com/containers/podman/v5/pkg/farm" "github.com/sirupsen/logrus" "github.com/spf13/cobra" ) diff --git a/cmd/podman/farm/create.go b/cmd/podman/farm/create.go index a8cee530ff..6e7c493797 100644 --- a/cmd/podman/farm/create.go +++ b/cmd/podman/farm/create.go @@ -5,8 +5,8 @@ import ( "github.com/containers/common/pkg/completion" "github.com/containers/common/pkg/config" - "github.com/containers/podman/v4/cmd/podman/registry" - "github.com/containers/podman/v4/cmd/podman/validate" + "github.com/containers/podman/v5/cmd/podman/registry" + "github.com/containers/podman/v5/cmd/podman/validate" "github.com/spf13/cobra" "golang.org/x/exp/slices" ) diff --git a/cmd/podman/farm/farm.go b/cmd/podman/farm/farm.go index 01b39eff0b..c3b40d4757 100644 --- a/cmd/podman/farm/farm.go +++ b/cmd/podman/farm/farm.go @@ -1,8 +1,8 @@ package farm import ( - "github.com/containers/podman/v4/cmd/podman/registry" - "github.com/containers/podman/v4/cmd/podman/validate" + "github.com/containers/podman/v5/cmd/podman/registry" + "github.com/containers/podman/v5/cmd/podman/validate" "github.com/spf13/cobra" ) diff --git a/cmd/podman/farm/list.go b/cmd/podman/farm/list.go index 6a63ff75c5..49be84003a 100644 --- a/cmd/podman/farm/list.go +++ b/cmd/podman/farm/list.go @@ -8,9 +8,9 @@ import ( "github.com/containers/common/pkg/completion" "github.com/containers/common/pkg/config" "github.com/containers/common/pkg/report" - "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/v5/cmd/podman/common" + "github.com/containers/podman/v5/cmd/podman/registry" + "github.com/containers/podman/v5/cmd/podman/validate" "github.com/spf13/cobra" ) diff --git a/cmd/podman/farm/remove.go b/cmd/podman/farm/remove.go index a9622336ee..96de335404 100644 --- a/cmd/podman/farm/remove.go +++ b/cmd/podman/farm/remove.go @@ -5,9 +5,9 @@ import ( "fmt" "github.com/containers/common/pkg/config" - "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/v5/cmd/podman/common" + "github.com/containers/podman/v5/cmd/podman/registry" + "github.com/containers/podman/v5/cmd/podman/validate" "github.com/sirupsen/logrus" "github.com/spf13/cobra" ) diff --git a/cmd/podman/farm/update.go b/cmd/podman/farm/update.go index 08c31114b7..aecdf00aeb 100644 --- a/cmd/podman/farm/update.go +++ b/cmd/podman/farm/update.go @@ -6,9 +6,9 @@ import ( "github.com/containers/common/pkg/completion" "github.com/containers/common/pkg/config" - "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/v5/cmd/podman/common" + "github.com/containers/podman/v5/cmd/podman/registry" + "github.com/containers/podman/v5/cmd/podman/validate" "github.com/spf13/cobra" "golang.org/x/exp/slices" ) diff --git a/cmd/podman/generate/generate.go b/cmd/podman/generate/generate.go index f1dea68164..3e86bc6053 100644 --- a/cmd/podman/generate/generate.go +++ b/cmd/podman/generate/generate.go @@ -1,9 +1,9 @@ package generate import ( - "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/containers/podman/v5/cmd/podman/registry" + "github.com/containers/podman/v5/cmd/podman/validate" + "github.com/containers/podman/v5/pkg/util" "github.com/spf13/cobra" ) diff --git a/cmd/podman/generate/spec.go b/cmd/podman/generate/spec.go index 0c3d7884c9..5991c2063a 100644 --- a/cmd/podman/generate/spec.go +++ b/cmd/podman/generate/spec.go @@ -5,10 +5,10 @@ import ( "os" "github.com/containers/common/pkg/completion" - "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/v5/cmd/podman/common" + "github.com/containers/podman/v5/cmd/podman/registry" + "github.com/containers/podman/v5/cmd/podman/utils" + "github.com/containers/podman/v5/pkg/domain/entities" "github.com/spf13/cobra" ) diff --git a/cmd/podman/generate/systemd.go b/cmd/podman/generate/systemd.go index 7cf311e91b..88bef03441 100644 --- a/cmd/podman/generate/systemd.go +++ b/cmd/podman/generate/systemd.go @@ -9,12 +9,12 @@ import ( "github.com/containers/common/pkg/completion" "github.com/containers/common/pkg/report" - "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" - envLib "github.com/containers/podman/v4/pkg/env" - systemDefine "github.com/containers/podman/v4/pkg/systemd/define" + "github.com/containers/podman/v5/cmd/podman/common" + "github.com/containers/podman/v5/cmd/podman/registry" + "github.com/containers/podman/v5/cmd/podman/utils" + "github.com/containers/podman/v5/pkg/domain/entities" + envLib "github.com/containers/podman/v5/pkg/env" + systemDefine "github.com/containers/podman/v5/pkg/systemd/define" "github.com/sirupsen/logrus" "github.com/spf13/cobra" ) diff --git a/cmd/podman/healthcheck/healthcheck.go b/cmd/podman/healthcheck/healthcheck.go index 164434c3d7..07a42f2d08 100644 --- a/cmd/podman/healthcheck/healthcheck.go +++ b/cmd/podman/healthcheck/healthcheck.go @@ -1,8 +1,8 @@ package healthcheck import ( - "github.com/containers/podman/v4/cmd/podman/registry" - "github.com/containers/podman/v4/cmd/podman/validate" + "github.com/containers/podman/v5/cmd/podman/registry" + "github.com/containers/podman/v5/cmd/podman/validate" "github.com/spf13/cobra" ) diff --git a/cmd/podman/healthcheck/run.go b/cmd/podman/healthcheck/run.go index 2445c1d01e..b44ac804c4 100644 --- a/cmd/podman/healthcheck/run.go +++ b/cmd/podman/healthcheck/run.go @@ -4,10 +4,10 @@ import ( "context" "fmt" - "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/containers/podman/v5/cmd/podman/common" + "github.com/containers/podman/v5/cmd/podman/registry" + "github.com/containers/podman/v5/libpod/define" + "github.com/containers/podman/v5/pkg/domain/entities" "github.com/spf13/cobra" ) diff --git a/cmd/podman/images/build.go b/cmd/podman/images/build.go index 1b44af8777..36c44ae2db 100644 --- a/cmd/podman/images/build.go +++ b/cmd/podman/images/build.go @@ -6,9 +6,9 @@ import ( "os/exec" buildahCLI "github.com/containers/buildah/pkg/cli" - "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/v5/cmd/podman/common" + "github.com/containers/podman/v5/cmd/podman/registry" + "github.com/containers/podman/v5/cmd/podman/utils" "github.com/sirupsen/logrus" "github.com/spf13/cobra" ) diff --git a/cmd/podman/images/buildx.go b/cmd/podman/images/buildx.go index 581e4519a7..37091ce5e8 100644 --- a/cmd/podman/images/buildx.go +++ b/cmd/podman/images/buildx.go @@ -1,8 +1,8 @@ package images import ( - "github.com/containers/podman/v4/cmd/podman/registry" - "github.com/containers/podman/v4/cmd/podman/validate" + "github.com/containers/podman/v5/cmd/podman/registry" + "github.com/containers/podman/v5/cmd/podman/validate" "github.com/spf13/cobra" ) diff --git a/cmd/podman/images/diff.go b/cmd/podman/images/diff.go index a017d569d5..801de179cb 100644 --- a/cmd/podman/images/diff.go +++ b/cmd/podman/images/diff.go @@ -1,11 +1,11 @@ package images import ( - "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/containers/podman/v5/cmd/podman/common" + "github.com/containers/podman/v5/cmd/podman/diff" + "github.com/containers/podman/v5/cmd/podman/registry" + "github.com/containers/podman/v5/libpod/define" + "github.com/containers/podman/v5/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 d8971c3185..272fe857f9 100644 --- a/cmd/podman/images/exists.go +++ b/cmd/podman/images/exists.go @@ -1,8 +1,8 @@ package images import ( - "github.com/containers/podman/v4/cmd/podman/common" - "github.com/containers/podman/v4/cmd/podman/registry" + "github.com/containers/podman/v5/cmd/podman/common" + "github.com/containers/podman/v5/cmd/podman/registry" "github.com/spf13/cobra" ) diff --git a/cmd/podman/images/history.go b/cmd/podman/images/history.go index b6b380658d..ccd3f41505 100644 --- a/cmd/podman/images/history.go +++ b/cmd/podman/images/history.go @@ -6,10 +6,10 @@ import ( "time" "github.com/containers/common/pkg/report" - "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/v5/cmd/podman/common" + "github.com/containers/podman/v5/cmd/podman/registry" + "github.com/containers/podman/v5/cmd/podman/utils" + "github.com/containers/podman/v5/pkg/domain/entities" "github.com/docker/go-units" "github.com/spf13/cobra" ) diff --git a/cmd/podman/images/image.go b/cmd/podman/images/image.go index f5501adbc3..2f65ad19f4 100644 --- a/cmd/podman/images/image.go +++ b/cmd/podman/images/image.go @@ -1,8 +1,8 @@ package images import ( - "github.com/containers/podman/v4/cmd/podman/registry" - "github.com/containers/podman/v4/cmd/podman/validate" + "github.com/containers/podman/v5/cmd/podman/registry" + "github.com/containers/podman/v5/cmd/podman/validate" "github.com/spf13/cobra" ) diff --git a/cmd/podman/images/import.go b/cmd/podman/images/import.go index 7532bf7a99..1efbaac394 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/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/containers/podman/v5/cmd/podman/common" + "github.com/containers/podman/v5/cmd/podman/parse" + "github.com/containers/podman/v5/cmd/podman/registry" + "github.com/containers/podman/v5/pkg/domain/entities" "github.com/hashicorp/go-multierror" "github.com/spf13/cobra" ) diff --git a/cmd/podman/images/inspect.go b/cmd/podman/images/inspect.go index 310f8cda82..301b7a5f81 100644 --- a/cmd/podman/images/inspect.go +++ b/cmd/podman/images/inspect.go @@ -1,11 +1,11 @@ package images import ( - "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/containers/podman/v5/cmd/podman/common" + "github.com/containers/podman/v5/cmd/podman/inspect" + "github.com/containers/podman/v5/cmd/podman/registry" + "github.com/containers/podman/v5/pkg/domain/entities" + inspectTypes "github.com/containers/podman/v5/pkg/inspect" "github.com/spf13/cobra" ) diff --git a/cmd/podman/images/list.go b/cmd/podman/images/list.go index d8804e8a56..c824d41bd0 100644 --- a/cmd/podman/images/list.go +++ b/cmd/podman/images/list.go @@ -12,9 +12,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/v4/cmd/podman/common" - "github.com/containers/podman/v4/cmd/podman/registry" - "github.com/containers/podman/v4/pkg/domain/entities" + "github.com/containers/podman/v5/cmd/podman/common" + "github.com/containers/podman/v5/cmd/podman/registry" + "github.com/containers/podman/v5/pkg/domain/entities" "github.com/docker/go-units" "github.com/spf13/cobra" ) diff --git a/cmd/podman/images/load.go b/cmd/podman/images/load.go index 4aae5217d1..c535d78e3e 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/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/containers/podman/v5/cmd/podman/registry" + "github.com/containers/podman/v5/cmd/podman/validate" + "github.com/containers/podman/v5/pkg/domain/entities" + "github.com/containers/podman/v5/pkg/util" "github.com/spf13/cobra" "golang.org/x/term" ) diff --git a/cmd/podman/images/mount.go b/cmd/podman/images/mount.go index cd54e24ae1..5e7c4ebab0 100644 --- a/cmd/podman/images/mount.go +++ b/cmd/podman/images/mount.go @@ -6,9 +6,9 @@ import ( "os" "github.com/containers/common/pkg/report" - "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/v5/cmd/podman/common" + "github.com/containers/podman/v5/cmd/podman/registry" + "github.com/containers/podman/v5/pkg/domain/entities" "github.com/spf13/cobra" ) diff --git a/cmd/podman/images/prune.go b/cmd/podman/images/prune.go index d76496a683..0474aefd14 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/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/containers/podman/v5/cmd/podman/common" + "github.com/containers/podman/v5/cmd/podman/parse" + "github.com/containers/podman/v5/cmd/podman/registry" + "github.com/containers/podman/v5/cmd/podman/utils" + "github.com/containers/podman/v5/cmd/podman/validate" + "github.com/containers/podman/v5/pkg/domain/entities" "github.com/spf13/cobra" ) diff --git a/cmd/podman/images/pull.go b/cmd/podman/images/pull.go index 8399f6c9c2..a1c8b6ca8f 100644 --- a/cmd/podman/images/pull.go +++ b/cmd/podman/images/pull.go @@ -10,11 +10,11 @@ import ( "github.com/containers/common/pkg/auth" "github.com/containers/common/pkg/completion" "github.com/containers/image/v5/types" - "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/containers/podman/v5/cmd/podman/common" + "github.com/containers/podman/v5/cmd/podman/registry" + "github.com/containers/podman/v5/cmd/podman/utils" + "github.com/containers/podman/v5/pkg/domain/entities" + "github.com/containers/podman/v5/pkg/util" "github.com/spf13/cobra" ) diff --git a/cmd/podman/images/push.go b/cmd/podman/images/push.go index 168411328f..f71e0fa7d5 100644 --- a/cmd/podman/images/push.go +++ b/cmd/podman/images/push.go @@ -8,10 +8,10 @@ import ( "github.com/containers/common/pkg/auth" "github.com/containers/common/pkg/completion" "github.com/containers/image/v5/types" - "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/containers/podman/v5/cmd/podman/common" + "github.com/containers/podman/v5/cmd/podman/registry" + "github.com/containers/podman/v5/pkg/domain/entities" + "github.com/containers/podman/v5/pkg/util" "github.com/spf13/cobra" ) diff --git a/cmd/podman/images/rm.go b/cmd/podman/images/rm.go index bde072f9e8..b0409ce208 100644 --- a/cmd/podman/images/rm.go +++ b/cmd/podman/images/rm.go @@ -5,11 +5,11 @@ import ( "fmt" "strings" - "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/errorhandling" + "github.com/containers/podman/v5/cmd/podman/common" + "github.com/containers/podman/v5/cmd/podman/registry" + "github.com/containers/podman/v5/cmd/podman/utils" + "github.com/containers/podman/v5/pkg/domain/entities" + "github.com/containers/podman/v5/pkg/errorhandling" "github.com/containers/storage/types" "github.com/spf13/cobra" "github.com/spf13/pflag" diff --git a/cmd/podman/images/save.go b/cmd/podman/images/save.go index 1c6dbd5229..529b050530 100644 --- a/cmd/podman/images/save.go +++ b/cmd/podman/images/save.go @@ -8,11 +8,11 @@ import ( "strings" "github.com/containers/common/pkg/completion" - "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/v5/cmd/podman/common" + "github.com/containers/podman/v5/cmd/podman/parse" + "github.com/containers/podman/v5/cmd/podman/registry" + "github.com/containers/podman/v5/libpod/define" + "github.com/containers/podman/v5/pkg/domain/entities" "github.com/spf13/cobra" "golang.org/x/exp/slices" "golang.org/x/term" diff --git a/cmd/podman/images/scp.go b/cmd/podman/images/scp.go index 775cf49f64..6904039b5b 100644 --- a/cmd/podman/images/scp.go +++ b/cmd/podman/images/scp.go @@ -5,8 +5,8 @@ import ( "strings" "github.com/containers/common/pkg/ssh" - "github.com/containers/podman/v4/cmd/podman/common" - "github.com/containers/podman/v4/cmd/podman/registry" + "github.com/containers/podman/v5/cmd/podman/common" + "github.com/containers/podman/v5/cmd/podman/registry" "github.com/spf13/cobra" ) diff --git a/cmd/podman/images/search.go b/cmd/podman/images/search.go index ef8c1e2be7..a09514f8a4 100644 --- a/cmd/podman/images/search.go +++ b/cmd/podman/images/search.go @@ -10,10 +10,10 @@ import ( "github.com/containers/common/pkg/completion" "github.com/containers/common/pkg/report" "github.com/containers/image/v5/types" - "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/containers/podman/v5/cmd/podman/common" + "github.com/containers/podman/v5/cmd/podman/registry" + "github.com/containers/podman/v5/pkg/domain/entities" + "github.com/containers/podman/v5/pkg/util" "github.com/spf13/cobra" ) diff --git a/cmd/podman/images/sign.go b/cmd/podman/images/sign.go index 66bc55bcbe..08aa93dea1 100644 --- a/cmd/podman/images/sign.go +++ b/cmd/podman/images/sign.go @@ -6,9 +6,9 @@ import ( "github.com/containers/common/pkg/auth" "github.com/containers/common/pkg/completion" - "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/v5/cmd/podman/common" + "github.com/containers/podman/v5/cmd/podman/registry" + "github.com/containers/podman/v5/pkg/domain/entities" "github.com/spf13/cobra" ) diff --git a/cmd/podman/images/tag.go b/cmd/podman/images/tag.go index 1129b82e58..9e29c4a6a5 100644 --- a/cmd/podman/images/tag.go +++ b/cmd/podman/images/tag.go @@ -1,9 +1,9 @@ package images import ( - "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/v5/cmd/podman/common" + "github.com/containers/podman/v5/cmd/podman/registry" + "github.com/containers/podman/v5/pkg/domain/entities" "github.com/spf13/cobra" ) diff --git a/cmd/podman/images/tree.go b/cmd/podman/images/tree.go index 00f888a663..db73893caa 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/v4/cmd/podman/common" - "github.com/containers/podman/v4/cmd/podman/registry" - "github.com/containers/podman/v4/pkg/domain/entities" + "github.com/containers/podman/v5/cmd/podman/common" + "github.com/containers/podman/v5/cmd/podman/registry" + "github.com/containers/podman/v5/pkg/domain/entities" "github.com/spf13/cobra" ) diff --git a/cmd/podman/images/trust.go b/cmd/podman/images/trust.go index a5badf72aa..6092c7f05a 100644 --- a/cmd/podman/images/trust.go +++ b/cmd/podman/images/trust.go @@ -1,8 +1,8 @@ package images import ( - "github.com/containers/podman/v4/cmd/podman/registry" - "github.com/containers/podman/v4/cmd/podman/validate" + "github.com/containers/podman/v5/cmd/podman/registry" + "github.com/containers/podman/v5/cmd/podman/validate" "github.com/spf13/cobra" ) diff --git a/cmd/podman/images/trust_set.go b/cmd/podman/images/trust_set.go index cd88514fee..a7acf21122 100644 --- a/cmd/podman/images/trust_set.go +++ b/cmd/podman/images/trust_set.go @@ -6,9 +6,9 @@ import ( "regexp" "github.com/containers/common/pkg/completion" - "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/v5/cmd/podman/common" + "github.com/containers/podman/v5/cmd/podman/registry" + "github.com/containers/podman/v5/pkg/domain/entities" "github.com/spf13/cobra" "golang.org/x/exp/slices" ) diff --git a/cmd/podman/images/trust_show.go b/cmd/podman/images/trust_show.go index 40c077d67e..2462a25f3f 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/v4/cmd/podman/common" - "github.com/containers/podman/v4/cmd/podman/registry" - "github.com/containers/podman/v4/pkg/domain/entities" + "github.com/containers/podman/v5/cmd/podman/common" + "github.com/containers/podman/v5/cmd/podman/registry" + "github.com/containers/podman/v5/pkg/domain/entities" "github.com/spf13/cobra" ) diff --git a/cmd/podman/images/unmount.go b/cmd/podman/images/unmount.go index 2a3df7cbd3..ea39f446a3 100644 --- a/cmd/podman/images/unmount.go +++ b/cmd/podman/images/unmount.go @@ -4,10 +4,10 @@ import ( "errors" "fmt" - "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/v5/cmd/podman/common" + "github.com/containers/podman/v5/cmd/podman/registry" + "github.com/containers/podman/v5/cmd/podman/utils" + "github.com/containers/podman/v5/pkg/domain/entities" "github.com/spf13/cobra" "github.com/spf13/pflag" ) diff --git a/cmd/podman/images/untag.go b/cmd/podman/images/untag.go index 50941e4961..879e91f6dd 100644 --- a/cmd/podman/images/untag.go +++ b/cmd/podman/images/untag.go @@ -1,9 +1,9 @@ package images import ( - "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/v5/cmd/podman/common" + "github.com/containers/podman/v5/cmd/podman/registry" + "github.com/containers/podman/v5/pkg/domain/entities" "github.com/spf13/cobra" ) diff --git a/cmd/podman/images/version.go b/cmd/podman/images/version.go index eee2c039fe..1fec5c894b 100644 --- a/cmd/podman/images/version.go +++ b/cmd/podman/images/version.go @@ -5,8 +5,8 @@ import ( "github.com/containers/buildah/define" "github.com/containers/common/pkg/completion" - "github.com/containers/podman/v4/cmd/podman/registry" - "github.com/containers/podman/v4/cmd/podman/validate" + "github.com/containers/podman/v5/cmd/podman/registry" + "github.com/containers/podman/v5/cmd/podman/validate" "github.com/spf13/cobra" ) diff --git a/cmd/podman/inspect.go b/cmd/podman/inspect.go index e8738ecc3f..d3d8efc36c 100644 --- a/cmd/podman/inspect.go +++ b/cmd/podman/inspect.go @@ -1,10 +1,10 @@ package main import ( - "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/v5/cmd/podman/common" + "github.com/containers/podman/v5/cmd/podman/inspect" + "github.com/containers/podman/v5/cmd/podman/registry" + "github.com/containers/podman/v5/pkg/domain/entities" "github.com/spf13/cobra" ) diff --git a/cmd/podman/inspect/inspect.go b/cmd/podman/inspect/inspect.go index 4866ac0e81..218f027faa 100644 --- a/cmd/podman/inspect/inspect.go +++ b/cmd/podman/inspect/inspect.go @@ -10,10 +10,10 @@ import ( "strings" "github.com/containers/common/pkg/report" - "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/v5/cmd/podman/common" + "github.com/containers/podman/v5/cmd/podman/registry" + "github.com/containers/podman/v5/cmd/podman/validate" + "github.com/containers/podman/v5/pkg/domain/entities" "github.com/spf13/cobra" ) diff --git a/cmd/podman/kube/apply.go b/cmd/podman/kube/apply.go index d075b51123..d062f08533 100644 --- a/cmd/podman/kube/apply.go +++ b/cmd/podman/kube/apply.go @@ -7,10 +7,10 @@ import ( "os" "github.com/containers/common/pkg/completion" - "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/v5/cmd/podman/common" + "github.com/containers/podman/v5/cmd/podman/registry" + "github.com/containers/podman/v5/cmd/podman/utils" + "github.com/containers/podman/v5/pkg/domain/entities" "github.com/spf13/cobra" ) diff --git a/cmd/podman/kube/down.go b/cmd/podman/kube/down.go index 319936ad7e..9860992edd 100644 --- a/cmd/podman/kube/down.go +++ b/cmd/podman/kube/down.go @@ -1,10 +1,10 @@ package kube import ( - "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/v5/cmd/podman/common" + "github.com/containers/podman/v5/cmd/podman/registry" + "github.com/containers/podman/v5/cmd/podman/utils" + "github.com/containers/podman/v5/pkg/domain/entities" "github.com/spf13/cobra" ) diff --git a/cmd/podman/kube/generate.go b/cmd/podman/kube/generate.go index edd6c8191f..6bf0357620 100644 --- a/cmd/podman/kube/generate.go +++ b/cmd/podman/kube/generate.go @@ -6,11 +6,11 @@ import ( "os" "github.com/containers/common/pkg/completion" - "github.com/containers/podman/v4/cmd/podman/common" - "github.com/containers/podman/v4/cmd/podman/generate" - "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/v5/cmd/podman/common" + "github.com/containers/podman/v5/cmd/podman/generate" + "github.com/containers/podman/v5/cmd/podman/registry" + "github.com/containers/podman/v5/cmd/podman/utils" + "github.com/containers/podman/v5/pkg/domain/entities" "github.com/spf13/cobra" ) diff --git a/cmd/podman/kube/kube.go b/cmd/podman/kube/kube.go index 2dab68c198..9dd9dec1e1 100644 --- a/cmd/podman/kube/kube.go +++ b/cmd/podman/kube/kube.go @@ -1,8 +1,8 @@ package kube import ( - "github.com/containers/podman/v4/cmd/podman/registry" - "github.com/containers/podman/v4/cmd/podman/validate" + "github.com/containers/podman/v5/cmd/podman/registry" + "github.com/containers/podman/v5/cmd/podman/validate" "github.com/spf13/cobra" ) diff --git a/cmd/podman/kube/play.go b/cmd/podman/kube/play.go index 21bb45260b..caa78add38 100644 --- a/cmd/podman/kube/play.go +++ b/cmd/podman/kube/play.go @@ -16,15 +16,15 @@ import ( "github.com/containers/common/pkg/auth" "github.com/containers/common/pkg/completion" "github.com/containers/image/v5/types" - "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/libpod/define" - "github.com/containers/podman/v4/libpod/shutdown" - "github.com/containers/podman/v4/pkg/domain/entities" - "github.com/containers/podman/v4/pkg/errorhandling" - "github.com/containers/podman/v4/pkg/util" + "github.com/containers/podman/v5/cmd/podman/common" + "github.com/containers/podman/v5/cmd/podman/parse" + "github.com/containers/podman/v5/cmd/podman/registry" + "github.com/containers/podman/v5/cmd/podman/utils" + "github.com/containers/podman/v5/libpod/define" + "github.com/containers/podman/v5/libpod/shutdown" + "github.com/containers/podman/v5/pkg/domain/entities" + "github.com/containers/podman/v5/pkg/errorhandling" + "github.com/containers/podman/v5/pkg/util" "github.com/spf13/cobra" ) diff --git a/cmd/podman/login.go b/cmd/podman/login.go index d9777941fd..5a3edb3369 100644 --- a/cmd/podman/login.go +++ b/cmd/podman/login.go @@ -9,9 +9,9 @@ import ( "github.com/containers/common/pkg/auth" "github.com/containers/common/pkg/completion" "github.com/containers/image/v5/types" - "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/v5/cmd/podman/common" + "github.com/containers/podman/v5/cmd/podman/registry" + "github.com/containers/podman/v5/pkg/domain/entities" "github.com/spf13/cobra" ) diff --git a/cmd/podman/logout.go b/cmd/podman/logout.go index f6c086d819..46a123f292 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/v4/cmd/podman/common" - "github.com/containers/podman/v4/cmd/podman/registry" + "github.com/containers/podman/v5/cmd/podman/common" + "github.com/containers/podman/v5/cmd/podman/registry" "github.com/spf13/cobra" ) diff --git a/cmd/podman/machine/client9p.go b/cmd/podman/machine/client9p.go index 3f91364efd..00f90fad4a 100644 --- a/cmd/podman/machine/client9p.go +++ b/cmd/podman/machine/client9p.go @@ -10,7 +10,7 @@ import ( "strconv" "github.com/containers/common/pkg/completion" - "github.com/containers/podman/v4/cmd/podman/registry" + "github.com/containers/podman/v5/cmd/podman/registry" "github.com/mdlayher/vsock" "github.com/sirupsen/logrus" "github.com/spf13/cobra" diff --git a/cmd/podman/machine/info.go b/cmd/podman/machine/info.go index df2b7a8950..0fec4323f5 100644 --- a/cmd/podman/machine/info.go +++ b/cmd/podman/machine/info.go @@ -9,12 +9,12 @@ import ( "github.com/containers/common/pkg/completion" "github.com/containers/common/pkg/report" - "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/machine" + "github.com/containers/podman/v5/cmd/podman/common" + "github.com/containers/podman/v5/cmd/podman/registry" + "github.com/containers/podman/v5/cmd/podman/validate" + "github.com/containers/podman/v5/libpod/define" + "github.com/containers/podman/v5/pkg/domain/entities" + "github.com/containers/podman/v5/pkg/machine" "github.com/spf13/cobra" "sigs.k8s.io/yaml" ) diff --git a/cmd/podman/machine/init.go b/cmd/podman/machine/init.go index f3a5d65e2c..012de30fc3 100644 --- a/cmd/podman/machine/init.go +++ b/cmd/podman/machine/init.go @@ -7,10 +7,10 @@ import ( "os" "github.com/containers/common/pkg/completion" - "github.com/containers/podman/v4/cmd/podman/registry" - "github.com/containers/podman/v4/libpod/events" - "github.com/containers/podman/v4/pkg/machine" - "github.com/containers/podman/v4/pkg/machine/define" + "github.com/containers/podman/v5/cmd/podman/registry" + "github.com/containers/podman/v5/libpod/events" + "github.com/containers/podman/v5/pkg/machine" + "github.com/containers/podman/v5/pkg/machine/define" "github.com/spf13/cobra" ) diff --git a/cmd/podman/machine/inspect.go b/cmd/podman/machine/inspect.go index 1840876a3c..6bd9cc9247 100644 --- a/cmd/podman/machine/inspect.go +++ b/cmd/podman/machine/inspect.go @@ -6,10 +6,10 @@ import ( "os" "github.com/containers/common/pkg/report" - "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/machine" + "github.com/containers/podman/v5/cmd/podman/common" + "github.com/containers/podman/v5/cmd/podman/registry" + "github.com/containers/podman/v5/cmd/podman/utils" + "github.com/containers/podman/v5/pkg/machine" "github.com/spf13/cobra" ) diff --git a/cmd/podman/machine/list.go b/cmd/podman/machine/list.go index f0de62c6ae..7356c9b3e4 100644 --- a/cmd/podman/machine/list.go +++ b/cmd/podman/machine/list.go @@ -11,11 +11,11 @@ import ( "github.com/containers/common/pkg/completion" "github.com/containers/common/pkg/report" - "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/machine" + "github.com/containers/podman/v5/cmd/podman/common" + "github.com/containers/podman/v5/cmd/podman/registry" + "github.com/containers/podman/v5/cmd/podman/validate" + "github.com/containers/podman/v5/pkg/domain/entities" + "github.com/containers/podman/v5/pkg/machine" "github.com/docker/go-units" "github.com/spf13/cobra" ) diff --git a/cmd/podman/machine/machine.go b/cmd/podman/machine/machine.go index 48ea7b3b6a..313a76e41e 100644 --- a/cmd/podman/machine/machine.go +++ b/cmd/podman/machine/machine.go @@ -12,12 +12,12 @@ import ( "sync" "time" - "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/machine" - provider2 "github.com/containers/podman/v4/pkg/machine/provider" - "github.com/containers/podman/v4/pkg/util" + "github.com/containers/podman/v5/cmd/podman/registry" + "github.com/containers/podman/v5/cmd/podman/validate" + "github.com/containers/podman/v5/libpod/events" + "github.com/containers/podman/v5/pkg/machine" + provider2 "github.com/containers/podman/v5/pkg/machine/provider" + "github.com/containers/podman/v5/pkg/util" "github.com/sirupsen/logrus" "github.com/spf13/cobra" ) diff --git a/cmd/podman/machine/machine_unix.go b/cmd/podman/machine/machine_unix.go index 94004898fb..a5fbd3d839 100644 --- a/cmd/podman/machine/machine_unix.go +++ b/cmd/podman/machine/machine_unix.go @@ -6,7 +6,7 @@ import ( "fmt" "os" - "github.com/containers/podman/v4/pkg/rootless" + "github.com/containers/podman/v5/pkg/rootless" "github.com/spf13/cobra" ) diff --git a/cmd/podman/machine/os.go b/cmd/podman/machine/os.go index 0059ab6a04..71477e030d 100644 --- a/cmd/podman/machine/os.go +++ b/cmd/podman/machine/os.go @@ -3,8 +3,8 @@ package machine import ( - "github.com/containers/podman/v4/cmd/podman/registry" - "github.com/containers/podman/v4/cmd/podman/validate" + "github.com/containers/podman/v5/cmd/podman/registry" + "github.com/containers/podman/v5/cmd/podman/validate" "github.com/spf13/cobra" ) diff --git a/cmd/podman/machine/os/apply.go b/cmd/podman/machine/os/apply.go index 79695768c6..dc8aae2d39 100644 --- a/cmd/podman/machine/os/apply.go +++ b/cmd/podman/machine/os/apply.go @@ -3,11 +3,11 @@ package os import ( - "github.com/containers/podman/v4/cmd/podman/common" - "github.com/containers/podman/v4/cmd/podman/machine" - "github.com/containers/podman/v4/cmd/podman/registry" - "github.com/containers/podman/v4/cmd/podman/validate" - "github.com/containers/podman/v4/pkg/machine/os" + "github.com/containers/podman/v5/cmd/podman/common" + "github.com/containers/podman/v5/cmd/podman/machine" + "github.com/containers/podman/v5/cmd/podman/registry" + "github.com/containers/podman/v5/cmd/podman/validate" + "github.com/containers/podman/v5/pkg/machine/os" "github.com/spf13/cobra" ) diff --git a/cmd/podman/machine/os/manager.go b/cmd/podman/machine/os/manager.go index 8ea79d48c4..ccd03e29b0 100644 --- a/cmd/podman/machine/os/manager.go +++ b/cmd/podman/machine/os/manager.go @@ -9,9 +9,9 @@ import ( "strings" machineconfig "github.com/containers/common/pkg/machine" - pkgMachine "github.com/containers/podman/v4/pkg/machine" - pkgOS "github.com/containers/podman/v4/pkg/machine/os" - "github.com/containers/podman/v4/pkg/machine/provider" + pkgMachine "github.com/containers/podman/v5/pkg/machine" + pkgOS "github.com/containers/podman/v5/pkg/machine/os" + "github.com/containers/podman/v5/pkg/machine/provider" ) type ManagerOpts struct { diff --git a/cmd/podman/machine/rm.go b/cmd/podman/machine/rm.go index d25922be11..d20e73f954 100644 --- a/cmd/podman/machine/rm.go +++ b/cmd/podman/machine/rm.go @@ -8,9 +8,9 @@ import ( "os" "strings" - "github.com/containers/podman/v4/cmd/podman/registry" - "github.com/containers/podman/v4/libpod/events" - "github.com/containers/podman/v4/pkg/machine" + "github.com/containers/podman/v5/cmd/podman/registry" + "github.com/containers/podman/v5/libpod/events" + "github.com/containers/podman/v5/pkg/machine" "github.com/spf13/cobra" ) diff --git a/cmd/podman/machine/server9p.go b/cmd/podman/machine/server9p.go index 6eb6354f50..d9206c1e9b 100644 --- a/cmd/podman/machine/server9p.go +++ b/cmd/podman/machine/server9p.go @@ -9,8 +9,8 @@ import ( "time" "github.com/containers/common/pkg/completion" - "github.com/containers/podman/v4/cmd/podman/registry" - "github.com/containers/podman/v4/pkg/fileserver" + "github.com/containers/podman/v5/cmd/podman/registry" + "github.com/containers/podman/v5/pkg/fileserver" psutil "github.com/shirou/gopsutil/v3/process" "github.com/sirupsen/logrus" "github.com/spf13/cobra" diff --git a/cmd/podman/machine/set.go b/cmd/podman/machine/set.go index f163a4fbd5..919f450daf 100644 --- a/cmd/podman/machine/set.go +++ b/cmd/podman/machine/set.go @@ -7,8 +7,8 @@ import ( "os" "github.com/containers/common/pkg/completion" - "github.com/containers/podman/v4/cmd/podman/registry" - "github.com/containers/podman/v4/pkg/machine" + "github.com/containers/podman/v5/cmd/podman/registry" + "github.com/containers/podman/v5/pkg/machine" "github.com/spf13/cobra" ) diff --git a/cmd/podman/machine/ssh.go b/cmd/podman/machine/ssh.go index 416643efd2..4956201a43 100644 --- a/cmd/podman/machine/ssh.go +++ b/cmd/podman/machine/ssh.go @@ -7,9 +7,9 @@ import ( "net/url" "github.com/containers/common/pkg/completion" - "github.com/containers/podman/v4/cmd/podman/registry" - "github.com/containers/podman/v4/cmd/podman/utils" - "github.com/containers/podman/v4/pkg/machine" + "github.com/containers/podman/v5/cmd/podman/registry" + "github.com/containers/podman/v5/cmd/podman/utils" + "github.com/containers/podman/v5/pkg/machine" "github.com/spf13/cobra" ) diff --git a/cmd/podman/machine/start.go b/cmd/podman/machine/start.go index 6063fce376..09e2cf5e3c 100644 --- a/cmd/podman/machine/start.go +++ b/cmd/podman/machine/start.go @@ -5,9 +5,9 @@ package machine import ( "fmt" - "github.com/containers/podman/v4/cmd/podman/registry" - "github.com/containers/podman/v4/libpod/events" - "github.com/containers/podman/v4/pkg/machine" + "github.com/containers/podman/v5/cmd/podman/registry" + "github.com/containers/podman/v5/libpod/events" + "github.com/containers/podman/v5/pkg/machine" "github.com/spf13/cobra" ) diff --git a/cmd/podman/machine/stop.go b/cmd/podman/machine/stop.go index a9b4c1b66d..d87edba467 100644 --- a/cmd/podman/machine/stop.go +++ b/cmd/podman/machine/stop.go @@ -5,9 +5,9 @@ package machine import ( "fmt" - "github.com/containers/podman/v4/cmd/podman/registry" - "github.com/containers/podman/v4/libpod/events" - "github.com/containers/podman/v4/pkg/machine" + "github.com/containers/podman/v5/cmd/podman/registry" + "github.com/containers/podman/v5/libpod/events" + "github.com/containers/podman/v5/pkg/machine" "github.com/spf13/cobra" ) diff --git a/cmd/podman/main.go b/cmd/podman/main.go index e635c3441f..6a7ef36ae8 100644 --- a/cmd/podman/main.go +++ b/cmd/podman/main.go @@ -7,26 +7,26 @@ import ( "strconv" "strings" - _ "github.com/containers/podman/v4/cmd/podman/completion" - _ "github.com/containers/podman/v4/cmd/podman/farm" - _ "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/kube" - _ "github.com/containers/podman/v4/cmd/podman/machine" - _ "github.com/containers/podman/v4/cmd/podman/machine/os" - _ "github.com/containers/podman/v4/cmd/podman/manifest" - _ "github.com/containers/podman/v4/cmd/podman/networks" - _ "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/validate" - _ "github.com/containers/podman/v4/cmd/podman/volumes" - "github.com/containers/podman/v4/pkg/domain/entities" - "github.com/containers/podman/v4/pkg/rootless" - "github.com/containers/podman/v4/pkg/terminal" + _ "github.com/containers/podman/v5/cmd/podman/completion" + _ "github.com/containers/podman/v5/cmd/podman/farm" + _ "github.com/containers/podman/v5/cmd/podman/generate" + _ "github.com/containers/podman/v5/cmd/podman/healthcheck" + _ "github.com/containers/podman/v5/cmd/podman/images" + _ "github.com/containers/podman/v5/cmd/podman/kube" + _ "github.com/containers/podman/v5/cmd/podman/machine" + _ "github.com/containers/podman/v5/cmd/podman/machine/os" + _ "github.com/containers/podman/v5/cmd/podman/manifest" + _ "github.com/containers/podman/v5/cmd/podman/networks" + _ "github.com/containers/podman/v5/cmd/podman/pods" + "github.com/containers/podman/v5/cmd/podman/registry" + _ "github.com/containers/podman/v5/cmd/podman/secrets" + _ "github.com/containers/podman/v5/cmd/podman/system" + _ "github.com/containers/podman/v5/cmd/podman/system/connection" + "github.com/containers/podman/v5/cmd/podman/validate" + _ "github.com/containers/podman/v5/cmd/podman/volumes" + "github.com/containers/podman/v5/pkg/domain/entities" + "github.com/containers/podman/v5/pkg/rootless" + "github.com/containers/podman/v5/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 f957ee4632..15f22e4350 100644 --- a/cmd/podman/manifest/add.go +++ b/cmd/podman/manifest/add.go @@ -8,10 +8,10 @@ import ( "github.com/containers/common/pkg/auth" "github.com/containers/common/pkg/completion" "github.com/containers/image/v5/types" - "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/containers/podman/v5/cmd/podman/common" + "github.com/containers/podman/v5/cmd/podman/registry" + "github.com/containers/podman/v5/pkg/domain/entities" + "github.com/containers/podman/v5/pkg/util" "github.com/spf13/cobra" ) diff --git a/cmd/podman/manifest/annotate.go b/cmd/podman/manifest/annotate.go index c628e3e0fe..e5dae5649b 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/v4/cmd/podman/common" - "github.com/containers/podman/v4/cmd/podman/registry" - "github.com/containers/podman/v4/pkg/domain/entities" + "github.com/containers/podman/v5/cmd/podman/common" + "github.com/containers/podman/v5/cmd/podman/registry" + "github.com/containers/podman/v5/pkg/domain/entities" "github.com/spf13/cobra" ) diff --git a/cmd/podman/manifest/create.go b/cmd/podman/manifest/create.go index 2ea40d8325..eb8d6ad517 100644 --- a/cmd/podman/manifest/create.go +++ b/cmd/podman/manifest/create.go @@ -5,9 +5,9 @@ import ( "fmt" "github.com/containers/image/v5/types" - "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/v5/cmd/podman/common" + "github.com/containers/podman/v5/cmd/podman/registry" + "github.com/containers/podman/v5/pkg/domain/entities" "github.com/spf13/cobra" ) diff --git a/cmd/podman/manifest/exists.go b/cmd/podman/manifest/exists.go index 0116885405..d2193ceaf6 100644 --- a/cmd/podman/manifest/exists.go +++ b/cmd/podman/manifest/exists.go @@ -1,8 +1,8 @@ package manifest import ( - "github.com/containers/podman/v4/cmd/podman/common" - "github.com/containers/podman/v4/cmd/podman/registry" + "github.com/containers/podman/v5/cmd/podman/common" + "github.com/containers/podman/v5/cmd/podman/registry" "github.com/spf13/cobra" ) diff --git a/cmd/podman/manifest/inspect.go b/cmd/podman/manifest/inspect.go index c81bbaf63f..f4d8971250 100644 --- a/cmd/podman/manifest/inspect.go +++ b/cmd/podman/manifest/inspect.go @@ -6,9 +6,9 @@ import ( "github.com/containers/common/pkg/auth" "github.com/containers/common/pkg/completion" "github.com/containers/image/v5/types" - "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/v5/cmd/podman/common" + "github.com/containers/podman/v5/cmd/podman/registry" + "github.com/containers/podman/v5/pkg/domain/entities" "github.com/spf13/cobra" ) diff --git a/cmd/podman/manifest/manifest.go b/cmd/podman/manifest/manifest.go index 837b5aec54..8f1011a319 100644 --- a/cmd/podman/manifest/manifest.go +++ b/cmd/podman/manifest/manifest.go @@ -1,8 +1,8 @@ package manifest import ( - "github.com/containers/podman/v4/cmd/podman/registry" - "github.com/containers/podman/v4/cmd/podman/validate" + "github.com/containers/podman/v5/cmd/podman/registry" + "github.com/containers/podman/v5/cmd/podman/validate" "github.com/spf13/cobra" ) diff --git a/cmd/podman/manifest/push.go b/cmd/podman/manifest/push.go index 01d4bf2028..bc8c219134 100644 --- a/cmd/podman/manifest/push.go +++ b/cmd/podman/manifest/push.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/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/containers/podman/v5/cmd/podman/common" + "github.com/containers/podman/v5/cmd/podman/registry" + "github.com/containers/podman/v5/cmd/podman/utils" + "github.com/containers/podman/v5/pkg/domain/entities" + "github.com/containers/podman/v5/pkg/util" "github.com/spf13/cobra" ) diff --git a/cmd/podman/manifest/remove.go b/cmd/podman/manifest/remove.go index 4aa3b66b73..3e1a4f3dbb 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/v4/cmd/podman/common" - "github.com/containers/podman/v4/cmd/podman/registry" + "github.com/containers/podman/v5/cmd/podman/common" + "github.com/containers/podman/v5/cmd/podman/registry" "github.com/spf13/cobra" ) diff --git a/cmd/podman/manifest/rm.go b/cmd/podman/manifest/rm.go index 81ff5107e6..f5f13a86e6 100644 --- a/cmd/podman/manifest/rm.go +++ b/cmd/podman/manifest/rm.go @@ -4,9 +4,9 @@ import ( "context" "fmt" - "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/containers/podman/v5/cmd/podman/common" + "github.com/containers/podman/v5/cmd/podman/registry" + "github.com/containers/podman/v5/pkg/errorhandling" "github.com/spf13/cobra" ) diff --git a/cmd/podman/networks/connect.go b/cmd/podman/networks/connect.go index 086125546d..6ab1b02891 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/v4/cmd/podman/common" - "github.com/containers/podman/v4/cmd/podman/registry" - "github.com/containers/podman/v4/pkg/domain/entities" + "github.com/containers/podman/v5/cmd/podman/common" + "github.com/containers/podman/v5/cmd/podman/registry" + "github.com/containers/podman/v5/pkg/domain/entities" "github.com/spf13/cobra" ) diff --git a/cmd/podman/networks/create.go b/cmd/podman/networks/create.go index 2a8c641c7f..7be21dfdeb 100644 --- a/cmd/podman/networks/create.go +++ b/cmd/podman/networks/create.go @@ -10,10 +10,10 @@ import ( "github.com/containers/common/libnetwork/types" "github.com/containers/common/libnetwork/util" "github.com/containers/common/pkg/completion" - "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/containers/podman/v5/cmd/podman/common" + "github.com/containers/podman/v5/cmd/podman/parse" + "github.com/containers/podman/v5/cmd/podman/registry" + "github.com/containers/podman/v5/pkg/domain/entities" "github.com/sirupsen/logrus" "github.com/spf13/cobra" ) diff --git a/cmd/podman/networks/disconnect.go b/cmd/podman/networks/disconnect.go index bfea285e7b..c29a624f97 100644 --- a/cmd/podman/networks/disconnect.go +++ b/cmd/podman/networks/disconnect.go @@ -1,9 +1,9 @@ package network import ( - "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/v5/cmd/podman/common" + "github.com/containers/podman/v5/cmd/podman/registry" + "github.com/containers/podman/v5/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 0fbe07c61a..c3465c46e0 100644 --- a/cmd/podman/networks/exists.go +++ b/cmd/podman/networks/exists.go @@ -1,8 +1,8 @@ package network import ( - "github.com/containers/podman/v4/cmd/podman/common" - "github.com/containers/podman/v4/cmd/podman/registry" + "github.com/containers/podman/v5/cmd/podman/common" + "github.com/containers/podman/v5/cmd/podman/registry" "github.com/spf13/cobra" ) diff --git a/cmd/podman/networks/inspect.go b/cmd/podman/networks/inspect.go index 14f62cbd14..6bb10287b5 100644 --- a/cmd/podman/networks/inspect.go +++ b/cmd/podman/networks/inspect.go @@ -2,10 +2,10 @@ package network import ( "github.com/containers/common/libnetwork/types" - "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/v5/cmd/podman/common" + "github.com/containers/podman/v5/cmd/podman/inspect" + "github.com/containers/podman/v5/cmd/podman/registry" + "github.com/containers/podman/v5/pkg/domain/entities" "github.com/spf13/cobra" ) diff --git a/cmd/podman/networks/list.go b/cmd/podman/networks/list.go index a6c0b1fa0f..8976cb41b9 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/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/containers/podman/v5/cmd/podman/common" + "github.com/containers/podman/v5/cmd/podman/parse" + "github.com/containers/podman/v5/cmd/podman/registry" + "github.com/containers/podman/v5/cmd/podman/validate" + "github.com/containers/podman/v5/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 45fbf00f43..7f96195cbd 100644 --- a/cmd/podman/networks/network.go +++ b/cmd/podman/networks/network.go @@ -1,9 +1,9 @@ package network import ( - "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/containers/podman/v5/cmd/podman/registry" + "github.com/containers/podman/v5/cmd/podman/validate" + "github.com/containers/podman/v5/pkg/util" "github.com/spf13/cobra" ) diff --git a/cmd/podman/networks/prune.go b/cmd/podman/networks/prune.go index 8e453d9580..892af5c423 100644 --- a/cmd/podman/networks/prune.go +++ b/cmd/podman/networks/prune.go @@ -6,12 +6,12 @@ import ( "os" "strings" - "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/containers/podman/v5/cmd/podman/common" + "github.com/containers/podman/v5/cmd/podman/parse" + "github.com/containers/podman/v5/cmd/podman/registry" + "github.com/containers/podman/v5/cmd/podman/utils" + "github.com/containers/podman/v5/cmd/podman/validate" + "github.com/containers/podman/v5/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 eaa1b29573..ff7a26f433 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/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/v5/cmd/podman/common" + "github.com/containers/podman/v5/cmd/podman/registry" + "github.com/containers/podman/v5/cmd/podman/utils" + "github.com/containers/podman/v5/cmd/podman/validate" + "github.com/containers/podman/v5/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 204738d2c0..896ee9ccef 100644 --- a/cmd/podman/networks/rm.go +++ b/cmd/podman/networks/rm.go @@ -6,11 +6,11 @@ import ( "strings" "github.com/containers/common/pkg/completion" - "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/v5/cmd/podman/common" + "github.com/containers/podman/v5/cmd/podman/registry" + "github.com/containers/podman/v5/cmd/podman/utils" + "github.com/containers/podman/v5/libpod/define" + "github.com/containers/podman/v5/pkg/domain/entities" "github.com/spf13/cobra" "github.com/spf13/pflag" ) diff --git a/cmd/podman/networks/update.go b/cmd/podman/networks/update.go index 10526f61cb..0589c533cd 100644 --- a/cmd/podman/networks/update.go +++ b/cmd/podman/networks/update.go @@ -4,9 +4,9 @@ import ( "fmt" "github.com/containers/common/pkg/completion" - "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/v5/cmd/podman/common" + "github.com/containers/podman/v5/cmd/podman/registry" + "github.com/containers/podman/v5/pkg/domain/entities" "github.com/spf13/cobra" ) diff --git a/cmd/podman/pods/clone.go b/cmd/podman/pods/clone.go index bf7d10c447..0ba84c477e 100644 --- a/cmd/podman/pods/clone.go +++ b/cmd/podman/pods/clone.go @@ -5,10 +5,10 @@ import ( "fmt" "github.com/containers/common/pkg/completion" - "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/containers/podman/v5/cmd/podman/common" + "github.com/containers/podman/v5/cmd/podman/registry" + "github.com/containers/podman/v5/libpod/define" + "github.com/containers/podman/v5/pkg/domain/entities" "github.com/spf13/cobra" ) diff --git a/cmd/podman/pods/create.go b/cmd/podman/pods/create.go index b3c6ca8242..7d3212558a 100644 --- a/cmd/podman/pods/create.go +++ b/cmd/podman/pods/create.go @@ -11,16 +11,16 @@ import ( "github.com/containers/common/pkg/completion" "github.com/containers/common/pkg/sysinfo" - "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/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/containers/podman/v5/cmd/podman/common" + "github.com/containers/podman/v5/cmd/podman/containers" + "github.com/containers/podman/v5/cmd/podman/parse" + "github.com/containers/podman/v5/cmd/podman/registry" + "github.com/containers/podman/v5/cmd/podman/utils" + "github.com/containers/podman/v5/libpod/define" + "github.com/containers/podman/v5/pkg/domain/entities" + "github.com/containers/podman/v5/pkg/specgen" + "github.com/containers/podman/v5/pkg/specgenutil" + "github.com/containers/podman/v5/pkg/util" "github.com/docker/docker/pkg/parsers" "github.com/sirupsen/logrus" "github.com/spf13/cobra" diff --git a/cmd/podman/pods/exists.go b/cmd/podman/pods/exists.go index cbab562a6f..d3f4f538f2 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/v4/cmd/podman/common" - "github.com/containers/podman/v4/cmd/podman/registry" + "github.com/containers/podman/v5/cmd/podman/common" + "github.com/containers/podman/v5/cmd/podman/registry" "github.com/spf13/cobra" ) diff --git a/cmd/podman/pods/inspect.go b/cmd/podman/pods/inspect.go index fa4cb64e6e..a63edce709 100644 --- a/cmd/podman/pods/inspect.go +++ b/cmd/podman/pods/inspect.go @@ -1,11 +1,11 @@ package pods import ( - "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/pkg/domain/entities" + "github.com/containers/podman/v5/cmd/podman/common" + "github.com/containers/podman/v5/cmd/podman/inspect" + "github.com/containers/podman/v5/cmd/podman/registry" + "github.com/containers/podman/v5/cmd/podman/validate" + "github.com/containers/podman/v5/pkg/domain/entities" "github.com/spf13/cobra" ) diff --git a/cmd/podman/pods/kill.go b/cmd/podman/pods/kill.go index 2107a5c3dd..5f389b1074 100644 --- a/cmd/podman/pods/kill.go +++ b/cmd/podman/pods/kill.go @@ -4,11 +4,11 @@ import ( "context" "fmt" - "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/v5/cmd/podman/common" + "github.com/containers/podman/v5/cmd/podman/registry" + "github.com/containers/podman/v5/cmd/podman/utils" + "github.com/containers/podman/v5/cmd/podman/validate" + "github.com/containers/podman/v5/pkg/domain/entities" "github.com/spf13/cobra" ) diff --git a/cmd/podman/pods/logs.go b/cmd/podman/pods/logs.go index a0ec169760..26f76f042e 100644 --- a/cmd/podman/pods/logs.go +++ b/cmd/podman/pods/logs.go @@ -6,12 +6,12 @@ import ( "os" "github.com/containers/common/pkg/completion" - "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/containers/podman/v5/cmd/podman/common" + "github.com/containers/podman/v5/cmd/podman/registry" + "github.com/containers/podman/v5/cmd/podman/validate" + "github.com/containers/podman/v5/libpod/define" + "github.com/containers/podman/v5/pkg/domain/entities" + "github.com/containers/podman/v5/pkg/util" "github.com/spf13/cobra" ) diff --git a/cmd/podman/pods/pause.go b/cmd/podman/pods/pause.go index 6caffc802d..bca150cac5 100644 --- a/cmd/podman/pods/pause.go +++ b/cmd/podman/pods/pause.go @@ -4,11 +4,11 @@ import ( "context" "fmt" - "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/v5/cmd/podman/common" + "github.com/containers/podman/v5/cmd/podman/registry" + "github.com/containers/podman/v5/cmd/podman/utils" + "github.com/containers/podman/v5/cmd/podman/validate" + "github.com/containers/podman/v5/pkg/domain/entities" "github.com/spf13/cobra" ) diff --git a/cmd/podman/pods/pod.go b/cmd/podman/pods/pod.go index 4e3994bb7c..3653638466 100644 --- a/cmd/podman/pods/pod.go +++ b/cmd/podman/pods/pod.go @@ -1,9 +1,9 @@ package pods import ( - "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/containers/podman/v5/cmd/podman/registry" + "github.com/containers/podman/v5/cmd/podman/validate" + "github.com/containers/podman/v5/pkg/util" "github.com/spf13/cobra" ) diff --git a/cmd/podman/pods/prune.go b/cmd/podman/pods/prune.go index e3cce71968..6c23df28ae 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/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/v5/cmd/podman/registry" + "github.com/containers/podman/v5/cmd/podman/utils" + "github.com/containers/podman/v5/cmd/podman/validate" + "github.com/containers/podman/v5/pkg/domain/entities" "github.com/spf13/cobra" ) diff --git a/cmd/podman/pods/ps.go b/cmd/podman/pods/ps.go index 4efc7e9f57..1f931d3828 100644 --- a/cmd/podman/pods/ps.go +++ b/cmd/podman/pods/ps.go @@ -12,11 +12,11 @@ import ( "github.com/containers/common/pkg/completion" "github.com/containers/common/pkg/report" - "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/v5/cmd/podman/common" + "github.com/containers/podman/v5/cmd/podman/registry" + "github.com/containers/podman/v5/cmd/podman/utils" + "github.com/containers/podman/v5/cmd/podman/validate" + "github.com/containers/podman/v5/pkg/domain/entities" "github.com/docker/go-units" "github.com/spf13/cobra" ) diff --git a/cmd/podman/pods/restart.go b/cmd/podman/pods/restart.go index d7934dc81d..c81cfaaa15 100644 --- a/cmd/podman/pods/restart.go +++ b/cmd/podman/pods/restart.go @@ -4,11 +4,11 @@ import ( "context" "fmt" - "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/v5/cmd/podman/common" + "github.com/containers/podman/v5/cmd/podman/registry" + "github.com/containers/podman/v5/cmd/podman/utils" + "github.com/containers/podman/v5/cmd/podman/validate" + "github.com/containers/podman/v5/pkg/domain/entities" "github.com/spf13/cobra" ) diff --git a/cmd/podman/pods/rm.go b/cmd/podman/pods/rm.go index ed143622a1..b96ef15d0a 100644 --- a/cmd/podman/pods/rm.go +++ b/cmd/podman/pods/rm.go @@ -8,13 +8,13 @@ import ( "strings" "github.com/containers/common/pkg/completion" - "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/containers/podman/v5/cmd/podman/common" + "github.com/containers/podman/v5/cmd/podman/registry" + "github.com/containers/podman/v5/cmd/podman/utils" + "github.com/containers/podman/v5/cmd/podman/validate" + "github.com/containers/podman/v5/libpod/define" + "github.com/containers/podman/v5/pkg/domain/entities" + "github.com/containers/podman/v5/pkg/specgenutil" "github.com/spf13/cobra" ) diff --git a/cmd/podman/pods/start.go b/cmd/podman/pods/start.go index 3cbbaba1ac..7e96781659 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/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/containers/podman/v5/cmd/podman/common" + "github.com/containers/podman/v5/cmd/podman/registry" + "github.com/containers/podman/v5/cmd/podman/utils" + "github.com/containers/podman/v5/cmd/podman/validate" + "github.com/containers/podman/v5/pkg/domain/entities" + "github.com/containers/podman/v5/pkg/specgenutil" "github.com/spf13/cobra" ) diff --git a/cmd/podman/pods/stats.go b/cmd/podman/pods/stats.go index 28e00eacc5..6057ae9500 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/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/v5/cmd/podman/common" + "github.com/containers/podman/v5/cmd/podman/registry" + "github.com/containers/podman/v5/cmd/podman/validate" + "github.com/containers/podman/v5/pkg/domain/entities" "github.com/spf13/cobra" ) diff --git a/cmd/podman/pods/stop.go b/cmd/podman/pods/stop.go index 32129e4850..6805f068a9 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/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/containers/podman/v5/cmd/podman/common" + "github.com/containers/podman/v5/cmd/podman/registry" + "github.com/containers/podman/v5/cmd/podman/utils" + "github.com/containers/podman/v5/cmd/podman/validate" + "github.com/containers/podman/v5/pkg/domain/entities" + "github.com/containers/podman/v5/pkg/specgenutil" "github.com/spf13/cobra" ) diff --git a/cmd/podman/pods/top.go b/cmd/podman/pods/top.go index bb2a95b5ba..c54fecf8bb 100644 --- a/cmd/podman/pods/top.go +++ b/cmd/podman/pods/top.go @@ -8,11 +8,11 @@ import ( "strings" "github.com/containers/common/pkg/report" - "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/containers/podman/v5/cmd/podman/common" + "github.com/containers/podman/v5/cmd/podman/registry" + "github.com/containers/podman/v5/cmd/podman/validate" + "github.com/containers/podman/v5/pkg/domain/entities" + "github.com/containers/podman/v5/pkg/util" "github.com/spf13/cobra" ) diff --git a/cmd/podman/pods/unpause.go b/cmd/podman/pods/unpause.go index 8e66e12e07..2d7598847d 100644 --- a/cmd/podman/pods/unpause.go +++ b/cmd/podman/pods/unpause.go @@ -4,11 +4,11 @@ import ( "context" "fmt" - "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/v5/cmd/podman/common" + "github.com/containers/podman/v5/cmd/podman/registry" + "github.com/containers/podman/v5/cmd/podman/utils" + "github.com/containers/podman/v5/cmd/podman/validate" + "github.com/containers/podman/v5/pkg/domain/entities" "github.com/spf13/cobra" ) diff --git a/cmd/podman/registry/config.go b/cmd/podman/registry/config.go index db5c292973..d3d7ad8be7 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/v4/pkg/domain/entities" - "github.com/containers/podman/v4/pkg/rootless" - "github.com/containers/podman/v4/pkg/util" + "github.com/containers/podman/v5/pkg/domain/entities" + "github.com/containers/podman/v5/pkg/rootless" + "github.com/containers/podman/v5/pkg/util" "github.com/spf13/cobra" "github.com/spf13/pflag" ) diff --git a/cmd/podman/registry/registry.go b/cmd/podman/registry/registry.go index d1b9e56018..3d7f93867a 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/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/containers/podman/v5/pkg/domain/entities" + "github.com/containers/podman/v5/pkg/domain/infra" + "github.com/containers/podman/v5/pkg/rootless" + "github.com/containers/podman/v5/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 7427becca4..0000722f91 100644 --- a/cmd/podman/registry/remote.go +++ b/cmd/podman/registry/remote.go @@ -6,7 +6,7 @@ import ( "strings" "sync" - "github.com/containers/podman/v4/pkg/domain/entities" + "github.com/containers/podman/v5/pkg/domain/entities" "github.com/spf13/pflag" ) diff --git a/cmd/podman/root.go b/cmd/podman/root.go index 2a1df1a2fd..aaa992b676 100644 --- a/cmd/podman/root.go +++ b/cmd/podman/root.go @@ -12,15 +12,15 @@ import ( "github.com/containers/common/pkg/completion" "github.com/containers/common/pkg/ssh" - "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/bindings" - "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/version" + "github.com/containers/podman/v5/cmd/podman/common" + "github.com/containers/podman/v5/cmd/podman/registry" + "github.com/containers/podman/v5/cmd/podman/validate" + "github.com/containers/podman/v5/libpod/define" + "github.com/containers/podman/v5/pkg/bindings" + "github.com/containers/podman/v5/pkg/checkpoint/crutils" + "github.com/containers/podman/v5/pkg/domain/entities" + "github.com/containers/podman/v5/pkg/parallel" + "github.com/containers/podman/v5/version" "github.com/containers/storage" "github.com/sirupsen/logrus" "github.com/spf13/cobra" diff --git a/cmd/podman/root_test.go b/cmd/podman/root_test.go index 98a3de79de..af89b90fbd 100644 --- a/cmd/podman/root_test.go +++ b/cmd/podman/root_test.go @@ -6,7 +6,7 @@ import ( "strings" "testing" - "github.com/containers/podman/v4/libpod/define" + "github.com/containers/podman/v5/libpod/define" ) func TestFormatError(t *testing.T) { diff --git a/cmd/podman/secrets/create.go b/cmd/podman/secrets/create.go index 51b123468a..9ebe4b4990 100644 --- a/cmd/podman/secrets/create.go +++ b/cmd/podman/secrets/create.go @@ -9,10 +9,10 @@ import ( "strings" "github.com/containers/common/pkg/completion" - "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/containers/podman/v5/cmd/podman/common" + "github.com/containers/podman/v5/cmd/podman/parse" + "github.com/containers/podman/v5/cmd/podman/registry" + "github.com/containers/podman/v5/pkg/domain/entities" "github.com/spf13/cobra" ) diff --git a/cmd/podman/secrets/exists.go b/cmd/podman/secrets/exists.go index 3ec68a2130..bf9c2307e6 100644 --- a/cmd/podman/secrets/exists.go +++ b/cmd/podman/secrets/exists.go @@ -1,8 +1,8 @@ package secrets import ( - "github.com/containers/podman/v4/cmd/podman/common" - "github.com/containers/podman/v4/cmd/podman/registry" + "github.com/containers/podman/v5/cmd/podman/common" + "github.com/containers/podman/v5/cmd/podman/registry" "github.com/spf13/cobra" ) diff --git a/cmd/podman/secrets/inspect.go b/cmd/podman/secrets/inspect.go index a19be85ddd..18f686e588 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/v4/cmd/podman/common" - "github.com/containers/podman/v4/cmd/podman/registry" - "github.com/containers/podman/v4/pkg/domain/entities" + "github.com/containers/podman/v5/cmd/podman/common" + "github.com/containers/podman/v5/cmd/podman/registry" + "github.com/containers/podman/v5/pkg/domain/entities" "github.com/spf13/cobra" ) diff --git a/cmd/podman/secrets/list.go b/cmd/podman/secrets/list.go index 382e0b820f..7bcf31e18a 100644 --- a/cmd/podman/secrets/list.go +++ b/cmd/podman/secrets/list.go @@ -8,11 +8,11 @@ import ( "github.com/containers/common/pkg/completion" "github.com/containers/common/pkg/report" - "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/containers/podman/v5/cmd/podman/common" + "github.com/containers/podman/v5/cmd/podman/parse" + "github.com/containers/podman/v5/cmd/podman/registry" + "github.com/containers/podman/v5/cmd/podman/validate" + "github.com/containers/podman/v5/pkg/domain/entities" "github.com/docker/go-units" "github.com/spf13/cobra" ) diff --git a/cmd/podman/secrets/rm.go b/cmd/podman/secrets/rm.go index 6370304599..f6affa4f4b 100644 --- a/cmd/podman/secrets/rm.go +++ b/cmd/podman/secrets/rm.go @@ -5,10 +5,10 @@ import ( "errors" "fmt" - "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/v5/cmd/podman/common" + "github.com/containers/podman/v5/cmd/podman/registry" + "github.com/containers/podman/v5/cmd/podman/utils" + "github.com/containers/podman/v5/pkg/domain/entities" "github.com/spf13/cobra" ) diff --git a/cmd/podman/secrets/secret.go b/cmd/podman/secrets/secret.go index 9d012325e4..025e2307c2 100644 --- a/cmd/podman/secrets/secret.go +++ b/cmd/podman/secrets/secret.go @@ -1,8 +1,8 @@ package secrets import ( - "github.com/containers/podman/v4/cmd/podman/registry" - "github.com/containers/podman/v4/cmd/podman/validate" + "github.com/containers/podman/v5/cmd/podman/registry" + "github.com/containers/podman/v5/cmd/podman/validate" "github.com/spf13/cobra" ) diff --git a/cmd/podman/syslog_common.go b/cmd/podman/syslog_common.go index e8feaf1a8c..a5782be638 100644 --- a/cmd/podman/syslog_common.go +++ b/cmd/podman/syslog_common.go @@ -5,7 +5,7 @@ package main import ( "log/syslog" - "github.com/containers/podman/v4/cmd/podman/registry" + "github.com/containers/podman/v5/cmd/podman/registry" "github.com/sirupsen/logrus" logrusSyslog "github.com/sirupsen/logrus/hooks/syslog" ) diff --git a/cmd/podman/syslog_unsupported.go b/cmd/podman/syslog_unsupported.go index 12d9b51b76..602c480b68 100644 --- a/cmd/podman/syslog_unsupported.go +++ b/cmd/podman/syslog_unsupported.go @@ -7,7 +7,7 @@ import ( "os" "runtime" - "github.com/containers/podman/v4/cmd/podman/registry" + "github.com/containers/podman/v5/cmd/podman/registry" ) func syslogHook() { diff --git a/cmd/podman/system/connection.go b/cmd/podman/system/connection.go index 5dbe50fc9e..a493b14976 100644 --- a/cmd/podman/system/connection.go +++ b/cmd/podman/system/connection.go @@ -1,8 +1,8 @@ package system import ( - "github.com/containers/podman/v4/cmd/podman/registry" - "github.com/containers/podman/v4/cmd/podman/validate" + "github.com/containers/podman/v5/cmd/podman/registry" + "github.com/containers/podman/v5/cmd/podman/validate" "github.com/spf13/cobra" ) diff --git a/cmd/podman/system/connection/add.go b/cmd/podman/system/connection/add.go index dc425f79a7..ba0723ac9f 100644 --- a/cmd/podman/system/connection/add.go +++ b/cmd/podman/system/connection/add.go @@ -11,9 +11,9 @@ import ( "github.com/containers/common/pkg/completion" "github.com/containers/common/pkg/config" "github.com/containers/common/pkg/ssh" - "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/v5/cmd/podman/common" + "github.com/containers/podman/v5/cmd/podman/registry" + "github.com/containers/podman/v5/cmd/podman/system" "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 58a3f67514..eeddd4dbe3 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/v4/cmd/podman/common" - "github.com/containers/podman/v4/cmd/podman/registry" - "github.com/containers/podman/v4/cmd/podman/system" + "github.com/containers/podman/v5/cmd/podman/common" + "github.com/containers/podman/v5/cmd/podman/registry" + "github.com/containers/podman/v5/cmd/podman/system" "github.com/spf13/cobra" ) diff --git a/cmd/podman/system/connection/list.go b/cmd/podman/system/connection/list.go index 48e9314e0c..75dd8846df 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/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/containers/podman/v5/cmd/podman/common" + "github.com/containers/podman/v5/cmd/podman/registry" + "github.com/containers/podman/v5/cmd/podman/system" + "github.com/containers/podman/v5/cmd/podman/validate" "github.com/spf13/cobra" "golang.org/x/exp/slices" ) diff --git a/cmd/podman/system/connection/remove.go b/cmd/podman/system/connection/remove.go index 187dfd8a7d..75975b9a0b 100644 --- a/cmd/podman/system/connection/remove.go +++ b/cmd/podman/system/connection/remove.go @@ -4,9 +4,9 @@ import ( "errors" "github.com/containers/common/pkg/config" - "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/v5/cmd/podman/common" + "github.com/containers/podman/v5/cmd/podman/registry" + "github.com/containers/podman/v5/cmd/podman/system" "github.com/spf13/cobra" "golang.org/x/exp/slices" ) diff --git a/cmd/podman/system/connection/rename.go b/cmd/podman/system/connection/rename.go index 9c4f32205b..abc38d3bbc 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/v4/cmd/podman/common" - "github.com/containers/podman/v4/cmd/podman/registry" - "github.com/containers/podman/v4/cmd/podman/system" + "github.com/containers/podman/v5/cmd/podman/common" + "github.com/containers/podman/v5/cmd/podman/registry" + "github.com/containers/podman/v5/cmd/podman/system" "github.com/spf13/cobra" ) diff --git a/cmd/podman/system/context.go b/cmd/podman/system/context.go index 926e4a4437..b58ab3efa2 100644 --- a/cmd/podman/system/context.go +++ b/cmd/podman/system/context.go @@ -1,8 +1,8 @@ package system import ( - "github.com/containers/podman/v4/cmd/podman/registry" - "github.com/containers/podman/v4/cmd/podman/validate" + "github.com/containers/podman/v5/cmd/podman/registry" + "github.com/containers/podman/v5/cmd/podman/validate" "github.com/spf13/cobra" ) diff --git a/cmd/podman/system/df.go b/cmd/podman/system/df.go index a69abeec91..7eebc5096c 100644 --- a/cmd/podman/system/df.go +++ b/cmd/podman/system/df.go @@ -10,10 +10,10 @@ import ( "github.com/containers/common/pkg/completion" "github.com/containers/common/pkg/report" - "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/v5/cmd/podman/common" + "github.com/containers/podman/v5/cmd/podman/registry" + "github.com/containers/podman/v5/cmd/podman/validate" + "github.com/containers/podman/v5/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 db079856c3..34a09bf819 100644 --- a/cmd/podman/system/dial_stdio.go +++ b/cmd/podman/system/dial_stdio.go @@ -8,9 +8,9 @@ import ( "errors" - "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/containers/podman/v5/cmd/podman/registry" + "github.com/containers/podman/v5/cmd/podman/validate" + "github.com/containers/podman/v5/pkg/bindings" "github.com/sirupsen/logrus" "github.com/spf13/cobra" ) diff --git a/cmd/podman/system/events.go b/cmd/podman/system/events.go index 0b30ccca69..fbda9dc300 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/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/containers/podman/v5/cmd/podman/common" + "github.com/containers/podman/v5/cmd/podman/registry" + "github.com/containers/podman/v5/cmd/podman/validate" + "github.com/containers/podman/v5/libpod/events" + "github.com/containers/podman/v5/pkg/domain/entities" "github.com/spf13/cobra" ) diff --git a/cmd/podman/system/info.go b/cmd/podman/system/info.go index 9d63d8a755..071e2021ba 100644 --- a/cmd/podman/system/info.go +++ b/cmd/podman/system/info.go @@ -6,10 +6,10 @@ import ( "github.com/containers/common/pkg/completion" "github.com/containers/common/pkg/report" - "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/v5/cmd/podman/common" + "github.com/containers/podman/v5/cmd/podman/registry" + "github.com/containers/podman/v5/cmd/podman/validate" + "github.com/containers/podman/v5/libpod/define" "github.com/spf13/cobra" "sigs.k8s.io/yaml" ) diff --git a/cmd/podman/system/locks.go b/cmd/podman/system/locks.go index 71f95d34d5..aa3f030c73 100644 --- a/cmd/podman/system/locks.go +++ b/cmd/podman/system/locks.go @@ -3,8 +3,8 @@ package system import ( "fmt" - "github.com/containers/podman/v4/cmd/podman/registry" - "github.com/containers/podman/v4/cmd/podman/validate" + "github.com/containers/podman/v5/cmd/podman/registry" + "github.com/containers/podman/v5/cmd/podman/validate" "github.com/spf13/cobra" ) diff --git a/cmd/podman/system/migrate.go b/cmd/podman/system/migrate.go index f74137597d..7405cb101a 100644 --- a/cmd/podman/system/migrate.go +++ b/cmd/podman/system/migrate.go @@ -7,10 +7,10 @@ import ( "os" "github.com/containers/common/pkg/completion" - "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/v5/cmd/podman/registry" + "github.com/containers/podman/v5/cmd/podman/validate" + "github.com/containers/podman/v5/libpod/define" + "github.com/containers/podman/v5/pkg/domain/entities" "github.com/spf13/cobra" ) diff --git a/cmd/podman/system/prune.go b/cmd/podman/system/prune.go index f7cf7b551c..6484bc3b34 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/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/containers/podman/v5/cmd/podman/common" + "github.com/containers/podman/v5/cmd/podman/parse" + "github.com/containers/podman/v5/cmd/podman/registry" + "github.com/containers/podman/v5/cmd/podman/utils" + "github.com/containers/podman/v5/cmd/podman/validate" + "github.com/containers/podman/v5/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 62f6221c37..a09ee70a3a 100644 --- a/cmd/podman/system/renumber.go +++ b/cmd/podman/system/renumber.go @@ -7,9 +7,9 @@ import ( "os" "github.com/containers/common/pkg/completion" - "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/v5/cmd/podman/registry" + "github.com/containers/podman/v5/cmd/podman/validate" + "github.com/containers/podman/v5/libpod/define" "github.com/spf13/cobra" ) diff --git a/cmd/podman/system/reset.go b/cmd/podman/system/reset.go index 6e2c6ceed1..adac3bbc60 100644 --- a/cmd/podman/system/reset.go +++ b/cmd/podman/system/reset.go @@ -10,8 +10,8 @@ import ( "github.com/containers/buildah/pkg/volumes" "github.com/containers/common/pkg/completion" - "github.com/containers/podman/v4/cmd/podman/registry" - "github.com/containers/podman/v4/cmd/podman/validate" + "github.com/containers/podman/v5/cmd/podman/registry" + "github.com/containers/podman/v5/cmd/podman/validate" "github.com/sirupsen/logrus" "github.com/spf13/cobra" ) diff --git a/cmd/podman/system/reset_machine.go b/cmd/podman/system/reset_machine.go index 183b8e81f4..9196295f9d 100644 --- a/cmd/podman/system/reset_machine.go +++ b/cmd/podman/system/reset_machine.go @@ -3,7 +3,7 @@ package system import ( - p "github.com/containers/podman/v4/pkg/machine/provider" + p "github.com/containers/podman/v5/pkg/machine/provider" ) func resetMachine() error { diff --git a/cmd/podman/system/service.go b/cmd/podman/system/service.go index d3f3b2e0f6..7806ca2e30 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/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/containers/podman/v5/cmd/podman/common" + "github.com/containers/podman/v5/cmd/podman/registry" + "github.com/containers/podman/v5/pkg/domain/entities" + "github.com/containers/podman/v5/pkg/rootless" + "github.com/containers/podman/v5/pkg/systemd" + "github.com/containers/podman/v5/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 69fd742f36..3dd86130f3 100644 --- a/cmd/podman/system/service_abi.go +++ b/cmd/podman/system/service_abi.go @@ -10,10 +10,10 @@ import ( "os" "path/filepath" - "github.com/containers/podman/v4/cmd/podman/registry" - 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/v5/cmd/podman/registry" + api "github.com/containers/podman/v5/pkg/api/server" + "github.com/containers/podman/v5/pkg/domain/entities" + "github.com/containers/podman/v5/pkg/domain/infra" "github.com/coreos/go-systemd/v22/activation" "github.com/sirupsen/logrus" "github.com/spf13/pflag" diff --git a/cmd/podman/system/service_abi_linux.go b/cmd/podman/system/service_abi_linux.go index ff8efa3118..d899ce9cce 100644 --- a/cmd/podman/system/service_abi_linux.go +++ b/cmd/podman/system/service_abi_linux.go @@ -5,7 +5,7 @@ package system import ( "github.com/containers/common/pkg/cgroups" "github.com/containers/common/pkg/servicereaper" - "github.com/containers/podman/v4/pkg/rootless" + "github.com/containers/podman/v5/pkg/rootless" "github.com/sirupsen/logrus" ) diff --git a/cmd/podman/system/system.go b/cmd/podman/system/system.go index a30bb5ab2c..6347b518e3 100644 --- a/cmd/podman/system/system.go +++ b/cmd/podman/system/system.go @@ -1,8 +1,8 @@ package system import ( - "github.com/containers/podman/v4/cmd/podman/registry" - "github.com/containers/podman/v4/cmd/podman/validate" + "github.com/containers/podman/v5/cmd/podman/registry" + "github.com/containers/podman/v5/cmd/podman/validate" "github.com/spf13/cobra" ) diff --git a/cmd/podman/system/unshare.go b/cmd/podman/system/unshare.go index 6d9c33b647..cd513b1cba 100644 --- a/cmd/podman/system/unshare.go +++ b/cmd/podman/system/unshare.go @@ -5,10 +5,10 @@ import ( "os" "github.com/containers/common/pkg/completion" - "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/containers/podman/v5/cmd/podman/registry" + "github.com/containers/podman/v5/cmd/podman/utils" + "github.com/containers/podman/v5/pkg/domain/entities" + "github.com/containers/podman/v5/pkg/rootless" "github.com/spf13/cobra" "github.com/spf13/pflag" ) diff --git a/cmd/podman/system/version.go b/cmd/podman/system/version.go index 28bae1d55e..48ea151135 100644 --- a/cmd/podman/system/version.go +++ b/cmd/podman/system/version.go @@ -7,10 +7,10 @@ import ( "github.com/containers/common/pkg/completion" "github.com/containers/common/pkg/report" - "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/v5/cmd/podman/common" + "github.com/containers/podman/v5/cmd/podman/registry" + "github.com/containers/podman/v5/cmd/podman/validate" + "github.com/containers/podman/v5/pkg/domain/entities" "github.com/sirupsen/logrus" "github.com/spf13/cobra" ) diff --git a/cmd/podman/utils/error.go b/cmd/podman/utils/error.go index c022af0920..345add2bc6 100644 --- a/cmd/podman/utils/error.go +++ b/cmd/podman/utils/error.go @@ -9,7 +9,7 @@ import ( "strings" buildahCLI "github.com/containers/buildah/pkg/cli" - "github.com/containers/podman/v4/cmd/podman/registry" + "github.com/containers/podman/v5/cmd/podman/registry" ) type OutputErrors []error diff --git a/cmd/podman/utils/utils.go b/cmd/podman/utils/utils.go index 4fa16914cc..3a33967a24 100644 --- a/cmd/podman/utils/utils.go +++ b/cmd/podman/utils/utils.go @@ -6,10 +6,10 @@ import ( "os" "strings" - "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/domain/entities/reports" + "github.com/containers/podman/v5/cmd/podman/registry" + "github.com/containers/podman/v5/libpod/define" + "github.com/containers/podman/v5/pkg/domain/entities" + "github.com/containers/podman/v5/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 267ccb1df4..52efd5bf23 100644 --- a/cmd/podman/validate/args.go +++ b/cmd/podman/validate/args.go @@ -6,7 +6,7 @@ import ( "strconv" "strings" - "github.com/containers/podman/v4/cmd/podman/registry" + "github.com/containers/podman/v5/cmd/podman/registry" "github.com/spf13/cobra" ) diff --git a/cmd/podman/validate/latest.go b/cmd/podman/validate/latest.go index a340d30a8b..f6f62ebace 100644 --- a/cmd/podman/validate/latest.go +++ b/cmd/podman/validate/latest.go @@ -1,7 +1,7 @@ package validate import ( - "github.com/containers/podman/v4/cmd/podman/registry" + "github.com/containers/podman/v5/cmd/podman/registry" "github.com/spf13/cobra" ) diff --git a/cmd/podman/volumes/create.go b/cmd/podman/volumes/create.go index cfc2d0bcf9..8e557edd87 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/v4/cmd/podman/parse" - "github.com/containers/podman/v4/cmd/podman/registry" - "github.com/containers/podman/v4/pkg/domain/entities" + "github.com/containers/podman/v5/cmd/podman/parse" + "github.com/containers/podman/v5/cmd/podman/registry" + "github.com/containers/podman/v5/pkg/domain/entities" "github.com/spf13/cobra" ) diff --git a/cmd/podman/volumes/exists.go b/cmd/podman/volumes/exists.go index 22aab1e327..e4f6d704e0 100644 --- a/cmd/podman/volumes/exists.go +++ b/cmd/podman/volumes/exists.go @@ -1,8 +1,8 @@ package volumes import ( - "github.com/containers/podman/v4/cmd/podman/common" - "github.com/containers/podman/v4/cmd/podman/registry" + "github.com/containers/podman/v5/cmd/podman/common" + "github.com/containers/podman/v5/cmd/podman/registry" "github.com/spf13/cobra" ) diff --git a/cmd/podman/volumes/export.go b/cmd/podman/volumes/export.go index f9e08be879..6d00af6e92 100644 --- a/cmd/podman/volumes/export.go +++ b/cmd/podman/volumes/export.go @@ -6,11 +6,11 @@ import ( "fmt" "github.com/containers/common/pkg/completion" - "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/containers/podman/v4/utils" + "github.com/containers/podman/v5/cmd/podman/common" + "github.com/containers/podman/v5/cmd/podman/registry" + "github.com/containers/podman/v5/pkg/domain/entities" + "github.com/containers/podman/v5/pkg/errorhandling" + "github.com/containers/podman/v5/utils" "github.com/sirupsen/logrus" "github.com/spf13/cobra" ) diff --git a/cmd/podman/volumes/import.go b/cmd/podman/volumes/import.go index 60e34c6f1d..40d1e37b3f 100644 --- a/cmd/podman/volumes/import.go +++ b/cmd/podman/volumes/import.go @@ -5,12 +5,12 @@ import ( "fmt" "os" - "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/containers/podman/v4/pkg/errorhandling" - "github.com/containers/podman/v4/utils" + "github.com/containers/podman/v5/cmd/podman/common" + "github.com/containers/podman/v5/cmd/podman/parse" + "github.com/containers/podman/v5/cmd/podman/registry" + "github.com/containers/podman/v5/pkg/domain/entities" + "github.com/containers/podman/v5/pkg/errorhandling" + "github.com/containers/podman/v5/utils" "github.com/spf13/cobra" ) diff --git a/cmd/podman/volumes/inspect.go b/cmd/podman/volumes/inspect.go index 68ba2976a1..e397cc08ec 100644 --- a/cmd/podman/volumes/inspect.go +++ b/cmd/podman/volumes/inspect.go @@ -3,11 +3,11 @@ package volumes import ( "errors" - "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/containers/podman/v5/cmd/podman/common" + "github.com/containers/podman/v5/cmd/podman/inspect" + "github.com/containers/podman/v5/cmd/podman/registry" + "github.com/containers/podman/v5/libpod/define" + "github.com/containers/podman/v5/pkg/domain/entities" "github.com/spf13/cobra" ) diff --git a/cmd/podman/volumes/list.go b/cmd/podman/volumes/list.go index 28f0669638..3abfe0cc28 100644 --- a/cmd/podman/volumes/list.go +++ b/cmd/podman/volumes/list.go @@ -8,11 +8,11 @@ import ( "github.com/containers/common/pkg/completion" "github.com/containers/common/pkg/report" - "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/containers/podman/v5/cmd/podman/common" + "github.com/containers/podman/v5/cmd/podman/parse" + "github.com/containers/podman/v5/cmd/podman/registry" + "github.com/containers/podman/v5/cmd/podman/validate" + "github.com/containers/podman/v5/pkg/domain/entities" "github.com/spf13/cobra" ) diff --git a/cmd/podman/volumes/mount.go b/cmd/podman/volumes/mount.go index 1f78187b8f..c96a3c4185 100644 --- a/cmd/podman/volumes/mount.go +++ b/cmd/podman/volumes/mount.go @@ -3,9 +3,9 @@ package volumes import ( "fmt" - "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/v5/cmd/podman/common" + "github.com/containers/podman/v5/cmd/podman/registry" + "github.com/containers/podman/v5/cmd/podman/utils" "github.com/spf13/cobra" ) diff --git a/cmd/podman/volumes/prune.go b/cmd/podman/volumes/prune.go index b821df8be1..b6dc05cb87 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/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/containers/podman/v5/cmd/podman/common" + "github.com/containers/podman/v5/cmd/podman/parse" + "github.com/containers/podman/v5/cmd/podman/registry" + "github.com/containers/podman/v5/cmd/podman/utils" + "github.com/containers/podman/v5/cmd/podman/validate" + "github.com/containers/podman/v5/pkg/domain/entities" "github.com/spf13/cobra" ) diff --git a/cmd/podman/volumes/reload.go b/cmd/podman/volumes/reload.go index 049a32372a..63b9bf2d7c 100644 --- a/cmd/podman/volumes/reload.go +++ b/cmd/podman/volumes/reload.go @@ -4,9 +4,9 @@ import ( "fmt" "github.com/containers/common/pkg/completion" - "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/v5/cmd/podman/registry" + "github.com/containers/podman/v5/cmd/podman/utils" + "github.com/containers/podman/v5/cmd/podman/validate" "github.com/spf13/cobra" ) diff --git a/cmd/podman/volumes/rm.go b/cmd/podman/volumes/rm.go index 8ded7ab860..358a3704c2 100644 --- a/cmd/podman/volumes/rm.go +++ b/cmd/podman/volumes/rm.go @@ -7,11 +7,11 @@ import ( "strings" "github.com/containers/common/pkg/completion" - "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/v5/cmd/podman/common" + "github.com/containers/podman/v5/cmd/podman/registry" + "github.com/containers/podman/v5/cmd/podman/utils" + "github.com/containers/podman/v5/libpod/define" + "github.com/containers/podman/v5/pkg/domain/entities" "github.com/spf13/cobra" ) diff --git a/cmd/podman/volumes/unmount.go b/cmd/podman/volumes/unmount.go index af79e49efb..1ba2841447 100644 --- a/cmd/podman/volumes/unmount.go +++ b/cmd/podman/volumes/unmount.go @@ -3,9 +3,9 @@ package volumes import ( "fmt" - "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/v5/cmd/podman/common" + "github.com/containers/podman/v5/cmd/podman/registry" + "github.com/containers/podman/v5/cmd/podman/utils" "github.com/spf13/cobra" ) diff --git a/cmd/podman/volumes/volume.go b/cmd/podman/volumes/volume.go index 1ba1f26861..eadbe60844 100644 --- a/cmd/podman/volumes/volume.go +++ b/cmd/podman/volumes/volume.go @@ -1,9 +1,9 @@ package volumes import ( - "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/containers/podman/v5/cmd/podman/registry" + "github.com/containers/podman/v5/cmd/podman/validate" + "github.com/containers/podman/v5/pkg/util" "github.com/spf13/cobra" ) diff --git a/cmd/quadlet/main.go b/cmd/quadlet/main.go index 2f1c6387ae..36d06f3489 100644 --- a/cmd/quadlet/main.go +++ b/cmd/quadlet/main.go @@ -13,9 +13,9 @@ import ( "strings" "unicode" - "github.com/containers/podman/v4/pkg/systemd/parser" - "github.com/containers/podman/v4/pkg/systemd/quadlet" - "github.com/containers/podman/v4/version/rawversion" + "github.com/containers/podman/v5/pkg/systemd/parser" + "github.com/containers/podman/v5/pkg/systemd/quadlet" + "github.com/containers/podman/v5/version/rawversion" ) // This commandline app is the systemd generator (system and user, diff --git a/cmd/quadlet/main_test.go b/cmd/quadlet/main_test.go index 1f29b74a13..7ecc9a0cfe 100644 --- a/cmd/quadlet/main_test.go +++ b/cmd/quadlet/main_test.go @@ -7,7 +7,7 @@ import ( "path/filepath" "testing" - "github.com/containers/podman/v4/pkg/systemd/quadlet" + "github.com/containers/podman/v5/pkg/systemd/quadlet" "github.com/stretchr/testify/assert" ) diff --git a/go.mod b/go.mod index b33729b37b..c8c54144d8 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/containers/podman/v4 +module github.com/containers/podman/v5 go 1.20 diff --git a/hack/podman-registry-go/registry.go b/hack/podman-registry-go/registry.go index 2e458c297a..fb2c81f9a9 100644 --- a/hack/podman-registry-go/registry.go +++ b/hack/podman-registry-go/registry.go @@ -5,7 +5,7 @@ import ( "os" "strings" - "github.com/containers/podman/v4/utils" + "github.com/containers/podman/v5/utils" "github.com/sirupsen/logrus" ) diff --git a/libpod/boltdb_state.go b/libpod/boltdb_state.go index b953b7cb60..44428df087 100644 --- a/libpod/boltdb_state.go +++ b/libpod/boltdb_state.go @@ -15,7 +15,7 @@ import ( "time" "github.com/containers/common/libnetwork/types" - "github.com/containers/podman/v4/libpod/define" + "github.com/containers/podman/v5/libpod/define" "github.com/sirupsen/logrus" bolt "go.etcd.io/bbolt" ) diff --git a/libpod/boltdb_state_internal.go b/libpod/boltdb_state_internal.go index 94eb5e6a20..3a2c66136f 100644 --- a/libpod/boltdb_state_internal.go +++ b/libpod/boltdb_state_internal.go @@ -11,7 +11,7 @@ import ( "runtime" "strings" - "github.com/containers/podman/v4/libpod/define" + "github.com/containers/podman/v5/libpod/define" "github.com/containers/storage" "github.com/sirupsen/logrus" bolt "go.etcd.io/bbolt" diff --git a/libpod/common_test.go b/libpod/common_test.go index df1bbb6de9..a4af91d297 100644 --- a/libpod/common_test.go +++ b/libpod/common_test.go @@ -11,8 +11,8 @@ import ( "github.com/containers/common/libnetwork/types" "github.com/containers/common/pkg/config" - "github.com/containers/podman/v4/libpod/define" - "github.com/containers/podman/v4/libpod/lock" + "github.com/containers/podman/v5/libpod/define" + "github.com/containers/podman/v5/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 f9803a55e8..45ec75a2f6 100644 --- a/libpod/container.go +++ b/libpod/container.go @@ -16,8 +16,8 @@ import ( "github.com/containers/common/pkg/config" "github.com/containers/common/pkg/secrets" "github.com/containers/image/v5/manifest" - "github.com/containers/podman/v4/libpod/define" - "github.com/containers/podman/v4/libpod/lock" + "github.com/containers/podman/v5/libpod/define" + "github.com/containers/podman/v5/libpod/lock" "github.com/containers/storage" spec "github.com/opencontainers/runtime-spec/specs-go" "github.com/sirupsen/logrus" diff --git a/libpod/container_api.go b/libpod/container_api.go index 7e3bd48832..8b1d677d34 100644 --- a/libpod/container_api.go +++ b/libpod/container_api.go @@ -13,9 +13,9 @@ import ( "time" "github.com/containers/common/pkg/resize" - "github.com/containers/podman/v4/libpod/define" - "github.com/containers/podman/v4/libpod/events" - "github.com/containers/podman/v4/pkg/signal" + "github.com/containers/podman/v5/libpod/define" + "github.com/containers/podman/v5/libpod/events" + "github.com/containers/podman/v5/pkg/signal" "github.com/containers/storage/pkg/archive" spec "github.com/opencontainers/runtime-spec/specs-go" "github.com/sirupsen/logrus" diff --git a/libpod/container_commit.go b/libpod/container_commit.go index 8dca951b9f..832b1499a1 100644 --- a/libpod/container_commit.go +++ b/libpod/container_commit.go @@ -12,8 +12,8 @@ import ( "github.com/containers/common/libimage" is "github.com/containers/image/v5/storage" "github.com/containers/image/v5/types" - "github.com/containers/podman/v4/libpod/define" - "github.com/containers/podman/v4/libpod/events" + "github.com/containers/podman/v5/libpod/define" + "github.com/containers/podman/v5/libpod/events" "github.com/sirupsen/logrus" ) diff --git a/libpod/container_config.go b/libpod/container_config.go index f3f9b000a9..262a4befa0 100644 --- a/libpod/container_config.go +++ b/libpod/container_config.go @@ -9,9 +9,9 @@ import ( "github.com/containers/common/libnetwork/types" "github.com/containers/common/pkg/secrets" "github.com/containers/image/v5/manifest" - "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/v5/libpod/define" + "github.com/containers/podman/v5/pkg/namespaces" + "github.com/containers/podman/v5/pkg/specgen" "github.com/containers/storage" spec "github.com/opencontainers/runtime-spec/specs-go" ) diff --git a/libpod/container_copy_common.go b/libpod/container_copy_common.go index e394018f27..e32f79dc09 100644 --- a/libpod/container_copy_common.go +++ b/libpod/container_copy_common.go @@ -11,8 +11,8 @@ import ( buildahCopiah "github.com/containers/buildah/copier" "github.com/containers/buildah/pkg/chrootuser" "github.com/containers/buildah/util" - "github.com/containers/podman/v4/libpod/define" - "github.com/containers/podman/v4/pkg/rootless" + "github.com/containers/podman/v5/libpod/define" + "github.com/containers/podman/v5/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_copy_linux.go b/libpod/container_copy_linux.go index ca8be36645..149da9b381 100644 --- a/libpod/container_copy_linux.go +++ b/libpod/container_copy_linux.go @@ -7,7 +7,7 @@ import ( "os" "runtime" - "github.com/containers/podman/v4/libpod/define" + "github.com/containers/podman/v5/libpod/define" "golang.org/x/sys/unix" ) diff --git a/libpod/container_exec.go b/libpod/container_exec.go index 8b3e8dda5e..0789d06f4e 100644 --- a/libpod/container_exec.go +++ b/libpod/container_exec.go @@ -14,8 +14,8 @@ import ( "github.com/containers/common/pkg/resize" "github.com/containers/common/pkg/util" - "github.com/containers/podman/v4/libpod/define" - "github.com/containers/podman/v4/libpod/events" + "github.com/containers/podman/v5/libpod/define" + "github.com/containers/podman/v5/libpod/events" "github.com/containers/storage/pkg/stringid" "github.com/sirupsen/logrus" "golang.org/x/sys/unix" diff --git a/libpod/container_graph.go b/libpod/container_graph.go index 2c35e00365..4f07043bf7 100644 --- a/libpod/container_graph.go +++ b/libpod/container_graph.go @@ -7,7 +7,7 @@ import ( "fmt" "strings" - "github.com/containers/podman/v4/libpod/define" + "github.com/containers/podman/v5/libpod/define" "github.com/sirupsen/logrus" ) diff --git a/libpod/container_graph_test.go b/libpod/container_graph_test.go index b0cb2a94e1..d73be360cb 100644 --- a/libpod/container_graph_test.go +++ b/libpod/container_graph_test.go @@ -5,7 +5,7 @@ package libpod import ( "testing" - "github.com/containers/podman/v4/libpod/lock" + "github.com/containers/podman/v5/libpod/lock" "github.com/stretchr/testify/assert" ) diff --git a/libpod/container_inspect.go b/libpod/container_inspect.go index cb448ed0e3..e16c53fd15 100644 --- a/libpod/container_inspect.go +++ b/libpod/container_inspect.go @@ -7,9 +7,9 @@ import ( "fmt" "strings" - "github.com/containers/podman/v4/libpod/define" - "github.com/containers/podman/v4/libpod/driver" - "github.com/containers/podman/v4/pkg/util" + "github.com/containers/podman/v5/libpod/define" + "github.com/containers/podman/v5/libpod/driver" + "github.com/containers/podman/v5/pkg/util" "github.com/containers/storage/types" "github.com/docker/go-units" spec "github.com/opencontainers/runtime-spec/specs-go" diff --git a/libpod/container_inspect_freebsd.go b/libpod/container_inspect_freebsd.go index 7e0f11b00b..a913b7e7d7 100644 --- a/libpod/container_inspect_freebsd.go +++ b/libpod/container_inspect_freebsd.go @@ -3,7 +3,7 @@ package libpod import ( - "github.com/containers/podman/v4/libpod/define" + "github.com/containers/podman/v5/libpod/define" spec "github.com/opencontainers/runtime-spec/specs-go" ) diff --git a/libpod/container_inspect_linux.go b/libpod/container_inspect_linux.go index 026cde377b..909be3d310 100644 --- a/libpod/container_inspect_linux.go +++ b/libpod/container_inspect_linux.go @@ -8,8 +8,8 @@ import ( "strings" "github.com/containers/common/pkg/config" - "github.com/containers/podman/v4/libpod/define" - "github.com/containers/podman/v4/pkg/util" + "github.com/containers/podman/v5/libpod/define" + "github.com/containers/podman/v5/pkg/util" spec "github.com/opencontainers/runtime-spec/specs-go" "github.com/opencontainers/runtime-tools/generate" "github.com/opencontainers/runtime-tools/validate/capabilities" diff --git a/libpod/container_internal.go b/libpod/container_internal.go index 361a342f3f..cbb0d18f52 100644 --- a/libpod/container_internal.go +++ b/libpod/container_internal.go @@ -26,15 +26,15 @@ import ( "github.com/containers/common/pkg/hooks" "github.com/containers/common/pkg/hooks/exec" cutil "github.com/containers/common/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/ctime" - "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/systemd/notifyproxy" - "github.com/containers/podman/v4/pkg/util" + "github.com/containers/podman/v5/libpod/define" + "github.com/containers/podman/v5/libpod/events" + "github.com/containers/podman/v5/libpod/shutdown" + "github.com/containers/podman/v5/pkg/ctime" + "github.com/containers/podman/v5/pkg/lookup" + "github.com/containers/podman/v5/pkg/rootless" + "github.com/containers/podman/v5/pkg/selinux" + "github.com/containers/podman/v5/pkg/systemd/notifyproxy" + "github.com/containers/podman/v5/pkg/util" "github.com/containers/storage" "github.com/containers/storage/pkg/chrootarchive" "github.com/containers/storage/pkg/idmap" diff --git a/libpod/container_internal_common.go b/libpod/container_internal_common.go index 6ecbeaf8d6..c7bf43be87 100644 --- a/libpod/container_internal_common.go +++ b/libpod/container_internal_common.go @@ -33,15 +33,15 @@ import ( "github.com/containers/common/pkg/subscriptions" "github.com/containers/common/pkg/umask" is "github.com/containers/image/v5/storage" - "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/rootless" - "github.com/containers/podman/v4/pkg/util" - "github.com/containers/podman/v4/version" + "github.com/containers/podman/v5/libpod/define" + "github.com/containers/podman/v5/libpod/events" + "github.com/containers/podman/v5/pkg/annotations" + "github.com/containers/podman/v5/pkg/checkpoint/crutils" + "github.com/containers/podman/v5/pkg/criu" + "github.com/containers/podman/v5/pkg/lookup" + "github.com/containers/podman/v5/pkg/rootless" + "github.com/containers/podman/v5/pkg/util" + "github.com/containers/podman/v5/version" "github.com/containers/storage/pkg/archive" "github.com/containers/storage/pkg/idtools" "github.com/containers/storage/pkg/lockfile" diff --git a/libpod/container_internal_freebsd.go b/libpod/container_internal_freebsd.go index 042e165525..0f8bca0a3d 100644 --- a/libpod/container_internal_freebsd.go +++ b/libpod/container_internal_freebsd.go @@ -12,7 +12,7 @@ import ( "time" "github.com/containers/common/libnetwork/types" - "github.com/containers/podman/v4/pkg/rootless" + "github.com/containers/podman/v5/pkg/rootless" spec "github.com/opencontainers/runtime-spec/specs-go" "github.com/opencontainers/runtime-tools/generate" "github.com/sirupsen/logrus" diff --git a/libpod/container_internal_linux.go b/libpod/container_internal_linux.go index c40a30209f..9e279116ca 100644 --- a/libpod/container_internal_linux.go +++ b/libpod/container_internal_linux.go @@ -18,8 +18,8 @@ import ( "github.com/containers/common/libnetwork/types" "github.com/containers/common/pkg/cgroups" "github.com/containers/common/pkg/config" - "github.com/containers/podman/v4/libpod/define" - "github.com/containers/podman/v4/pkg/rootless" + "github.com/containers/podman/v5/libpod/define" + "github.com/containers/podman/v5/pkg/rootless" spec "github.com/opencontainers/runtime-spec/specs-go" "github.com/opencontainers/runtime-tools/generate" "github.com/opencontainers/selinux/go-selinux/label" diff --git a/libpod/container_log.go b/libpod/container_log.go index 1e5d69f89e..ea76c7ea39 100644 --- a/libpod/container_log.go +++ b/libpod/container_log.go @@ -9,10 +9,10 @@ import ( "os" "time" - "github.com/containers/podman/v4/libpod/define" - "github.com/containers/podman/v4/libpod/events" - "github.com/containers/podman/v4/libpod/logs" - systemdDefine "github.com/containers/podman/v4/pkg/systemd/define" + "github.com/containers/podman/v5/libpod/define" + "github.com/containers/podman/v5/libpod/events" + "github.com/containers/podman/v5/libpod/logs" + systemdDefine "github.com/containers/podman/v5/pkg/systemd/define" "github.com/nxadm/tail" "github.com/nxadm/tail/watch" "github.com/sirupsen/logrus" diff --git a/libpod/container_log_linux.go b/libpod/container_log_linux.go index ebf08f61c2..f874faa58d 100644 --- a/libpod/container_log_linux.go +++ b/libpod/container_log_linux.go @@ -10,10 +10,10 @@ import ( "strings" "time" - "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/rootless" + "github.com/containers/podman/v5/libpod/define" + "github.com/containers/podman/v5/libpod/events" + "github.com/containers/podman/v5/libpod/logs" + "github.com/containers/podman/v5/pkg/rootless" "github.com/coreos/go-systemd/v22/sdjournal" "github.com/sirupsen/logrus" ) diff --git a/libpod/container_log_unsupported.go b/libpod/container_log_unsupported.go index 6a9081d50d..ebda51ff66 100644 --- a/libpod/container_log_unsupported.go +++ b/libpod/container_log_unsupported.go @@ -6,8 +6,8 @@ import ( "context" "fmt" - "github.com/containers/podman/v4/libpod/define" - "github.com/containers/podman/v4/libpod/logs" + "github.com/containers/podman/v5/libpod/define" + "github.com/containers/podman/v5/libpod/logs" ) func (c *Container) readFromJournal(_ context.Context, _ *logs.LogOptions, _ chan *logs.LogLine, _ int64, _ string) error { diff --git a/libpod/container_path_resolution.go b/libpod/container_path_resolution.go index 1f3938b2ec..682aa93284 100644 --- a/libpod/container_path_resolution.go +++ b/libpod/container_path_resolution.go @@ -7,7 +7,7 @@ import ( "path/filepath" "strings" - "github.com/containers/podman/v4/libpod/define" + "github.com/containers/podman/v5/libpod/define" securejoin "github.com/cyphar/filepath-securejoin" "github.com/opencontainers/runtime-spec/specs-go" "github.com/sirupsen/logrus" diff --git a/libpod/container_stat_common.go b/libpod/container_stat_common.go index 198290f168..9ad7acb4ee 100644 --- a/libpod/container_stat_common.go +++ b/libpod/container_stat_common.go @@ -10,8 +10,8 @@ import ( "strings" "github.com/containers/buildah/copier" - "github.com/containers/podman/v4/libpod/define" - "github.com/containers/podman/v4/pkg/copy" + "github.com/containers/podman/v5/libpod/define" + "github.com/containers/podman/v5/pkg/copy" ) // statOnHost stats the specified path *on the host*. It returns the file info diff --git a/libpod/container_stat_linux.go b/libpod/container_stat_linux.go index 210e6f98d2..5a67c0ea32 100644 --- a/libpod/container_stat_linux.go +++ b/libpod/container_stat_linux.go @@ -4,7 +4,7 @@ package libpod import ( "github.com/containers/buildah/copier" - "github.com/containers/podman/v4/libpod/define" + "github.com/containers/podman/v5/libpod/define" ) // statInsideMount stats the specified path *inside* the container's mount and PID diff --git a/libpod/container_top_freebsd.go b/libpod/container_top_freebsd.go index 358f9e8125..21be8250de 100644 --- a/libpod/container_top_freebsd.go +++ b/libpod/container_top_freebsd.go @@ -10,8 +10,8 @@ import ( "strings" "sync" - "github.com/containers/podman/v4/libpod/define" - "github.com/containers/podman/v4/pkg/util" + "github.com/containers/podman/v5/libpod/define" + "github.com/containers/podman/v5/pkg/util" "github.com/google/shlex" "github.com/sirupsen/logrus" ) diff --git a/libpod/container_top_linux.go b/libpod/container_top_linux.go index 7807eeff23..c1d78cd4e1 100644 --- a/libpod/container_top_linux.go +++ b/libpod/container_top_linux.go @@ -16,8 +16,8 @@ import ( "syscall" "unsafe" - "github.com/containers/podman/v4/libpod/define" - "github.com/containers/podman/v4/pkg/rootless" + "github.com/containers/podman/v5/libpod/define" + "github.com/containers/podman/v5/pkg/rootless" "github.com/containers/psgo" "github.com/containers/storage/pkg/reexec" "github.com/google/shlex" diff --git a/libpod/container_validate.go b/libpod/container_validate.go index 26504a5bd2..0c2b604dd0 100644 --- a/libpod/container_validate.go +++ b/libpod/container_validate.go @@ -8,7 +8,7 @@ import ( "github.com/containers/image/v5/docker" "github.com/containers/image/v5/pkg/shortnames" "github.com/containers/image/v5/transports/alltransports" - "github.com/containers/podman/v4/libpod/define" + "github.com/containers/podman/v5/libpod/define" spec "github.com/opencontainers/runtime-spec/specs-go" ) diff --git a/libpod/define/version.go b/libpod/define/version.go index 2c17e6e92a..13a8fdb778 100644 --- a/libpod/define/version.go +++ b/libpod/define/version.go @@ -5,7 +5,7 @@ import ( "strconv" "time" - "github.com/containers/podman/v4/version" + "github.com/containers/podman/v5/version" ) // Overwritten at build time diff --git a/libpod/diff.go b/libpod/diff.go index 66d1077f2d..b32881faca 100644 --- a/libpod/diff.go +++ b/libpod/diff.go @@ -5,8 +5,8 @@ package libpod import ( "fmt" - "github.com/containers/podman/v4/libpod/define" - "github.com/containers/podman/v4/libpod/layers" + "github.com/containers/podman/v5/libpod/define" + "github.com/containers/podman/v5/libpod/layers" "github.com/containers/storage/pkg/archive" ) diff --git a/libpod/driver/driver.go b/libpod/driver/driver.go index 8694685ffc..789089a23f 100644 --- a/libpod/driver/driver.go +++ b/libpod/driver/driver.go @@ -1,7 +1,7 @@ package driver import ( - "github.com/containers/podman/v4/libpod/define" + "github.com/containers/podman/v5/libpod/define" "github.com/containers/storage" ) diff --git a/libpod/events.go b/libpod/events.go index 14df5e7c04..6e862f3676 100644 --- a/libpod/events.go +++ b/libpod/events.go @@ -8,7 +8,7 @@ import ( "path/filepath" "sync" - "github.com/containers/podman/v4/libpod/events" + "github.com/containers/podman/v5/libpod/events" "github.com/sirupsen/logrus" ) diff --git a/libpod/events/filters.go b/libpod/events/filters.go index 6d08dc4ed3..e502546be4 100644 --- a/libpod/events/filters.go +++ b/libpod/events/filters.go @@ -5,7 +5,7 @@ import ( "strings" "time" - "github.com/containers/podman/v4/pkg/util" + "github.com/containers/podman/v5/pkg/util" ) func generateEventFilter(filter, filterValue string) (func(e *Event) bool, error) { diff --git a/libpod/events/journal_linux.go b/libpod/events/journal_linux.go index 710bbd9079..273c5307dc 100644 --- a/libpod/events/journal_linux.go +++ b/libpod/events/journal_linux.go @@ -10,8 +10,8 @@ import ( "strconv" "time" - "github.com/containers/podman/v4/pkg/rootless" - "github.com/containers/podman/v4/pkg/util" + "github.com/containers/podman/v5/pkg/rootless" + "github.com/containers/podman/v5/pkg/util" "github.com/coreos/go-systemd/v22/journal" "github.com/coreos/go-systemd/v22/sdjournal" "github.com/sirupsen/logrus" diff --git a/libpod/events/logfile.go b/libpod/events/logfile.go index 865c2272cf..9b69d15f61 100644 --- a/libpod/events/logfile.go +++ b/libpod/events/logfile.go @@ -13,7 +13,7 @@ import ( "path/filepath" "time" - "github.com/containers/podman/v4/pkg/util" + "github.com/containers/podman/v5/pkg/util" "github.com/containers/storage/pkg/lockfile" "github.com/nxadm/tail" "github.com/sirupsen/logrus" diff --git a/libpod/healthcheck.go b/libpod/healthcheck.go index d5faf06ed9..47ddc04948 100644 --- a/libpod/healthcheck.go +++ b/libpod/healthcheck.go @@ -12,8 +12,8 @@ import ( "strings" "time" - "github.com/containers/podman/v4/libpod/define" - "github.com/containers/podman/v4/libpod/events" + "github.com/containers/podman/v5/libpod/define" + "github.com/containers/podman/v5/libpod/events" "github.com/sirupsen/logrus" "golang.org/x/sys/unix" ) diff --git a/libpod/healthcheck_linux.go b/libpod/healthcheck_linux.go index 34be42e4e5..b7b66a9392 100644 --- a/libpod/healthcheck_linux.go +++ b/libpod/healthcheck_linux.go @@ -10,9 +10,9 @@ import ( "strings" systemdCommon "github.com/containers/common/pkg/systemd" - "github.com/containers/podman/v4/pkg/errorhandling" - "github.com/containers/podman/v4/pkg/rootless" - "github.com/containers/podman/v4/pkg/systemd" + "github.com/containers/podman/v5/pkg/errorhandling" + "github.com/containers/podman/v5/pkg/rootless" + "github.com/containers/podman/v5/pkg/systemd" "github.com/sirupsen/logrus" ) diff --git a/libpod/info.go b/libpod/info.go index 6558638fc0..140b535ef7 100644 --- a/libpod/info.go +++ b/libpod/info.go @@ -19,8 +19,8 @@ import ( "github.com/containers/buildah/pkg/util" "github.com/containers/common/pkg/version" "github.com/containers/image/v5/pkg/sysregistriesv2" - "github.com/containers/podman/v4/libpod/define" - "github.com/containers/podman/v4/libpod/linkmode" + "github.com/containers/podman/v5/libpod/define" + "github.com/containers/podman/v5/libpod/linkmode" "github.com/containers/storage" "github.com/containers/storage/pkg/system" "github.com/sirupsen/logrus" diff --git a/libpod/info_freebsd.go b/libpod/info_freebsd.go index 959553bf5e..2feab40dd1 100644 --- a/libpod/info_freebsd.go +++ b/libpod/info_freebsd.go @@ -6,7 +6,7 @@ import ( "fmt" "unsafe" - "github.com/containers/podman/v4/libpod/define" + "github.com/containers/podman/v5/libpod/define" "golang.org/x/sys/unix" ) diff --git a/libpod/info_linux.go b/libpod/info_linux.go index f992647d9b..ee34c8e200 100644 --- a/libpod/info_linux.go +++ b/libpod/info_linux.go @@ -16,8 +16,8 @@ import ( "github.com/containers/common/pkg/cgroups" "github.com/containers/common/pkg/seccomp" "github.com/containers/common/pkg/version" - "github.com/containers/podman/v4/libpod/define" - "github.com/containers/podman/v4/pkg/rootless" + "github.com/containers/podman/v5/libpod/define" + "github.com/containers/podman/v5/pkg/rootless" "github.com/opencontainers/selinux/go-selinux" "github.com/sirupsen/logrus" ) diff --git a/libpod/info_test.go b/libpod/info_test.go index bc3c0b9ddc..b7de11c576 100644 --- a/libpod/info_test.go +++ b/libpod/info_test.go @@ -6,7 +6,7 @@ import ( "fmt" "testing" - "github.com/containers/podman/v4/libpod/define" + "github.com/containers/podman/v5/libpod/define" "github.com/stretchr/testify/assert" ) diff --git a/libpod/kube.go b/libpod/kube.go index 72514d03e1..5a45087e94 100644 --- a/libpod/kube.go +++ b/libpod/kube.go @@ -17,18 +17,18 @@ import ( "github.com/containers/common/libnetwork/types" "github.com/containers/common/pkg/config" - "github.com/containers/podman/v4/libpod/define" - "github.com/containers/podman/v4/pkg/annotations" - "github.com/containers/podman/v4/pkg/domain/entities" - "github.com/containers/podman/v4/pkg/env" - v1 "github.com/containers/podman/v4/pkg/k8s.io/api/core/v1" - "github.com/containers/podman/v4/pkg/k8s.io/apimachinery/pkg/api/resource" - v12 "github.com/containers/podman/v4/pkg/k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/containers/podman/v4/pkg/k8s.io/apimachinery/pkg/util/intstr" - "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/containers/podman/v5/libpod/define" + "github.com/containers/podman/v5/pkg/annotations" + "github.com/containers/podman/v5/pkg/domain/entities" + "github.com/containers/podman/v5/pkg/env" + v1 "github.com/containers/podman/v5/pkg/k8s.io/api/core/v1" + "github.com/containers/podman/v5/pkg/k8s.io/apimachinery/pkg/api/resource" + v12 "github.com/containers/podman/v5/pkg/k8s.io/apimachinery/pkg/apis/meta/v1" + "github.com/containers/podman/v5/pkg/k8s.io/apimachinery/pkg/util/intstr" + "github.com/containers/podman/v5/pkg/lookup" + "github.com/containers/podman/v5/pkg/namespaces" + "github.com/containers/podman/v5/pkg/specgen" + "github.com/containers/podman/v5/pkg/util" "github.com/opencontainers/runtime-spec/specs-go" "github.com/sirupsen/logrus" "golang.org/x/exp/slices" diff --git a/libpod/lock/file_lock_manager.go b/libpod/lock/file_lock_manager.go index 4a82e687cc..0f6757a6da 100644 --- a/libpod/lock/file_lock_manager.go +++ b/libpod/lock/file_lock_manager.go @@ -1,8 +1,8 @@ package lock import ( - "github.com/containers/podman/v4/libpod/define" - "github.com/containers/podman/v4/libpod/lock/file" + "github.com/containers/podman/v5/libpod/define" + "github.com/containers/podman/v5/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 c6b76e0a2e..ba438b9c61 100644 --- a/libpod/lock/shm_lock_manager_linux.go +++ b/libpod/lock/shm_lock_manager_linux.go @@ -6,7 +6,7 @@ import ( "fmt" "syscall" - "github.com/containers/podman/v4/libpod/lock/shm" + "github.com/containers/podman/v5/libpod/lock/shm" ) // SHMLockManager manages shared memory locks. diff --git a/libpod/logs/log.go b/libpod/logs/log.go index 4229501cfc..e6ad32f99b 100644 --- a/libpod/logs/log.go +++ b/libpod/logs/log.go @@ -9,7 +9,7 @@ import ( "sync" "time" - "github.com/containers/podman/v4/libpod/logs/reversereader" + "github.com/containers/podman/v5/libpod/logs/reversereader" "github.com/nxadm/tail" "github.com/sirupsen/logrus" ) diff --git a/libpod/networking_common.go b/libpod/networking_common.go index dc188b3fa4..4218c91500 100644 --- a/libpod/networking_common.go +++ b/libpod/networking_common.go @@ -12,10 +12,10 @@ import ( "github.com/containers/common/libnetwork/types" "github.com/containers/common/pkg/config" "github.com/containers/common/pkg/machine" - "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/v5/libpod/define" + "github.com/containers/podman/v5/libpod/events" + "github.com/containers/podman/v5/pkg/namespaces" + "github.com/containers/podman/v5/pkg/rootless" "github.com/containers/storage/pkg/lockfile" "github.com/sirupsen/logrus" "golang.org/x/exp/slices" diff --git a/libpod/networking_linux.go b/libpod/networking_linux.go index 977fdf108a..121b1bf1ef 100644 --- a/libpod/networking_linux.go +++ b/libpod/networking_linux.go @@ -13,7 +13,7 @@ import ( "github.com/containers/common/libnetwork/types" netUtil "github.com/containers/common/libnetwork/util" "github.com/containers/common/pkg/netns" - "github.com/containers/podman/v4/pkg/rootless" + "github.com/containers/podman/v5/pkg/rootless" "github.com/opencontainers/runtime-spec/specs-go" "github.com/sirupsen/logrus" "github.com/vishvananda/netlink" diff --git a/libpod/networking_linux_test.go b/libpod/networking_linux_test.go index bf3bd3ca99..bfa0d1135d 100644 --- a/libpod/networking_linux_test.go +++ b/libpod/networking_linux_test.go @@ -11,7 +11,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/containers/common/libnetwork/types" - "github.com/containers/podman/v4/libpod/define" + "github.com/containers/podman/v5/libpod/define" ) func Test_ocicniPortsToNetTypesPorts(t *testing.T) { diff --git a/libpod/networking_slirp4netns.go b/libpod/networking_slirp4netns.go index 8cf22a5460..0de8e439f6 100644 --- a/libpod/networking_slirp4netns.go +++ b/libpod/networking_slirp4netns.go @@ -11,7 +11,7 @@ import ( "github.com/containers/common/libnetwork/slirp4netns" "github.com/containers/common/libnetwork/types" - "github.com/containers/podman/v4/pkg/errorhandling" + "github.com/containers/podman/v5/pkg/errorhandling" "github.com/sirupsen/logrus" ) diff --git a/libpod/oci.go b/libpod/oci.go index 6a6a5954a7..10cb5556bb 100644 --- a/libpod/oci.go +++ b/libpod/oci.go @@ -6,7 +6,7 @@ import ( "net/http" "github.com/containers/common/pkg/resize" - "github.com/containers/podman/v4/libpod/define" + "github.com/containers/podman/v5/libpod/define" "github.com/opencontainers/runtime-spec/specs-go" ) diff --git a/libpod/oci_conmon_attach_common.go b/libpod/oci_conmon_attach_common.go index dbeb5b9c03..a1d102fc18 100644 --- a/libpod/oci_conmon_attach_common.go +++ b/libpod/oci_conmon_attach_common.go @@ -15,8 +15,8 @@ import ( "github.com/containers/common/pkg/config" "github.com/containers/common/pkg/detach" "github.com/containers/common/pkg/resize" - "github.com/containers/podman/v4/libpod/define" - "github.com/containers/podman/v4/pkg/errorhandling" + "github.com/containers/podman/v5/libpod/define" + "github.com/containers/podman/v5/pkg/errorhandling" "github.com/moby/term" "github.com/sirupsen/logrus" "golang.org/x/sys/unix" diff --git a/libpod/oci_conmon_common.go b/libpod/oci_conmon_common.go index 8779ca72ca..e77e0b2217 100644 --- a/libpod/oci_conmon_common.go +++ b/libpod/oci_conmon_common.go @@ -26,14 +26,14 @@ import ( "github.com/containers/common/pkg/resize" "github.com/containers/common/pkg/version" conmonConfig "github.com/containers/conmon/runner/config" - "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/podman/v5/libpod/define" + "github.com/containers/podman/v5/libpod/logs" + "github.com/containers/podman/v5/pkg/checkpoint/crutils" + "github.com/containers/podman/v5/pkg/errorhandling" + "github.com/containers/podman/v5/pkg/rootless" + "github.com/containers/podman/v5/pkg/specgenutil" + "github.com/containers/podman/v5/pkg/util" + "github.com/containers/podman/v5/utils" spec "github.com/opencontainers/runtime-spec/specs-go" "github.com/sirupsen/logrus" "golang.org/x/sys/unix" diff --git a/libpod/oci_conmon_exec_common.go b/libpod/oci_conmon_exec_common.go index 6ce6bf7e05..3e6fbcbc8a 100644 --- a/libpod/oci_conmon_exec_common.go +++ b/libpod/oci_conmon_exec_common.go @@ -17,9 +17,9 @@ import ( "github.com/containers/common/pkg/config" "github.com/containers/common/pkg/detach" "github.com/containers/common/pkg/resize" - "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/v5/libpod/define" + "github.com/containers/podman/v5/pkg/errorhandling" + "github.com/containers/podman/v5/pkg/lookup" spec "github.com/opencontainers/runtime-spec/specs-go" "github.com/sirupsen/logrus" "golang.org/x/sys/unix" diff --git a/libpod/oci_conmon_linux.go b/libpod/oci_conmon_linux.go index 3df11d2077..e624894000 100644 --- a/libpod/oci_conmon_linux.go +++ b/libpod/oci_conmon_linux.go @@ -16,8 +16,8 @@ import ( "github.com/containers/common/pkg/cgroups" "github.com/containers/common/pkg/config" "github.com/containers/common/pkg/systemd" - "github.com/containers/podman/v4/pkg/errorhandling" - "github.com/containers/podman/v4/pkg/rootless" + "github.com/containers/podman/v5/pkg/errorhandling" + "github.com/containers/podman/v5/pkg/rootless" pmount "github.com/containers/storage/pkg/mount" spec "github.com/opencontainers/runtime-spec/specs-go" "github.com/opencontainers/selinux/go-selinux/label" diff --git a/libpod/oci_missing.go b/libpod/oci_missing.go index fe0c4518e8..2879b871ec 100644 --- a/libpod/oci_missing.go +++ b/libpod/oci_missing.go @@ -9,7 +9,7 @@ import ( "sync" "github.com/containers/common/pkg/resize" - "github.com/containers/podman/v4/libpod/define" + "github.com/containers/podman/v5/libpod/define" spec "github.com/opencontainers/runtime-spec/specs-go" "github.com/sirupsen/logrus" ) diff --git a/libpod/oci_util.go b/libpod/oci_util.go index 6f57d244ae..31d6b7fbe4 100644 --- a/libpod/oci_util.go +++ b/libpod/oci_util.go @@ -11,7 +11,7 @@ import ( "time" "github.com/containers/common/libnetwork/types" - "github.com/containers/podman/v4/libpod/define" + "github.com/containers/podman/v5/libpod/define" "github.com/sirupsen/logrus" ) diff --git a/libpod/options.go b/libpod/options.go index 5c2301a880..e8dd7b931c 100644 --- a/libpod/options.go +++ b/libpod/options.go @@ -17,11 +17,11 @@ import ( "github.com/containers/common/pkg/secrets" "github.com/containers/image/v5/manifest" "github.com/containers/image/v5/types" - "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/specgen" - "github.com/containers/podman/v4/pkg/util" + "github.com/containers/podman/v5/libpod/define" + "github.com/containers/podman/v5/libpod/events" + "github.com/containers/podman/v5/pkg/namespaces" + "github.com/containers/podman/v5/pkg/specgen" + "github.com/containers/podman/v5/pkg/util" "github.com/containers/storage" "github.com/containers/storage/pkg/idtools" "github.com/containers/storage/pkg/regexp" diff --git a/libpod/plugin/volume_api.go b/libpod/plugin/volume_api.go index 2c20166851..bc9f675f4c 100644 --- a/libpod/plugin/volume_api.go +++ b/libpod/plugin/volume_api.go @@ -15,7 +15,7 @@ import ( "time" "github.com/containers/common/pkg/config" - "github.com/containers/podman/v4/libpod/define" + "github.com/containers/podman/v5/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 c63f320012..83867620ab 100644 --- a/libpod/pod.go +++ b/libpod/pod.go @@ -10,8 +10,8 @@ import ( "time" "github.com/containers/common/pkg/config" - "github.com/containers/podman/v4/libpod/define" - "github.com/containers/podman/v4/libpod/lock" + "github.com/containers/podman/v5/libpod/define" + "github.com/containers/podman/v5/libpod/lock" "github.com/opencontainers/runtime-spec/specs-go" ) diff --git a/libpod/pod_api.go b/libpod/pod_api.go index 8fb6d965d3..875d9ef3d5 100644 --- a/libpod/pod_api.go +++ b/libpod/pod_api.go @@ -8,10 +8,10 @@ import ( "fmt" "github.com/containers/common/pkg/cgroups" - "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/containers/podman/v5/libpod/define" + "github.com/containers/podman/v5/libpod/events" + "github.com/containers/podman/v5/pkg/parallel" + "github.com/containers/podman/v5/pkg/rootless" "github.com/opencontainers/runtime-spec/specs-go" "github.com/sirupsen/logrus" ) diff --git a/libpod/pod_internal.go b/libpod/pod_internal.go index 96489865c7..8af8615649 100644 --- a/libpod/pod_internal.go +++ b/libpod/pod_internal.go @@ -6,7 +6,7 @@ import ( "fmt" "time" - "github.com/containers/podman/v4/libpod/define" + "github.com/containers/podman/v5/libpod/define" "github.com/containers/storage/pkg/stringid" ) diff --git a/libpod/pod_internal_linux.go b/libpod/pod_internal_linux.go index c386aff8e5..873e2c24aa 100644 --- a/libpod/pod_internal_linux.go +++ b/libpod/pod_internal_linux.go @@ -7,8 +7,8 @@ import ( "path/filepath" "github.com/containers/common/pkg/config" - "github.com/containers/podman/v4/libpod/define" - "github.com/containers/podman/v4/pkg/rootless" + "github.com/containers/podman/v5/libpod/define" + "github.com/containers/podman/v5/pkg/rootless" "github.com/sirupsen/logrus" ) diff --git a/libpod/pod_status.go b/libpod/pod_status.go index e11260696b..186709a29b 100644 --- a/libpod/pod_status.go +++ b/libpod/pod_status.go @@ -2,7 +2,7 @@ package libpod -import "github.com/containers/podman/v4/libpod/define" +import "github.com/containers/podman/v5/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_freebsd.go b/libpod/pod_top_freebsd.go index cbab60a944..0175944103 100644 --- a/libpod/pod_top_freebsd.go +++ b/libpod/pod_top_freebsd.go @@ -6,7 +6,7 @@ import ( "fmt" "strings" - "github.com/containers/podman/v4/libpod/define" + "github.com/containers/podman/v5/libpod/define" ) // GetPodPidInformation returns process-related data of all processes in diff --git a/libpod/pod_top_linux.go b/libpod/pod_top_linux.go index f139fe1798..c7f0c9ce32 100644 --- a/libpod/pod_top_linux.go +++ b/libpod/pod_top_linux.go @@ -6,8 +6,8 @@ import ( "strconv" "strings" - "github.com/containers/podman/v4/libpod/define" - "github.com/containers/podman/v4/pkg/rootless" + "github.com/containers/podman/v5/libpod/define" + "github.com/containers/podman/v5/pkg/rootless" "github.com/containers/psgo" ) diff --git a/libpod/reset.go b/libpod/reset.go index 215e278114..187bcbf4ba 100644 --- a/libpod/reset.go +++ b/libpod/reset.go @@ -11,9 +11,9 @@ import ( "github.com/containers/common/libimage" "github.com/containers/common/libnetwork/types" - "github.com/containers/podman/v4/libpod/define" - "github.com/containers/podman/v4/pkg/errorhandling" - "github.com/containers/podman/v4/pkg/util" + "github.com/containers/podman/v5/libpod/define" + "github.com/containers/podman/v5/pkg/errorhandling" + "github.com/containers/podman/v5/pkg/util" "github.com/containers/storage" "github.com/containers/storage/pkg/lockfile" stypes "github.com/containers/storage/types" diff --git a/libpod/runtime.go b/libpod/runtime.go index e30455da5f..d53febe0e5 100644 --- a/libpod/runtime.go +++ b/libpod/runtime.go @@ -28,14 +28,14 @@ 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/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/v5/libpod/define" + "github.com/containers/podman/v5/libpod/events" + "github.com/containers/podman/v5/libpod/lock" + "github.com/containers/podman/v5/libpod/plugin" + "github.com/containers/podman/v5/libpod/shutdown" + "github.com/containers/podman/v5/pkg/rootless" + "github.com/containers/podman/v5/pkg/systemd" + "github.com/containers/podman/v5/pkg/util" "github.com/containers/storage" "github.com/containers/storage/pkg/lockfile" "github.com/containers/storage/pkg/unshare" diff --git a/libpod/runtime_cstorage.go b/libpod/runtime_cstorage.go index e84f72ce69..21078999bb 100644 --- a/libpod/runtime_cstorage.go +++ b/libpod/runtime_cstorage.go @@ -7,7 +7,7 @@ import ( "fmt" "time" - "github.com/containers/podman/v4/libpod/define" + "github.com/containers/podman/v5/libpod/define" "github.com/containers/storage" "github.com/sirupsen/logrus" ) diff --git a/libpod/runtime_ctr.go b/libpod/runtime_ctr.go index 481d1b7c94..119dd23df1 100644 --- a/libpod/runtime_ctr.go +++ b/libpod/runtime_ctr.go @@ -17,13 +17,13 @@ import ( "github.com/containers/common/libnetwork/types" "github.com/containers/common/pkg/cgroups" "github.com/containers/common/pkg/config" - "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/podman/v5/libpod/define" + "github.com/containers/podman/v5/libpod/events" + "github.com/containers/podman/v5/libpod/shutdown" + "github.com/containers/podman/v5/pkg/domain/entities/reports" + "github.com/containers/podman/v5/pkg/rootless" + "github.com/containers/podman/v5/pkg/specgen" + "github.com/containers/podman/v5/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 b51ea95b50..db70c4c108 100644 --- a/libpod/runtime_img.go +++ b/libpod/runtime_img.go @@ -13,9 +13,9 @@ import ( "github.com/containers/buildah/imagebuildah" "github.com/containers/common/libimage" "github.com/containers/image/v5/docker/reference" - "github.com/containers/podman/v4/libpod/define" - "github.com/containers/podman/v4/libpod/events" - "github.com/containers/podman/v4/pkg/util" + "github.com/containers/podman/v5/libpod/define" + "github.com/containers/podman/v5/libpod/events" + "github.com/containers/podman/v5/pkg/util" "github.com/sirupsen/logrus" ) diff --git a/libpod/runtime_migrate_linux.go b/libpod/runtime_migrate_linux.go index d642a682de..002acb09a4 100644 --- a/libpod/runtime_migrate_linux.go +++ b/libpod/runtime_migrate_linux.go @@ -9,9 +9,9 @@ import ( "strconv" "syscall" - "github.com/containers/podman/v4/libpod/define" - "github.com/containers/podman/v4/pkg/rootless" - "github.com/containers/podman/v4/pkg/util" + "github.com/containers/podman/v5/libpod/define" + "github.com/containers/podman/v5/pkg/rootless" + "github.com/containers/podman/v5/pkg/util" "github.com/sirupsen/logrus" ) diff --git a/libpod/runtime_pod.go b/libpod/runtime_pod.go index 3dfbec004c..86b0780df2 100644 --- a/libpod/runtime_pod.go +++ b/libpod/runtime_pod.go @@ -8,7 +8,7 @@ import ( "fmt" "time" - "github.com/containers/podman/v4/libpod/define" + "github.com/containers/podman/v5/libpod/define" "golang.org/x/exp/slices" ) diff --git a/libpod/runtime_pod_common.go b/libpod/runtime_pod_common.go index f939756055..802026f90c 100644 --- a/libpod/runtime_pod_common.go +++ b/libpod/runtime_pod_common.go @@ -7,9 +7,9 @@ import ( "errors" "fmt" - "github.com/containers/podman/v4/libpod/define" - "github.com/containers/podman/v4/libpod/events" - "github.com/containers/podman/v4/pkg/specgen" + "github.com/containers/podman/v5/libpod/define" + "github.com/containers/podman/v5/libpod/events" + "github.com/containers/podman/v5/pkg/specgen" "github.com/hashicorp/go-multierror" "github.com/sirupsen/logrus" ) diff --git a/libpod/runtime_pod_linux.go b/libpod/runtime_pod_linux.go index 28f72daf04..e10186bcdb 100644 --- a/libpod/runtime_pod_linux.go +++ b/libpod/runtime_pod_linux.go @@ -10,8 +10,8 @@ import ( "github.com/containers/common/pkg/cgroups" "github.com/containers/common/pkg/config" - "github.com/containers/podman/v4/libpod/define" - "github.com/containers/podman/v4/pkg/rootless" + "github.com/containers/podman/v5/libpod/define" + "github.com/containers/podman/v5/pkg/rootless" spec "github.com/opencontainers/runtime-spec/specs-go" "github.com/sirupsen/logrus" ) diff --git a/libpod/runtime_renumber.go b/libpod/runtime_renumber.go index 6d857048cc..953e832427 100644 --- a/libpod/runtime_renumber.go +++ b/libpod/runtime_renumber.go @@ -5,8 +5,8 @@ package libpod import ( "fmt" - "github.com/containers/podman/v4/libpod/define" - "github.com/containers/podman/v4/libpod/events" + "github.com/containers/podman/v5/libpod/define" + "github.com/containers/podman/v5/libpod/events" ) // RenumberLocks reassigns lock numbers for all containers and pods in the diff --git a/libpod/runtime_volume.go b/libpod/runtime_volume.go index 8724156c2f..6066145f02 100644 --- a/libpod/runtime_volume.go +++ b/libpod/runtime_volume.go @@ -6,9 +6,9 @@ import ( "context" "errors" - "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/containers/podman/v5/libpod/define" + "github.com/containers/podman/v5/libpod/events" + "github.com/containers/podman/v5/pkg/domain/entities/reports" ) // Contains the public Runtime API for volumes diff --git a/libpod/runtime_volume_common.go b/libpod/runtime_volume_common.go index c1d52b8db3..2f982fce74 100644 --- a/libpod/runtime_volume_common.go +++ b/libpod/runtime_volume_common.go @@ -11,9 +11,9 @@ import ( "strings" "time" - "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/podman/v5/libpod/define" + "github.com/containers/podman/v5/libpod/events" + volplugin "github.com/containers/podman/v5/libpod/plugin" "github.com/containers/storage" "github.com/containers/storage/drivers/quota" "github.com/containers/storage/pkg/idtools" diff --git a/libpod/service.go b/libpod/service.go index 514afbe708..e5cbb7b536 100644 --- a/libpod/service.go +++ b/libpod/service.go @@ -7,7 +7,7 @@ import ( "errors" "fmt" - "github.com/containers/podman/v4/libpod/define" + "github.com/containers/podman/v5/libpod/define" "github.com/sirupsen/logrus" "golang.org/x/sys/unix" ) diff --git a/libpod/sqlite_state.go b/libpod/sqlite_state.go index 4a59a141ef..9a9f793e86 100644 --- a/libpod/sqlite_state.go +++ b/libpod/sqlite_state.go @@ -14,7 +14,7 @@ import ( "time" "github.com/containers/common/libnetwork/types" - "github.com/containers/podman/v4/libpod/define" + "github.com/containers/podman/v5/libpod/define" "github.com/containers/storage" "github.com/sirupsen/logrus" diff --git a/libpod/sqlite_state_internal.go b/libpod/sqlite_state_internal.go index 4487cea774..7aa2048edd 100644 --- a/libpod/sqlite_state_internal.go +++ b/libpod/sqlite_state_internal.go @@ -10,7 +10,7 @@ import ( "strings" "github.com/containers/common/libnetwork/types" - "github.com/containers/podman/v4/libpod/define" + "github.com/containers/podman/v5/libpod/define" "github.com/sirupsen/logrus" // SQLite backend for database/sql diff --git a/libpod/state_test.go b/libpod/state_test.go index 965f01983b..5572638602 100644 --- a/libpod/state_test.go +++ b/libpod/state_test.go @@ -11,8 +11,8 @@ import ( "github.com/containers/common/libnetwork/types" "github.com/containers/common/pkg/config" - "github.com/containers/podman/v4/libpod/define" - "github.com/containers/podman/v4/libpod/lock" + "github.com/containers/podman/v5/libpod/define" + "github.com/containers/podman/v5/libpod/lock" "github.com/containers/storage" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/libpod/stats_common.go b/libpod/stats_common.go index 338f67a4ea..09bfccb3ab 100644 --- a/libpod/stats_common.go +++ b/libpod/stats_common.go @@ -5,7 +5,7 @@ package libpod import ( "fmt" - "github.com/containers/podman/v4/libpod/define" + "github.com/containers/podman/v5/libpod/define" ) // GetContainerStats gets the running stats for a given container. diff --git a/libpod/stats_freebsd.go b/libpod/stats_freebsd.go index 3945e977ee..c7b78eb36a 100644 --- a/libpod/stats_freebsd.go +++ b/libpod/stats_freebsd.go @@ -7,8 +7,8 @@ import ( "math" "time" - "github.com/containers/podman/v4/libpod/define" - "github.com/containers/podman/v4/pkg/rctl" + "github.com/containers/podman/v5/libpod/define" + "github.com/containers/podman/v5/pkg/rctl" "github.com/containers/storage/pkg/system" "github.com/sirupsen/logrus" ) diff --git a/libpod/stats_linux.go b/libpod/stats_linux.go index ad8dfc45f4..c463d40f6d 100644 --- a/libpod/stats_linux.go +++ b/libpod/stats_linux.go @@ -11,7 +11,7 @@ import ( runccgroup "github.com/opencontainers/runc/libcontainer/cgroups" "github.com/containers/common/pkg/cgroups" - "github.com/containers/podman/v4/libpod/define" + "github.com/containers/podman/v5/libpod/define" "golang.org/x/sys/unix" ) diff --git a/libpod/storage.go b/libpod/storage.go index 9ec1067e1e..b9db7921fa 100644 --- a/libpod/storage.go +++ b/libpod/storage.go @@ -9,7 +9,7 @@ import ( istorage "github.com/containers/image/v5/storage" "github.com/containers/image/v5/types" - "github.com/containers/podman/v4/libpod/define" + "github.com/containers/podman/v5/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 596d3a485f..3b30b100d1 100644 --- a/libpod/util.go +++ b/libpod/util.go @@ -18,8 +18,8 @@ import ( "github.com/containers/common/libnetwork/types" "github.com/containers/common/pkg/config" - "github.com/containers/podman/v4/libpod/define" - "github.com/containers/podman/v4/pkg/api/handlers/utils/apiutil" + "github.com/containers/podman/v5/libpod/define" + "github.com/containers/podman/v5/pkg/api/handlers/utils/apiutil" spec "github.com/opencontainers/runtime-spec/specs-go" "github.com/opencontainers/selinux/go-selinux/label" "github.com/sirupsen/logrus" diff --git a/libpod/util_linux.go b/libpod/util_linux.go index f550debc79..1d83475922 100644 --- a/libpod/util_linux.go +++ b/libpod/util_linux.go @@ -11,8 +11,8 @@ import ( "syscall" "github.com/containers/common/pkg/cgroups" - "github.com/containers/podman/v4/libpod/define" - "github.com/containers/podman/v4/pkg/rootless" + "github.com/containers/podman/v5/libpod/define" + "github.com/containers/podman/v5/pkg/rootless" spec "github.com/opencontainers/runtime-spec/specs-go" "github.com/opencontainers/selinux/go-selinux/label" "github.com/sirupsen/logrus" diff --git a/libpod/util_test.go b/libpod/util_test.go index 42a7740f88..baa596f777 100644 --- a/libpod/util_test.go +++ b/libpod/util_test.go @@ -5,7 +5,7 @@ package libpod import ( "testing" - "github.com/containers/podman/v4/utils" + "github.com/containers/podman/v5/utils" "github.com/stretchr/testify/assert" ) diff --git a/libpod/volume.go b/libpod/volume.go index 462c728742..4b5a224f80 100644 --- a/libpod/volume.go +++ b/libpod/volume.go @@ -5,9 +5,9 @@ package libpod import ( "time" - "github.com/containers/podman/v4/libpod/define" - "github.com/containers/podman/v4/libpod/lock" - "github.com/containers/podman/v4/libpod/plugin" + "github.com/containers/podman/v5/libpod/define" + "github.com/containers/podman/v5/libpod/lock" + "github.com/containers/podman/v5/libpod/plugin" "github.com/containers/storage/pkg/directory" ) diff --git a/libpod/volume_inspect.go b/libpod/volume_inspect.go index 7fc7bc5714..f4a3cc889d 100644 --- a/libpod/volume_inspect.go +++ b/libpod/volume_inspect.go @@ -5,7 +5,7 @@ package libpod import ( "fmt" - "github.com/containers/podman/v4/libpod/define" + "github.com/containers/podman/v5/libpod/define" pluginapi "github.com/docker/go-plugins-helpers/volume" "github.com/sirupsen/logrus" ) diff --git a/libpod/volume_internal.go b/libpod/volume_internal.go index 3067a19f79..3d308c8620 100644 --- a/libpod/volume_internal.go +++ b/libpod/volume_internal.go @@ -7,7 +7,7 @@ import ( "os" "path/filepath" - "github.com/containers/podman/v4/libpod/define" + "github.com/containers/podman/v5/libpod/define" ) // Creates a new volume diff --git a/libpod/volume_internal_common.go b/libpod/volume_internal_common.go index 117fbe40ef..c9a20820fa 100644 --- a/libpod/volume_internal_common.go +++ b/libpod/volume_internal_common.go @@ -8,7 +8,7 @@ import ( "os/exec" "strings" - "github.com/containers/podman/v4/libpod/define" + "github.com/containers/podman/v5/libpod/define" pluginapi "github.com/docker/go-plugins-helpers/volume" "github.com/sirupsen/logrus" "golang.org/x/sys/unix" diff --git a/pkg/api/handlers/compat/auth.go b/pkg/api/handlers/compat/auth.go index 9968a3bacb..9364d4c6d9 100644 --- a/pkg/api/handlers/compat/auth.go +++ b/pkg/api/handlers/compat/auth.go @@ -11,10 +11,10 @@ import ( "github.com/containers/common/pkg/auth" DockerClient "github.com/containers/image/v5/docker" "github.com/containers/image/v5/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/containers/podman/v4/pkg/domain/entities" + "github.com/containers/podman/v5/libpod" + "github.com/containers/podman/v5/pkg/api/handlers/utils" + api "github.com/containers/podman/v5/pkg/api/types" + "github.com/containers/podman/v5/pkg/domain/entities" "github.com/docker/docker/api/types/registry" ) diff --git a/pkg/api/handlers/compat/changes.go b/pkg/api/handlers/compat/changes.go index e848591eb3..5b74ae07c3 100644 --- a/pkg/api/handlers/compat/changes.go +++ b/pkg/api/handlers/compat/changes.go @@ -4,10 +4,10 @@ import ( "fmt" "net/http" - "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/v5/libpod" + "github.com/containers/podman/v5/libpod/define" + "github.com/containers/podman/v5/pkg/api/handlers/utils" + api "github.com/containers/podman/v5/pkg/api/types" ) func Changes(w http.ResponseWriter, r *http.Request) { diff --git a/pkg/api/handlers/compat/containers.go b/pkg/api/handlers/compat/containers.go index c2a095c21a..e72db326b2 100644 --- a/pkg/api/handlers/compat/containers.go +++ b/pkg/api/handlers/compat/containers.go @@ -11,17 +11,17 @@ import ( "syscall" "time" - "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/containers/podman/v5/libpod" + "github.com/containers/podman/v5/libpod/define" + "github.com/containers/podman/v5/pkg/api/handlers" + "github.com/containers/podman/v5/pkg/api/handlers/utils" + api "github.com/containers/podman/v5/pkg/api/types" + "github.com/containers/podman/v5/pkg/domain/entities" + "github.com/containers/podman/v5/pkg/domain/filters" + "github.com/containers/podman/v5/pkg/domain/infra/abi" + "github.com/containers/podman/v5/pkg/ps" + "github.com/containers/podman/v5/pkg/signal" + "github.com/containers/podman/v5/pkg/util" "github.com/docker/docker/api/types" dockerBackend "github.com/docker/docker/api/types/backend" "github.com/docker/docker/api/types/container" diff --git a/pkg/api/handlers/compat/containers_archive.go b/pkg/api/handlers/compat/containers_archive.go index 2250572444..044ec6455e 100644 --- a/pkg/api/handlers/compat/containers_archive.go +++ b/pkg/api/handlers/compat/containers_archive.go @@ -9,13 +9,13 @@ import ( "errors" - "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/containers/podman/v5/libpod" + "github.com/containers/podman/v5/libpod/define" + "github.com/containers/podman/v5/pkg/api/handlers/utils" + api "github.com/containers/podman/v5/pkg/api/types" + "github.com/containers/podman/v5/pkg/copy" + "github.com/containers/podman/v5/pkg/domain/entities" + "github.com/containers/podman/v5/pkg/domain/infra/abi" "github.com/gorilla/schema" "github.com/sirupsen/logrus" ) diff --git a/pkg/api/handlers/compat/containers_attach.go b/pkg/api/handlers/compat/containers_attach.go index f87857319d..6d7295cdf2 100644 --- a/pkg/api/handlers/compat/containers_attach.go +++ b/pkg/api/handlers/compat/containers_attach.go @@ -5,11 +5,11 @@ import ( "fmt" "net/http" - "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/containers/podman/v5/libpod" + "github.com/containers/podman/v5/libpod/define" + "github.com/containers/podman/v5/pkg/api/handlers/utils" + "github.com/containers/podman/v5/pkg/api/server/idle" + api "github.com/containers/podman/v5/pkg/api/types" "github.com/sirupsen/logrus" ) diff --git a/pkg/api/handlers/compat/containers_create.go b/pkg/api/handlers/compat/containers_create.go index 8565ed8f25..c3ba5f1f85 100644 --- a/pkg/api/handlers/compat/containers_create.go +++ b/pkg/api/handlers/compat/containers_create.go @@ -16,16 +16,16 @@ import ( "github.com/containers/common/libnetwork/types" "github.com/containers/common/pkg/cgroups" "github.com/containers/common/pkg/config" - "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/rootless" - "github.com/containers/podman/v4/pkg/specgen" - "github.com/containers/podman/v4/pkg/specgenutil" + "github.com/containers/podman/v5/libpod" + "github.com/containers/podman/v5/libpod/define" + "github.com/containers/podman/v5/pkg/api/handlers" + "github.com/containers/podman/v5/pkg/api/handlers/utils" + api "github.com/containers/podman/v5/pkg/api/types" + "github.com/containers/podman/v5/pkg/domain/entities" + "github.com/containers/podman/v5/pkg/domain/infra/abi" + "github.com/containers/podman/v5/pkg/rootless" + "github.com/containers/podman/v5/pkg/specgen" + "github.com/containers/podman/v5/pkg/specgenutil" "github.com/containers/storage" "github.com/docker/docker/api/types/mount" ) diff --git a/pkg/api/handlers/compat/containers_export.go b/pkg/api/handlers/compat/containers_export.go index 0392ad6de6..a95406ab7a 100644 --- a/pkg/api/handlers/compat/containers_export.go +++ b/pkg/api/handlers/compat/containers_export.go @@ -4,9 +4,9 @@ import ( "fmt" "net/http" - "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/v5/libpod" + "github.com/containers/podman/v5/pkg/api/handlers/utils" + api "github.com/containers/podman/v5/pkg/api/types" ) func ExportContainer(w http.ResponseWriter, r *http.Request) { diff --git a/pkg/api/handlers/compat/containers_logs.go b/pkg/api/handlers/compat/containers_logs.go index eef2f8cdf8..3f5f75406c 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/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/containers/podman/v5/libpod" + "github.com/containers/podman/v5/libpod/logs" + "github.com/containers/podman/v5/pkg/api/handlers/utils" + api "github.com/containers/podman/v5/pkg/api/types" + "github.com/containers/podman/v5/pkg/util" log "github.com/sirupsen/logrus" ) diff --git a/pkg/api/handlers/compat/containers_pause.go b/pkg/api/handlers/compat/containers_pause.go index 91aca2b3f9..acd06ae420 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/v4/libpod" - "github.com/containers/podman/v4/pkg/api/handlers/utils" - api "github.com/containers/podman/v4/pkg/api/types" + "github.com/containers/podman/v5/libpod" + "github.com/containers/podman/v5/pkg/api/handlers/utils" + api "github.com/containers/podman/v5/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 95d6a639fa..30b38403b0 100644 --- a/pkg/api/handlers/compat/containers_prune.go +++ b/pkg/api/handlers/compat/containers_prune.go @@ -6,13 +6,13 @@ import ( "fmt" "net/http" - "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/containers/podman/v5/libpod" + "github.com/containers/podman/v5/pkg/api/handlers" + "github.com/containers/podman/v5/pkg/api/handlers/utils" + api "github.com/containers/podman/v5/pkg/api/types" + "github.com/containers/podman/v5/pkg/domain/entities/reports" + "github.com/containers/podman/v5/pkg/domain/filters" + "github.com/containers/podman/v5/pkg/util" ) func PruneContainers(w http.ResponseWriter, r *http.Request) { diff --git a/pkg/api/handlers/compat/containers_restart.go b/pkg/api/handlers/compat/containers_restart.go index 054ff06776..3681993dde 100644 --- a/pkg/api/handlers/compat/containers_restart.go +++ b/pkg/api/handlers/compat/containers_restart.go @@ -5,12 +5,12 @@ import ( "fmt" "net/http" - "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/v5/libpod" + "github.com/containers/podman/v5/libpod/define" + "github.com/containers/podman/v5/pkg/api/handlers/utils" + api "github.com/containers/podman/v5/pkg/api/types" + "github.com/containers/podman/v5/pkg/domain/entities" + "github.com/containers/podman/v5/pkg/domain/infra/abi" ) func RestartContainer(w http.ResponseWriter, r *http.Request) { diff --git a/pkg/api/handlers/compat/containers_start.go b/pkg/api/handlers/compat/containers_start.go index 67490b90c3..08ad3287ac 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/v4/pkg/api/types" + api "github.com/containers/podman/v5/pkg/api/types" "github.com/sirupsen/logrus" - "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/v5/libpod" + "github.com/containers/podman/v5/libpod/define" + "github.com/containers/podman/v5/pkg/api/handlers/utils" ) func StartContainer(w http.ResponseWriter, r *http.Request) { diff --git a/pkg/api/handlers/compat/containers_stats_freebsd.go b/pkg/api/handlers/compat/containers_stats_freebsd.go index 5745547691..06490bbe90 100644 --- a/pkg/api/handlers/compat/containers_stats_freebsd.go +++ b/pkg/api/handlers/compat/containers_stats_freebsd.go @@ -5,7 +5,7 @@ import ( "net/http" "time" - "github.com/containers/podman/v4/pkg/api/handlers/utils" + "github.com/containers/podman/v5/pkg/api/handlers/utils" ) const DefaultStatsPeriod = 5 * time.Second diff --git a/pkg/api/handlers/compat/containers_stats_linux.go b/pkg/api/handlers/compat/containers_stats_linux.go index f94fe65f1f..5e0c7f855d 100644 --- a/pkg/api/handlers/compat/containers_stats_linux.go +++ b/pkg/api/handlers/compat/containers_stats_linux.go @@ -7,10 +7,10 @@ import ( "time" "github.com/containers/common/pkg/cgroups" - "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/v5/libpod" + "github.com/containers/podman/v5/libpod/define" + "github.com/containers/podman/v5/pkg/api/handlers/utils" + api "github.com/containers/podman/v5/pkg/api/types" "github.com/containers/storage/pkg/system" docker "github.com/docker/docker/api/types" runccgroups "github.com/opencontainers/runc/libcontainer/cgroups" diff --git a/pkg/api/handlers/compat/containers_stop.go b/pkg/api/handlers/compat/containers_stop.go index 52b6f3da1e..b801508335 100644 --- a/pkg/api/handlers/compat/containers_stop.go +++ b/pkg/api/handlers/compat/containers_stop.go @@ -5,13 +5,13 @@ import ( "fmt" "net/http" - "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/containers/podman/v5/libpod" + "github.com/containers/podman/v5/libpod/define" + "github.com/containers/podman/v5/pkg/api/handlers/utils" + api "github.com/containers/podman/v5/pkg/api/types" + "github.com/containers/podman/v5/pkg/domain/entities" + "github.com/containers/podman/v5/pkg/domain/infra/abi" + "github.com/containers/podman/v5/pkg/util" ) func StopContainer(w http.ResponseWriter, r *http.Request) { diff --git a/pkg/api/handlers/compat/containers_top.go b/pkg/api/handlers/compat/containers_top.go index 8298c46c79..ea72919dfc 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/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/v5/libpod" + "github.com/containers/podman/v5/pkg/api/handlers" + "github.com/containers/podman/v5/pkg/api/handlers/utils" + api "github.com/containers/podman/v5/pkg/api/types" "github.com/sirupsen/logrus" ) diff --git a/pkg/api/handlers/compat/containers_unpause.go b/pkg/api/handlers/compat/containers_unpause.go index 67409bc8d0..7533c5a905 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/v4/libpod" - "github.com/containers/podman/v4/pkg/api/handlers/utils" - api "github.com/containers/podman/v4/pkg/api/types" + "github.com/containers/podman/v5/libpod" + "github.com/containers/podman/v5/pkg/api/handlers/utils" + api "github.com/containers/podman/v5/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 486ac54656..ceb1493e03 100644 --- a/pkg/api/handlers/compat/events.go +++ b/pkg/api/handlers/compat/events.go @@ -4,12 +4,12 @@ import ( "fmt" "net/http" - "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/containers/podman/v5/libpod" + "github.com/containers/podman/v5/libpod/events" + "github.com/containers/podman/v5/pkg/api/handlers/utils" + api "github.com/containers/podman/v5/pkg/api/types" + "github.com/containers/podman/v5/pkg/domain/entities" + "github.com/containers/podman/v5/pkg/util" jsoniter "github.com/json-iterator/go" "github.com/sirupsen/logrus" ) diff --git a/pkg/api/handlers/compat/exec.go b/pkg/api/handlers/compat/exec.go index 68d3335b8a..88ccffa9f4 100644 --- a/pkg/api/handlers/compat/exec.go +++ b/pkg/api/handlers/compat/exec.go @@ -8,15 +8,15 @@ import ( "strings" "github.com/containers/common/pkg/resize" - "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/domain/entities" - "github.com/containers/podman/v4/pkg/specgenutil" - "github.com/containers/podman/v4/pkg/util" + "github.com/containers/podman/v5/libpod" + "github.com/containers/podman/v5/libpod/define" + "github.com/containers/podman/v5/pkg/api/handlers" + "github.com/containers/podman/v5/pkg/api/handlers/utils" + "github.com/containers/podman/v5/pkg/api/server/idle" + api "github.com/containers/podman/v5/pkg/api/types" + "github.com/containers/podman/v5/pkg/domain/entities" + "github.com/containers/podman/v5/pkg/specgenutil" + "github.com/containers/podman/v5/pkg/util" "github.com/gorilla/mux" "github.com/sirupsen/logrus" ) diff --git a/pkg/api/handlers/compat/images.go b/pkg/api/handlers/compat/images.go index 0a5f755e8e..89d904f183 100644 --- a/pkg/api/handlers/compat/images.go +++ b/pkg/api/handlers/compat/images.go @@ -14,14 +14,14 @@ import ( "github.com/containers/common/pkg/config" "github.com/containers/common/pkg/filters" "github.com/containers/image/v5/manifest" - "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/util" + "github.com/containers/podman/v5/libpod" + "github.com/containers/podman/v5/pkg/api/handlers" + "github.com/containers/podman/v5/pkg/api/handlers/utils" + api "github.com/containers/podman/v5/pkg/api/types" + "github.com/containers/podman/v5/pkg/auth" + "github.com/containers/podman/v5/pkg/domain/entities" + "github.com/containers/podman/v5/pkg/domain/infra/abi" + "github.com/containers/podman/v5/pkg/util" "github.com/containers/storage" docker "github.com/docker/docker/api/types" dockerContainer "github.com/docker/docker/api/types/container" diff --git a/pkg/api/handlers/compat/images_build.go b/pkg/api/handlers/compat/images_build.go index 195a916227..93a1100c38 100644 --- a/pkg/api/handlers/compat/images_build.go +++ b/pkg/api/handlers/compat/images_build.go @@ -18,14 +18,14 @@ import ( "github.com/containers/buildah/pkg/parse" "github.com/containers/image/v5/docker/reference" "github.com/containers/image/v5/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/containers/podman/v4/pkg/auth" - "github.com/containers/podman/v4/pkg/bindings/images" - "github.com/containers/podman/v4/pkg/channel" - "github.com/containers/podman/v4/pkg/rootless" - "github.com/containers/podman/v4/pkg/util" + "github.com/containers/podman/v5/libpod" + "github.com/containers/podman/v5/pkg/api/handlers/utils" + api "github.com/containers/podman/v5/pkg/api/types" + "github.com/containers/podman/v5/pkg/auth" + "github.com/containers/podman/v5/pkg/bindings/images" + "github.com/containers/podman/v5/pkg/channel" + "github.com/containers/podman/v5/pkg/rootless" + "github.com/containers/podman/v5/pkg/util" "github.com/containers/storage/pkg/archive" "github.com/docker/docker/pkg/jsonmessage" "github.com/opencontainers/runtime-spec/specs-go" diff --git a/pkg/api/handlers/compat/images_history.go b/pkg/api/handlers/compat/images_history.go index b0970b6efd..4ed97cdbe8 100644 --- a/pkg/api/handlers/compat/images_history.go +++ b/pkg/api/handlers/compat/images_history.go @@ -4,10 +4,10 @@ import ( "fmt" "net/http" - "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/v5/libpod" + "github.com/containers/podman/v5/pkg/api/handlers" + "github.com/containers/podman/v5/pkg/api/handlers/utils" + api "github.com/containers/podman/v5/pkg/api/types" ) func HistoryImage(w http.ResponseWriter, r *http.Request) { diff --git a/pkg/api/handlers/compat/images_prune.go b/pkg/api/handlers/compat/images_prune.go index e3baed86e3..d46b3df4f0 100644 --- a/pkg/api/handlers/compat/images_prune.go +++ b/pkg/api/handlers/compat/images_prune.go @@ -6,13 +6,13 @@ import ( "fmt" "net/http" - "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/containers/podman/v5/libpod" + "github.com/containers/podman/v5/pkg/api/handlers" + "github.com/containers/podman/v5/pkg/api/handlers/utils" + api "github.com/containers/podman/v5/pkg/api/types" + "github.com/containers/podman/v5/pkg/domain/entities" + "github.com/containers/podman/v5/pkg/domain/infra/abi" + "github.com/containers/podman/v5/pkg/util" "github.com/docker/docker/api/types" dockerImage "github.com/docker/docker/api/types/image" ) diff --git a/pkg/api/handlers/compat/images_push.go b/pkg/api/handlers/compat/images_push.go index f20f22e2c7..1710006c67 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/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/podman/v5/libpod" + "github.com/containers/podman/v5/pkg/api/handlers/utils" + api "github.com/containers/podman/v5/pkg/api/types" + "github.com/containers/podman/v5/pkg/auth" + "github.com/containers/podman/v5/pkg/domain/entities" + "github.com/containers/podman/v5/pkg/domain/infra/abi" "github.com/containers/storage" "github.com/docker/docker/pkg/jsonmessage" "github.com/sirupsen/logrus" diff --git a/pkg/api/handlers/compat/images_remove.go b/pkg/api/handlers/compat/images_remove.go index 1a51640a8d..957a87c5ad 100644 --- a/pkg/api/handlers/compat/images_remove.go +++ b/pkg/api/handlers/compat/images_remove.go @@ -5,11 +5,11 @@ import ( "fmt" "net/http" - "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/v5/libpod" + "github.com/containers/podman/v5/pkg/api/handlers/utils" + api "github.com/containers/podman/v5/pkg/api/types" + "github.com/containers/podman/v5/pkg/domain/entities" + "github.com/containers/podman/v5/pkg/domain/infra/abi" "github.com/containers/storage" ) diff --git a/pkg/api/handlers/compat/images_search.go b/pkg/api/handlers/compat/images_search.go index 02cc7e3521..d918929f6d 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/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/podman/v5/libpod" + "github.com/containers/podman/v5/pkg/api/handlers/utils" + api "github.com/containers/podman/v5/pkg/api/types" + "github.com/containers/podman/v5/pkg/auth" + "github.com/containers/podman/v5/pkg/domain/entities" + "github.com/containers/podman/v5/pkg/domain/infra/abi" "github.com/containers/storage" ) diff --git a/pkg/api/handlers/compat/images_tag.go b/pkg/api/handlers/compat/images_tag.go index e9f6dedd06..d210b70764 100644 --- a/pkg/api/handlers/compat/images_tag.go +++ b/pkg/api/handlers/compat/images_tag.go @@ -6,9 +6,9 @@ import ( "net/http" "github.com/containers/common/libimage" - "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/v5/libpod" + "github.com/containers/podman/v5/pkg/api/handlers/utils" + api "github.com/containers/podman/v5/pkg/api/types" ) func TagImage(w http.ResponseWriter, r *http.Request) { diff --git a/pkg/api/handlers/compat/info.go b/pkg/api/handlers/compat/info.go index 0fe6afcd53..94b7bdfdbd 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/image/v5/pkg/sysregistriesv2" - "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" + "github.com/containers/podman/v5/libpod" + "github.com/containers/podman/v5/libpod/define" + "github.com/containers/podman/v5/pkg/api/handlers" + "github.com/containers/podman/v5/pkg/api/handlers/utils" + api "github.com/containers/podman/v5/pkg/api/types" + "github.com/containers/podman/v5/pkg/rootless" "github.com/docker/docker/api/types/registry" "github.com/docker/docker/api/types/swarm" dockerSystem "github.com/docker/docker/api/types/system" diff --git a/pkg/api/handlers/compat/networks.go b/pkg/api/handlers/compat/networks.go index 030a1d394f..a727225692 100644 --- a/pkg/api/handlers/compat/networks.go +++ b/pkg/api/handlers/compat/networks.go @@ -9,13 +9,13 @@ import ( nettypes "github.com/containers/common/libnetwork/types" netutil "github.com/containers/common/libnetwork/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/containers/podman/v5/libpod" + "github.com/containers/podman/v5/libpod/define" + "github.com/containers/podman/v5/pkg/api/handlers/utils" + api "github.com/containers/podman/v5/pkg/api/types" + "github.com/containers/podman/v5/pkg/domain/entities" + "github.com/containers/podman/v5/pkg/domain/infra/abi" + "github.com/containers/podman/v5/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 6139b9e996..8d13d9b70c 100644 --- a/pkg/api/handlers/compat/resize.go +++ b/pkg/api/handlers/compat/resize.go @@ -7,10 +7,10 @@ import ( "strings" "github.com/containers/common/pkg/resize" - "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/v5/libpod" + "github.com/containers/podman/v5/libpod/define" + "github.com/containers/podman/v5/pkg/api/handlers/utils" + api "github.com/containers/podman/v5/pkg/api/types" "github.com/gorilla/mux" ) diff --git a/pkg/api/handlers/compat/secrets.go b/pkg/api/handlers/compat/secrets.go index 1d78c18973..13f7508ca2 100644 --- a/pkg/api/handlers/compat/secrets.go +++ b/pkg/api/handlers/compat/secrets.go @@ -9,12 +9,12 @@ import ( "net/http" "strings" - "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/containers/podman/v5/libpod" + "github.com/containers/podman/v5/pkg/api/handlers/utils" + api "github.com/containers/podman/v5/pkg/api/types" + "github.com/containers/podman/v5/pkg/domain/entities" + "github.com/containers/podman/v5/pkg/domain/infra/abi" + "github.com/containers/podman/v5/pkg/util" ) func ListSecrets(w http.ResponseWriter, r *http.Request) { diff --git a/pkg/api/handlers/compat/system.go b/pkg/api/handlers/compat/system.go index 97a451ad7c..95960279c2 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/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/v5/libpod" + "github.com/containers/podman/v5/pkg/api/handlers" + "github.com/containers/podman/v5/pkg/api/handlers/utils" + api "github.com/containers/podman/v5/pkg/api/types" + "github.com/containers/podman/v5/pkg/domain/entities" + "github.com/containers/podman/v5/pkg/domain/infra/abi" docker "github.com/docker/docker/api/types" dockerImage "github.com/docker/docker/api/types/image" "github.com/docker/docker/api/types/volume" diff --git a/pkg/api/handlers/compat/unsupported.go b/pkg/api/handlers/compat/unsupported.go index 2217e87c39..31afb85bad 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/v4/pkg/api/handlers/utils" - "github.com/containers/podman/v4/pkg/errorhandling" + "github.com/containers/podman/v5/pkg/api/handlers/utils" + "github.com/containers/podman/v5/pkg/errorhandling" log "github.com/sirupsen/logrus" ) diff --git a/pkg/api/handlers/compat/version.go b/pkg/api/handlers/compat/version.go index dd64841ac6..4b0af7bf79 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/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/containers/podman/v5/libpod" + "github.com/containers/podman/v5/libpod/define" + "github.com/containers/podman/v5/pkg/api/handlers/utils" + api "github.com/containers/podman/v5/pkg/api/types" + "github.com/containers/podman/v5/pkg/domain/entities" + "github.com/containers/podman/v5/pkg/domain/entities/types" + "github.com/containers/podman/v5/version" ) func VersionHandler(w http.ResponseWriter, r *http.Request) { diff --git a/pkg/api/handlers/compat/volumes.go b/pkg/api/handlers/compat/volumes.go index 9494933abd..18a85e8585 100644 --- a/pkg/api/handlers/compat/volumes.go +++ b/pkg/api/handlers/compat/volumes.go @@ -9,14 +9,14 @@ import ( "net/url" "time" - "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" + "github.com/containers/podman/v5/libpod" + "github.com/containers/podman/v5/libpod/define" + "github.com/containers/podman/v5/pkg/api/handlers" + "github.com/containers/podman/v5/pkg/api/handlers/utils" + api "github.com/containers/podman/v5/pkg/api/types" + "github.com/containers/podman/v5/pkg/domain/filters" + "github.com/containers/podman/v5/pkg/domain/infra/abi/parse" + "github.com/containers/podman/v5/pkg/util" docker_api_types "github.com/docker/docker/api/types" docker_api_types_volume "github.com/docker/docker/api/types/volume" ) diff --git a/pkg/api/handlers/decoder.go b/pkg/api/handlers/decoder.go index 4a636bc817..4750fa1c54 100644 --- a/pkg/api/handlers/decoder.go +++ b/pkg/api/handlers/decoder.go @@ -7,8 +7,8 @@ import ( "syscall" "time" - "github.com/containers/podman/v4/libpod/define" - "github.com/containers/podman/v4/pkg/util" + "github.com/containers/podman/v5/libpod/define" + "github.com/containers/podman/v5/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 5866d23117..e823cf0608 100644 --- a/pkg/api/handlers/libpod/containers.go +++ b/pkg/api/handlers/libpod/containers.go @@ -8,15 +8,15 @@ import ( "os" "strings" - "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/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/containers/podman/v5/libpod" + "github.com/containers/podman/v5/libpod/define" + "github.com/containers/podman/v5/pkg/api/handlers" + "github.com/containers/podman/v5/pkg/api/handlers/compat" + "github.com/containers/podman/v5/pkg/api/handlers/utils" + api "github.com/containers/podman/v5/pkg/api/types" + "github.com/containers/podman/v5/pkg/domain/entities" + "github.com/containers/podman/v5/pkg/domain/infra/abi" + "github.com/containers/podman/v5/pkg/util" "github.com/gorilla/schema" "github.com/opencontainers/runtime-spec/specs-go" "github.com/sirupsen/logrus" diff --git a/pkg/api/handlers/libpod/containers_create.go b/pkg/api/handlers/libpod/containers_create.go index 645a7ea220..46fc5a80ef 100644 --- a/pkg/api/handlers/libpod/containers_create.go +++ b/pkg/api/handlers/libpod/containers_create.go @@ -7,13 +7,13 @@ import ( "net/http" "strconv" - "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/containers/podman/v4/pkg/specgenutil" + "github.com/containers/podman/v5/libpod" + "github.com/containers/podman/v5/pkg/api/handlers/utils" + api "github.com/containers/podman/v5/pkg/api/types" + "github.com/containers/podman/v5/pkg/domain/entities" + "github.com/containers/podman/v5/pkg/specgen" + "github.com/containers/podman/v5/pkg/specgen/generate" + "github.com/containers/podman/v5/pkg/specgenutil" "github.com/containers/storage" ) diff --git a/pkg/api/handlers/libpod/containers_stats.go b/pkg/api/handlers/libpod/containers_stats.go index cc4c74644f..41b0bfbaf7 100644 --- a/pkg/api/handlers/libpod/containers_stats.go +++ b/pkg/api/handlers/libpod/containers_stats.go @@ -7,12 +7,12 @@ import ( "net/http" "github.com/containers/common/pkg/cgroups" - "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/containers/podman/v5/libpod" + "github.com/containers/podman/v5/pkg/api/handlers/utils" + api "github.com/containers/podman/v5/pkg/api/types" + "github.com/containers/podman/v5/pkg/domain/entities" + "github.com/containers/podman/v5/pkg/domain/infra/abi" + "github.com/containers/podman/v5/pkg/rootless" "github.com/gorilla/schema" "github.com/sirupsen/logrus" ) diff --git a/pkg/api/handlers/libpod/generate.go b/pkg/api/handlers/libpod/generate.go index f9223f40b1..9c9ea458a9 100644 --- a/pkg/api/handlers/libpod/generate.go +++ b/pkg/api/handlers/libpod/generate.go @@ -4,12 +4,12 @@ import ( "fmt" "net/http" - "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/containers/podman/v5/libpod" + "github.com/containers/podman/v5/pkg/api/handlers/utils" + api "github.com/containers/podman/v5/pkg/api/types" + "github.com/containers/podman/v5/pkg/domain/entities" + "github.com/containers/podman/v5/pkg/domain/infra/abi" + "github.com/containers/podman/v5/pkg/util" "github.com/gorilla/schema" ) diff --git a/pkg/api/handlers/libpod/healthcheck.go b/pkg/api/handlers/libpod/healthcheck.go index 42df39c0c0..e5e9214051 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/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/v5/libpod" + "github.com/containers/podman/v5/libpod/define" + "github.com/containers/podman/v5/pkg/api/handlers/utils" + api "github.com/containers/podman/v5/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 5fc3b21e1c..aa12e5976b 100644 --- a/pkg/api/handlers/libpod/images.go +++ b/pkg/api/handlers/libpod/images.go @@ -17,20 +17,20 @@ import ( "github.com/containers/image/v5/manifest" "github.com/containers/image/v5/pkg/shortnames" "github.com/containers/image/v5/types" - "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/bindings/images" - "github.com/containers/podman/v4/pkg/channel" - "github.com/containers/podman/v4/pkg/domain/entities" - "github.com/containers/podman/v4/pkg/domain/entities/reports" - "github.com/containers/podman/v4/pkg/domain/infra/abi" - domainUtils "github.com/containers/podman/v4/pkg/domain/utils" - "github.com/containers/podman/v4/pkg/errorhandling" - "github.com/containers/podman/v4/pkg/util" - utils2 "github.com/containers/podman/v4/utils" + "github.com/containers/podman/v5/libpod" + "github.com/containers/podman/v5/libpod/define" + "github.com/containers/podman/v5/pkg/api/handlers" + "github.com/containers/podman/v5/pkg/api/handlers/utils" + api "github.com/containers/podman/v5/pkg/api/types" + "github.com/containers/podman/v5/pkg/bindings/images" + "github.com/containers/podman/v5/pkg/channel" + "github.com/containers/podman/v5/pkg/domain/entities" + "github.com/containers/podman/v5/pkg/domain/entities/reports" + "github.com/containers/podman/v5/pkg/domain/infra/abi" + domainUtils "github.com/containers/podman/v5/pkg/domain/utils" + "github.com/containers/podman/v5/pkg/errorhandling" + "github.com/containers/podman/v5/pkg/util" + utils2 "github.com/containers/podman/v5/utils" "github.com/containers/storage" "github.com/containers/storage/pkg/archive" "github.com/containers/storage/pkg/chrootarchive" diff --git a/pkg/api/handlers/libpod/images_pull.go b/pkg/api/handlers/libpod/images_pull.go index 0f50b44a45..5181a58a76 100644 --- a/pkg/api/handlers/libpod/images_pull.go +++ b/pkg/api/handlers/libpod/images_pull.go @@ -10,12 +10,12 @@ import ( "github.com/containers/common/libimage" "github.com/containers/common/pkg/config" "github.com/containers/image/v5/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/containers/podman/v4/pkg/auth" - "github.com/containers/podman/v4/pkg/channel" - "github.com/containers/podman/v4/pkg/domain/entities" + "github.com/containers/podman/v5/libpod" + "github.com/containers/podman/v5/pkg/api/handlers/utils" + api "github.com/containers/podman/v5/pkg/api/types" + "github.com/containers/podman/v5/pkg/auth" + "github.com/containers/podman/v5/pkg/channel" + "github.com/containers/podman/v5/pkg/domain/entities" "github.com/gorilla/schema" "github.com/sirupsen/logrus" ) diff --git a/pkg/api/handlers/libpod/images_push.go b/pkg/api/handlers/libpod/images_push.go index 43d28f6620..8caf23ef36 100644 --- a/pkg/api/handlers/libpod/images_push.go +++ b/pkg/api/handlers/libpod/images_push.go @@ -8,13 +8,13 @@ import ( "strings" "github.com/containers/image/v5/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/containers/podman/v4/pkg/auth" - "github.com/containers/podman/v4/pkg/channel" - "github.com/containers/podman/v4/pkg/domain/entities" - "github.com/containers/podman/v4/pkg/domain/infra/abi" + "github.com/containers/podman/v5/libpod" + "github.com/containers/podman/v5/pkg/api/handlers/utils" + api "github.com/containers/podman/v5/pkg/api/types" + "github.com/containers/podman/v5/pkg/auth" + "github.com/containers/podman/v5/pkg/channel" + "github.com/containers/podman/v5/pkg/domain/entities" + "github.com/containers/podman/v5/pkg/domain/infra/abi" "github.com/gorilla/schema" "github.com/sirupsen/logrus" ) diff --git a/pkg/api/handlers/libpod/info.go b/pkg/api/handlers/libpod/info.go index a8c0cf1d88..536cd51d8f 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/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" + "github.com/containers/podman/v5/libpod" + "github.com/containers/podman/v5/pkg/api/handlers/utils" + api "github.com/containers/podman/v5/pkg/api/types" + "github.com/containers/podman/v5/pkg/domain/infra/abi" ) func GetInfo(w http.ResponseWriter, r *http.Request) { diff --git a/pkg/api/handlers/libpod/kube.go b/pkg/api/handlers/libpod/kube.go index e78157c5b5..8d6d096ca1 100644 --- a/pkg/api/handlers/libpod/kube.go +++ b/pkg/api/handlers/libpod/kube.go @@ -6,12 +6,12 @@ import ( "net/http" "github.com/containers/image/v5/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/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/v5/libpod" + "github.com/containers/podman/v5/pkg/api/handlers/utils" + api "github.com/containers/podman/v5/pkg/api/types" + "github.com/containers/podman/v5/pkg/auth" + "github.com/containers/podman/v5/pkg/domain/entities" + "github.com/containers/podman/v5/pkg/domain/infra/abi" "github.com/gorilla/schema" ) diff --git a/pkg/api/handlers/libpod/manifests.go b/pkg/api/handlers/libpod/manifests.go index 6c7752b8f7..4d28cdd9ec 100644 --- a/pkg/api/handlers/libpod/manifests.go +++ b/pkg/api/handlers/libpod/manifests.go @@ -14,17 +14,17 @@ import ( "github.com/containers/common/libimage/define" "github.com/containers/image/v5/docker/reference" "github.com/containers/image/v5/types" - "github.com/containers/podman/v4/libpod" - "github.com/containers/podman/v4/pkg/api/handlers" - "github.com/containers/podman/v4/pkg/api/handlers/utils" - "github.com/containers/podman/v4/pkg/api/handlers/utils/apiutil" - 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/containers/podman/v4/pkg/domain/infra/abi" - envLib "github.com/containers/podman/v4/pkg/env" - "github.com/containers/podman/v4/pkg/errorhandling" + "github.com/containers/podman/v5/libpod" + "github.com/containers/podman/v5/pkg/api/handlers" + "github.com/containers/podman/v5/pkg/api/handlers/utils" + "github.com/containers/podman/v5/pkg/api/handlers/utils/apiutil" + api "github.com/containers/podman/v5/pkg/api/types" + "github.com/containers/podman/v5/pkg/auth" + "github.com/containers/podman/v5/pkg/channel" + "github.com/containers/podman/v5/pkg/domain/entities" + "github.com/containers/podman/v5/pkg/domain/infra/abi" + envLib "github.com/containers/podman/v5/pkg/env" + "github.com/containers/podman/v5/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 13a38a9977..e427cb94f6 100644 --- a/pkg/api/handlers/libpod/networks.go +++ b/pkg/api/handlers/libpod/networks.go @@ -8,13 +8,13 @@ import ( "errors" "github.com/containers/common/libnetwork/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/containers/podman/v4/pkg/domain/entities" - "github.com/containers/podman/v4/pkg/domain/infra/abi" - "github.com/containers/podman/v4/pkg/util" + "github.com/containers/podman/v5/libpod" + "github.com/containers/podman/v5/libpod/define" + "github.com/containers/podman/v5/pkg/api/handlers/utils" + api "github.com/containers/podman/v5/pkg/api/types" + "github.com/containers/podman/v5/pkg/domain/entities" + "github.com/containers/podman/v5/pkg/domain/infra/abi" + "github.com/containers/podman/v5/pkg/util" "github.com/gorilla/schema" ) diff --git a/pkg/api/handlers/libpod/pods.go b/pkg/api/handlers/libpod/pods.go index 752409c139..25da4beaa8 100644 --- a/pkg/api/handlers/libpod/pods.go +++ b/pkg/api/handlers/libpod/pods.go @@ -8,17 +8,17 @@ import ( "strings" "time" - "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/containers/podman/v5/libpod" + "github.com/containers/podman/v5/libpod/define" + "github.com/containers/podman/v5/pkg/api/handlers" + "github.com/containers/podman/v5/pkg/api/handlers/utils" + api "github.com/containers/podman/v5/pkg/api/types" + "github.com/containers/podman/v5/pkg/domain/entities" + "github.com/containers/podman/v5/pkg/domain/infra/abi" + "github.com/containers/podman/v5/pkg/specgen" + "github.com/containers/podman/v5/pkg/specgen/generate" + "github.com/containers/podman/v5/pkg/specgenutil" + "github.com/containers/podman/v5/pkg/util" "github.com/gorilla/schema" "github.com/hashicorp/go-multierror" "github.com/sirupsen/logrus" diff --git a/pkg/api/handlers/libpod/secrets.go b/pkg/api/handlers/libpod/secrets.go index 7c7fd11aeb..56d27778c5 100644 --- a/pkg/api/handlers/libpod/secrets.go +++ b/pkg/api/handlers/libpod/secrets.go @@ -5,11 +5,11 @@ import ( "net/http" "github.com/containers/common/pkg/secrets" - "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/v5/libpod" + "github.com/containers/podman/v5/pkg/api/handlers/utils" + api "github.com/containers/podman/v5/pkg/api/types" + "github.com/containers/podman/v5/pkg/domain/entities" + "github.com/containers/podman/v5/pkg/domain/infra/abi" "github.com/gorilla/schema" ) diff --git a/pkg/api/handlers/libpod/swagger_spec.go b/pkg/api/handlers/libpod/swagger_spec.go index bfe4ab9fdd..3686c8c9fc 100644 --- a/pkg/api/handlers/libpod/swagger_spec.go +++ b/pkg/api/handlers/libpod/swagger_spec.go @@ -6,7 +6,7 @@ import ( "net/http" "os" - "github.com/containers/podman/v4/pkg/api/handlers/utils" + "github.com/containers/podman/v5/pkg/api/handlers/utils" ) // DefaultPodmanSwaggerSpec provides the default path to the podman swagger spec file diff --git a/pkg/api/handlers/libpod/system.go b/pkg/api/handlers/libpod/system.go index 70d4493f81..8e9f939588 100644 --- a/pkg/api/handlers/libpod/system.go +++ b/pkg/api/handlers/libpod/system.go @@ -4,12 +4,12 @@ import ( "fmt" "net/http" - "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/containers/podman/v5/libpod" + "github.com/containers/podman/v5/pkg/api/handlers/utils" + api "github.com/containers/podman/v5/pkg/api/types" + "github.com/containers/podman/v5/pkg/domain/entities" + "github.com/containers/podman/v5/pkg/domain/infra/abi" + "github.com/containers/podman/v5/pkg/util" "github.com/gorilla/schema" ) diff --git a/pkg/api/handlers/libpod/volumes.go b/pkg/api/handlers/libpod/volumes.go index 589fe71e9a..b3b3ce27ae 100644 --- a/pkg/api/handlers/libpod/volumes.go +++ b/pkg/api/handlers/libpod/volumes.go @@ -8,16 +8,16 @@ import ( "errors" - "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/containers/podman/v5/libpod" + "github.com/containers/podman/v5/libpod/define" + "github.com/containers/podman/v5/pkg/api/handlers/utils" + api "github.com/containers/podman/v5/pkg/api/types" + "github.com/containers/podman/v5/pkg/domain/entities" + "github.com/containers/podman/v5/pkg/domain/entities/reports" + "github.com/containers/podman/v5/pkg/domain/filters" + "github.com/containers/podman/v5/pkg/domain/infra/abi" + "github.com/containers/podman/v5/pkg/domain/infra/abi/parse" + "github.com/containers/podman/v5/pkg/util" "github.com/gorilla/schema" ) diff --git a/pkg/api/handlers/swagger/errors.go b/pkg/api/handlers/swagger/errors.go index 1317cf783f..176fa3c18c 100644 --- a/pkg/api/handlers/swagger/errors.go +++ b/pkg/api/handlers/swagger/errors.go @@ -2,7 +2,7 @@ package swagger import ( - "github.com/containers/podman/v4/pkg/errorhandling" + "github.com/containers/podman/v5/pkg/errorhandling" ) // Error model embedded in swagger:response to aid in documentation generation diff --git a/pkg/api/handlers/swagger/models.go b/pkg/api/handlers/swagger/models.go index 57f35c869c..a7b561df97 100644 --- a/pkg/api/handlers/swagger/models.go +++ b/pkg/api/handlers/swagger/models.go @@ -2,7 +2,7 @@ package swagger import ( - "github.com/containers/podman/v4/pkg/domain/entities" + "github.com/containers/podman/v5/pkg/domain/entities" "github.com/docker/docker/api/types" ) diff --git a/pkg/api/handlers/swagger/responses.go b/pkg/api/handlers/swagger/responses.go index c60941a151..ee8704dea8 100644 --- a/pkg/api/handlers/swagger/responses.go +++ b/pkg/api/handlers/swagger/responses.go @@ -4,11 +4,11 @@ package swagger import ( "github.com/containers/common/libnetwork/types" "github.com/containers/image/v5/manifest" - "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/domain/entities/reports" - "github.com/containers/podman/v4/pkg/inspect" + "github.com/containers/podman/v5/libpod/define" + "github.com/containers/podman/v5/pkg/api/handlers" + "github.com/containers/podman/v5/pkg/domain/entities" + "github.com/containers/podman/v5/pkg/domain/entities/reports" + "github.com/containers/podman/v5/pkg/inspect" dockerAPI "github.com/docker/docker/api/types" dockerImage "github.com/docker/docker/api/types/image" dockerVolume "github.com/docker/docker/api/types/volume" diff --git a/pkg/api/handlers/types.go b/pkg/api/handlers/types.go index 2ea2fa516c..194a8d3918 100644 --- a/pkg/api/handlers/types.go +++ b/pkg/api/handlers/types.go @@ -1,7 +1,7 @@ package handlers import ( - "github.com/containers/podman/v4/pkg/domain/entities" + "github.com/containers/podman/v5/pkg/domain/entities" docker "github.com/docker/docker/api/types" dockerBackend "github.com/docker/docker/api/types/backend" dockerContainer "github.com/docker/docker/api/types/container" diff --git a/pkg/api/handlers/types/types.go b/pkg/api/handlers/types/types.go index 71e1d50248..7329fc7a7a 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/v4/pkg/domain/entities" +import "github.com/containers/podman/v5/pkg/domain/entities" // LibpodImagesRemoveReport is the return type for image removal via the rest // api. diff --git a/pkg/api/handlers/utils/apiutil/apiutil.go b/pkg/api/handlers/utils/apiutil/apiutil.go index b33627e31e..48f4dfba5d 100644 --- a/pkg/api/handlers/utils/apiutil/apiutil.go +++ b/pkg/api/handlers/utils/apiutil/apiutil.go @@ -8,7 +8,7 @@ import ( "strings" "github.com/blang/semver/v4" - "github.com/containers/podman/v4/version" + "github.com/containers/podman/v5/version" "github.com/gorilla/mux" ) diff --git a/pkg/api/handlers/utils/apiutil/apiutil_test.go b/pkg/api/handlers/utils/apiutil/apiutil_test.go index b86dc719cd..377c0ef84a 100644 --- a/pkg/api/handlers/utils/apiutil/apiutil_test.go +++ b/pkg/api/handlers/utils/apiutil/apiutil_test.go @@ -7,7 +7,7 @@ import ( "net/http/httptest" "testing" - "github.com/containers/podman/v4/version" + "github.com/containers/podman/v5/version" "github.com/gorilla/mux" ) diff --git a/pkg/api/handlers/utils/containers.go b/pkg/api/handlers/utils/containers.go index 00f7242f66..383505cabb 100644 --- a/pkg/api/handlers/utils/containers.go +++ b/pkg/api/handlers/utils/containers.go @@ -9,17 +9,17 @@ import ( "strings" "time" - "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/v5/libpod/events" + api "github.com/containers/podman/v5/pkg/api/types" + "github.com/containers/podman/v5/pkg/domain/entities" + "github.com/containers/podman/v5/pkg/domain/infra/abi" - "github.com/containers/podman/v4/pkg/api/handlers" + "github.com/containers/podman/v5/pkg/api/handlers" "github.com/sirupsen/logrus" - "github.com/containers/podman/v4/libpod/define" + "github.com/containers/podman/v5/libpod/define" - "github.com/containers/podman/v4/libpod" + "github.com/containers/podman/v5/libpod" "github.com/gorilla/schema" ) diff --git a/pkg/api/handlers/utils/errors.go b/pkg/api/handlers/utils/errors.go index ab1b6f2278..2f97bd7168 100644 --- a/pkg/api/handlers/utils/errors.go +++ b/pkg/api/handlers/utils/errors.go @@ -5,8 +5,8 @@ import ( "fmt" "net/http" - "github.com/containers/podman/v4/libpod/define" - "github.com/containers/podman/v4/pkg/errorhandling" + "github.com/containers/podman/v5/libpod/define" + "github.com/containers/podman/v5/pkg/errorhandling" "github.com/containers/storage" log "github.com/sirupsen/logrus" ) diff --git a/pkg/api/handlers/utils/handler.go b/pkg/api/handlers/utils/handler.go index 5ebe3f7d37..49bbf4c0cf 100644 --- a/pkg/api/handlers/utils/handler.go +++ b/pkg/api/handlers/utils/handler.go @@ -14,8 +14,8 @@ import ( jsoniter "github.com/json-iterator/go" "github.com/sirupsen/logrus" - "github.com/containers/podman/v4/pkg/api/handlers/utils/apiutil" - api "github.com/containers/podman/v4/pkg/api/types" + "github.com/containers/podman/v5/pkg/api/handlers/utils/apiutil" + api "github.com/containers/podman/v5/pkg/api/types" ) // IsLibpodRequest returns true if the request related to a libpod endpoint diff --git a/pkg/api/handlers/utils/images.go b/pkg/api/handlers/utils/images.go index c80bcd267f..c330e45e55 100644 --- a/pkg/api/handlers/utils/images.go +++ b/pkg/api/handlers/utils/images.go @@ -14,10 +14,10 @@ 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/v4/libpod" - api "github.com/containers/podman/v4/pkg/api/types" - "github.com/containers/podman/v4/pkg/errorhandling" - "github.com/containers/podman/v4/pkg/util" + "github.com/containers/podman/v5/libpod" + api "github.com/containers/podman/v5/pkg/api/types" + "github.com/containers/podman/v5/pkg/errorhandling" + "github.com/containers/podman/v5/pkg/util" "github.com/containers/storage" "github.com/docker/distribution/registry/api/errcode" "github.com/docker/docker/pkg/jsonmessage" diff --git a/pkg/api/server/handler_api.go b/pkg/api/server/handler_api.go index 316cad5df0..7696db4eec 100644 --- a/pkg/api/server/handler_api.go +++ b/pkg/api/server/handler_api.go @@ -8,7 +8,7 @@ import ( "net/http" "runtime" - "github.com/containers/podman/v4/version" + "github.com/containers/podman/v5/version" "github.com/sirupsen/logrus" ) diff --git a/pkg/api/server/handler_panic.go b/pkg/api/server/handler_panic.go index e00b3b5e7d..5bab6eff83 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/v4/pkg/api/handlers/utils" + "github.com/containers/podman/v5/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 3e404cc31c..7869cc1a14 100644 --- a/pkg/api/server/handler_rid.go +++ b/pkg/api/server/handler_rid.go @@ -5,7 +5,7 @@ import ( "io" "net/http" - "github.com/containers/podman/v4/pkg/api/types" + "github.com/containers/podman/v5/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 10131c7f23..6e031a074e 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/v4/pkg/api/handlers/compat" + "github.com/containers/podman/v5/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 beb37bf00d..6fabd65fe0 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/v4/pkg/api/handlers/compat" + "github.com/containers/podman/v5/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 b4f0d8592c..998a70e1dc 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/v4/pkg/api/handlers/compat" - "github.com/containers/podman/v4/pkg/api/handlers/libpod" + "github.com/containers/podman/v5/pkg/api/handlers/compat" + "github.com/containers/podman/v5/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 8048c1ad2d..d85480d090 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/v4/pkg/api/handlers/compat" + "github.com/containers/podman/v5/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 3442b3eab6..aa8b3d0d9a 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/v4/pkg/api/handlers/compat" + "github.com/containers/podman/v5/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 529c2465eb..56228ae1aa 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/v4/pkg/api/handlers/compat" + "github.com/containers/podman/v5/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 ac2818db05..2d1d517cf8 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/v4/pkg/api/handlers/libpod" + "github.com/containers/podman/v5/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 4e2d4059a2..b3643af6df 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/v4/pkg/api/handlers/libpod" + "github.com/containers/podman/v5/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 d541f5a972..b04fbd52b4 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/v4/pkg/api/handlers/compat" - "github.com/containers/podman/v4/pkg/api/handlers/libpod" + "github.com/containers/podman/v5/pkg/api/handlers/compat" + "github.com/containers/podman/v5/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 116d847ccf..5f6a114326 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/v4/pkg/api/handlers/compat" - "github.com/containers/podman/v4/pkg/api/handlers/libpod" + "github.com/containers/podman/v5/pkg/api/handlers/compat" + "github.com/containers/podman/v5/pkg/api/handlers/libpod" "github.com/gorilla/mux" ) diff --git a/pkg/api/server/register_kube.go b/pkg/api/server/register_kube.go index 188c9fe441..5678746669 100644 --- a/pkg/api/server/register_kube.go +++ b/pkg/api/server/register_kube.go @@ -3,7 +3,7 @@ package server import ( "net/http" - "github.com/containers/podman/v4/pkg/api/handlers/libpod" + "github.com/containers/podman/v5/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 a79d49340a..fb77e8e262 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/v4/pkg/api/handlers/libpod" + "github.com/containers/podman/v5/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 348b99400a..b892442bd2 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/v4/pkg/api/handlers/compat" + "github.com/containers/podman/v5/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 50f1ffb9b9..38075e93b5 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/v4/pkg/api/handlers/compat" - "github.com/containers/podman/v4/pkg/api/handlers/libpod" + "github.com/containers/podman/v5/pkg/api/handlers/compat" + "github.com/containers/podman/v5/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 fcc8b4a104..041fbf301a 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/v4/pkg/api/handlers/compat" + "github.com/containers/podman/v5/pkg/api/handlers/compat" "github.com/gorilla/mux" ) diff --git a/pkg/api/server/register_plugins.go b/pkg/api/server/register_plugins.go index 0134f1f323..2e4aca8d4a 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/v4/pkg/api/handlers/compat" + "github.com/containers/podman/v5/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 e396d668d6..0eb7e79a80 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/v4/pkg/api/handlers/libpod" + "github.com/containers/podman/v5/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 c50be3c971..deb0fc2492 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/v4/pkg/api/handlers/compat" - "github.com/containers/podman/v4/pkg/api/handlers/libpod" + "github.com/containers/podman/v5/pkg/api/handlers/compat" + "github.com/containers/podman/v5/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 1f6edb3368..ceb9d87426 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/v4/pkg/api/handlers/libpod" + "github.com/containers/podman/v5/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 6b0bad4ac6..4dcb63cf32 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/v4/pkg/api/handlers/utils" + "github.com/containers/podman/v5/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 8932ecc815..2034c2a7b6 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/v4/pkg/api/handlers/compat" - "github.com/containers/podman/v4/pkg/api/handlers/libpod" + "github.com/containers/podman/v5/pkg/api/handlers/compat" + "github.com/containers/podman/v5/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 f7bdc2ea92..1a62e51d83 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/v4/pkg/api/handlers/compat" + "github.com/containers/podman/v5/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 820953b09f..7ad71e58cb 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/v4/pkg/api/handlers/compat" - "github.com/containers/podman/v4/pkg/api/handlers/libpod" + "github.com/containers/podman/v5/pkg/api/handlers/compat" + "github.com/containers/podman/v5/pkg/api/handlers/libpod" "github.com/gorilla/mux" ) diff --git a/pkg/api/server/server.go b/pkg/api/server/server.go index 43cc30f07f..8c5b73872a 100644 --- a/pkg/api/server/server.go +++ b/pkg/api/server/server.go @@ -14,12 +14,12 @@ import ( "syscall" "time" - "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/containers/podman/v5/libpod" + "github.com/containers/podman/v5/libpod/shutdown" + "github.com/containers/podman/v5/pkg/api/handlers" + "github.com/containers/podman/v5/pkg/api/server/idle" + "github.com/containers/podman/v5/pkg/api/types" + "github.com/containers/podman/v5/pkg/domain/entities" "github.com/coreos/go-systemd/v22/daemon" "github.com/gorilla/mux" "github.com/gorilla/schema" diff --git a/pkg/autoupdate/autoupdate.go b/pkg/autoupdate/autoupdate.go index a408e69d17..5b2ac829f2 100644 --- a/pkg/autoupdate/autoupdate.go +++ b/pkg/autoupdate/autoupdate.go @@ -11,12 +11,12 @@ import ( "github.com/containers/common/libimage" "github.com/containers/common/pkg/config" "github.com/containers/image/v5/docker" - "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/pkg/domain/entities" - "github.com/containers/podman/v4/pkg/systemd" - systemdDefine "github.com/containers/podman/v4/pkg/systemd/define" + "github.com/containers/podman/v5/libpod" + "github.com/containers/podman/v5/libpod/define" + "github.com/containers/podman/v5/libpod/events" + "github.com/containers/podman/v5/pkg/domain/entities" + "github.com/containers/podman/v5/pkg/systemd" + systemdDefine "github.com/containers/podman/v5/pkg/systemd/define" "github.com/coreos/go-systemd/v22/dbus" "github.com/sirupsen/logrus" ) diff --git a/pkg/bindings/connection.go b/pkg/bindings/connection.go index d3bd5e8a8e..d2c3aaba2a 100644 --- a/pkg/bindings/connection.go +++ b/pkg/bindings/connection.go @@ -15,7 +15,7 @@ import ( "github.com/blang/semver/v4" "github.com/containers/common/pkg/ssh" - "github.com/containers/podman/v4/version" + "github.com/containers/podman/v5/version" "github.com/sirupsen/logrus" "golang.org/x/net/proxy" ) diff --git a/pkg/bindings/containers/archive.go b/pkg/bindings/containers/archive.go index 6b229dac3d..f24efdf658 100644 --- a/pkg/bindings/containers/archive.go +++ b/pkg/bindings/containers/archive.go @@ -7,9 +7,9 @@ import ( "net/http" "net/url" - "github.com/containers/podman/v4/pkg/bindings" - "github.com/containers/podman/v4/pkg/copy" - "github.com/containers/podman/v4/pkg/domain/entities/types" + "github.com/containers/podman/v5/pkg/bindings" + "github.com/containers/podman/v5/pkg/copy" + "github.com/containers/podman/v5/pkg/domain/entities/types" ) // Stat checks if the specified path is on the container. Note that the stat diff --git a/pkg/bindings/containers/attach.go b/pkg/bindings/containers/attach.go index e1c22d9e6b..94219174b8 100644 --- a/pkg/bindings/containers/attach.go +++ b/pkg/bindings/containers/attach.go @@ -16,8 +16,8 @@ import ( "time" "github.com/containers/common/pkg/detach" - "github.com/containers/podman/v4/libpod/define" - "github.com/containers/podman/v4/pkg/bindings" + "github.com/containers/podman/v5/libpod/define" + "github.com/containers/podman/v5/pkg/bindings" "github.com/moby/term" "github.com/sirupsen/logrus" terminal "golang.org/x/term" diff --git a/pkg/bindings/containers/checkpoint.go b/pkg/bindings/containers/checkpoint.go index 359a7d0f44..fa0ae97cfe 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/v4/pkg/bindings" - "github.com/containers/podman/v4/pkg/domain/entities/types" + "github.com/containers/podman/v5/pkg/bindings" + "github.com/containers/podman/v5/pkg/domain/entities/types" ) // 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 e580961715..76b22d1f06 100644 --- a/pkg/bindings/containers/commit.go +++ b/pkg/bindings/containers/commit.go @@ -9,8 +9,8 @@ import ( "os" "strings" - "github.com/containers/podman/v4/pkg/bindings" - "github.com/containers/podman/v4/pkg/bindings/images" + "github.com/containers/podman/v5/pkg/bindings" + "github.com/containers/podman/v5/pkg/bindings/images" "github.com/containers/storage/pkg/regexp" dockerAPI "github.com/docker/docker/api/types" ) diff --git a/pkg/bindings/containers/containers.go b/pkg/bindings/containers/containers.go index cb384853f9..19fc74f735 100644 --- a/pkg/bindings/containers/containers.go +++ b/pkg/bindings/containers/containers.go @@ -9,11 +9,11 @@ import ( "net/url" "strings" - "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/reports" - "github.com/containers/podman/v4/pkg/domain/entities/types" + "github.com/containers/podman/v5/libpod/define" + "github.com/containers/podman/v5/pkg/api/handlers" + "github.com/containers/podman/v5/pkg/bindings" + "github.com/containers/podman/v5/pkg/domain/entities/reports" + "github.com/containers/podman/v5/pkg/domain/entities/types" ) var ( diff --git a/pkg/bindings/containers/create.go b/pkg/bindings/containers/create.go index 6c639cad7e..7b39e848d1 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/v4/pkg/bindings" - "github.com/containers/podman/v4/pkg/domain/entities/types" - "github.com/containers/podman/v4/pkg/specgen" + "github.com/containers/podman/v5/pkg/bindings" + "github.com/containers/podman/v5/pkg/domain/entities/types" + "github.com/containers/podman/v5/pkg/specgen" jsoniter "github.com/json-iterator/go" ) diff --git a/pkg/bindings/containers/diff.go b/pkg/bindings/containers/diff.go index 2eb13088c1..e782aa9201 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/v4/pkg/bindings" + "github.com/containers/podman/v5/pkg/bindings" "github.com/containers/storage/pkg/archive" ) diff --git a/pkg/bindings/containers/exec.go b/pkg/bindings/containers/exec.go index 7438e8966f..e471a58dd5 100644 --- a/pkg/bindings/containers/exec.go +++ b/pkg/bindings/containers/exec.go @@ -8,9 +8,9 @@ import ( "net/http" "strings" - "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/v5/libpod/define" + "github.com/containers/podman/v5/pkg/api/handlers" + "github.com/containers/podman/v5/pkg/bindings" dockerAPI "github.com/docker/docker/api/types" jsoniter "github.com/json-iterator/go" "github.com/sirupsen/logrus" diff --git a/pkg/bindings/containers/healthcheck.go b/pkg/bindings/containers/healthcheck.go index e0680238d4..7f396fcc54 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/v4/libpod/define" - "github.com/containers/podman/v4/pkg/bindings" + "github.com/containers/podman/v5/libpod/define" + "github.com/containers/podman/v5/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 9d3fdb8ebe..141c7733a4 100644 --- a/pkg/bindings/containers/logs.go +++ b/pkg/bindings/containers/logs.go @@ -8,7 +8,7 @@ import ( "net/http" "strconv" - "github.com/containers/podman/v4/pkg/bindings" + "github.com/containers/podman/v5/pkg/bindings" ) // Logs obtains a container's logs given the options provided. The logs are then sent to the diff --git a/pkg/bindings/containers/mount.go b/pkg/bindings/containers/mount.go index de286e4b4d..63aaf5c117 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/v4/pkg/bindings" + "github.com/containers/podman/v5/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 7cc16e3343..4642547bf9 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/v4/pkg/bindings" + "github.com/containers/podman/v5/pkg/bindings" ) // Rename an existing container. diff --git a/pkg/bindings/containers/term_unix.go b/pkg/bindings/containers/term_unix.go index 60c25e2959..6c9f2a4b92 100644 --- a/pkg/bindings/containers/term_unix.go +++ b/pkg/bindings/containers/term_unix.go @@ -7,7 +7,7 @@ import ( "os" "os/signal" - sig "github.com/containers/podman/v4/pkg/signal" + sig "github.com/containers/podman/v5/pkg/signal" "golang.org/x/term" ) diff --git a/pkg/bindings/containers/term_windows.go b/pkg/bindings/containers/term_windows.go index e710e29986..ba91ae2c5b 100644 --- a/pkg/bindings/containers/term_windows.go +++ b/pkg/bindings/containers/term_windows.go @@ -5,7 +5,7 @@ import ( "os" "time" - sig "github.com/containers/podman/v4/pkg/signal" + sig "github.com/containers/podman/v5/pkg/signal" "golang.org/x/sys/windows" "golang.org/x/term" ) diff --git a/pkg/bindings/containers/types.go b/pkg/bindings/containers/types.go index ee2fe4b94b..ba3703ceeb 100644 --- a/pkg/bindings/containers/types.go +++ b/pkg/bindings/containers/types.go @@ -4,7 +4,7 @@ import ( "bufio" "io" - "github.com/containers/podman/v4/libpod/define" + "github.com/containers/podman/v5/libpod/define" ) // LogOptions describe finer control of log content or diff --git a/pkg/bindings/containers/types_attach_options.go b/pkg/bindings/containers/types_attach_options.go index 9fa21ef4e1..6c272f33c5 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/v4/pkg/bindings/internal/util" + "github.com/containers/podman/v5/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 d5f6e541d1..16bd91a725 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/v4/pkg/bindings/internal/util" + "github.com/containers/podman/v5/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 20e59f4d50..c74e2bab57 100644 --- a/pkg/bindings/containers/types_commit_options.go +++ b/pkg/bindings/containers/types_commit_options.go @@ -5,7 +5,7 @@ import ( "io" "net/url" - "github.com/containers/podman/v4/pkg/bindings/internal/util" + "github.com/containers/podman/v5/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 e43d797525..b6cf40d706 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/v4/pkg/bindings/internal/util" + "github.com/containers/podman/v5/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 57896b9ef9..099685ec31 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/v4/pkg/bindings/internal/util" + "github.com/containers/podman/v5/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 5fc3dedae2..75f7907d92 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/v4/pkg/bindings/internal/util" + "github.com/containers/podman/v5/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 0e926be0c1..e963118348 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/v4/pkg/bindings/internal/util" + "github.com/containers/podman/v5/pkg/bindings/internal/util" ) // Changed returns true if named field has been set diff --git a/pkg/bindings/containers/types_execremove_options.go b/pkg/bindings/containers/types_execremove_options.go index 3dcebe3007..cfc6d8a4ef 100644 --- a/pkg/bindings/containers/types_execremove_options.go +++ b/pkg/bindings/containers/types_execremove_options.go @@ -4,7 +4,7 @@ package containers import ( "net/url" - "github.com/containers/podman/v4/pkg/bindings/internal/util" + "github.com/containers/podman/v5/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 4bd66e25bf..bbfb4a3044 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/v4/pkg/bindings/internal/util" + "github.com/containers/podman/v5/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 759676f2ff..1b8e48725a 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/v4/pkg/bindings/internal/util" + "github.com/containers/podman/v5/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 6c73fcc654..91a7ceec59 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/v4/pkg/bindings/internal/util" + "github.com/containers/podman/v5/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 041a18041f..81c94f2b32 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/v4/pkg/bindings/internal/util" + "github.com/containers/podman/v5/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 f7daafdaba..e346d4822a 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/v4/pkg/bindings/internal/util" + "github.com/containers/podman/v5/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 f93422ee3e..2f06ae25f6 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/v4/pkg/bindings/internal/util" + "github.com/containers/podman/v5/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 0fa8d0917b..29fa6fedd4 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/v4/pkg/bindings/internal/util" + "github.com/containers/podman/v5/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 af26b34165..8cb9855280 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/v4/pkg/bindings/internal/util" + "github.com/containers/podman/v5/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 0204423eb2..c6a25908e0 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/v4/pkg/bindings/internal/util" + "github.com/containers/podman/v5/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 4aab596d8c..f6efbaa9bc 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/v4/pkg/bindings/internal/util" + "github.com/containers/podman/v5/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 1e0b7ddbfb..332f018093 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/v4/pkg/bindings/internal/util" + "github.com/containers/podman/v5/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 62377b52b9..8c5494face 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/v4/pkg/bindings/internal/util" + "github.com/containers/podman/v5/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 26ee31db07..14b18a87ff 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/v4/pkg/bindings/internal/util" + "github.com/containers/podman/v5/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 413b84f473..69d619d169 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/v4/pkg/bindings/internal/util" + "github.com/containers/podman/v5/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 b73b01cd2d..e7da10a0f7 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/v4/pkg/bindings/internal/util" + "github.com/containers/podman/v5/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 1957a39823..5725812138 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/v4/pkg/bindings/internal/util" + "github.com/containers/podman/v5/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 2a7d5b5404..0741f4eaee 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/v4/pkg/bindings/internal/util" + "github.com/containers/podman/v5/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 fc027c48d9..c336f6fe8e 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/v4/pkg/bindings/internal/util" + "github.com/containers/podman/v5/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 f5f20df51d..e27e881adc 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/v4/pkg/bindings/internal/util" + "github.com/containers/podman/v5/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 b1b14a7042..cb4e307601 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/v4/pkg/bindings/internal/util" + "github.com/containers/podman/v5/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 e9d529355e..e968731b04 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/v4/pkg/bindings/internal/util" + "github.com/containers/podman/v5/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 88342dcd06..fb77b421cd 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/v4/pkg/bindings/internal/util" + "github.com/containers/podman/v5/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 968f824d57..fbae6bd49f 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/v4/pkg/bindings/internal/util" + "github.com/containers/podman/v5/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 375557ecb2..eea280e3fd 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/v4/pkg/bindings/internal/util" + "github.com/containers/podman/v5/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 61d37ed0d6..cfd21ecc3c 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/v4/pkg/bindings/internal/util" + "github.com/containers/podman/v5/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 0faa405c4e..0752556a00 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/v4/pkg/bindings/internal/util" + "github.com/containers/podman/v5/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 4a967862ed..2f91a7d33a 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/v4/pkg/bindings/internal/util" + "github.com/containers/podman/v5/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 260a73d6f9..fcb9a91407 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/v4/libpod/define" - "github.com/containers/podman/v4/pkg/bindings/internal/util" + "github.com/containers/podman/v5/libpod/define" + "github.com/containers/podman/v5/pkg/bindings/internal/util" ) // Changed returns true if named field has been set diff --git a/pkg/bindings/containers/update.go b/pkg/bindings/containers/update.go index 60b33292da..20b743c954 100644 --- a/pkg/bindings/containers/update.go +++ b/pkg/bindings/containers/update.go @@ -5,8 +5,8 @@ import ( "net/http" "strings" - "github.com/containers/podman/v4/pkg/bindings" - "github.com/containers/podman/v4/pkg/domain/entities/types" + "github.com/containers/podman/v5/pkg/bindings" + "github.com/containers/podman/v5/pkg/domain/entities/types" jsoniter "github.com/json-iterator/go" ) diff --git a/pkg/bindings/errors.go b/pkg/bindings/errors.go index 46d3a70244..af506a0f39 100644 --- a/pkg/bindings/errors.go +++ b/pkg/bindings/errors.go @@ -7,7 +7,7 @@ import ( "io" "github.com/blang/semver/v4" - "github.com/containers/podman/v4/pkg/errorhandling" + "github.com/containers/podman/v5/pkg/errorhandling" ) var ( diff --git a/pkg/bindings/generate/generate.go b/pkg/bindings/generate/generate.go index d5c9207c6a..59a5cd4cbf 100644 --- a/pkg/bindings/generate/generate.go +++ b/pkg/bindings/generate/generate.go @@ -6,8 +6,8 @@ import ( "net/http" "strconv" - "github.com/containers/podman/v4/pkg/bindings" - "github.com/containers/podman/v4/pkg/domain/entities/types" + "github.com/containers/podman/v5/pkg/bindings" + "github.com/containers/podman/v5/pkg/domain/entities/types" ) func Systemd(ctx context.Context, nameOrID string, options *SystemdOptions) (*types.GenerateSystemdReport, error) { diff --git a/pkg/bindings/generate/types_kube_options.go b/pkg/bindings/generate/types_kube_options.go index b015949578..4770a7b617 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/v4/pkg/bindings/internal/util" + "github.com/containers/podman/v5/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 3aec33a544..2069e39ff3 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/v4/pkg/bindings/internal/util" + "github.com/containers/podman/v5/pkg/bindings/internal/util" ) // Changed returns true if named field has been set diff --git a/pkg/bindings/images/build.go b/pkg/bindings/images/build.go index d4089d0a40..bb4f65e315 100644 --- a/pkg/bindings/images/build.go +++ b/pkg/bindings/images/build.go @@ -19,11 +19,11 @@ import ( "github.com/containers/buildah/define" imageTypes "github.com/containers/image/v5/types" - ldefine "github.com/containers/podman/v4/libpod/define" - "github.com/containers/podman/v4/pkg/auth" - "github.com/containers/podman/v4/pkg/bindings" - "github.com/containers/podman/v4/pkg/domain/entities/types" - "github.com/containers/podman/v4/pkg/util" + ldefine "github.com/containers/podman/v5/libpod/define" + "github.com/containers/podman/v5/pkg/auth" + "github.com/containers/podman/v5/pkg/bindings" + "github.com/containers/podman/v5/pkg/domain/entities/types" + "github.com/containers/podman/v5/pkg/util" "github.com/containers/storage/pkg/fileutils" "github.com/containers/storage/pkg/ioutils" "github.com/containers/storage/pkg/regexp" diff --git a/pkg/bindings/images/diff.go b/pkg/bindings/images/diff.go index 2a59e6d695..b4eaac8a0e 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/v4/pkg/bindings" + "github.com/containers/podman/v5/pkg/bindings" "github.com/containers/storage/pkg/archive" ) diff --git a/pkg/bindings/images/images.go b/pkg/bindings/images/images.go index d9ef13ddc4..018edbc974 100644 --- a/pkg/bindings/images/images.go +++ b/pkg/bindings/images/images.go @@ -10,11 +10,11 @@ import ( "strconv" imageTypes "github.com/containers/image/v5/types" - handlersTypes "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/reports" - "github.com/containers/podman/v4/pkg/domain/entities/types" + handlersTypes "github.com/containers/podman/v5/pkg/api/handlers/types" + "github.com/containers/podman/v5/pkg/auth" + "github.com/containers/podman/v5/pkg/bindings" + "github.com/containers/podman/v5/pkg/domain/entities/reports" + "github.com/containers/podman/v5/pkg/domain/entities/types" ) // Exists a lightweight way to determine if an image exists in local storage. It returns a diff --git a/pkg/bindings/images/pull.go b/pkg/bindings/images/pull.go index 4172e85373..45534a2123 100644 --- a/pkg/bindings/images/pull.go +++ b/pkg/bindings/images/pull.go @@ -11,10 +11,10 @@ import ( "strconv" imgTypes "github.com/containers/image/v5/types" - "github.com/containers/podman/v4/pkg/auth" - "github.com/containers/podman/v4/pkg/bindings" - "github.com/containers/podman/v4/pkg/domain/entities/types" - "github.com/containers/podman/v4/pkg/errorhandling" + "github.com/containers/podman/v5/pkg/auth" + "github.com/containers/podman/v5/pkg/bindings" + "github.com/containers/podman/v5/pkg/domain/entities/types" + "github.com/containers/podman/v5/pkg/errorhandling" ) // Pull is the binding for libpod's v2 endpoints for pulling images. Note that diff --git a/pkg/bindings/images/push.go b/pkg/bindings/images/push.go index 33ad34dd13..d6769786f1 100644 --- a/pkg/bindings/images/push.go +++ b/pkg/bindings/images/push.go @@ -11,9 +11,9 @@ import ( "strconv" imageTypes "github.com/containers/image/v5/types" - "github.com/containers/podman/v4/pkg/auth" - "github.com/containers/podman/v4/pkg/bindings" - "github.com/containers/podman/v4/pkg/domain/entities/types" + "github.com/containers/podman/v5/pkg/auth" + "github.com/containers/podman/v5/pkg/bindings" + "github.com/containers/podman/v5/pkg/domain/entities/types" ) // Push is the binding for libpod's endpoints for push images. Note that diff --git a/pkg/bindings/images/rm.go b/pkg/bindings/images/rm.go index 2d251e6ed7..4fd35c5551 100644 --- a/pkg/bindings/images/rm.go +++ b/pkg/bindings/images/rm.go @@ -4,10 +4,10 @@ import ( "context" "net/http" - handlersTypes "github.com/containers/podman/v4/pkg/api/handlers/types" - "github.com/containers/podman/v4/pkg/bindings" - "github.com/containers/podman/v4/pkg/domain/entities/types" - "github.com/containers/podman/v4/pkg/errorhandling" + handlersTypes "github.com/containers/podman/v5/pkg/api/handlers/types" + "github.com/containers/podman/v5/pkg/bindings" + "github.com/containers/podman/v5/pkg/domain/entities/types" + "github.com/containers/podman/v5/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.go b/pkg/bindings/images/types.go index 6617108792..25595adc4c 100644 --- a/pkg/bindings/images/types.go +++ b/pkg/bindings/images/types.go @@ -3,7 +3,7 @@ package images import ( "io" - "github.com/containers/podman/v4/pkg/domain/entities/types" + "github.com/containers/podman/v5/pkg/domain/entities/types" ) // RemoveOptions are optional options for image removal diff --git a/pkg/bindings/images/types_diff_options.go b/pkg/bindings/images/types_diff_options.go index 3a30321557..18bcf95264 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/v4/pkg/bindings/internal/util" + "github.com/containers/podman/v5/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 7521d85f3a..e31138d439 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/v4/pkg/bindings/internal/util" + "github.com/containers/podman/v5/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 77850734c4..0cc3da8c87 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/v4/pkg/bindings/internal/util" + "github.com/containers/podman/v5/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 36b62272e2..84295a75f5 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/v4/pkg/bindings/internal/util" + "github.com/containers/podman/v5/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 a9abb482a6..3dc43cc421 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/v4/pkg/bindings/internal/util" + "github.com/containers/podman/v5/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 f958fe8b48..aafb8de70f 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/v4/pkg/bindings/internal/util" + "github.com/containers/podman/v5/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 f47cd9c757..4c378e1e83 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/v4/pkg/bindings/internal/util" + "github.com/containers/podman/v5/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 9978201ce5..470e4293b4 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/v4/pkg/bindings/internal/util" + "github.com/containers/podman/v5/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 eddf1ae453..ead74e7ea2 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/v4/pkg/bindings/internal/util" + "github.com/containers/podman/v5/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 c1a88fd9ed..cf48878e2e 100644 --- a/pkg/bindings/images/types_pull_options.go +++ b/pkg/bindings/images/types_pull_options.go @@ -5,7 +5,7 @@ import ( "io" "net/url" - "github.com/containers/podman/v4/pkg/bindings/internal/util" + "github.com/containers/podman/v5/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 770ffffd17..2dcd382912 100644 --- a/pkg/bindings/images/types_push_options.go +++ b/pkg/bindings/images/types_push_options.go @@ -5,7 +5,7 @@ import ( "io" "net/url" - "github.com/containers/podman/v4/pkg/bindings/internal/util" + "github.com/containers/podman/v5/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 8972ac93c7..68d24149c0 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/v4/pkg/bindings/internal/util" + "github.com/containers/podman/v5/pkg/bindings/internal/util" ) // Changed returns true if named field has been set diff --git a/pkg/bindings/images/types_scp_options.go b/pkg/bindings/images/types_scp_options.go index 5a1178cb17..e92b3dc035 100644 --- a/pkg/bindings/images/types_scp_options.go +++ b/pkg/bindings/images/types_scp_options.go @@ -3,7 +3,7 @@ package images import ( "net/url" - "github.com/containers/podman/v4/pkg/bindings/internal/util" + "github.com/containers/podman/v5/pkg/bindings/internal/util" ) // ToParams formats struct fields to be passed to API service diff --git a/pkg/bindings/images/types_search_options.go b/pkg/bindings/images/types_search_options.go index cc28da57f9..7da357ba56 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/v4/pkg/bindings/internal/util" + "github.com/containers/podman/v5/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 30cef4dd2c..39582afd61 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/v4/pkg/bindings/internal/util" + "github.com/containers/podman/v5/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 57eecf959a..f87517cb0b 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/v4/pkg/bindings/internal/util" + "github.com/containers/podman/v5/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 eba687f3d2..4fdb689ad0 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/v4/pkg/bindings/internal/util" + "github.com/containers/podman/v5/pkg/bindings/internal/util" ) // Changed returns true if named field has been set diff --git a/pkg/bindings/kube/kube.go b/pkg/bindings/kube/kube.go index c9e2c025f6..c8e4bb6649 100644 --- a/pkg/bindings/kube/kube.go +++ b/pkg/bindings/kube/kube.go @@ -9,10 +9,10 @@ import ( "strconv" "github.com/containers/image/v5/types" - "github.com/containers/podman/v4/pkg/auth" - "github.com/containers/podman/v4/pkg/bindings" - "github.com/containers/podman/v4/pkg/bindings/generate" - entitiesTypes "github.com/containers/podman/v4/pkg/domain/entities/types" + "github.com/containers/podman/v5/pkg/auth" + "github.com/containers/podman/v5/pkg/bindings" + "github.com/containers/podman/v5/pkg/bindings/generate" + entitiesTypes "github.com/containers/podman/v5/pkg/domain/entities/types" "github.com/sirupsen/logrus" ) diff --git a/pkg/bindings/kube/types_apply_options.go b/pkg/bindings/kube/types_apply_options.go index 9fb49594dd..9ec4a82156 100644 --- a/pkg/bindings/kube/types_apply_options.go +++ b/pkg/bindings/kube/types_apply_options.go @@ -4,7 +4,7 @@ package kube import ( "net/url" - "github.com/containers/podman/v4/pkg/bindings/internal/util" + "github.com/containers/podman/v5/pkg/bindings/internal/util" ) // Changed returns true if named field has been set diff --git a/pkg/bindings/kube/types_down_options.go b/pkg/bindings/kube/types_down_options.go index 99ce3abe4d..58b85de0d6 100644 --- a/pkg/bindings/kube/types_down_options.go +++ b/pkg/bindings/kube/types_down_options.go @@ -4,7 +4,7 @@ package kube import ( "net/url" - "github.com/containers/podman/v4/pkg/bindings/internal/util" + "github.com/containers/podman/v5/pkg/bindings/internal/util" ) // Changed returns true if named field has been set diff --git a/pkg/bindings/kube/types_play_options.go b/pkg/bindings/kube/types_play_options.go index 6082799a69..f9e160e141 100644 --- a/pkg/bindings/kube/types_play_options.go +++ b/pkg/bindings/kube/types_play_options.go @@ -5,7 +5,7 @@ import ( "net" "net/url" - "github.com/containers/podman/v4/pkg/bindings/internal/util" + "github.com/containers/podman/v5/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 b825f47fb5..bc183042d6 100644 --- a/pkg/bindings/manifests/manifests.go +++ b/pkg/bindings/manifests/manifests.go @@ -14,11 +14,11 @@ import ( "github.com/containers/common/libimage/define" "github.com/containers/image/v5/manifest" imageTypes "github.com/containers/image/v5/types" - "github.com/containers/podman/v4/pkg/auth" - "github.com/containers/podman/v4/pkg/bindings" - "github.com/containers/podman/v4/pkg/bindings/images" - entitiesTypes "github.com/containers/podman/v4/pkg/domain/entities/types" - "github.com/containers/podman/v4/pkg/errorhandling" + "github.com/containers/podman/v5/pkg/auth" + "github.com/containers/podman/v5/pkg/bindings" + "github.com/containers/podman/v5/pkg/bindings/images" + entitiesTypes "github.com/containers/podman/v5/pkg/domain/entities/types" + "github.com/containers/podman/v5/pkg/errorhandling" dockerAPI "github.com/docker/docker/api/types" 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 5ba1cc5fa9..cd1c2c7aa2 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/v4/pkg/bindings/internal/util" + "github.com/containers/podman/v5/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 09942c00a0..65407928cc 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/v4/pkg/bindings/internal/util" + "github.com/containers/podman/v5/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 287710ce9b..82ace8c3cb 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/v4/pkg/bindings/internal/util" + "github.com/containers/podman/v5/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 791dbf3e6a..062851374b 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/v4/pkg/bindings/internal/util" + "github.com/containers/podman/v5/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 ab00cb2c51..866b658b4d 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/v4/pkg/bindings/internal/util" + "github.com/containers/podman/v5/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 efadbe2c01..065e9f96b7 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/v4/pkg/bindings/internal/util" + "github.com/containers/podman/v5/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 f95fadb1f2..0ff425313c 100644 --- a/pkg/bindings/network/network.go +++ b/pkg/bindings/network/network.go @@ -7,8 +7,8 @@ import ( "strings" "github.com/containers/common/libnetwork/types" - "github.com/containers/podman/v4/pkg/bindings" - entitiesTypes "github.com/containers/podman/v4/pkg/domain/entities/types" + "github.com/containers/podman/v5/pkg/bindings" + entitiesTypes "github.com/containers/podman/v5/pkg/domain/entities/types" 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 63551c14a9..2bfa13a117 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/v4/pkg/bindings/internal/util" + "github.com/containers/podman/v5/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 0c3560d179..987138f504 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/v4/pkg/bindings/internal/util" + "github.com/containers/podman/v5/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 890f85db02..72c936a6df 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/v4/pkg/bindings/internal/util" + "github.com/containers/podman/v5/pkg/bindings/internal/util" ) // Changed returns true if named field has been set diff --git a/pkg/bindings/network/types_extracreate_options.go b/pkg/bindings/network/types_extracreate_options.go index f12adf6bcf..6f74842cd9 100644 --- a/pkg/bindings/network/types_extracreate_options.go +++ b/pkg/bindings/network/types_extracreate_options.go @@ -4,7 +4,7 @@ package network import ( "net/url" - "github.com/containers/podman/v4/pkg/bindings/internal/util" + "github.com/containers/podman/v5/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 1d5fcd4c8c..d9cc782bca 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/v4/pkg/bindings/internal/util" + "github.com/containers/podman/v5/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 95bf088a89..b1f214cdd7 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/v4/pkg/bindings/internal/util" + "github.com/containers/podman/v5/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 4d0fdbf439..6036648e94 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/v4/pkg/bindings/internal/util" + "github.com/containers/podman/v5/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 6c73a39892..426fdb1c4b 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/v4/pkg/bindings/internal/util" + "github.com/containers/podman/v5/pkg/bindings/internal/util" ) // Changed returns true if named field has been set diff --git a/pkg/bindings/network/types_update_options.go b/pkg/bindings/network/types_update_options.go index 2cc9d50dcc..424d067133 100644 --- a/pkg/bindings/network/types_update_options.go +++ b/pkg/bindings/network/types_update_options.go @@ -4,7 +4,7 @@ package network import ( "net/url" - "github.com/containers/podman/v4/pkg/bindings/internal/util" + "github.com/containers/podman/v5/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 7e8f9ee40f..acc39d9724 100644 --- a/pkg/bindings/play/play.go +++ b/pkg/bindings/play/play.go @@ -4,8 +4,8 @@ import ( "context" "io" - "github.com/containers/podman/v4/pkg/bindings/kube" - "github.com/containers/podman/v4/pkg/domain/entities/types" + "github.com/containers/podman/v5/pkg/bindings/kube" + "github.com/containers/podman/v5/pkg/domain/entities/types" ) type KubeOptions = kube.PlayOptions diff --git a/pkg/bindings/pods/pods.go b/pkg/bindings/pods/pods.go index 615f2b6dbe..88ceeca5e0 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/v4/pkg/api/handlers" - "github.com/containers/podman/v4/pkg/bindings" - entitiesTypes "github.com/containers/podman/v4/pkg/domain/entities/types" - "github.com/containers/podman/v4/pkg/errorhandling" + "github.com/containers/podman/v5/pkg/api/handlers" + "github.com/containers/podman/v5/pkg/bindings" + entitiesTypes "github.com/containers/podman/v5/pkg/domain/entities/types" + "github.com/containers/podman/v5/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 c7b7114e2d..b9ae5122f9 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/v4/pkg/bindings/internal/util" + "github.com/containers/podman/v5/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 ca043986f9..3dd4f0a004 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/v4/pkg/bindings/internal/util" + "github.com/containers/podman/v5/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 cf630f36ba..75c501a5b6 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/v4/pkg/bindings/internal/util" + "github.com/containers/podman/v5/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 547afe5d3a..489800c6ca 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/v4/pkg/bindings/internal/util" + "github.com/containers/podman/v5/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 af6ce44f82..038b753b63 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/v4/pkg/bindings/internal/util" + "github.com/containers/podman/v5/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 6f38ad9b70..0bee2b0fd9 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/v4/pkg/bindings/internal/util" + "github.com/containers/podman/v5/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 9d1f3749a8..dac0417f79 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/v4/pkg/bindings/internal/util" + "github.com/containers/podman/v5/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 53c30617f9..a0bbd57daa 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/v4/pkg/bindings/internal/util" + "github.com/containers/podman/v5/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 d2beb641bb..957bab982b 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/v4/pkg/bindings/internal/util" + "github.com/containers/podman/v5/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 59f3000e6b..ec971037b8 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/v4/pkg/bindings/internal/util" + "github.com/containers/podman/v5/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 ad7b6ca0a2..f3e662b199 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/v4/pkg/bindings/internal/util" + "github.com/containers/podman/v5/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 1982108455..e635780a2b 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/v4/pkg/bindings/internal/util" + "github.com/containers/podman/v5/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 3d165c5038..c8e415ec60 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/v4/pkg/bindings/internal/util" + "github.com/containers/podman/v5/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 0cd5c3447b..01f316d01a 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/v4/pkg/bindings/internal/util" + "github.com/containers/podman/v5/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 0413fbab2f..49313f94c9 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/v4/pkg/bindings" - entitiesTypes "github.com/containers/podman/v4/pkg/domain/entities/types" + "github.com/containers/podman/v5/pkg/bindings" + entitiesTypes "github.com/containers/podman/v5/pkg/domain/entities/types" ) // 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 19ae02d720..8403b1f805 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/v4/pkg/bindings/internal/util" + "github.com/containers/podman/v5/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 5ef8a1276c..0456ff77a4 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/v4/pkg/bindings/internal/util" + "github.com/containers/podman/v5/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 97351e16d0..1dd120fa67 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/v4/pkg/bindings/internal/util" + "github.com/containers/podman/v5/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 f8a060fdda..5dff2f91ca 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/v4/pkg/bindings/internal/util" + "github.com/containers/podman/v5/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 a75ffc9821..bf70481360 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/v4/libpod/define" - "github.com/containers/podman/v4/pkg/bindings" + "github.com/containers/podman/v5/libpod/define" + "github.com/containers/podman/v5/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 9dc3736a58..e97ebc7b66 100644 --- a/pkg/bindings/system/system.go +++ b/pkg/bindings/system/system.go @@ -9,9 +9,9 @@ import ( "net/http" "time" - "github.com/containers/podman/v4/libpod/define" - "github.com/containers/podman/v4/pkg/bindings" - "github.com/containers/podman/v4/pkg/domain/entities/types" + "github.com/containers/podman/v5/libpod/define" + "github.com/containers/podman/v5/pkg/bindings" + "github.com/containers/podman/v5/pkg/domain/entities/types" "github.com/sirupsen/logrus" ) diff --git a/pkg/bindings/system/types_disk_options.go b/pkg/bindings/system/types_disk_options.go index 7f9cd000e0..0acb3c55b2 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/v4/pkg/bindings/internal/util" + "github.com/containers/podman/v5/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 d7f0572674..3a8920cf54 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/v4/pkg/bindings/internal/util" + "github.com/containers/podman/v5/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 eae6a74bf8..dce750c4c7 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/v4/pkg/bindings/internal/util" + "github.com/containers/podman/v5/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 d004985205..b9758eafb9 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/v4/pkg/bindings/internal/util" + "github.com/containers/podman/v5/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 30e02dd95f..d13f24392c 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/v4/pkg/bindings/internal/util" + "github.com/containers/podman/v5/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 b1789f6add..6d6ac3bdb7 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/v4/libpod/define" - "github.com/containers/podman/v4/pkg/bindings/containers" - "github.com/containers/podman/v4/pkg/specgen" + "github.com/containers/podman/v5/libpod/define" + "github.com/containers/podman/v5/pkg/bindings/containers" + "github.com/containers/podman/v5/pkg/specgen" . "github.com/onsi/ginkgo/v2" . "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 fb5011906e..017dafad7c 100644 --- a/pkg/bindings/test/auth_test.go +++ b/pkg/bindings/test/auth_test.go @@ -6,8 +6,8 @@ import ( "github.com/containers/common/pkg/auth" "github.com/containers/image/v5/types" - podmanRegistry "github.com/containers/podman/v4/hack/podman-registry-go" - "github.com/containers/podman/v4/pkg/bindings/images" + podmanRegistry "github.com/containers/podman/v5/hack/podman-registry-go" + "github.com/containers/podman/v5/pkg/bindings/images" . "github.com/onsi/ginkgo/v2" . "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 a23b3c6401..9544d170d0 100644 --- a/pkg/bindings/test/common_test.go +++ b/pkg/bindings/test/common_test.go @@ -9,10 +9,10 @@ import ( "strings" "time" - "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/containers/podman/v5/libpod/define" + . "github.com/containers/podman/v5/pkg/bindings" + "github.com/containers/podman/v5/pkg/bindings/containers" + "github.com/containers/podman/v5/pkg/specgen" "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/pkg/bindings/test/connection_test.go b/pkg/bindings/test/connection_test.go index dd5fdcd197..73d8e52f1f 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/v4/pkg/bindings/containers" - "github.com/containers/podman/v4/pkg/bindings/system" + "github.com/containers/podman/v5/pkg/bindings/containers" + "github.com/containers/podman/v5/pkg/bindings/system" . "github.com/onsi/ginkgo/v2" . "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 12ff16dbd2..be41826390 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/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/containers/podman/v5/libpod/define" + "github.com/containers/podman/v5/pkg/bindings" + "github.com/containers/podman/v5/pkg/bindings/containers" + "github.com/containers/podman/v5/pkg/domain/entities/reports" + "github.com/containers/podman/v5/pkg/specgen" . "github.com/onsi/ginkgo/v2" . "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 abb0df95e1..c8818454f5 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/v4/pkg/bindings/containers" - "github.com/containers/podman/v4/pkg/specgen" + "github.com/containers/podman/v5/pkg/bindings/containers" + "github.com/containers/podman/v5/pkg/specgen" . "github.com/onsi/ginkgo/v2" . "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 97fc6dc9df..a0081e8a88 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/v4/pkg/api/handlers" - "github.com/containers/podman/v4/pkg/bindings/containers" + "github.com/containers/podman/v5/pkg/api/handlers" + "github.com/containers/podman/v5/pkg/bindings/containers" . "github.com/onsi/ginkgo/v2" . "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 6bc2cf5d15..b5c1ea10bd 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/v4/pkg/bindings/containers" + "github.com/containers/podman/v5/pkg/bindings/containers" . "github.com/onsi/ginkgo/v2" . "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 e607f71dfd..1b0a23c63f 100644 --- a/pkg/bindings/test/images_test.go +++ b/pkg/bindings/test/images_test.go @@ -8,12 +8,12 @@ import ( "path/filepath" "time" - podmanRegistry "github.com/containers/podman/v4/hack/podman-registry-go" - "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/bindings/images" - "github.com/containers/podman/v4/pkg/domain/entities" + podmanRegistry "github.com/containers/podman/v5/hack/podman-registry-go" + "github.com/containers/podman/v5/libpod/define" + "github.com/containers/podman/v5/pkg/bindings" + "github.com/containers/podman/v5/pkg/bindings/containers" + "github.com/containers/podman/v5/pkg/bindings/images" + "github.com/containers/podman/v5/pkg/domain/entities" . "github.com/onsi/ginkgo/v2" . "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 4baf116b5c..7fc7f4c32d 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/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/containers/podman/v5/pkg/bindings/containers" + "github.com/containers/podman/v5/pkg/bindings/images" + "github.com/containers/podman/v5/pkg/bindings/system" + "github.com/containers/podman/v5/pkg/specgen" . "github.com/onsi/ginkgo/v2" . "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 f214edfde3..6648d11ec1 100644 --- a/pkg/bindings/test/manifests_test.go +++ b/pkg/bindings/test/manifests_test.go @@ -6,10 +6,10 @@ import ( "net/http" "time" - podmanRegistry "github.com/containers/podman/v4/hack/podman-registry-go" - "github.com/containers/podman/v4/pkg/bindings" - "github.com/containers/podman/v4/pkg/bindings/images" - "github.com/containers/podman/v4/pkg/bindings/manifests" + podmanRegistry "github.com/containers/podman/v5/hack/podman-registry-go" + "github.com/containers/podman/v5/pkg/bindings" + "github.com/containers/podman/v5/pkg/bindings/images" + "github.com/containers/podman/v5/pkg/bindings/manifests" . "github.com/onsi/ginkgo/v2" . "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 55db4e7a5b..c7b61aee28 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/v4/pkg/bindings" - "github.com/containers/podman/v4/pkg/bindings/containers" - "github.com/containers/podman/v4/pkg/bindings/network" + "github.com/containers/podman/v5/pkg/bindings" + "github.com/containers/podman/v5/pkg/bindings/containers" + "github.com/containers/podman/v5/pkg/bindings/network" . "github.com/onsi/ginkgo/v2" . "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 7e559714bd..9db33af529 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/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/containers/podman/v5/libpod/define" + "github.com/containers/podman/v5/pkg/bindings" + "github.com/containers/podman/v5/pkg/bindings/pods" + "github.com/containers/podman/v5/pkg/domain/entities" + "github.com/containers/podman/v5/pkg/errorhandling" + "github.com/containers/podman/v5/pkg/specgen" + "github.com/containers/podman/v5/utils" . "github.com/onsi/ginkgo/v2" . "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 4e4b510afe..3a2421c8a3 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/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/containers/podman/v5/pkg/bindings" + "github.com/containers/podman/v5/pkg/bindings/containers" + "github.com/containers/podman/v5/pkg/bindings/images" + "github.com/containers/podman/v5/pkg/bindings/pods" + "github.com/containers/podman/v5/pkg/bindings/system" . "github.com/onsi/ginkgo/v2" . "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 6a44dae1ed..b9f93f1139 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/v4/pkg/bindings" - "github.com/containers/podman/v4/pkg/bindings/secrets" + "github.com/containers/podman/v5/pkg/bindings" + "github.com/containers/podman/v5/pkg/bindings/secrets" . "github.com/onsi/ginkgo/v2" . "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 a906879832..f55752f592 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/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/containers/podman/v5/pkg/bindings/containers" + "github.com/containers/podman/v5/pkg/bindings/pods" + "github.com/containers/podman/v5/pkg/bindings/system" + "github.com/containers/podman/v5/pkg/bindings/volumes" + "github.com/containers/podman/v5/pkg/domain/entities" + "github.com/containers/podman/v5/pkg/domain/entities/reports" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "github.com/onsi/gomega/gexec" diff --git a/pkg/bindings/test/types_test.go b/pkg/bindings/test/types_test.go index fb322a69d4..1de29279e2 100644 --- a/pkg/bindings/test/types_test.go +++ b/pkg/bindings/test/types_test.go @@ -3,9 +3,9 @@ package bindings_test import ( "bytes" - "github.com/containers/podman/v4/pkg/bindings/images" - "github.com/containers/podman/v4/pkg/bindings/kube" - "github.com/containers/podman/v4/pkg/bindings/manifests" + "github.com/containers/podman/v5/pkg/bindings/images" + "github.com/containers/podman/v5/pkg/bindings/kube" + "github.com/containers/podman/v5/pkg/bindings/manifests" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/pkg/bindings/test/volumes_test.go b/pkg/bindings/test/volumes_test.go index 62950d3fd0..7fc64178b4 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/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/containers/podman/v5/pkg/bindings" + "github.com/containers/podman/v5/pkg/bindings/containers" + "github.com/containers/podman/v5/pkg/bindings/volumes" + "github.com/containers/podman/v5/pkg/domain/entities" + "github.com/containers/podman/v5/pkg/domain/entities/reports" . "github.com/onsi/ginkgo/v2" . "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 49c59f48ac..98ac9d746a 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/v4/pkg/bindings/internal/util" + "github.com/containers/podman/v5/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 3493c23ead..70f5f5cb05 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/v4/pkg/bindings/internal/util" + "github.com/containers/podman/v5/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 a4aefd9941..913faa5e99 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/v4/pkg/bindings/internal/util" + "github.com/containers/podman/v5/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 3d1930bf4c..2db1d37ae4 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/v4/pkg/bindings/internal/util" + "github.com/containers/podman/v5/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 3b4671c47c..ad4346a89d 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/v4/pkg/bindings/internal/util" + "github.com/containers/podman/v5/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 356527705a..577633e2b6 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/v4/pkg/bindings/internal/util" + "github.com/containers/podman/v5/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 f52ac46405..6ad1b9fb84 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/v4/pkg/bindings" - "github.com/containers/podman/v4/pkg/domain/entities/reports" - entitiesTypes "github.com/containers/podman/v4/pkg/domain/entities/types" + "github.com/containers/podman/v5/pkg/bindings" + "github.com/containers/podman/v5/pkg/domain/entities/reports" + entitiesTypes "github.com/containers/podman/v5/pkg/domain/entities/types" jsoniter "github.com/json-iterator/go" ) diff --git a/pkg/checkpoint/checkpoint_restore.go b/pkg/checkpoint/checkpoint_restore.go index 8e8224d7ed..e80e1cf1f3 100644 --- a/pkg/checkpoint/checkpoint_restore.go +++ b/pkg/checkpoint/checkpoint_restore.go @@ -11,13 +11,13 @@ import ( metadata "github.com/checkpoint-restore/checkpointctl/lib" "github.com/containers/common/libimage" "github.com/containers/common/pkg/config" - "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" + "github.com/containers/podman/v5/libpod" + ann "github.com/containers/podman/v5/pkg/annotations" + "github.com/containers/podman/v5/pkg/checkpoint/crutils" + "github.com/containers/podman/v5/pkg/criu" + "github.com/containers/podman/v5/pkg/domain/entities" + "github.com/containers/podman/v5/pkg/specgen/generate" + "github.com/containers/podman/v5/pkg/specgenutil" spec "github.com/opencontainers/runtime-spec/specs-go" "github.com/sirupsen/logrus" ) diff --git a/pkg/copy/fileinfo.go b/pkg/copy/fileinfo.go index 7d4e67896f..b0d31e5e07 100644 --- a/pkg/copy/fileinfo.go +++ b/pkg/copy/fileinfo.go @@ -10,7 +10,7 @@ import ( "path/filepath" "strings" - "github.com/containers/podman/v4/libpod/define" + "github.com/containers/podman/v5/libpod/define" ) // XDockerContainerPathStatHeader is the *key* in http headers pointing to the diff --git a/pkg/domain/entities/container_ps.go b/pkg/domain/entities/container_ps.go index 99aa0daa9c..0cd8e740f9 100644 --- a/pkg/domain/entities/container_ps.go +++ b/pkg/domain/entities/container_ps.go @@ -5,7 +5,7 @@ import ( "sort" "strings" - "github.com/containers/podman/v4/pkg/domain/entities/types" + "github.com/containers/podman/v5/pkg/domain/entities/types" ) // ListContainer describes a container suitable for listing diff --git a/pkg/domain/entities/containers.go b/pkg/domain/entities/containers.go index 1a05588623..24c1d78f8a 100644 --- a/pkg/domain/entities/containers.go +++ b/pkg/domain/entities/containers.go @@ -8,9 +8,9 @@ import ( nettypes "github.com/containers/common/libnetwork/types" imageTypes "github.com/containers/image/v5/types" - "github.com/containers/podman/v4/libpod/define" - "github.com/containers/podman/v4/pkg/domain/entities/types" - "github.com/containers/podman/v4/pkg/specgen" + "github.com/containers/podman/v5/libpod/define" + "github.com/containers/podman/v5/pkg/domain/entities/types" + "github.com/containers/podman/v5/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 7bb037ff1b..5c9c53517f 100644 --- a/pkg/domain/entities/engine_container.go +++ b/pkg/domain/entities/engine_container.go @@ -6,10 +6,10 @@ import ( netTypes "github.com/containers/common/libnetwork/types" "github.com/containers/common/pkg/config" - "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" - "github.com/containers/podman/v4/pkg/specgen" + "github.com/containers/podman/v5/libpod/define" + "github.com/containers/podman/v5/pkg/domain/entities/reports" + "github.com/containers/podman/v5/pkg/domain/entities/types" + "github.com/containers/podman/v5/pkg/specgen" ) type ContainerCopyFunc = types.ContainerCopyFunc diff --git a/pkg/domain/entities/engine_image.go b/pkg/domain/entities/engine_image.go index fee4656fb0..09941a39da 100644 --- a/pkg/domain/entities/engine_image.go +++ b/pkg/domain/entities/engine_image.go @@ -5,7 +5,7 @@ import ( "github.com/containers/common/pkg/config" "github.com/containers/common/pkg/ssh" - "github.com/containers/podman/v4/pkg/domain/entities/reports" + "github.com/containers/podman/v5/pkg/domain/entities/reports" ) type ImageEngine interface { //nolint:interfacebloat diff --git a/pkg/domain/entities/events.go b/pkg/domain/entities/events.go index f1b4e0c90e..5d41addb73 100644 --- a/pkg/domain/entities/events.go +++ b/pkg/domain/entities/events.go @@ -4,8 +4,8 @@ import ( "strconv" "time" - libpodEvents "github.com/containers/podman/v4/libpod/events" - types "github.com/containers/podman/v4/pkg/domain/entities/types" + libpodEvents "github.com/containers/podman/v5/libpod/events" + types "github.com/containers/podman/v5/pkg/domain/entities/types" dockerEvents "github.com/docker/docker/api/types/events" ) diff --git a/pkg/domain/entities/generate.go b/pkg/domain/entities/generate.go index c123187ced..8a54ce2905 100644 --- a/pkg/domain/entities/generate.go +++ b/pkg/domain/entities/generate.go @@ -1,7 +1,7 @@ package entities import ( - "github.com/containers/podman/v4/pkg/domain/entities/types" + "github.com/containers/podman/v5/pkg/domain/entities/types" ) // GenerateSystemdOptions control the generation of systemd unit files. diff --git a/pkg/domain/entities/images.go b/pkg/domain/entities/images.go index 0a4b234068..247e9cf643 100644 --- a/pkg/domain/entities/images.go +++ b/pkg/domain/entities/images.go @@ -9,7 +9,7 @@ import ( "github.com/containers/image/v5/signature/signer" "github.com/containers/image/v5/types" encconfig "github.com/containers/ocicrypt/config" - entitiesTypes "github.com/containers/podman/v4/pkg/domain/entities/types" + entitiesTypes "github.com/containers/podman/v5/pkg/domain/entities/types" "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/machine.go b/pkg/domain/entities/machine.go index bd8be9779c..74c025db5d 100644 --- a/pkg/domain/entities/machine.go +++ b/pkg/domain/entities/machine.go @@ -1,6 +1,6 @@ package entities -import "github.com/containers/podman/v4/libpod/define" +import "github.com/containers/podman/v5/libpod/define" type ListReporter struct { Name string diff --git a/pkg/domain/entities/manifest.go b/pkg/domain/entities/manifest.go index 943a29e054..303995903b 100644 --- a/pkg/domain/entities/manifest.go +++ b/pkg/domain/entities/manifest.go @@ -2,7 +2,7 @@ package entities import ( "github.com/containers/image/v5/types" - entitiesTypes "github.com/containers/podman/v4/pkg/domain/entities/types" + entitiesTypes "github.com/containers/podman/v5/pkg/domain/entities/types" ) // ManifestCreateOptions provides model for creating manifest diff --git a/pkg/domain/entities/network.go b/pkg/domain/entities/network.go index d5774ba972..c2e223233c 100644 --- a/pkg/domain/entities/network.go +++ b/pkg/domain/entities/network.go @@ -3,7 +3,7 @@ package entities import ( "net" - entitiesTypes "github.com/containers/podman/v4/pkg/domain/entities/types" + entitiesTypes "github.com/containers/podman/v5/pkg/domain/entities/types" ) // NetworkListOptions describes options for listing networks in cli diff --git a/pkg/domain/entities/play.go b/pkg/domain/entities/play.go index e837608c7a..eaec3690be 100644 --- a/pkg/domain/entities/play.go +++ b/pkg/domain/entities/play.go @@ -4,7 +4,7 @@ import ( "net" "github.com/containers/image/v5/types" - entitiesTypes "github.com/containers/podman/v4/pkg/domain/entities/types" + entitiesTypes "github.com/containers/podman/v5/pkg/domain/entities/types" ) // PlayKubeOptions controls playing kube YAML files. diff --git a/pkg/domain/entities/pods.go b/pkg/domain/entities/pods.go index c37ada47b1..51167a1183 100644 --- a/pkg/domain/entities/pods.go +++ b/pkg/domain/entities/pods.go @@ -5,9 +5,9 @@ import ( "strings" commonFlag "github.com/containers/common/pkg/flag" - "github.com/containers/podman/v4/pkg/domain/entities/types" - "github.com/containers/podman/v4/pkg/specgen" - "github.com/containers/podman/v4/pkg/util" + "github.com/containers/podman/v5/pkg/domain/entities/types" + "github.com/containers/podman/v5/pkg/specgen" + "github.com/containers/podman/v5/pkg/util" "github.com/opencontainers/runtime-spec/specs-go" ) diff --git a/pkg/domain/entities/secrets.go b/pkg/domain/entities/secrets.go index 45936ded9f..cd35ab4cc9 100644 --- a/pkg/domain/entities/secrets.go +++ b/pkg/domain/entities/secrets.go @@ -1,8 +1,8 @@ package entities import ( - "github.com/containers/podman/v4/pkg/domain/entities/types" - "github.com/containers/podman/v4/pkg/errorhandling" + "github.com/containers/podman/v5/pkg/domain/entities/types" + "github.com/containers/podman/v5/pkg/errorhandling" ) type SecretCreateReport = types.SecretCreateReport diff --git a/pkg/domain/entities/system.go b/pkg/domain/entities/system.go index 685b3125d4..5d11f0a326 100644 --- a/pkg/domain/entities/system.go +++ b/pkg/domain/entities/system.go @@ -1,7 +1,7 @@ package entities import ( - "github.com/containers/podman/v4/pkg/domain/entities/types" + "github.com/containers/podman/v5/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 99cd33a9c0..52901c03f2 100644 --- a/pkg/domain/entities/types.go +++ b/pkg/domain/entities/types.go @@ -4,10 +4,10 @@ import ( "net" "github.com/containers/common/libnetwork/types" - "github.com/containers/podman/v4/libpod/define" - "github.com/containers/podman/v4/libpod/events" - entitiesTypes "github.com/containers/podman/v4/pkg/domain/entities/types" - "github.com/containers/podman/v4/pkg/specgen" + "github.com/containers/podman/v5/libpod/define" + "github.com/containers/podman/v5/libpod/events" + entitiesTypes "github.com/containers/podman/v5/pkg/domain/entities/types" + "github.com/containers/podman/v5/pkg/specgen" "github.com/containers/storage/pkg/archive" dockerAPI "github.com/docker/docker/api/types" ) diff --git a/pkg/domain/entities/types/container_ps.go b/pkg/domain/entities/types/container_ps.go index f1430b1c51..73f70dbe4c 100644 --- a/pkg/domain/entities/types/container_ps.go +++ b/pkg/domain/entities/types/container_ps.go @@ -4,7 +4,7 @@ import ( "time" netTypes "github.com/containers/common/libnetwork/types" - define "github.com/containers/podman/v4/pkg/ps/define" + define "github.com/containers/podman/v5/pkg/ps/define" ) // ListContainer describes a container suitable for listing diff --git a/pkg/domain/entities/types/containers.go b/pkg/domain/entities/types/containers.go index fa4c042920..f9d922e229 100644 --- a/pkg/domain/entities/types/containers.go +++ b/pkg/domain/entities/types/containers.go @@ -1,8 +1,8 @@ package types import ( - "github.com/containers/podman/v4/libpod/define" - "github.com/containers/podman/v4/pkg/specgen" + "github.com/containers/podman/v5/libpod/define" + "github.com/containers/podman/v5/pkg/specgen" ) type ContainerCopyFunc func() error diff --git a/pkg/domain/entities/types/images.go b/pkg/domain/entities/types/images.go index 1c012f7007..1a63d5d809 100644 --- a/pkg/domain/entities/types/images.go +++ b/pkg/domain/entities/types/images.go @@ -3,8 +3,8 @@ package types import ( "time" - "github.com/containers/podman/v4/pkg/inspect" - "github.com/containers/podman/v4/pkg/trust" + "github.com/containers/podman/v5/pkg/inspect" + "github.com/containers/podman/v5/pkg/trust" ) // swagger:model LibpodImageSummary diff --git a/pkg/domain/entities/types/pods.go b/pkg/domain/entities/types/pods.go index c4d6cb91b1..4a42558006 100644 --- a/pkg/domain/entities/types/pods.go +++ b/pkg/domain/entities/types/pods.go @@ -3,8 +3,8 @@ package types import ( "time" - "github.com/containers/podman/v4/libpod/define" - "github.com/containers/podman/v4/pkg/specgen" + "github.com/containers/podman/v5/libpod/define" + "github.com/containers/podman/v5/pkg/specgen" ) type PodPruneReport struct { diff --git a/pkg/domain/entities/types/system.go b/pkg/domain/entities/types/system.go index 3100370052..3d1361ef01 100644 --- a/pkg/domain/entities/types/system.go +++ b/pkg/domain/entities/types/system.go @@ -3,8 +3,8 @@ package types import ( "time" - "github.com/containers/podman/v4/libpod/define" - "github.com/containers/podman/v4/pkg/domain/entities/reports" + "github.com/containers/podman/v5/libpod/define" + "github.com/containers/podman/v5/pkg/domain/entities/reports" ) // ServiceOptions provides the input for starting an API and sidecar pprof services diff --git a/pkg/domain/entities/types/volumes.go b/pkg/domain/entities/types/volumes.go index e5c89edef1..3a47d9d7b7 100644 --- a/pkg/domain/entities/types/volumes.go +++ b/pkg/domain/entities/types/volumes.go @@ -1,7 +1,7 @@ package types import ( - "github.com/containers/podman/v4/libpod/define" + "github.com/containers/podman/v5/libpod/define" ) // swagger:model diff --git a/pkg/domain/entities/volumes.go b/pkg/domain/entities/volumes.go index ab68fcf97e..a0acd3a7f0 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/v4/pkg/domain/entities/types" + "github.com/containers/podman/v5/pkg/domain/entities/types" ) // VolumeCreateOptions provides details for creating volumes diff --git a/pkg/domain/filters/containers.go b/pkg/domain/filters/containers.go index d690a0bdc9..d69b46fa32 100644 --- a/pkg/domain/filters/containers.go +++ b/pkg/domain/filters/containers.go @@ -11,8 +11,8 @@ import ( "github.com/containers/common/pkg/filters" "github.com/containers/common/pkg/util" - "github.com/containers/podman/v4/libpod" - "github.com/containers/podman/v4/libpod/define" + "github.com/containers/podman/v5/libpod" + "github.com/containers/podman/v5/libpod/define" "golang.org/x/exp/slices" ) diff --git a/pkg/domain/filters/pods.go b/pkg/domain/filters/pods.go index 9943ab7e57..3529f01276 100644 --- a/pkg/domain/filters/pods.go +++ b/pkg/domain/filters/pods.go @@ -10,8 +10,8 @@ import ( "github.com/containers/common/pkg/filters" "github.com/containers/common/pkg/util" - "github.com/containers/podman/v4/libpod" - "github.com/containers/podman/v4/libpod/define" + "github.com/containers/podman/v5/libpod" + "github.com/containers/podman/v5/libpod/define" "golang.org/x/exp/slices" ) diff --git a/pkg/domain/filters/volumes.go b/pkg/domain/filters/volumes.go index 28e541b522..07e2cac86c 100644 --- a/pkg/domain/filters/volumes.go +++ b/pkg/domain/filters/volumes.go @@ -8,8 +8,8 @@ import ( "time" "github.com/containers/common/pkg/filters" - "github.com/containers/podman/v4/libpod" - "github.com/containers/podman/v4/pkg/util" + "github.com/containers/podman/v5/libpod" + "github.com/containers/podman/v5/pkg/util" ) func GenerateVolumeFilters(filter string, filterValues []string, runtime *libpod.Runtime) (libpod.VolumeFilter, error) { diff --git a/pkg/domain/infra/abi/apply.go b/pkg/domain/infra/abi/apply.go index 51cd4e909c..9031546365 100644 --- a/pkg/domain/infra/abi/apply.go +++ b/pkg/domain/infra/abi/apply.go @@ -12,8 +12,8 @@ import ( "os" "strings" - "github.com/containers/podman/v4/pkg/domain/entities" - k8sAPI "github.com/containers/podman/v4/pkg/k8s.io/api/core/v1" + "github.com/containers/podman/v5/pkg/domain/entities" + k8sAPI "github.com/containers/podman/v5/pkg/k8s.io/api/core/v1" "sigs.k8s.io/yaml" ) diff --git a/pkg/domain/infra/abi/archive.go b/pkg/domain/infra/abi/archive.go index de96cf8b0b..49dc9f3f04 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/v4/pkg/domain/entities" + "github.com/containers/podman/v5/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 028ea5a07d..57504e92a1 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/v4/pkg/autoupdate" - "github.com/containers/podman/v4/pkg/domain/entities" + "github.com/containers/podman/v5/pkg/autoupdate" + "github.com/containers/podman/v5/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 4ab040a52b..9016398bb5 100644 --- a/pkg/domain/infra/abi/containers.go +++ b/pkg/domain/infra/abi/containers.go @@ -15,24 +15,24 @@ import ( "github.com/containers/common/pkg/cgroups" "github.com/containers/common/pkg/config" "github.com/containers/image/v5/manifest" - "github.com/containers/podman/v4/libpod" - "github.com/containers/podman/v4/libpod/define" - "github.com/containers/podman/v4/libpod/logs" - "github.com/containers/podman/v4/pkg/api/handlers" - "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/podman/v5/libpod" + "github.com/containers/podman/v5/libpod/define" + "github.com/containers/podman/v5/libpod/logs" + "github.com/containers/podman/v5/pkg/api/handlers" + "github.com/containers/podman/v5/pkg/checkpoint" + "github.com/containers/podman/v5/pkg/domain/entities" + "github.com/containers/podman/v5/pkg/domain/entities/reports" + dfilters "github.com/containers/podman/v5/pkg/domain/filters" + "github.com/containers/podman/v5/pkg/domain/infra/abi/terminal" + "github.com/containers/podman/v5/pkg/errorhandling" + parallelctr "github.com/containers/podman/v5/pkg/parallel/ctr" + "github.com/containers/podman/v5/pkg/ps" + "github.com/containers/podman/v5/pkg/rootless" + "github.com/containers/podman/v5/pkg/signal" + "github.com/containers/podman/v5/pkg/specgen" + "github.com/containers/podman/v5/pkg/specgen/generate" + "github.com/containers/podman/v5/pkg/specgenutil" + "github.com/containers/podman/v5/pkg/util" "github.com/containers/storage" "github.com/sirupsen/logrus" ) diff --git a/pkg/domain/infra/abi/containers_runlabel.go b/pkg/domain/infra/abi/containers_runlabel.go index 26626fd501..2ee64441fc 100644 --- a/pkg/domain/infra/abi/containers_runlabel.go +++ b/pkg/domain/infra/abi/containers_runlabel.go @@ -10,10 +10,10 @@ import ( "github.com/containers/common/libimage" "github.com/containers/common/pkg/config" - "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/containers/podman/v5/libpod/define" + "github.com/containers/podman/v5/pkg/domain/entities" + envLib "github.com/containers/podman/v5/pkg/env" + "github.com/containers/podman/v5/utils" "github.com/google/shlex" "github.com/sirupsen/logrus" ) diff --git a/pkg/domain/infra/abi/containers_stat.go b/pkg/domain/infra/abi/containers_stat.go index 2183d39f09..99cde00350 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/v4/pkg/domain/entities" + "github.com/containers/podman/v5/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 dffe1ac1a2..ffbd119f1c 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/v4/libpod/events" - "github.com/containers/podman/v4/pkg/domain/entities" + "github.com/containers/podman/v5/libpod/events" + "github.com/containers/podman/v5/pkg/domain/entities" ) func (ic *ContainerEngine) Events(ctx context.Context, opts entities.EventsOptions) error { diff --git a/pkg/domain/infra/abi/farm.go b/pkg/domain/infra/abi/farm.go index 121a106896..a055fdef49 100644 --- a/pkg/domain/infra/abi/farm.go +++ b/pkg/domain/infra/abi/farm.go @@ -9,8 +9,8 @@ import ( "github.com/containers/buildah/pkg/parse" lplatform "github.com/containers/common/libimage/platform" - "github.com/containers/podman/v4/pkg/domain/entities" - "github.com/containers/podman/v4/pkg/emulation" + "github.com/containers/podman/v5/pkg/domain/entities" + "github.com/containers/podman/v5/pkg/emulation" ) // FarmNodeName returns the local engine's name. diff --git a/pkg/domain/infra/abi/generate.go b/pkg/domain/infra/abi/generate.go index 801bab3496..e48e52d446 100644 --- a/pkg/domain/infra/abi/generate.go +++ b/pkg/domain/infra/abi/generate.go @@ -7,13 +7,13 @@ import ( "fmt" "strings" - "github.com/containers/podman/v4/libpod" - "github.com/containers/podman/v4/libpod/define" - "github.com/containers/podman/v4/pkg/domain/entities" - k8sAPI "github.com/containers/podman/v4/pkg/k8s.io/api/core/v1" - "github.com/containers/podman/v4/pkg/specgen" - generateUtils "github.com/containers/podman/v4/pkg/specgen/generate" - "github.com/containers/podman/v4/pkg/systemd/generate" + "github.com/containers/podman/v5/libpod" + "github.com/containers/podman/v5/libpod/define" + "github.com/containers/podman/v5/pkg/domain/entities" + k8sAPI "github.com/containers/podman/v5/pkg/k8s.io/api/core/v1" + "github.com/containers/podman/v5/pkg/specgen" + generateUtils "github.com/containers/podman/v5/pkg/specgen/generate" + "github.com/containers/podman/v5/pkg/systemd/generate" "sigs.k8s.io/yaml" ) diff --git a/pkg/domain/infra/abi/healthcheck.go b/pkg/domain/infra/abi/healthcheck.go index 8761521ccb..b464c88c4b 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/v4/libpod/define" - "github.com/containers/podman/v4/pkg/domain/entities" + "github.com/containers/podman/v5/libpod/define" + "github.com/containers/podman/v5/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 6c06d68afe..f0eb556bc0 100644 --- a/pkg/domain/infra/abi/images.go +++ b/pkg/domain/infra/abi/images.go @@ -27,12 +27,12 @@ import ( "github.com/containers/image/v5/signature" "github.com/containers/image/v5/transports" "github.com/containers/image/v5/transports/alltransports" - "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/v5/libpod/define" + "github.com/containers/podman/v5/pkg/domain/entities" + "github.com/containers/podman/v5/pkg/domain/entities/reports" + domainUtils "github.com/containers/podman/v5/pkg/domain/utils" + "github.com/containers/podman/v5/pkg/errorhandling" + "github.com/containers/podman/v5/pkg/rootless" "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/images_list.go b/pkg/domain/infra/abi/images_list.go index 706c40a22f..2dafc8218b 100644 --- a/pkg/domain/infra/abi/images_list.go +++ b/pkg/domain/infra/abi/images_list.go @@ -5,8 +5,8 @@ import ( "fmt" "github.com/containers/common/libimage" - "github.com/containers/podman/v4/libpod/define" - "github.com/containers/podman/v4/pkg/domain/entities" + "github.com/containers/podman/v5/libpod/define" + "github.com/containers/podman/v5/pkg/domain/entities" "golang.org/x/exp/slices" ) diff --git a/pkg/domain/infra/abi/manifest.go b/pkg/domain/infra/abi/manifest.go index d5436a7129..65037ce5cc 100644 --- a/pkg/domain/infra/abi/manifest.go +++ b/pkg/domain/infra/abi/manifest.go @@ -18,8 +18,8 @@ import ( "github.com/containers/image/v5/transports" "github.com/containers/image/v5/transports/alltransports" "github.com/containers/image/v5/types" - "github.com/containers/podman/v4/pkg/domain/entities" - envLib "github.com/containers/podman/v4/pkg/env" + "github.com/containers/podman/v5/pkg/domain/entities" + envLib "github.com/containers/podman/v5/pkg/env" "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 166176b4ea..683b16576e 100644 --- a/pkg/domain/infra/abi/network.go +++ b/pkg/domain/infra/abi/network.go @@ -8,8 +8,8 @@ import ( "github.com/containers/common/libnetwork/types" netutil "github.com/containers/common/libnetwork/util" - "github.com/containers/podman/v4/libpod/define" - "github.com/containers/podman/v4/pkg/domain/entities" + "github.com/containers/podman/v5/libpod/define" + "github.com/containers/podman/v5/pkg/domain/entities" "golang.org/x/exp/slices" ) diff --git a/pkg/domain/infra/abi/parse/parse.go b/pkg/domain/infra/abi/parse/parse.go index 19d26c39e2..571e52a951 100644 --- a/pkg/domain/infra/abi/parse/parse.go +++ b/pkg/domain/infra/abi/parse/parse.go @@ -5,8 +5,8 @@ import ( "strconv" "strings" - "github.com/containers/podman/v4/libpod" - "github.com/containers/podman/v4/libpod/define" + "github.com/containers/podman/v5/libpod" + "github.com/containers/podman/v5/libpod/define" "github.com/docker/go-units" "github.com/sirupsen/logrus" ) diff --git a/pkg/domain/infra/abi/play.go b/pkg/domain/infra/abi/play.go index c977704554..9db0380878 100644 --- a/pkg/domain/infra/abi/play.go +++ b/pkg/domain/infra/abi/play.go @@ -20,21 +20,21 @@ import ( "github.com/containers/common/pkg/secrets" "github.com/containers/image/v5/docker/reference" "github.com/containers/image/v5/types" - "github.com/containers/podman/v4/cmd/podman/parse" - "github.com/containers/podman/v4/libpod" - "github.com/containers/podman/v4/libpod/define" - "github.com/containers/podman/v4/pkg/domain/entities" - entitiesTypes "github.com/containers/podman/v4/pkg/domain/entities/types" - v1apps "github.com/containers/podman/v4/pkg/k8s.io/api/apps/v1" - v1 "github.com/containers/podman/v4/pkg/k8s.io/api/core/v1" - metav1 "github.com/containers/podman/v4/pkg/k8s.io/apimachinery/pkg/apis/meta/v1" - "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/systemd/notifyproxy" - "github.com/containers/podman/v4/pkg/util" - "github.com/containers/podman/v4/utils" + "github.com/containers/podman/v5/cmd/podman/parse" + "github.com/containers/podman/v5/libpod" + "github.com/containers/podman/v5/libpod/define" + "github.com/containers/podman/v5/pkg/domain/entities" + entitiesTypes "github.com/containers/podman/v5/pkg/domain/entities/types" + v1apps "github.com/containers/podman/v5/pkg/k8s.io/api/apps/v1" + v1 "github.com/containers/podman/v5/pkg/k8s.io/api/core/v1" + metav1 "github.com/containers/podman/v5/pkg/k8s.io/apimachinery/pkg/apis/meta/v1" + "github.com/containers/podman/v5/pkg/specgen" + "github.com/containers/podman/v5/pkg/specgen/generate" + "github.com/containers/podman/v5/pkg/specgen/generate/kube" + "github.com/containers/podman/v5/pkg/specgenutil" + "github.com/containers/podman/v5/pkg/systemd/notifyproxy" + "github.com/containers/podman/v5/pkg/util" + "github.com/containers/podman/v5/utils" "github.com/coreos/go-systemd/v22/daemon" "github.com/opencontainers/go-digest" "github.com/opencontainers/selinux/go-selinux" diff --git a/pkg/domain/infra/abi/play_test.go b/pkg/domain/infra/abi/play_test.go index 37b5863f64..4661763e28 100644 --- a/pkg/domain/infra/abi/play_test.go +++ b/pkg/domain/infra/abi/play_test.go @@ -4,8 +4,8 @@ import ( "bytes" "testing" - v1 "github.com/containers/podman/v4/pkg/k8s.io/api/core/v1" - v12 "github.com/containers/podman/v4/pkg/k8s.io/apimachinery/pkg/apis/meta/v1" + v1 "github.com/containers/podman/v5/pkg/k8s.io/api/core/v1" + v12 "github.com/containers/podman/v5/pkg/k8s.io/apimachinery/pkg/apis/meta/v1" "github.com/stretchr/testify/assert" ) diff --git a/pkg/domain/infra/abi/play_utils.go b/pkg/domain/infra/abi/play_utils.go index 482a158e6e..16d30acd16 100644 --- a/pkg/domain/infra/abi/play_utils.go +++ b/pkg/domain/infra/abi/play_utils.go @@ -1,6 +1,6 @@ package abi -import "github.com/containers/podman/v4/libpod/define" +import "github.com/containers/podman/v5/libpod/define" // getSdNotifyMode returns the `sdNotifyAnnotation/$name` for the specified // name. If name is empty, it'll only look for `sdNotifyAnnotation`. diff --git a/pkg/domain/infra/abi/play_utils_test.go b/pkg/domain/infra/abi/play_utils_test.go index 80a9fe5435..8bc56e234b 100644 --- a/pkg/domain/infra/abi/play_utils_test.go +++ b/pkg/domain/infra/abi/play_utils_test.go @@ -3,7 +3,7 @@ package abi import ( "testing" - "github.com/containers/podman/v4/libpod/define" + "github.com/containers/podman/v5/libpod/define" "github.com/stretchr/testify/require" ) diff --git a/pkg/domain/infra/abi/pods.go b/pkg/domain/infra/abi/pods.go index b3e8714a56..72a4ca0f6f 100644 --- a/pkg/domain/infra/abi/pods.go +++ b/pkg/domain/infra/abi/pods.go @@ -7,13 +7,13 @@ import ( "strconv" "strings" - "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" - "github.com/containers/podman/v4/pkg/specgen/generate" + "github.com/containers/podman/v5/libpod" + "github.com/containers/podman/v5/libpod/define" + "github.com/containers/podman/v5/pkg/domain/entities" + dfilters "github.com/containers/podman/v5/pkg/domain/filters" + "github.com/containers/podman/v5/pkg/signal" + "github.com/containers/podman/v5/pkg/specgen" + "github.com/containers/podman/v5/pkg/specgen/generate" "github.com/sirupsen/logrus" ) diff --git a/pkg/domain/infra/abi/pods_stats.go b/pkg/domain/infra/abi/pods_stats.go index 447ceab9de..5d636f240e 100644 --- a/pkg/domain/infra/abi/pods_stats.go +++ b/pkg/domain/infra/abi/pods_stats.go @@ -7,10 +7,10 @@ import ( "strconv" "github.com/containers/common/pkg/cgroups" - "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/containers/podman/v5/libpod" + "github.com/containers/podman/v5/pkg/domain/entities" + "github.com/containers/podman/v5/pkg/rootless" + "github.com/containers/podman/v5/utils" "github.com/docker/go-units" ) diff --git a/pkg/domain/infra/abi/runtime.go b/pkg/domain/infra/abi/runtime.go index f44f657012..bfa182f243 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/v4/libpod" + "github.com/containers/podman/v5/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 72f7730a4f..02fbc94269 100644 --- a/pkg/domain/infra/abi/secrets.go +++ b/pkg/domain/infra/abi/secrets.go @@ -9,8 +9,8 @@ import ( "strings" "github.com/containers/common/pkg/secrets" - "github.com/containers/podman/v4/pkg/domain/entities" - "github.com/containers/podman/v4/pkg/domain/utils" + "github.com/containers/podman/v5/pkg/domain/entities" + "github.com/containers/podman/v5/pkg/domain/utils" ) func (ic *ContainerEngine) SecretCreate(ctx context.Context, name string, reader io.Reader, options entities.SecretCreateOptions) (*entities.SecretCreateReport, error) { diff --git a/pkg/domain/infra/abi/secrets_test.go b/pkg/domain/infra/abi/secrets_test.go index 01632ef22a..6b3a745e25 100644 --- a/pkg/domain/infra/abi/secrets_test.go +++ b/pkg/domain/infra/abi/secrets_test.go @@ -5,7 +5,7 @@ import ( "time" "github.com/containers/common/pkg/secrets" - "github.com/containers/podman/v4/pkg/domain/entities" + "github.com/containers/podman/v5/pkg/domain/entities" "github.com/stretchr/testify/assert" ) diff --git a/pkg/domain/infra/abi/system.go b/pkg/domain/infra/abi/system.go index b5eaadbf4d..75dc5e65ab 100644 --- a/pkg/domain/infra/abi/system.go +++ b/pkg/domain/infra/abi/system.go @@ -9,10 +9,10 @@ import ( "os/exec" "path/filepath" - "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/util" + "github.com/containers/podman/v5/libpod/define" + "github.com/containers/podman/v5/pkg/domain/entities" + "github.com/containers/podman/v5/pkg/domain/entities/reports" + "github.com/containers/podman/v5/pkg/util" "github.com/containers/storage" "github.com/containers/storage/pkg/directory" "github.com/sirupsen/logrus" diff --git a/pkg/domain/infra/abi/system_linux.go b/pkg/domain/infra/abi/system_linux.go index 312021641a..abe00d89af 100644 --- a/pkg/domain/infra/abi/system_linux.go +++ b/pkg/domain/infra/abi/system_linux.go @@ -8,8 +8,8 @@ import ( "github.com/containers/common/pkg/cgroups" "github.com/containers/common/pkg/config" "github.com/containers/common/pkg/systemd" - "github.com/containers/podman/v4/pkg/rootless" - "github.com/containers/podman/v4/pkg/util" + "github.com/containers/podman/v5/pkg/rootless" + "github.com/containers/podman/v5/pkg/util" "github.com/containers/storage/pkg/unshare" "github.com/sirupsen/logrus" ) diff --git a/pkg/domain/infra/abi/terminal/sigproxy_commn.go b/pkg/domain/infra/abi/terminal/sigproxy_commn.go index 8809d94bc2..e4a601f93d 100644 --- a/pkg/domain/infra/abi/terminal/sigproxy_commn.go +++ b/pkg/domain/infra/abi/terminal/sigproxy_commn.go @@ -7,10 +7,10 @@ import ( "os" "syscall" - "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/containers/podman/v5/libpod" + "github.com/containers/podman/v5/libpod/define" + "github.com/containers/podman/v5/libpod/shutdown" + "github.com/containers/podman/v5/pkg/signal" "github.com/sirupsen/logrus" ) diff --git a/pkg/domain/infra/abi/terminal/terminal.go b/pkg/domain/infra/abi/terminal/terminal.go index 37dadd92ac..c7b75c6c29 100644 --- a/pkg/domain/infra/abi/terminal/terminal.go +++ b/pkg/domain/infra/abi/terminal/terminal.go @@ -7,7 +7,7 @@ import ( "os/signal" "github.com/containers/common/pkg/resize" - lsignal "github.com/containers/podman/v4/pkg/signal" + lsignal "github.com/containers/podman/v5/pkg/signal" "github.com/moby/term" "github.com/sirupsen/logrus" ) diff --git a/pkg/domain/infra/abi/terminal/terminal_common.go b/pkg/domain/infra/abi/terminal/terminal_common.go index 4f6fb0b066..e4f3afeb32 100644 --- a/pkg/domain/infra/abi/terminal/terminal_common.go +++ b/pkg/domain/infra/abi/terminal/terminal_common.go @@ -9,8 +9,8 @@ import ( "os" "github.com/containers/common/pkg/resize" - "github.com/containers/podman/v4/libpod" - "github.com/containers/podman/v4/libpod/define" + "github.com/containers/podman/v5/libpod" + "github.com/containers/podman/v5/libpod/define" "github.com/sirupsen/logrus" "golang.org/x/term" ) diff --git a/pkg/domain/infra/abi/terminal/terminal_unsupported.go b/pkg/domain/infra/abi/terminal/terminal_unsupported.go index 48adfef6d8..a1b5ac37d1 100644 --- a/pkg/domain/infra/abi/terminal/terminal_unsupported.go +++ b/pkg/domain/infra/abi/terminal/terminal_unsupported.go @@ -7,8 +7,8 @@ import ( "errors" "os" - "github.com/containers/podman/v4/libpod" - "github.com/containers/podman/v4/libpod/define" + "github.com/containers/podman/v5/libpod" + "github.com/containers/podman/v5/libpod/define" ) // ExecAttachCtr execs and attaches to a container diff --git a/pkg/domain/infra/abi/trust.go b/pkg/domain/infra/abi/trust.go index 9b30920d77..e23ed4bd57 100644 --- a/pkg/domain/infra/abi/trust.go +++ b/pkg/domain/infra/abi/trust.go @@ -5,8 +5,8 @@ import ( "fmt" "os" - "github.com/containers/podman/v4/pkg/domain/entities" - "github.com/containers/podman/v4/pkg/trust" + "github.com/containers/podman/v5/pkg/domain/entities" + "github.com/containers/podman/v5/pkg/trust" ) func (ir *ImageEngine) ShowTrust(ctx context.Context, args []string, options entities.ShowTrustOptions) (*entities.ShowTrustReport, error) { diff --git a/pkg/domain/infra/abi/volumes.go b/pkg/domain/infra/abi/volumes.go index 1423ac571f..d99ab0f992 100644 --- a/pkg/domain/infra/abi/volumes.go +++ b/pkg/domain/infra/abi/volumes.go @@ -5,12 +5,12 @@ import ( "errors" "fmt" - "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/containers/podman/v5/libpod" + "github.com/containers/podman/v5/libpod/define" + "github.com/containers/podman/v5/pkg/domain/entities" + "github.com/containers/podman/v5/pkg/domain/entities/reports" + "github.com/containers/podman/v5/pkg/domain/filters" + "github.com/containers/podman/v5/pkg/domain/infra/abi/parse" ) func (ic *ContainerEngine) VolumeCreate(ctx context.Context, opts entities.VolumeCreateOptions) (*entities.IDOrNameResponse, error) { diff --git a/pkg/domain/infra/runtime_abi.go b/pkg/domain/infra/runtime_abi.go index e2e01eb176..21704fa760 100644 --- a/pkg/domain/infra/runtime_abi.go +++ b/pkg/domain/infra/runtime_abi.go @@ -6,9 +6,9 @@ import ( "context" "fmt" - "github.com/containers/podman/v4/pkg/bindings" - "github.com/containers/podman/v4/pkg/domain/entities" - "github.com/containers/podman/v4/pkg/domain/infra/tunnel" + "github.com/containers/podman/v5/pkg/bindings" + "github.com/containers/podman/v5/pkg/domain/entities" + "github.com/containers/podman/v5/pkg/domain/infra/tunnel" ) // NewContainerEngine factory provides a libpod runtime for container-related operations diff --git a/pkg/domain/infra/runtime_libpod.go b/pkg/domain/infra/runtime_libpod.go index a7a4acdcf1..6c4d4494de 100644 --- a/pkg/domain/infra/runtime_libpod.go +++ b/pkg/domain/infra/runtime_libpod.go @@ -13,11 +13,11 @@ import ( "syscall" "github.com/containers/common/pkg/cgroups" - "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/podman/v4/pkg/util" + "github.com/containers/podman/v5/libpod" + "github.com/containers/podman/v5/pkg/domain/entities" + "github.com/containers/podman/v5/pkg/namespaces" + "github.com/containers/podman/v5/pkg/rootless" + "github.com/containers/podman/v5/pkg/util" "github.com/containers/storage/pkg/idtools" "github.com/containers/storage/types" "github.com/sirupsen/logrus" diff --git a/pkg/domain/infra/runtime_proxy.go b/pkg/domain/infra/runtime_proxy.go index e005bb0a93..f8c2daacac 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/v4/pkg/domain/entities" - "github.com/containers/podman/v4/pkg/domain/infra/abi" + "github.com/containers/podman/v5/pkg/domain/entities" + "github.com/containers/podman/v5/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 83c951abb8..a28385890c 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/v4/pkg/bindings" - "github.com/containers/podman/v4/pkg/domain/entities" - "github.com/containers/podman/v4/pkg/domain/infra/tunnel" + "github.com/containers/podman/v5/pkg/bindings" + "github.com/containers/podman/v5/pkg/domain/entities" + "github.com/containers/podman/v5/pkg/domain/infra/tunnel" ) var ( diff --git a/pkg/domain/infra/tunnel/auto-update.go b/pkg/domain/infra/tunnel/auto-update.go index 469da5a7a6..e8322bf6a6 100644 --- a/pkg/domain/infra/tunnel/auto-update.go +++ b/pkg/domain/infra/tunnel/auto-update.go @@ -4,7 +4,7 @@ import ( "context" "errors" - "github.com/containers/podman/v4/pkg/domain/entities" + "github.com/containers/podman/v5/pkg/domain/entities" ) func (ic *ContainerEngine) AutoUpdate(ctx context.Context, options entities.AutoUpdateOptions) ([]*entities.AutoUpdateReport, []error) { diff --git a/pkg/domain/infra/tunnel/containers.go b/pkg/domain/infra/tunnel/containers.go index 93473263df..9c81fb2197 100644 --- a/pkg/domain/infra/tunnel/containers.go +++ b/pkg/domain/infra/tunnel/containers.go @@ -15,17 +15,17 @@ import ( "github.com/containers/common/pkg/config" "github.com/containers/image/v5/docker/reference" - "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" - "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/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/podman/v5/libpod/define" + "github.com/containers/podman/v5/libpod/events" + "github.com/containers/podman/v5/pkg/api/handlers" + "github.com/containers/podman/v5/pkg/bindings" + "github.com/containers/podman/v5/pkg/bindings/containers" + "github.com/containers/podman/v5/pkg/bindings/images" + "github.com/containers/podman/v5/pkg/domain/entities" + "github.com/containers/podman/v5/pkg/domain/entities/reports" + "github.com/containers/podman/v5/pkg/errorhandling" + "github.com/containers/podman/v5/pkg/specgen" + "github.com/containers/podman/v5/pkg/util" "github.com/containers/storage/types" "github.com/sirupsen/logrus" ) diff --git a/pkg/domain/infra/tunnel/events.go b/pkg/domain/infra/tunnel/events.go index 30be92e23a..d2c0e62ef0 100644 --- a/pkg/domain/infra/tunnel/events.go +++ b/pkg/domain/infra/tunnel/events.go @@ -5,9 +5,9 @@ import ( "fmt" "strings" - "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/containers/podman/v5/libpod/events" + "github.com/containers/podman/v5/pkg/bindings/system" + "github.com/containers/podman/v5/pkg/domain/entities" ) func (ic *ContainerEngine) Events(ctx context.Context, opts entities.EventsOptions) error { diff --git a/pkg/domain/infra/tunnel/farm.go b/pkg/domain/infra/tunnel/farm.go index 1dbde31789..dfb2183f8e 100644 --- a/pkg/domain/infra/tunnel/farm.go +++ b/pkg/domain/infra/tunnel/farm.go @@ -4,8 +4,8 @@ import ( "context" "fmt" - "github.com/containers/podman/v4/pkg/bindings/system" - "github.com/containers/podman/v4/pkg/domain/entities" + "github.com/containers/podman/v5/pkg/bindings/system" + "github.com/containers/podman/v5/pkg/domain/entities" ) const ( diff --git a/pkg/domain/infra/tunnel/healthcheck.go b/pkg/domain/infra/tunnel/healthcheck.go index 67d529201b..2be64f701b 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/v4/libpod/define" - "github.com/containers/podman/v4/pkg/bindings/containers" - "github.com/containers/podman/v4/pkg/domain/entities" + "github.com/containers/podman/v5/libpod/define" + "github.com/containers/podman/v5/pkg/bindings/containers" + "github.com/containers/podman/v5/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 d3741cadce..3d33f179d6 100644 --- a/pkg/domain/infra/tunnel/helpers.go +++ b/pkg/domain/infra/tunnel/helpers.go @@ -5,11 +5,11 @@ import ( "errors" "fmt" - "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/containers/podman/v5/libpod/define" + "github.com/containers/podman/v5/pkg/bindings/containers" + "github.com/containers/podman/v5/pkg/bindings/pods" + "github.com/containers/podman/v5/pkg/domain/entities" + "github.com/containers/podman/v5/pkg/errorhandling" ) // FIXME: the `ignore` parameter is very likely wrong here as it should rather diff --git a/pkg/domain/infra/tunnel/images.go b/pkg/domain/infra/tunnel/images.go index c0468c9e07..d92afc19ac 100644 --- a/pkg/domain/infra/tunnel/images.go +++ b/pkg/domain/infra/tunnel/images.go @@ -15,12 +15,12 @@ import ( "github.com/containers/common/pkg/ssh" "github.com/containers/image/v5/docker/reference" "github.com/containers/image/v5/types" - "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" + "github.com/containers/podman/v5/libpod/define" + "github.com/containers/podman/v5/pkg/bindings/images" + "github.com/containers/podman/v5/pkg/domain/entities" + "github.com/containers/podman/v5/pkg/domain/entities/reports" + "github.com/containers/podman/v5/pkg/domain/utils" + "github.com/containers/podman/v5/pkg/errorhandling" "github.com/containers/storage/pkg/archive" ) diff --git a/pkg/domain/infra/tunnel/kube.go b/pkg/domain/infra/tunnel/kube.go index d03d4ebc7c..6a863cff7e 100644 --- a/pkg/domain/infra/tunnel/kube.go +++ b/pkg/domain/infra/tunnel/kube.go @@ -6,10 +6,10 @@ import ( "io" "github.com/containers/image/v5/types" - "github.com/containers/podman/v4/pkg/bindings/generate" - "github.com/containers/podman/v4/pkg/bindings/kube" - "github.com/containers/podman/v4/pkg/bindings/play" - "github.com/containers/podman/v4/pkg/domain/entities" + "github.com/containers/podman/v5/pkg/bindings/generate" + "github.com/containers/podman/v5/pkg/bindings/kube" + "github.com/containers/podman/v5/pkg/bindings/play" + "github.com/containers/podman/v5/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/manifest.go b/pkg/domain/infra/tunnel/manifest.go index f4aec45b0b..cdbfd63fc0 100644 --- a/pkg/domain/infra/tunnel/manifest.go +++ b/pkg/domain/infra/tunnel/manifest.go @@ -7,10 +7,10 @@ import ( "strings" "github.com/containers/image/v5/types" - "github.com/containers/podman/v4/pkg/bindings/images" - "github.com/containers/podman/v4/pkg/bindings/manifests" - "github.com/containers/podman/v4/pkg/domain/entities" - envLib "github.com/containers/podman/v4/pkg/env" + "github.com/containers/podman/v5/pkg/bindings/images" + "github.com/containers/podman/v5/pkg/bindings/manifests" + "github.com/containers/podman/v5/pkg/domain/entities" + envLib "github.com/containers/podman/v5/pkg/env" ) // ManifestCreate implements manifest create via ImageEngine diff --git a/pkg/domain/infra/tunnel/network.go b/pkg/domain/infra/tunnel/network.go index 36d8ddce41..e09e247a3b 100644 --- a/pkg/domain/infra/tunnel/network.go +++ b/pkg/domain/infra/tunnel/network.go @@ -6,10 +6,10 @@ import ( "fmt" "github.com/containers/common/libnetwork/types" - "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/containers/podman/v5/libpod/define" + "github.com/containers/podman/v5/pkg/bindings/network" + "github.com/containers/podman/v5/pkg/domain/entities" + "github.com/containers/podman/v5/pkg/errorhandling" ) func (ic *ContainerEngine) NetworkUpdate(ctx context.Context, netName string, opts entities.NetworkUpdateOptions) error { diff --git a/pkg/domain/infra/tunnel/pods.go b/pkg/domain/infra/tunnel/pods.go index 76526181e6..f485b8a386 100644 --- a/pkg/domain/infra/tunnel/pods.go +++ b/pkg/domain/infra/tunnel/pods.go @@ -5,11 +5,11 @@ import ( "errors" "fmt" - "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/errorhandling" - "github.com/containers/podman/v4/pkg/util" + "github.com/containers/podman/v5/libpod/define" + "github.com/containers/podman/v5/pkg/bindings/pods" + "github.com/containers/podman/v5/pkg/domain/entities" + "github.com/containers/podman/v5/pkg/errorhandling" + "github.com/containers/podman/v5/pkg/util" ) func (ic *ContainerEngine) PodExists(ctx context.Context, nameOrID string) (*entities.BoolReport, error) { diff --git a/pkg/domain/infra/tunnel/runtime.go b/pkg/domain/infra/tunnel/runtime.go index 65c1354df4..05f8b00787 100644 --- a/pkg/domain/infra/tunnel/runtime.go +++ b/pkg/domain/infra/tunnel/runtime.go @@ -6,8 +6,8 @@ import ( "sync" "syscall" - "github.com/containers/podman/v4/libpod/define" - "github.com/containers/podman/v4/pkg/signal" + "github.com/containers/podman/v5/libpod/define" + "github.com/containers/podman/v5/pkg/signal" "github.com/sirupsen/logrus" ) diff --git a/pkg/domain/infra/tunnel/secrets.go b/pkg/domain/infra/tunnel/secrets.go index 4776f65326..326a75c8b4 100644 --- a/pkg/domain/infra/tunnel/secrets.go +++ b/pkg/domain/infra/tunnel/secrets.go @@ -5,9 +5,9 @@ import ( "fmt" "io" - "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/containers/podman/v5/pkg/bindings/secrets" + "github.com/containers/podman/v5/pkg/domain/entities" + "github.com/containers/podman/v5/pkg/errorhandling" ) func (ic *ContainerEngine) SecretCreate(ctx context.Context, name string, reader io.Reader, options entities.SecretCreateOptions) (*entities.SecretCreateReport, error) { diff --git a/pkg/domain/infra/tunnel/system.go b/pkg/domain/infra/tunnel/system.go index fc82e7b2bb..492fd0a894 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/v4/libpod/define" - "github.com/containers/podman/v4/pkg/bindings/system" - "github.com/containers/podman/v4/pkg/domain/entities" + "github.com/containers/podman/v5/libpod/define" + "github.com/containers/podman/v5/pkg/bindings/system" + "github.com/containers/podman/v5/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 deb9965a37..07097d92ac 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/v4/pkg/domain/entities" + "github.com/containers/podman/v5/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 b70d297831..175d5b1465 100644 --- a/pkg/domain/infra/tunnel/volumes.go +++ b/pkg/domain/infra/tunnel/volumes.go @@ -5,10 +5,10 @@ import ( "errors" "fmt" - "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/containers/podman/v5/pkg/bindings/volumes" + "github.com/containers/podman/v5/pkg/domain/entities" + "github.com/containers/podman/v5/pkg/domain/entities/reports" + "github.com/containers/podman/v5/pkg/errorhandling" ) func (ic *ContainerEngine) VolumeCreate(ctx context.Context, opts entities.VolumeCreateOptions) (*entities.IDOrNameResponse, error) { diff --git a/pkg/domain/utils/scp.go b/pkg/domain/utils/scp.go index 96f1d90502..9d50bdc252 100644 --- a/pkg/domain/utils/scp.go +++ b/pkg/domain/utils/scp.go @@ -12,8 +12,8 @@ import ( "github.com/containers/common/pkg/config" "github.com/containers/common/pkg/ssh" "github.com/containers/image/v5/transports/alltransports" - "github.com/containers/podman/v4/libpod/define" - "github.com/containers/podman/v4/pkg/domain/entities" + "github.com/containers/podman/v5/libpod/define" + "github.com/containers/podman/v5/pkg/domain/entities" "github.com/sirupsen/logrus" ) diff --git a/pkg/domain/utils/scp_test.go b/pkg/domain/utils/scp_test.go index ee375396d8..7d10d3317b 100644 --- a/pkg/domain/utils/scp_test.go +++ b/pkg/domain/utils/scp_test.go @@ -4,7 +4,7 @@ import ( "fmt" "testing" - "github.com/containers/podman/v4/pkg/domain/entities" + "github.com/containers/podman/v5/pkg/domain/entities" "github.com/stretchr/testify/assert" ) diff --git a/pkg/domain/utils/secrets_filters.go b/pkg/domain/utils/secrets_filters.go index ab9b681ec8..48162ce08c 100644 --- a/pkg/domain/utils/secrets_filters.go +++ b/pkg/domain/utils/secrets_filters.go @@ -5,7 +5,7 @@ import ( "strings" "github.com/containers/common/pkg/secrets" - "github.com/containers/podman/v4/pkg/util" + "github.com/containers/podman/v5/pkg/util" ) func IfPassesSecretsFilter(s secrets.Secret, filters map[string][]string) (bool, error) { diff --git a/pkg/domain/utils/utils_test.go b/pkg/domain/utils/utils_test.go index 291567f6b3..65314d0047 100644 --- a/pkg/domain/utils/utils_test.go +++ b/pkg/domain/utils/utils_test.go @@ -5,7 +5,7 @@ import ( "sort" "testing" - "github.com/containers/podman/v4/pkg/domain/entities" + "github.com/containers/podman/v5/pkg/domain/entities" "github.com/stretchr/testify/assert" ) diff --git a/pkg/farm/farm.go b/pkg/farm/farm.go index 5204ba4005..a1cc62610a 100644 --- a/pkg/farm/farm.go +++ b/pkg/farm/farm.go @@ -14,8 +14,8 @@ import ( "github.com/containers/buildah/define" lplatform "github.com/containers/common/libimage/platform" "github.com/containers/common/pkg/config" - "github.com/containers/podman/v4/pkg/domain/entities" - "github.com/containers/podman/v4/pkg/domain/infra" + "github.com/containers/podman/v5/pkg/domain/entities" + "github.com/containers/podman/v5/pkg/domain/infra" "github.com/hashicorp/go-multierror" "github.com/sirupsen/logrus" ) diff --git a/pkg/farm/list_builder.go b/pkg/farm/list_builder.go index 338c1606cd..f5216efdc8 100644 --- a/pkg/farm/list_builder.go +++ b/pkg/farm/list_builder.go @@ -8,7 +8,7 @@ import ( "github.com/containers/image/v5/docker" "github.com/containers/image/v5/types" - "github.com/containers/podman/v4/pkg/domain/entities" + "github.com/containers/podman/v5/pkg/domain/entities" "github.com/hashicorp/go-multierror" "github.com/sirupsen/logrus" ) diff --git a/pkg/fileserver/server_windows.go b/pkg/fileserver/server_windows.go index 949398bda7..029438d9c1 100644 --- a/pkg/fileserver/server_windows.go +++ b/pkg/fileserver/server_windows.go @@ -3,7 +3,7 @@ package fileserver import ( "fmt" - "github.com/containers/podman/v4/pkg/fileserver/plan9" + "github.com/containers/podman/v5/pkg/fileserver/plan9" "github.com/linuxkit/virtsock/pkg/hvsock" "github.com/sirupsen/logrus" ) diff --git a/pkg/inspect/inspect.go b/pkg/inspect/inspect.go index 15943858f9..26436155bf 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/v4/libpod/define" + "github.com/containers/podman/v5/libpod/define" "github.com/opencontainers/go-digest" v1 "github.com/opencontainers/image-spec/specs-go/v1" ) diff --git a/pkg/k8s.io/api/apps/v1/types.go b/pkg/k8s.io/api/apps/v1/types.go index 86e320617c..96d070fab2 100644 --- a/pkg/k8s.io/api/apps/v1/types.go +++ b/pkg/k8s.io/api/apps/v1/types.go @@ -17,9 +17,9 @@ limitations under the License. package v1 import ( - v1 "github.com/containers/podman/v4/pkg/k8s.io/api/core/v1" - metav1 "github.com/containers/podman/v4/pkg/k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/containers/podman/v4/pkg/k8s.io/apimachinery/pkg/util/intstr" + v1 "github.com/containers/podman/v5/pkg/k8s.io/api/core/v1" + metav1 "github.com/containers/podman/v5/pkg/k8s.io/apimachinery/pkg/apis/meta/v1" + "github.com/containers/podman/v5/pkg/k8s.io/apimachinery/pkg/util/intstr" ) const ( diff --git a/pkg/k8s.io/api/core/v1/resource.go b/pkg/k8s.io/api/core/v1/resource.go index 91aa95f9a3..d2dba9f9b4 100644 --- a/pkg/k8s.io/api/core/v1/resource.go +++ b/pkg/k8s.io/api/core/v1/resource.go @@ -17,7 +17,7 @@ limitations under the License. package v1 import ( - "github.com/containers/podman/v4/pkg/k8s.io/apimachinery/pkg/api/resource" + "github.com/containers/podman/v5/pkg/k8s.io/apimachinery/pkg/api/resource" ) // Returns string version of ResourceName. diff --git a/pkg/k8s.io/api/core/v1/types.go b/pkg/k8s.io/api/core/v1/types.go index e5bfbebf92..9b79298a63 100644 --- a/pkg/k8s.io/api/core/v1/types.go +++ b/pkg/k8s.io/api/core/v1/types.go @@ -17,10 +17,10 @@ limitations under the License. package v1 import ( - "github.com/containers/podman/v4/pkg/k8s.io/apimachinery/pkg/api/resource" - metav1 "github.com/containers/podman/v4/pkg/k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/containers/podman/v4/pkg/k8s.io/apimachinery/pkg/types" - "github.com/containers/podman/v4/pkg/k8s.io/apimachinery/pkg/util/intstr" + "github.com/containers/podman/v5/pkg/k8s.io/apimachinery/pkg/api/resource" + metav1 "github.com/containers/podman/v5/pkg/k8s.io/apimachinery/pkg/apis/meta/v1" + "github.com/containers/podman/v5/pkg/k8s.io/apimachinery/pkg/types" + "github.com/containers/podman/v5/pkg/k8s.io/apimachinery/pkg/util/intstr" ) // Volume represents a named volume in a pod that may be accessed by any container in the pod. diff --git a/pkg/k8s.io/apimachinery/pkg/apis/meta/v1/types.go b/pkg/k8s.io/apimachinery/pkg/apis/meta/v1/types.go index 41053090f3..cb6838c062 100644 --- a/pkg/k8s.io/apimachinery/pkg/apis/meta/v1/types.go +++ b/pkg/k8s.io/apimachinery/pkg/apis/meta/v1/types.go @@ -30,7 +30,7 @@ import ( "fmt" "strings" - "github.com/containers/podman/v4/pkg/k8s.io/apimachinery/pkg/types" + "github.com/containers/podman/v5/pkg/k8s.io/apimachinery/pkg/types" ) // TypeMeta describes an individual object in an API response or request diff --git a/pkg/machine/applehv/config.go b/pkg/machine/applehv/config.go index 26fa74665a..e39873765a 100644 --- a/pkg/machine/applehv/config.go +++ b/pkg/machine/applehv/config.go @@ -9,11 +9,11 @@ import ( "path/filepath" "time" - "github.com/containers/podman/v4/pkg/machine" - "github.com/containers/podman/v4/pkg/machine/compression" - "github.com/containers/podman/v4/pkg/machine/define" - "github.com/containers/podman/v4/pkg/machine/ignition" - "github.com/containers/podman/v4/pkg/machine/vmconfigs" + "github.com/containers/podman/v5/pkg/machine" + "github.com/containers/podman/v5/pkg/machine/compression" + "github.com/containers/podman/v5/pkg/machine/define" + "github.com/containers/podman/v5/pkg/machine/ignition" + "github.com/containers/podman/v5/pkg/machine/vmconfigs" vfConfig "github.com/crc-org/vfkit/pkg/config" "github.com/docker/go-units" "golang.org/x/sys/unix" diff --git a/pkg/machine/applehv/ignition.go b/pkg/machine/applehv/ignition.go index 678468e62e..3eb87de014 100644 --- a/pkg/machine/applehv/ignition.go +++ b/pkg/machine/applehv/ignition.go @@ -6,7 +6,7 @@ import ( "net" "net/http" - "github.com/containers/podman/v4/pkg/machine/define" + "github.com/containers/podman/v5/pkg/machine/define" "github.com/sirupsen/logrus" ) diff --git a/pkg/machine/applehv/machine.go b/pkg/machine/applehv/machine.go index 1d39edfcea..1616781f4d 100644 --- a/pkg/machine/applehv/machine.go +++ b/pkg/machine/applehv/machine.go @@ -19,15 +19,15 @@ import ( "github.com/containers/common/pkg/config" gvproxy "github.com/containers/gvisor-tap-vsock/pkg/types" - "github.com/containers/podman/v4/pkg/machine" - "github.com/containers/podman/v4/pkg/machine/applehv/vfkit" - "github.com/containers/podman/v4/pkg/machine/define" - "github.com/containers/podman/v4/pkg/machine/ignition" - "github.com/containers/podman/v4/pkg/machine/sockets" - "github.com/containers/podman/v4/pkg/machine/vmconfigs" - "github.com/containers/podman/v4/pkg/strongunits" - "github.com/containers/podman/v4/pkg/systemd/parser" - "github.com/containers/podman/v4/utils" + "github.com/containers/podman/v5/pkg/machine" + "github.com/containers/podman/v5/pkg/machine/applehv/vfkit" + "github.com/containers/podman/v5/pkg/machine/define" + "github.com/containers/podman/v5/pkg/machine/ignition" + "github.com/containers/podman/v5/pkg/machine/sockets" + "github.com/containers/podman/v5/pkg/machine/vmconfigs" + "github.com/containers/podman/v5/pkg/strongunits" + "github.com/containers/podman/v5/pkg/systemd/parser" + "github.com/containers/podman/v5/utils" "github.com/containers/storage/pkg/lockfile" vfConfig "github.com/crc-org/vfkit/pkg/config" vfRest "github.com/crc-org/vfkit/pkg/rest" diff --git a/pkg/machine/applehv/vfkit.go b/pkg/machine/applehv/vfkit.go index 7014d3555b..20f923ccf9 100644 --- a/pkg/machine/applehv/vfkit.go +++ b/pkg/machine/applehv/vfkit.go @@ -3,7 +3,7 @@ package applehv import ( - "github.com/containers/podman/v4/pkg/machine" + "github.com/containers/podman/v5/pkg/machine" vfConfig "github.com/crc-org/vfkit/pkg/config" ) diff --git a/pkg/machine/applehv/vfkit/config.go b/pkg/machine/applehv/vfkit/config.go index 80be55c864..d791b8daf5 100644 --- a/pkg/machine/applehv/vfkit/config.go +++ b/pkg/machine/applehv/vfkit/config.go @@ -11,7 +11,7 @@ import ( "net/http" "time" - "github.com/containers/podman/v4/pkg/machine/define" + "github.com/containers/podman/v5/pkg/machine/define" "github.com/crc-org/vfkit/pkg/config" rest "github.com/crc-org/vfkit/pkg/rest/define" "github.com/sirupsen/logrus" diff --git a/pkg/machine/applehv/vfkit/rest.go b/pkg/machine/applehv/vfkit/rest.go index 6729923c5f..aa11cd159e 100644 --- a/pkg/machine/applehv/vfkit/rest.go +++ b/pkg/machine/applehv/vfkit/rest.go @@ -6,7 +6,7 @@ import ( "errors" "fmt" - "github.com/containers/podman/v4/pkg/machine/define" + "github.com/containers/podman/v5/pkg/machine/define" ) type Endpoint string diff --git a/pkg/machine/compression/decompress.go b/pkg/machine/compression/decompress.go index f5b2a16cc4..c55fa39965 100644 --- a/pkg/machine/compression/decompress.go +++ b/pkg/machine/compression/decompress.go @@ -12,8 +12,8 @@ import ( "strings" "github.com/containers/image/v5/pkg/compression" - "github.com/containers/podman/v4/pkg/machine/define" - "github.com/containers/podman/v4/utils" + "github.com/containers/podman/v5/pkg/machine/define" + "github.com/containers/podman/v5/utils" "github.com/containers/storage/pkg/archive" "github.com/sirupsen/logrus" "github.com/ulikunitz/xz" diff --git a/pkg/machine/config.go b/pkg/machine/config.go index f0198c9305..40117b5a74 100644 --- a/pkg/machine/config.go +++ b/pkg/machine/config.go @@ -14,9 +14,9 @@ import ( "strings" "time" - "github.com/containers/podman/v4/pkg/machine/compression" - "github.com/containers/podman/v4/pkg/machine/define" - "github.com/containers/podman/v4/pkg/machine/vmconfigs" + "github.com/containers/podman/v5/pkg/machine/compression" + "github.com/containers/podman/v5/pkg/machine/define" + "github.com/containers/podman/v5/pkg/machine/vmconfigs" "github.com/containers/storage/pkg/homedir" "github.com/containers/storage/pkg/lockfile" "github.com/sirupsen/logrus" diff --git a/pkg/machine/define/vmfile_test.go b/pkg/machine/define/vmfile_test.go index 8eeca3190b..4c2cc8f59d 100644 --- a/pkg/machine/define/vmfile_test.go +++ b/pkg/machine/define/vmfile_test.go @@ -8,7 +8,7 @@ import ( "reflect" "testing" - "github.com/containers/podman/v4/test/utils" + "github.com/containers/podman/v5/test/utils" ) func TestMachineFile_GetPath(t *testing.T) { diff --git a/pkg/machine/e2e/config_test.go b/pkg/machine/e2e/config_test.go index 9692bccc01..cf9b5c7048 100644 --- a/pkg/machine/e2e/config_test.go +++ b/pkg/machine/e2e/config_test.go @@ -10,8 +10,8 @@ import ( "strings" "time" - "github.com/containers/podman/v4/pkg/machine" - "github.com/containers/podman/v4/pkg/machine/define" + "github.com/containers/podman/v5/pkg/machine" + "github.com/containers/podman/v5/pkg/machine/define" "github.com/containers/storage/pkg/stringid" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/pkg/machine/e2e/config_unix_test.go b/pkg/machine/e2e/config_unix_test.go index 24c57ee65f..c0fb6da9ce 100644 --- a/pkg/machine/e2e/config_unix_test.go +++ b/pkg/machine/e2e/config_unix_test.go @@ -5,7 +5,7 @@ package e2e_test import ( "os/exec" - "github.com/containers/podman/v4/pkg/machine" + "github.com/containers/podman/v5/pkg/machine" ) func getDownloadLocation(p machine.VirtProvider) string { diff --git a/pkg/machine/e2e/config_windows_test.go b/pkg/machine/e2e/config_windows_test.go index d82a7f022d..af17a520b5 100644 --- a/pkg/machine/e2e/config_windows_test.go +++ b/pkg/machine/e2e/config_windows_test.go @@ -5,9 +5,9 @@ import ( "os/exec" "strings" - "github.com/containers/podman/v4/pkg/machine" - "github.com/containers/podman/v4/pkg/machine/define" - "github.com/containers/podman/v4/pkg/machine/wsl" + "github.com/containers/podman/v5/pkg/machine" + "github.com/containers/podman/v5/pkg/machine/define" + "github.com/containers/podman/v5/pkg/machine/wsl" . "github.com/onsi/ginkgo/v2" ) diff --git a/pkg/machine/e2e/info_test.go b/pkg/machine/e2e/info_test.go index b016e3e1e1..19bcfd7246 100644 --- a/pkg/machine/e2e/info_test.go +++ b/pkg/machine/e2e/info_test.go @@ -3,7 +3,7 @@ package e2e_test import ( "strconv" - "github.com/containers/podman/v4/pkg/domain/entities" + "github.com/containers/podman/v5/pkg/domain/entities" jsoniter "github.com/json-iterator/go" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/pkg/machine/e2e/init_test.go b/pkg/machine/e2e/init_test.go index 27b0b3d060..65586752ca 100644 --- a/pkg/machine/e2e/init_test.go +++ b/pkg/machine/e2e/init_test.go @@ -8,8 +8,8 @@ import ( "strings" "time" - "github.com/containers/podman/v4/pkg/machine/define" - "github.com/containers/podman/v4/utils" + "github.com/containers/podman/v5/pkg/machine/define" + "github.com/containers/podman/v5/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/pkg/machine/e2e/inspect_test.go b/pkg/machine/e2e/inspect_test.go index 6a60089acc..1153a0c1b1 100644 --- a/pkg/machine/e2e/inspect_test.go +++ b/pkg/machine/e2e/inspect_test.go @@ -1,8 +1,8 @@ package e2e_test import ( - "github.com/containers/podman/v4/pkg/machine" - "github.com/containers/podman/v4/pkg/machine/define" + "github.com/containers/podman/v5/pkg/machine" + "github.com/containers/podman/v5/pkg/machine/define" jsoniter "github.com/json-iterator/go" . "github.com/onsi/ginkgo/v2" diff --git a/pkg/machine/e2e/list_test.go b/pkg/machine/e2e/list_test.go index 2a8f51f13b..54d976fd7f 100644 --- a/pkg/machine/e2e/list_test.go +++ b/pkg/machine/e2e/list_test.go @@ -4,7 +4,7 @@ import ( "strings" "time" - "github.com/containers/podman/v4/pkg/domain/entities" + "github.com/containers/podman/v5/pkg/domain/entities" jsoniter "github.com/json-iterator/go" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/pkg/machine/e2e/machine_test.go b/pkg/machine/e2e/machine_test.go index 5c2a0f30db..e69a60b71f 100644 --- a/pkg/machine/e2e/machine_test.go +++ b/pkg/machine/e2e/machine_test.go @@ -11,11 +11,11 @@ import ( "testing" "time" - "github.com/containers/podman/v4/pkg/machine" - "github.com/containers/podman/v4/pkg/machine/compression" - "github.com/containers/podman/v4/pkg/machine/define" - "github.com/containers/podman/v4/pkg/machine/provider" - "github.com/containers/podman/v4/utils" + "github.com/containers/podman/v5/pkg/machine" + "github.com/containers/podman/v5/pkg/machine/compression" + "github.com/containers/podman/v5/pkg/machine/define" + "github.com/containers/podman/v5/pkg/machine/provider" + "github.com/containers/podman/v5/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/pkg/machine/e2e/proxy_test.go b/pkg/machine/e2e/proxy_test.go index 24e65e5e2d..c74d3253a7 100644 --- a/pkg/machine/e2e/proxy_test.go +++ b/pkg/machine/e2e/proxy_test.go @@ -3,7 +3,7 @@ package e2e_test import ( "os" - "github.com/containers/podman/v4/pkg/machine/define" + "github.com/containers/podman/v5/pkg/machine/define" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/pkg/machine/e2e/rm_test.go b/pkg/machine/e2e/rm_test.go index 11f76de25b..1e27863c40 100644 --- a/pkg/machine/e2e/rm_test.go +++ b/pkg/machine/e2e/rm_test.go @@ -5,7 +5,7 @@ import ( "os" "path/filepath" - "github.com/containers/podman/v4/pkg/machine/define" + "github.com/containers/podman/v5/pkg/machine/define" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/pkg/machine/e2e/set_test.go b/pkg/machine/e2e/set_test.go index 5cc574fd44..6f49e82ef9 100644 --- a/pkg/machine/e2e/set_test.go +++ b/pkg/machine/e2e/set_test.go @@ -6,7 +6,7 @@ import ( "strconv" "strings" - "github.com/containers/podman/v4/pkg/machine/define" + "github.com/containers/podman/v5/pkg/machine/define" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/pkg/machine/e2e/ssh_test.go b/pkg/machine/e2e/ssh_test.go index f36ceeb42a..6bd6268454 100644 --- a/pkg/machine/e2e/ssh_test.go +++ b/pkg/machine/e2e/ssh_test.go @@ -1,7 +1,7 @@ package e2e_test import ( - "github.com/containers/podman/v4/pkg/machine/define" + "github.com/containers/podman/v5/pkg/machine/define" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/pkg/machine/e2e/start_test.go b/pkg/machine/e2e/start_test.go index 8c77bde6bc..7dbe5261c4 100644 --- a/pkg/machine/e2e/start_test.go +++ b/pkg/machine/e2e/start_test.go @@ -3,7 +3,7 @@ package e2e_test import ( "time" - "github.com/containers/podman/v4/pkg/machine/define" + "github.com/containers/podman/v5/pkg/machine/define" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/pkg/machine/errors.go b/pkg/machine/errors.go index 7a3724aefc..b7d6bf1315 100644 --- a/pkg/machine/errors.go +++ b/pkg/machine/errors.go @@ -4,7 +4,7 @@ import ( "errors" "fmt" - "github.com/containers/podman/v4/pkg/strongunits" + "github.com/containers/podman/v5/pkg/strongunits" ) var ( diff --git a/pkg/machine/fcos.go b/pkg/machine/fcos.go index 07d1a7fbbd..a06daacdf5 100644 --- a/pkg/machine/fcos.go +++ b/pkg/machine/fcos.go @@ -12,8 +12,8 @@ import ( "runtime" "time" - "github.com/containers/podman/v4/pkg/machine/compression" - "github.com/containers/podman/v4/pkg/machine/define" + "github.com/containers/podman/v5/pkg/machine/compression" + "github.com/containers/podman/v5/pkg/machine/define" "github.com/coreos/stream-metadata-go/fedoracoreos" "github.com/coreos/stream-metadata-go/release" "github.com/coreos/stream-metadata-go/stream" diff --git a/pkg/machine/gvproxy.go b/pkg/machine/gvproxy.go index 5786b564b5..7f1ae58af4 100644 --- a/pkg/machine/gvproxy.go +++ b/pkg/machine/gvproxy.go @@ -8,7 +8,7 @@ import ( "syscall" "time" - "github.com/containers/podman/v4/pkg/machine/define" + "github.com/containers/podman/v5/pkg/machine/define" psutil "github.com/shirou/gopsutil/v3/process" "github.com/sirupsen/logrus" ) diff --git a/pkg/machine/hyperv/config.go b/pkg/machine/hyperv/config.go index fe09d46ca5..d35341f944 100644 --- a/pkg/machine/hyperv/config.go +++ b/pkg/machine/hyperv/config.go @@ -12,10 +12,10 @@ import ( "time" "github.com/containers/libhvee/pkg/hypervctl" - "github.com/containers/podman/v4/pkg/machine" - "github.com/containers/podman/v4/pkg/machine/compression" - "github.com/containers/podman/v4/pkg/machine/define" - "github.com/containers/podman/v4/pkg/machine/ignition" + "github.com/containers/podman/v5/pkg/machine" + "github.com/containers/podman/v5/pkg/machine/compression" + "github.com/containers/podman/v5/pkg/machine/define" + "github.com/containers/podman/v5/pkg/machine/ignition" "github.com/docker/go-units" "github.com/sirupsen/logrus" ) diff --git a/pkg/machine/hyperv/machine.go b/pkg/machine/hyperv/machine.go index 1f8f01c9e2..4698b49db2 100644 --- a/pkg/machine/hyperv/machine.go +++ b/pkg/machine/hyperv/machine.go @@ -18,14 +18,14 @@ import ( "github.com/containers/common/pkg/config" gvproxy "github.com/containers/gvisor-tap-vsock/pkg/types" "github.com/containers/libhvee/pkg/hypervctl" - "github.com/containers/podman/v4/pkg/machine" - "github.com/containers/podman/v4/pkg/machine/define" - "github.com/containers/podman/v4/pkg/machine/hyperv/vsock" - "github.com/containers/podman/v4/pkg/machine/ignition" - "github.com/containers/podman/v4/pkg/machine/vmconfigs" - "github.com/containers/podman/v4/pkg/strongunits" - "github.com/containers/podman/v4/pkg/systemd/parser" - "github.com/containers/podman/v4/utils" + "github.com/containers/podman/v5/pkg/machine" + "github.com/containers/podman/v5/pkg/machine/define" + "github.com/containers/podman/v5/pkg/machine/hyperv/vsock" + "github.com/containers/podman/v5/pkg/machine/ignition" + "github.com/containers/podman/v5/pkg/machine/vmconfigs" + "github.com/containers/podman/v5/pkg/strongunits" + "github.com/containers/podman/v5/pkg/systemd/parser" + "github.com/containers/podman/v5/utils" "github.com/containers/storage/pkg/lockfile" psutil "github.com/shirou/gopsutil/v3/process" "github.com/sirupsen/logrus" diff --git a/pkg/machine/hyperv/vsock/vsock.go b/pkg/machine/hyperv/vsock/vsock.go index 3bcdf66c8e..b557953e07 100644 --- a/pkg/machine/hyperv/vsock/vsock.go +++ b/pkg/machine/hyperv/vsock/vsock.go @@ -8,10 +8,10 @@ import ( "net" "strings" - "github.com/containers/podman/v4/pkg/machine/sockets" + "github.com/containers/podman/v5/pkg/machine/sockets" "github.com/Microsoft/go-winio" - "github.com/containers/podman/v4/utils" + "github.com/containers/podman/v5/utils" "github.com/sirupsen/logrus" "golang.org/x/sys/windows/registry" ) diff --git a/pkg/machine/ignition/ignition.go b/pkg/machine/ignition/ignition.go index 94a1ebd0cf..c64b870e25 100644 --- a/pkg/machine/ignition/ignition.go +++ b/pkg/machine/ignition/ignition.go @@ -10,8 +10,8 @@ import ( "os" "path/filepath" - "github.com/containers/podman/v4/pkg/machine/define" - "github.com/containers/podman/v4/pkg/systemd/parser" + "github.com/containers/podman/v5/pkg/machine/define" + "github.com/containers/podman/v5/pkg/systemd/parser" "github.com/sirupsen/logrus" ) diff --git a/pkg/machine/ignition/ready.go b/pkg/machine/ignition/ready.go index 6fb775ef67..bff2c3d744 100644 --- a/pkg/machine/ignition/ready.go +++ b/pkg/machine/ignition/ready.go @@ -4,7 +4,7 @@ import ( "errors" "fmt" - "github.com/containers/podman/v4/pkg/machine/define" + "github.com/containers/podman/v5/pkg/machine/define" ) // ReadyUnitOpts are options for creating the ready unit that reports back to podman diff --git a/pkg/machine/machine_windows.go b/pkg/machine/machine_windows.go index 87c9ae8807..f9644c355a 100644 --- a/pkg/machine/machine_windows.go +++ b/pkg/machine/machine_windows.go @@ -11,7 +11,7 @@ import ( "syscall" "time" - "github.com/containers/podman/v4/pkg/machine/define" + "github.com/containers/podman/v5/pkg/machine/define" "github.com/sirupsen/logrus" ) diff --git a/pkg/machine/ocipull/oci.go b/pkg/machine/ocipull/oci.go index 52ac308808..d9f7c8de1a 100644 --- a/pkg/machine/ocipull/oci.go +++ b/pkg/machine/ocipull/oci.go @@ -9,8 +9,8 @@ import ( "github.com/blang/semver/v4" "github.com/containers/image/v5/pkg/compression" "github.com/containers/image/v5/types" - "github.com/containers/podman/v4/pkg/machine/define" - "github.com/containers/podman/v4/version" + "github.com/containers/podman/v5/pkg/machine/define" + "github.com/containers/podman/v5/version" "github.com/containers/storage/pkg/archive" "github.com/sirupsen/logrus" ) diff --git a/pkg/machine/ocipull/ocidir.go b/pkg/machine/ocipull/ocidir.go index ceda9e5e06..5b61680c23 100644 --- a/pkg/machine/ocipull/ocidir.go +++ b/pkg/machine/ocipull/ocidir.go @@ -11,8 +11,8 @@ import ( "github.com/containers/image/v5/pkg/compression" "github.com/containers/image/v5/types" - diskcompression "github.com/containers/podman/v4/pkg/machine/compression" - "github.com/containers/podman/v4/pkg/machine/define" + diskcompression "github.com/containers/podman/v5/pkg/machine/compression" + "github.com/containers/podman/v5/pkg/machine/define" "github.com/sirupsen/logrus" ) diff --git a/pkg/machine/ocipull/versioned.go b/pkg/machine/ocipull/versioned.go index 59a8d56010..9a6dfa026d 100644 --- a/pkg/machine/ocipull/versioned.go +++ b/pkg/machine/ocipull/versioned.go @@ -8,9 +8,9 @@ import ( "strings" "github.com/containers/image/v5/types" - "github.com/containers/podman/v4/pkg/machine/compression" - "github.com/containers/podman/v4/pkg/machine/define" - "github.com/containers/podman/v4/utils" + "github.com/containers/podman/v5/pkg/machine/compression" + "github.com/containers/podman/v5/pkg/machine/define" + "github.com/containers/podman/v5/utils" v1 "github.com/opencontainers/image-spec/specs-go/v1" "github.com/sirupsen/logrus" ) diff --git a/pkg/machine/os/machine_os.go b/pkg/machine/os/machine_os.go index 5081034af9..40fcf96c71 100644 --- a/pkg/machine/os/machine_os.go +++ b/pkg/machine/os/machine_os.go @@ -5,7 +5,7 @@ package os import ( "fmt" - "github.com/containers/podman/v4/pkg/machine" + "github.com/containers/podman/v5/pkg/machine" ) // MachineOS manages machine OS's from outside the machine. diff --git a/pkg/machine/provider/platform.go b/pkg/machine/provider/platform.go index 83d06bd0f9..267614d670 100644 --- a/pkg/machine/provider/platform.go +++ b/pkg/machine/provider/platform.go @@ -7,9 +7,9 @@ import ( "os" "github.com/containers/common/pkg/config" - "github.com/containers/podman/v4/pkg/machine" - "github.com/containers/podman/v4/pkg/machine/define" - "github.com/containers/podman/v4/pkg/machine/qemu" + "github.com/containers/podman/v5/pkg/machine" + "github.com/containers/podman/v5/pkg/machine/define" + "github.com/containers/podman/v5/pkg/machine/qemu" "github.com/sirupsen/logrus" ) diff --git a/pkg/machine/provider/platform_darwin.go b/pkg/machine/provider/platform_darwin.go index ffe8dc2377..77ca11340f 100644 --- a/pkg/machine/provider/platform_darwin.go +++ b/pkg/machine/provider/platform_darwin.go @@ -5,10 +5,10 @@ import ( "os" "github.com/containers/common/pkg/config" - "github.com/containers/podman/v4/pkg/machine" - "github.com/containers/podman/v4/pkg/machine/applehv" - "github.com/containers/podman/v4/pkg/machine/define" - "github.com/containers/podman/v4/pkg/machine/qemu" + "github.com/containers/podman/v5/pkg/machine" + "github.com/containers/podman/v5/pkg/machine/applehv" + "github.com/containers/podman/v5/pkg/machine/define" + "github.com/containers/podman/v5/pkg/machine/qemu" "github.com/sirupsen/logrus" ) diff --git a/pkg/machine/provider/platform_windows.go b/pkg/machine/provider/platform_windows.go index a57f283e37..38f26b6725 100644 --- a/pkg/machine/provider/platform_windows.go +++ b/pkg/machine/provider/platform_windows.go @@ -5,10 +5,10 @@ import ( "os" "github.com/containers/common/pkg/config" - "github.com/containers/podman/v4/pkg/machine" - "github.com/containers/podman/v4/pkg/machine/define" - "github.com/containers/podman/v4/pkg/machine/hyperv" - "github.com/containers/podman/v4/pkg/machine/wsl" + "github.com/containers/podman/v5/pkg/machine" + "github.com/containers/podman/v5/pkg/machine/define" + "github.com/containers/podman/v5/pkg/machine/hyperv" + "github.com/containers/podman/v5/pkg/machine/wsl" "github.com/sirupsen/logrus" ) diff --git a/pkg/machine/pull.go b/pkg/machine/pull.go index 909425d070..dd74a63e73 100644 --- a/pkg/machine/pull.go +++ b/pkg/machine/pull.go @@ -14,10 +14,10 @@ import ( "strings" "time" - "github.com/containers/podman/v4/pkg/machine/compression" - "github.com/containers/podman/v4/pkg/machine/define" - "github.com/containers/podman/v4/pkg/machine/ocipull" - "github.com/containers/podman/v4/utils" + "github.com/containers/podman/v5/pkg/machine/compression" + "github.com/containers/podman/v5/pkg/machine/define" + "github.com/containers/podman/v5/pkg/machine/ocipull" + "github.com/containers/podman/v5/utils" "github.com/sirupsen/logrus" ) diff --git a/pkg/machine/qemu/command/command.go b/pkg/machine/qemu/command/command.go index 3619619ef3..a331fe4d16 100644 --- a/pkg/machine/qemu/command/command.go +++ b/pkg/machine/qemu/command/command.go @@ -11,7 +11,7 @@ import ( "github.com/containers/common/libnetwork/etchosts" "github.com/containers/common/pkg/config" - "github.com/containers/podman/v4/pkg/machine/define" + "github.com/containers/podman/v5/pkg/machine/define" ) // QemuCmd is an alias around a string slice to prevent the need to migrate the diff --git a/pkg/machine/qemu/command/command_test.go b/pkg/machine/qemu/command/command_test.go index c56d9341f5..f7609618e0 100644 --- a/pkg/machine/qemu/command/command_test.go +++ b/pkg/machine/qemu/command/command_test.go @@ -7,7 +7,7 @@ import ( "testing" "github.com/containers/common/libnetwork/etchosts" - "github.com/containers/podman/v4/pkg/machine/define" + "github.com/containers/podman/v5/pkg/machine/define" "github.com/stretchr/testify/assert" ) diff --git a/pkg/machine/qemu/command/qemu_command_test.go b/pkg/machine/qemu/command/qemu_command_test.go index 5cfa6c0d5b..a4bcd8aa5e 100644 --- a/pkg/machine/qemu/command/qemu_command_test.go +++ b/pkg/machine/qemu/command/qemu_command_test.go @@ -6,7 +6,7 @@ import ( "fmt" "testing" - "github.com/containers/podman/v4/pkg/machine/define" + "github.com/containers/podman/v5/pkg/machine/define" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/pkg/machine/qemu/config.go b/pkg/machine/qemu/config.go index e15e7b0387..3f79edf1c2 100644 --- a/pkg/machine/qemu/config.go +++ b/pkg/machine/qemu/config.go @@ -10,14 +10,14 @@ import ( "time" "github.com/containers/common/pkg/config" - "github.com/containers/podman/v4/pkg/machine" - "github.com/containers/podman/v4/pkg/machine/compression" - "github.com/containers/podman/v4/pkg/machine/define" - "github.com/containers/podman/v4/pkg/machine/ignition" - "github.com/containers/podman/v4/pkg/machine/qemu/command" - "github.com/containers/podman/v4/pkg/machine/sockets" - "github.com/containers/podman/v4/pkg/machine/vmconfigs" - "github.com/containers/podman/v4/utils" + "github.com/containers/podman/v5/pkg/machine" + "github.com/containers/podman/v5/pkg/machine/compression" + "github.com/containers/podman/v5/pkg/machine/define" + "github.com/containers/podman/v5/pkg/machine/ignition" + "github.com/containers/podman/v5/pkg/machine/qemu/command" + "github.com/containers/podman/v5/pkg/machine/sockets" + "github.com/containers/podman/v5/pkg/machine/vmconfigs" + "github.com/containers/podman/v5/utils" "github.com/docker/go-units" "github.com/sirupsen/logrus" ) diff --git a/pkg/machine/qemu/config_test.go b/pkg/machine/qemu/config_test.go index ae630f355c..79929028e4 100644 --- a/pkg/machine/qemu/config_test.go +++ b/pkg/machine/qemu/config_test.go @@ -4,7 +4,7 @@ import ( "reflect" "testing" - "github.com/containers/podman/v4/pkg/machine/qemu/command" + "github.com/containers/podman/v5/pkg/machine/qemu/command" ) func TestUSBParsing(t *testing.T) { diff --git a/pkg/machine/qemu/machine.go b/pkg/machine/qemu/machine.go index 93de8b5609..4acb6582df 100644 --- a/pkg/machine/qemu/machine.go +++ b/pkg/machine/qemu/machine.go @@ -21,13 +21,13 @@ import ( "github.com/containers/common/pkg/config" gvproxy "github.com/containers/gvisor-tap-vsock/pkg/types" - "github.com/containers/podman/v4/pkg/machine" - "github.com/containers/podman/v4/pkg/machine/define" - "github.com/containers/podman/v4/pkg/machine/ignition" - "github.com/containers/podman/v4/pkg/machine/qemu/command" - "github.com/containers/podman/v4/pkg/machine/sockets" - "github.com/containers/podman/v4/pkg/machine/vmconfigs" - "github.com/containers/podman/v4/pkg/rootless" + "github.com/containers/podman/v5/pkg/machine" + "github.com/containers/podman/v5/pkg/machine/define" + "github.com/containers/podman/v5/pkg/machine/ignition" + "github.com/containers/podman/v5/pkg/machine/qemu/command" + "github.com/containers/podman/v5/pkg/machine/sockets" + "github.com/containers/podman/v5/pkg/machine/vmconfigs" + "github.com/containers/podman/v5/pkg/rootless" "github.com/containers/storage/pkg/lockfile" "github.com/digitalocean/go-qemu/qmp" "github.com/sirupsen/logrus" diff --git a/pkg/machine/qemu/machine_test.go b/pkg/machine/qemu/machine_test.go index dbf6b9aae9..377da3b435 100644 --- a/pkg/machine/qemu/machine_test.go +++ b/pkg/machine/qemu/machine_test.go @@ -5,7 +5,7 @@ package qemu import ( "testing" - "github.com/containers/podman/v4/pkg/machine/qemu/command" + "github.com/containers/podman/v5/pkg/machine/qemu/command" "github.com/stretchr/testify/require" ) diff --git a/pkg/machine/qemu/machine_windows.go b/pkg/machine/qemu/machine_windows.go index b31a4f1d10..d2fcd951fd 100644 --- a/pkg/machine/qemu/machine_windows.go +++ b/pkg/machine/qemu/machine_windows.go @@ -6,7 +6,7 @@ import ( "regexp" "strings" - "github.com/containers/podman/v4/pkg/machine" + "github.com/containers/podman/v5/pkg/machine" ) func isProcessAlive(pid int) bool { diff --git a/pkg/machine/qemu/options_linux.go b/pkg/machine/qemu/options_linux.go index 04303d402e..936717c1f3 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/v4/pkg/rootless" - "github.com/containers/podman/v4/pkg/util" + "github.com/containers/podman/v5/pkg/rootless" + "github.com/containers/podman/v5/pkg/util" ) func getRuntimeDir() (string, error) { diff --git a/pkg/machine/sockets/sockets.go b/pkg/machine/sockets/sockets.go index 6d966dbfb3..244aecc80c 100644 --- a/pkg/machine/sockets/sockets.go +++ b/pkg/machine/sockets/sockets.go @@ -8,7 +8,7 @@ import ( "path/filepath" "time" - "github.com/containers/podman/v4/pkg/machine/define" + "github.com/containers/podman/v5/pkg/machine/define" ) // SetSocket creates a new machine file for the socket and assigns it to diff --git a/pkg/machine/update.go b/pkg/machine/update.go index 0f009a5e04..f779922e7e 100644 --- a/pkg/machine/update.go +++ b/pkg/machine/update.go @@ -5,7 +5,7 @@ package machine import ( "fmt" - "github.com/containers/podman/v4/pkg/machine/ignition" + "github.com/containers/podman/v5/pkg/machine/ignition" "github.com/sirupsen/logrus" ) diff --git a/pkg/machine/vmconfigs/config.go b/pkg/machine/vmconfigs/config.go index 8a4cb1e718..30f5ca1aa2 100644 --- a/pkg/machine/vmconfigs/config.go +++ b/pkg/machine/vmconfigs/config.go @@ -6,8 +6,8 @@ import ( "time" gvproxy "github.com/containers/gvisor-tap-vsock/pkg/types" - "github.com/containers/podman/v4/pkg/machine/define" - "github.com/containers/podman/v4/pkg/machine/qemu/command" + "github.com/containers/podman/v5/pkg/machine/define" + "github.com/containers/podman/v5/pkg/machine/qemu/command" "github.com/containers/storage/pkg/lockfile" ) diff --git a/pkg/machine/vmconfigs/config_darwin.go b/pkg/machine/vmconfigs/config_darwin.go index 62bdff414e..24872f7660 100644 --- a/pkg/machine/vmconfigs/config_darwin.go +++ b/pkg/machine/vmconfigs/config_darwin.go @@ -1,7 +1,7 @@ package vmconfigs import ( - "github.com/containers/podman/v4/pkg/machine/applehv/vfkit" + "github.com/containers/podman/v5/pkg/machine/applehv/vfkit" ) type AppleHVConfig struct { diff --git a/pkg/machine/vmconfigs/config_linux.go b/pkg/machine/vmconfigs/config_linux.go index 59d37e8f44..fdffb8dd1e 100644 --- a/pkg/machine/vmconfigs/config_linux.go +++ b/pkg/machine/vmconfigs/config_linux.go @@ -1,7 +1,7 @@ package vmconfigs import ( - "github.com/containers/podman/v4/pkg/machine/qemu/command" + "github.com/containers/podman/v5/pkg/machine/qemu/command" ) type QEMUConfig struct { diff --git a/pkg/machine/vmconfigs/config_windows.go b/pkg/machine/vmconfigs/config_windows.go index 8cec6976ea..79323c6b6e 100644 --- a/pkg/machine/vmconfigs/config_windows.go +++ b/pkg/machine/vmconfigs/config_windows.go @@ -1,7 +1,7 @@ package vmconfigs import ( - "github.com/containers/podman/v4/pkg/machine/hyperv/vsock" + "github.com/containers/podman/v5/pkg/machine/hyperv/vsock" ) type HyperVConfig struct { diff --git a/pkg/machine/volumes.go b/pkg/machine/volumes.go index b2a9d9de41..6a04bcd71b 100644 --- a/pkg/machine/volumes.go +++ b/pkg/machine/volumes.go @@ -3,7 +3,7 @@ package machine import ( "strings" - "github.com/containers/podman/v4/pkg/machine/vmconfigs" + "github.com/containers/podman/v5/pkg/machine/vmconfigs" ) type Volume interface { diff --git a/pkg/machine/wsl/config.go b/pkg/machine/wsl/config.go index a522a77f52..df9bd1b8ce 100644 --- a/pkg/machine/wsl/config.go +++ b/pkg/machine/wsl/config.go @@ -9,10 +9,10 @@ import ( "strings" "time" - "github.com/containers/podman/v4/pkg/machine" - "github.com/containers/podman/v4/pkg/machine/compression" - "github.com/containers/podman/v4/pkg/machine/define" - "github.com/containers/podman/v4/utils" + "github.com/containers/podman/v5/pkg/machine" + "github.com/containers/podman/v5/pkg/machine/compression" + "github.com/containers/podman/v5/pkg/machine/define" + "github.com/containers/podman/v5/utils" "github.com/sirupsen/logrus" ) diff --git a/pkg/machine/wsl/fedora.go b/pkg/machine/wsl/fedora.go index f1d31b6521..5ad76acb2a 100644 --- a/pkg/machine/wsl/fedora.go +++ b/pkg/machine/wsl/fedora.go @@ -14,8 +14,8 @@ import ( "strings" "time" - "github.com/containers/podman/v4/pkg/machine" - "github.com/containers/podman/v4/pkg/machine/define" + "github.com/containers/podman/v5/pkg/machine" + "github.com/containers/podman/v5/pkg/machine/define" ) const ( diff --git a/pkg/machine/wsl/machine.go b/pkg/machine/wsl/machine.go index 7405192e53..cd51b7033c 100644 --- a/pkg/machine/wsl/machine.go +++ b/pkg/machine/wsl/machine.go @@ -17,12 +17,12 @@ import ( "time" "github.com/containers/common/pkg/config" - "github.com/containers/podman/v4/pkg/machine" - "github.com/containers/podman/v4/pkg/machine/define" - "github.com/containers/podman/v4/pkg/machine/ignition" - "github.com/containers/podman/v4/pkg/machine/vmconfigs" - "github.com/containers/podman/v4/pkg/machine/wsl/wutil" - "github.com/containers/podman/v4/utils" + "github.com/containers/podman/v5/pkg/machine" + "github.com/containers/podman/v5/pkg/machine/define" + "github.com/containers/podman/v5/pkg/machine/ignition" + "github.com/containers/podman/v5/pkg/machine/vmconfigs" + "github.com/containers/podman/v5/pkg/machine/wsl/wutil" + "github.com/containers/podman/v5/utils" "github.com/containers/storage/pkg/homedir" "github.com/containers/storage/pkg/lockfile" "github.com/sirupsen/logrus" diff --git a/pkg/machine/wsl/usermodenet.go b/pkg/machine/wsl/usermodenet.go index 3bbef936d1..bb2f6528ad 100644 --- a/pkg/machine/wsl/usermodenet.go +++ b/pkg/machine/wsl/usermodenet.go @@ -9,9 +9,9 @@ import ( "os/exec" "path/filepath" - "github.com/containers/podman/v4/pkg/machine" - "github.com/containers/podman/v4/pkg/machine/wsl/wutil" - "github.com/containers/podman/v4/pkg/specgen" + "github.com/containers/podman/v5/pkg/machine" + "github.com/containers/podman/v5/pkg/machine/wsl/wutil" + "github.com/containers/podman/v5/pkg/specgen" "github.com/sirupsen/logrus" ) diff --git a/pkg/parallel/ctr/ctr.go b/pkg/parallel/ctr/ctr.go index 8c3724627c..1cdb30f8cd 100644 --- a/pkg/parallel/ctr/ctr.go +++ b/pkg/parallel/ctr/ctr.go @@ -5,8 +5,8 @@ package ctr import ( "context" - "github.com/containers/podman/v4/libpod" - "github.com/containers/podman/v4/pkg/parallel" + "github.com/containers/podman/v5/libpod" + "github.com/containers/podman/v5/pkg/parallel" "github.com/sirupsen/logrus" ) diff --git a/pkg/ps/ps.go b/pkg/ps/ps.go index 591f03f94c..a3bb9b9f90 100644 --- a/pkg/ps/ps.go +++ b/pkg/ps/ps.go @@ -14,11 +14,11 @@ import ( "time" libnetworkTypes "github.com/containers/common/libnetwork/types" - "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/podman/v5/libpod" + "github.com/containers/podman/v5/libpod/define" + "github.com/containers/podman/v5/pkg/domain/entities" + "github.com/containers/podman/v5/pkg/domain/filters" + psdefine "github.com/containers/podman/v5/pkg/ps/define" "github.com/containers/storage" "github.com/containers/storage/types" "github.com/sirupsen/logrus" diff --git a/pkg/rootless/rootless_linux.go b/pkg/rootless/rootless_linux.go index 32b47c8ba3..40f81301fb 100644 --- a/pkg/rootless/rootless_linux.go +++ b/pkg/rootless/rootless_linux.go @@ -18,7 +18,7 @@ import ( "sync" "unsafe" - "github.com/containers/podman/v4/pkg/errorhandling" + "github.com/containers/podman/v5/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 223a3d8fc8..f740719af4 100644 --- a/pkg/specgen/container_validate.go +++ b/pkg/specgen/container_validate.go @@ -5,7 +5,7 @@ import ( "fmt" "strings" - "github.com/containers/podman/v4/libpod/define" + "github.com/containers/podman/v5/libpod/define" "golang.org/x/exp/slices" ) diff --git a/pkg/specgen/generate/config_linux.go b/pkg/specgen/generate/config_linux.go index 30714b5727..4d62c93e01 100644 --- a/pkg/specgen/generate/config_linux.go +++ b/pkg/specgen/generate/config_linux.go @@ -11,9 +11,9 @@ import ( "strings" "github.com/containers/common/pkg/config" - "github.com/containers/podman/v4/libpod/define" - "github.com/containers/podman/v4/pkg/rootless" - "github.com/containers/podman/v4/pkg/util" + "github.com/containers/podman/v5/libpod/define" + "github.com/containers/podman/v5/pkg/rootless" + "github.com/containers/podman/v5/pkg/util" spec "github.com/opencontainers/runtime-spec/specs-go" "github.com/opencontainers/runtime-tools/generate" diff --git a/pkg/specgen/generate/config_linux_seccomp.go b/pkg/specgen/generate/config_linux_seccomp.go index a54794cf04..04f2a3c3e4 100644 --- a/pkg/specgen/generate/config_linux_seccomp.go +++ b/pkg/specgen/generate/config_linux_seccomp.go @@ -10,8 +10,8 @@ import ( "github.com/containers/common/libimage" goSeccomp "github.com/containers/common/pkg/seccomp" - "github.com/containers/podman/v4/pkg/seccomp" - "github.com/containers/podman/v4/pkg/specgen" + "github.com/containers/podman/v5/pkg/seccomp" + "github.com/containers/podman/v5/pkg/specgen" spec "github.com/opencontainers/runtime-spec/specs-go" "github.com/sirupsen/logrus" ) diff --git a/pkg/specgen/generate/container.go b/pkg/specgen/generate/container.go index 1f5cb8945f..f224453da7 100644 --- a/pkg/specgen/generate/container.go +++ b/pkg/specgen/generate/container.go @@ -14,12 +14,12 @@ import ( "github.com/containers/common/libimage" "github.com/containers/common/pkg/config" - "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" + "github.com/containers/podman/v5/libpod" + "github.com/containers/podman/v5/libpod/define" + ann "github.com/containers/podman/v5/pkg/annotations" + envLib "github.com/containers/podman/v5/pkg/env" + "github.com/containers/podman/v5/pkg/signal" + "github.com/containers/podman/v5/pkg/specgen" "github.com/openshift/imagebuilder" "github.com/sirupsen/logrus" ) diff --git a/pkg/specgen/generate/container_create.go b/pkg/specgen/generate/container_create.go index 927d64d446..db4f8cdb60 100644 --- a/pkg/specgen/generate/container_create.go +++ b/pkg/specgen/generate/container_create.go @@ -14,13 +14,13 @@ import ( "github.com/containers/common/libimage" "github.com/containers/common/libnetwork/pasta" "github.com/containers/common/libnetwork/slirp4netns" - "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/rootless" - "github.com/containers/podman/v4/pkg/specgen" - "github.com/containers/podman/v4/pkg/specgenutil" - "github.com/containers/podman/v4/pkg/util" + "github.com/containers/podman/v5/libpod" + "github.com/containers/podman/v5/libpod/define" + "github.com/containers/podman/v5/pkg/namespaces" + "github.com/containers/podman/v5/pkg/rootless" + "github.com/containers/podman/v5/pkg/specgen" + "github.com/containers/podman/v5/pkg/specgenutil" + "github.com/containers/podman/v5/pkg/util" "github.com/opencontainers/runtime-spec/specs-go" "github.com/opencontainers/selinux/go-selinux/label" "github.com/sirupsen/logrus" diff --git a/pkg/specgen/generate/kube/kube.go b/pkg/specgen/generate/kube/kube.go index c9361380a9..d20c37d7ca 100644 --- a/pkg/specgen/generate/kube/kube.go +++ b/pkg/specgen/generate/kube/kube.go @@ -23,16 +23,16 @@ import ( "github.com/containers/common/pkg/secrets" "github.com/containers/image/v5/manifest" itypes "github.com/containers/image/v5/types" - "github.com/containers/podman/v4/libpod/define" - ann "github.com/containers/podman/v4/pkg/annotations" - "github.com/containers/podman/v4/pkg/domain/entities" - v1 "github.com/containers/podman/v4/pkg/k8s.io/api/core/v1" - "github.com/containers/podman/v4/pkg/k8s.io/apimachinery/pkg/api/resource" - "github.com/containers/podman/v4/pkg/k8s.io/apimachinery/pkg/util/intstr" - "github.com/containers/podman/v4/pkg/specgen" - "github.com/containers/podman/v4/pkg/specgen/generate" - systemdDefine "github.com/containers/podman/v4/pkg/systemd/define" - "github.com/containers/podman/v4/pkg/util" + "github.com/containers/podman/v5/libpod/define" + ann "github.com/containers/podman/v5/pkg/annotations" + "github.com/containers/podman/v5/pkg/domain/entities" + v1 "github.com/containers/podman/v5/pkg/k8s.io/api/core/v1" + "github.com/containers/podman/v5/pkg/k8s.io/apimachinery/pkg/api/resource" + "github.com/containers/podman/v5/pkg/k8s.io/apimachinery/pkg/util/intstr" + "github.com/containers/podman/v5/pkg/specgen" + "github.com/containers/podman/v5/pkg/specgen/generate" + systemdDefine "github.com/containers/podman/v5/pkg/systemd/define" + "github.com/containers/podman/v5/pkg/util" "github.com/docker/docker/pkg/meminfo" "github.com/docker/go-units" spec "github.com/opencontainers/runtime-spec/specs-go" diff --git a/pkg/specgen/generate/kube/kube_test.go b/pkg/specgen/generate/kube/kube_test.go index b579ff3263..a374ee8f16 100644 --- a/pkg/specgen/generate/kube/kube_test.go +++ b/pkg/specgen/generate/kube/kube_test.go @@ -5,8 +5,8 @@ package kube import ( "testing" - v1 "github.com/containers/podman/v4/pkg/k8s.io/api/core/v1" - "github.com/containers/podman/v4/pkg/k8s.io/apimachinery/pkg/util/intstr" + v1 "github.com/containers/podman/v5/pkg/k8s.io/api/core/v1" + "github.com/containers/podman/v5/pkg/k8s.io/apimachinery/pkg/util/intstr" "github.com/stretchr/testify/assert" ) diff --git a/pkg/specgen/generate/kube/play_test.go b/pkg/specgen/generate/kube/play_test.go index 603462ca11..88580f5b29 100644 --- a/pkg/specgen/generate/kube/play_test.go +++ b/pkg/specgen/generate/kube/play_test.go @@ -9,11 +9,11 @@ import ( "testing" "github.com/containers/common/pkg/secrets" - v1 "github.com/containers/podman/v4/pkg/k8s.io/api/core/v1" - "github.com/containers/podman/v4/pkg/k8s.io/apimachinery/pkg/api/resource" - v12 "github.com/containers/podman/v4/pkg/k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/containers/podman/v4/pkg/k8s.io/apimachinery/pkg/util/intstr" - "github.com/containers/podman/v4/pkg/specgen" + v1 "github.com/containers/podman/v5/pkg/k8s.io/api/core/v1" + "github.com/containers/podman/v5/pkg/k8s.io/apimachinery/pkg/api/resource" + v12 "github.com/containers/podman/v5/pkg/k8s.io/apimachinery/pkg/apis/meta/v1" + "github.com/containers/podman/v5/pkg/k8s.io/apimachinery/pkg/util/intstr" + "github.com/containers/podman/v5/pkg/specgen" "github.com/docker/docker/pkg/meminfo" "github.com/stretchr/testify/assert" "sigs.k8s.io/yaml" diff --git a/pkg/specgen/generate/kube/seccomp.go b/pkg/specgen/generate/kube/seccomp.go index 0ac8bb894b..22659b0827 100644 --- a/pkg/specgen/generate/kube/seccomp.go +++ b/pkg/specgen/generate/kube/seccomp.go @@ -7,8 +7,8 @@ import ( "path/filepath" "strings" - "github.com/containers/podman/v4/libpod" - v1 "github.com/containers/podman/v4/pkg/k8s.io/api/core/v1" + "github.com/containers/podman/v5/libpod" + v1 "github.com/containers/podman/v5/pkg/k8s.io/api/core/v1" ) // KubeSeccompPaths holds information about a pod YAML's seccomp configuration diff --git a/pkg/specgen/generate/kube/volume.go b/pkg/specgen/generate/kube/volume.go index 48f9abe094..40d57170b6 100644 --- a/pkg/specgen/generate/kube/volume.go +++ b/pkg/specgen/generate/kube/volume.go @@ -9,8 +9,8 @@ import ( "github.com/containers/common/pkg/parse" "github.com/containers/common/pkg/secrets" - "github.com/containers/podman/v4/libpod" - v1 "github.com/containers/podman/v4/pkg/k8s.io/api/core/v1" + "github.com/containers/podman/v5/libpod" + v1 "github.com/containers/podman/v5/pkg/k8s.io/api/core/v1" "github.com/sirupsen/logrus" "sigs.k8s.io/yaml" diff --git a/pkg/specgen/generate/namespaces.go b/pkg/specgen/generate/namespaces.go index fc9022b19a..d6bf38fef0 100644 --- a/pkg/specgen/generate/namespaces.go +++ b/pkg/specgen/generate/namespaces.go @@ -9,12 +9,12 @@ import ( "github.com/containers/common/libimage" "github.com/containers/common/libnetwork/types" "github.com/containers/common/pkg/config" - "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/rootless" - "github.com/containers/podman/v4/pkg/specgen" - "github.com/containers/podman/v4/pkg/util" + "github.com/containers/podman/v5/libpod" + "github.com/containers/podman/v5/libpod/define" + "github.com/containers/podman/v5/pkg/namespaces" + "github.com/containers/podman/v5/pkg/rootless" + "github.com/containers/podman/v5/pkg/specgen" + "github.com/containers/podman/v5/pkg/util" spec "github.com/opencontainers/runtime-spec/specs-go" "github.com/sirupsen/logrus" ) diff --git a/pkg/specgen/generate/namespaces_freebsd.go b/pkg/specgen/generate/namespaces_freebsd.go index d6596d3ae8..0230bb3a82 100644 --- a/pkg/specgen/generate/namespaces_freebsd.go +++ b/pkg/specgen/generate/namespaces_freebsd.go @@ -7,8 +7,8 @@ import ( "os" "github.com/containers/buildah/pkg/jail" - "github.com/containers/podman/v4/libpod" - "github.com/containers/podman/v4/pkg/specgen" + "github.com/containers/podman/v5/libpod" + "github.com/containers/podman/v5/pkg/specgen" "github.com/opencontainers/runtime-tools/generate" "github.com/sirupsen/logrus" ) diff --git a/pkg/specgen/generate/namespaces_linux.go b/pkg/specgen/generate/namespaces_linux.go index ecfc6b87e8..fb22b12b18 100644 --- a/pkg/specgen/generate/namespaces_linux.go +++ b/pkg/specgen/generate/namespaces_linux.go @@ -6,9 +6,9 @@ import ( "fmt" "os" - "github.com/containers/podman/v4/libpod" - "github.com/containers/podman/v4/libpod/define" - "github.com/containers/podman/v4/pkg/specgen" + "github.com/containers/podman/v5/libpod" + "github.com/containers/podman/v5/libpod/define" + "github.com/containers/podman/v5/pkg/specgen" spec "github.com/opencontainers/runtime-spec/specs-go" "github.com/opencontainers/runtime-tools/generate" "github.com/sirupsen/logrus" diff --git a/pkg/specgen/generate/oci.go b/pkg/specgen/generate/oci.go index 8a7d606c3c..5cec103fbe 100644 --- a/pkg/specgen/generate/oci.go +++ b/pkg/specgen/generate/oci.go @@ -6,8 +6,8 @@ import ( "strings" "github.com/containers/common/libimage" - "github.com/containers/podman/v4/libpod/define" - "github.com/containers/podman/v4/pkg/specgen" + "github.com/containers/podman/v5/libpod/define" + "github.com/containers/podman/v5/pkg/specgen" "github.com/opencontainers/runtime-tools/generate" "github.com/sirupsen/logrus" ) diff --git a/pkg/specgen/generate/oci_freebsd.go b/pkg/specgen/generate/oci_freebsd.go index 86c35b27b7..0649a1b23d 100644 --- a/pkg/specgen/generate/oci_freebsd.go +++ b/pkg/specgen/generate/oci_freebsd.go @@ -9,9 +9,9 @@ import ( "github.com/containers/common/libimage" "github.com/containers/common/pkg/config" - "github.com/containers/podman/v4/libpod" - "github.com/containers/podman/v4/libpod/define" - "github.com/containers/podman/v4/pkg/specgen" + "github.com/containers/podman/v5/libpod" + "github.com/containers/podman/v5/libpod/define" + "github.com/containers/podman/v5/pkg/specgen" "github.com/opencontainers/runtime-spec/specs-go" spec "github.com/opencontainers/runtime-spec/specs-go" "github.com/opencontainers/runtime-tools/generate" diff --git a/pkg/specgen/generate/oci_linux.go b/pkg/specgen/generate/oci_linux.go index adcc5a73a4..7eb9787f4c 100644 --- a/pkg/specgen/generate/oci_linux.go +++ b/pkg/specgen/generate/oci_linux.go @@ -12,10 +12,10 @@ import ( "github.com/containers/common/libimage" "github.com/containers/common/pkg/cgroups" "github.com/containers/common/pkg/config" - "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/v5/libpod" + "github.com/containers/podman/v5/libpod/define" + "github.com/containers/podman/v5/pkg/rootless" + "github.com/containers/podman/v5/pkg/specgen" "github.com/docker/go-units" spec "github.com/opencontainers/runtime-spec/specs-go" "github.com/opencontainers/runtime-tools/generate" diff --git a/pkg/specgen/generate/pause_image.go b/pkg/specgen/generate/pause_image.go index 7a367e2c1c..ffd398decc 100644 --- a/pkg/specgen/generate/pause_image.go +++ b/pkg/specgen/generate/pause_image.go @@ -9,8 +9,8 @@ import ( buildahDefine "github.com/containers/buildah/define" "github.com/containers/common/pkg/config" - "github.com/containers/podman/v4/libpod" - "github.com/containers/podman/v4/libpod/define" + "github.com/containers/podman/v5/libpod" + "github.com/containers/podman/v5/libpod/define" ) // PullOrBuildInfraImage pulls down the specified image or the one set in diff --git a/pkg/specgen/generate/pod_create.go b/pkg/specgen/generate/pod_create.go index c502134ded..79348aec8b 100644 --- a/pkg/specgen/generate/pod_create.go +++ b/pkg/specgen/generate/pod_create.go @@ -11,11 +11,11 @@ import ( "strconv" "strings" - "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/containers/podman/v4/pkg/specgenutil" + "github.com/containers/podman/v5/libpod" + "github.com/containers/podman/v5/libpod/define" + "github.com/containers/podman/v5/pkg/domain/entities" + "github.com/containers/podman/v5/pkg/specgen" + "github.com/containers/podman/v5/pkg/specgenutil" "github.com/opencontainers/runtime-spec/specs-go" "github.com/sirupsen/logrus" ) diff --git a/pkg/specgen/generate/pod_create_test.go b/pkg/specgen/generate/pod_create_test.go index 54c3de88ed..a5833361a0 100644 --- a/pkg/specgen/generate/pod_create_test.go +++ b/pkg/specgen/generate/pod_create_test.go @@ -6,7 +6,7 @@ import ( "net" "github.com/containers/common/libnetwork/types" - "github.com/containers/podman/v4/pkg/specgen" + "github.com/containers/podman/v5/pkg/specgen" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/pkg/specgen/generate/ports.go b/pkg/specgen/generate/ports.go index 22b230ab12..0218050e03 100644 --- a/pkg/specgen/generate/ports.go +++ b/pkg/specgen/generate/ports.go @@ -10,9 +10,9 @@ import ( "github.com/containers/common/libimage" "github.com/containers/common/libnetwork/types" - "github.com/containers/podman/v4/pkg/specgen" - "github.com/containers/podman/v4/pkg/specgenutil" - "github.com/containers/podman/v4/utils" + "github.com/containers/podman/v5/pkg/specgen" + "github.com/containers/podman/v5/pkg/specgenutil" + "github.com/containers/podman/v5/utils" "github.com/sirupsen/logrus" "golang.org/x/exp/slices" ) diff --git a/pkg/specgen/generate/security_freebsd.go b/pkg/specgen/generate/security_freebsd.go index 4a7b8542c7..948acd3f5b 100644 --- a/pkg/specgen/generate/security_freebsd.go +++ b/pkg/specgen/generate/security_freebsd.go @@ -5,8 +5,8 @@ package generate import ( "github.com/containers/common/libimage" "github.com/containers/common/pkg/config" - "github.com/containers/podman/v4/libpod" - "github.com/containers/podman/v4/pkg/specgen" + "github.com/containers/podman/v5/libpod" + "github.com/containers/podman/v5/pkg/specgen" "github.com/opencontainers/runtime-tools/generate" ) diff --git a/pkg/specgen/generate/security_linux.go b/pkg/specgen/generate/security_linux.go index b81d2ac373..a04508586c 100644 --- a/pkg/specgen/generate/security_linux.go +++ b/pkg/specgen/generate/security_linux.go @@ -10,10 +10,10 @@ import ( "github.com/containers/common/pkg/apparmor" "github.com/containers/common/pkg/capabilities" "github.com/containers/common/pkg/config" - "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/containers/podman/v5/libpod" + "github.com/containers/podman/v5/libpod/define" + "github.com/containers/podman/v5/pkg/specgen" + "github.com/containers/podman/v5/pkg/util" "github.com/opencontainers/runtime-tools/generate" "github.com/opencontainers/selinux/go-selinux/label" "github.com/sirupsen/logrus" diff --git a/pkg/specgen/generate/storage.go b/pkg/specgen/generate/storage.go index d4b0d4563d..9ff8700cd5 100644 --- a/pkg/specgen/generate/storage.go +++ b/pkg/specgen/generate/storage.go @@ -14,10 +14,10 @@ import ( "github.com/containers/common/libimage" "github.com/containers/common/pkg/config" "github.com/containers/common/pkg/parse" - "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/containers/podman/v5/libpod" + "github.com/containers/podman/v5/libpod/define" + "github.com/containers/podman/v5/pkg/specgen" + "github.com/containers/podman/v5/pkg/util" spec "github.com/opencontainers/runtime-spec/specs-go" "github.com/sirupsen/logrus" ) diff --git a/pkg/specgen/generate/validate_freebsd.go b/pkg/specgen/generate/validate_freebsd.go index 00cc210c2b..4e6da178a2 100644 --- a/pkg/specgen/generate/validate_freebsd.go +++ b/pkg/specgen/generate/validate_freebsd.go @@ -1,6 +1,6 @@ package generate -import "github.com/containers/podman/v4/pkg/specgen" +import "github.com/containers/podman/v5/pkg/specgen" // verifyContainerResources does nothing on freebsd as it has no cgroups func verifyContainerResources(s *specgen.SpecGenerator) ([]string, error) { diff --git a/pkg/specgen/generate/validate_linux.go b/pkg/specgen/generate/validate_linux.go index 9f4c32bc9d..25c249613a 100644 --- a/pkg/specgen/generate/validate_linux.go +++ b/pkg/specgen/generate/validate_linux.go @@ -11,8 +11,8 @@ import ( "github.com/containers/common/pkg/cgroups" "github.com/containers/common/pkg/sysinfo" - "github.com/containers/podman/v4/pkg/rootless" - "github.com/containers/podman/v4/pkg/specgen" + "github.com/containers/podman/v5/pkg/rootless" + "github.com/containers/podman/v5/pkg/specgen" "github.com/opencontainers/runtime-spec/specs-go" ) diff --git a/pkg/specgen/namespaces.go b/pkg/specgen/namespaces.go index 52a3763fbc..e94de45c14 100644 --- a/pkg/specgen/namespaces.go +++ b/pkg/specgen/namespaces.go @@ -9,10 +9,10 @@ import ( "github.com/containers/common/libnetwork/types" "github.com/containers/common/pkg/cgroups" - "github.com/containers/podman/v4/libpod/define" - "github.com/containers/podman/v4/pkg/namespaces" - "github.com/containers/podman/v4/pkg/rootless" - "github.com/containers/podman/v4/pkg/util" + "github.com/containers/podman/v5/libpod/define" + "github.com/containers/podman/v5/pkg/namespaces" + "github.com/containers/podman/v5/pkg/rootless" + "github.com/containers/podman/v5/pkg/util" storageTypes "github.com/containers/storage/types" spec "github.com/opencontainers/runtime-spec/specs-go" "github.com/opencontainers/runtime-tools/generate" diff --git a/pkg/specgen/pod_validate.go b/pkg/specgen/pod_validate.go index 1c0413cd5c..2f1c874ae8 100644 --- a/pkg/specgen/pod_validate.go +++ b/pkg/specgen/pod_validate.go @@ -4,7 +4,7 @@ import ( "errors" "fmt" - "github.com/containers/podman/v4/pkg/util" + "github.com/containers/podman/v5/pkg/util" ) var ( diff --git a/pkg/specgen/specgen.go b/pkg/specgen/specgen.go index fab854a51a..00a208921a 100644 --- a/pkg/specgen/specgen.go +++ b/pkg/specgen/specgen.go @@ -8,7 +8,7 @@ import ( nettypes "github.com/containers/common/libnetwork/types" "github.com/containers/image/v5/manifest" - "github.com/containers/podman/v4/libpod/define" + "github.com/containers/podman/v5/libpod/define" "github.com/containers/storage/types" spec "github.com/opencontainers/runtime-spec/specs-go" ) diff --git a/pkg/specgen/volumes.go b/pkg/specgen/volumes.go index b8b2ece8bd..075711138c 100644 --- a/pkg/specgen/volumes.go +++ b/pkg/specgen/volumes.go @@ -7,7 +7,7 @@ import ( "strings" "github.com/containers/common/pkg/parse" - "github.com/containers/podman/v4/libpod/define" + "github.com/containers/podman/v5/libpod/define" spec "github.com/opencontainers/runtime-spec/specs-go" "github.com/sirupsen/logrus" ) diff --git a/pkg/specgenutil/createparse.go b/pkg/specgenutil/createparse.go index 373fb6faa1..04bd8b0aa9 100644 --- a/pkg/specgenutil/createparse.go +++ b/pkg/specgenutil/createparse.go @@ -4,7 +4,7 @@ import ( "errors" "github.com/containers/common/pkg/config" - "github.com/containers/podman/v4/pkg/domain/entities" + "github.com/containers/podman/v5/pkg/domain/entities" ) // validate determines if the flags and values given by the user are valid. things checked diff --git a/pkg/specgenutil/specgen.go b/pkg/specgenutil/specgen.go index c4d2b66d8b..912193b453 100644 --- a/pkg/specgenutil/specgen.go +++ b/pkg/specgenutil/specgen.go @@ -11,14 +11,14 @@ import ( "github.com/containers/common/pkg/config" "github.com/containers/image/v5/manifest" - "github.com/containers/podman/v4/cmd/podman/parse" - "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/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/containers/podman/v5/cmd/podman/parse" + "github.com/containers/podman/v5/libpod/define" + "github.com/containers/podman/v5/pkg/domain/entities" + envLib "github.com/containers/podman/v5/pkg/env" + "github.com/containers/podman/v5/pkg/namespaces" + "github.com/containers/podman/v5/pkg/specgen" + systemdDefine "github.com/containers/podman/v5/pkg/systemd/define" + "github.com/containers/podman/v5/pkg/util" "github.com/docker/go-units" "github.com/opencontainers/runtime-spec/specs-go" "github.com/opencontainers/selinux/go-selinux" diff --git a/pkg/specgenutil/specgenutil_test.go b/pkg/specgenutil/specgenutil_test.go index 6a7a68939e..c0e93316f8 100644 --- a/pkg/specgenutil/specgenutil_test.go +++ b/pkg/specgenutil/specgenutil_test.go @@ -8,8 +8,8 @@ import ( "testing" "github.com/containers/common/pkg/machine" - "github.com/containers/podman/v4/pkg/domain/entities" - "github.com/containers/podman/v4/pkg/specgen" + "github.com/containers/podman/v5/pkg/domain/entities" + "github.com/containers/podman/v5/pkg/specgen" "github.com/stretchr/testify/assert" ) diff --git a/pkg/specgenutil/volumes.go b/pkg/specgenutil/volumes.go index cae55f18b5..c481867163 100644 --- a/pkg/specgenutil/volumes.go +++ b/pkg/specgenutil/volumes.go @@ -9,11 +9,11 @@ import ( "github.com/containers/common/pkg/config" "github.com/containers/common/pkg/parse" - "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/specgenutilexternal" - "github.com/containers/podman/v4/pkg/util" + "github.com/containers/podman/v5/libpod/define" + "github.com/containers/podman/v5/pkg/rootless" + "github.com/containers/podman/v5/pkg/specgen" + "github.com/containers/podman/v5/pkg/specgenutilexternal" + "github.com/containers/podman/v5/pkg/util" spec "github.com/opencontainers/runtime-spec/specs-go" ) diff --git a/pkg/systemd/dbus.go b/pkg/systemd/dbus.go index 059d39958a..d5613bb859 100644 --- a/pkg/systemd/dbus.go +++ b/pkg/systemd/dbus.go @@ -7,7 +7,7 @@ import ( "path/filepath" "strconv" - "github.com/containers/podman/v4/pkg/rootless" + "github.com/containers/podman/v5/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 4ddf48969f..ded78aab37 100644 --- a/pkg/systemd/generate/common.go +++ b/pkg/systemd/generate/common.go @@ -7,7 +7,7 @@ import ( "strconv" "strings" - "github.com/containers/podman/v4/pkg/systemd/define" + "github.com/containers/podman/v5/pkg/systemd/define" ) // minTimeoutStopSec is the minimal stop timeout for generated systemd units. diff --git a/pkg/systemd/generate/containers.go b/pkg/systemd/generate/containers.go index e7bb77d6db..ade2824304 100644 --- a/pkg/systemd/generate/containers.go +++ b/pkg/systemd/generate/containers.go @@ -12,11 +12,11 @@ import ( "text/template" "time" - "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/containers/podman/v5/libpod" + libpodDefine "github.com/containers/podman/v5/libpod/define" + "github.com/containers/podman/v5/pkg/domain/entities" + "github.com/containers/podman/v5/pkg/systemd/define" + "github.com/containers/podman/v5/version" "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 48054ded49..db0c9113dd 100644 --- a/pkg/systemd/generate/containers_test.go +++ b/pkg/systemd/generate/containers_test.go @@ -7,8 +7,8 @@ import ( "strings" "testing" - "github.com/containers/podman/v4/pkg/domain/entities" - "github.com/containers/podman/v4/pkg/systemd/define" + "github.com/containers/podman/v5/pkg/domain/entities" + "github.com/containers/podman/v5/pkg/systemd/define" "github.com/stretchr/testify/assert" ) diff --git a/pkg/systemd/generate/pods.go b/pkg/systemd/generate/pods.go index 3258ef4a1e..3c97973295 100644 --- a/pkg/systemd/generate/pods.go +++ b/pkg/systemd/generate/pods.go @@ -12,10 +12,10 @@ import ( "text/template" "time" - "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/containers/podman/v5/libpod" + "github.com/containers/podman/v5/pkg/domain/entities" + "github.com/containers/podman/v5/pkg/systemd/define" + "github.com/containers/podman/v5/version" "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 43c655ee0a..6b43a32ffb 100644 --- a/pkg/systemd/generate/pods_test.go +++ b/pkg/systemd/generate/pods_test.go @@ -5,7 +5,7 @@ package generate import ( "testing" - "github.com/containers/podman/v4/pkg/domain/entities" + "github.com/containers/podman/v5/pkg/domain/entities" "github.com/stretchr/testify/assert" ) diff --git a/pkg/systemd/notifyproxy/notifyproxy.go b/pkg/systemd/notifyproxy/notifyproxy.go index 44db55d633..240aed3129 100644 --- a/pkg/systemd/notifyproxy/notifyproxy.go +++ b/pkg/systemd/notifyproxy/notifyproxy.go @@ -11,7 +11,7 @@ import ( "syscall" "time" - "github.com/containers/podman/v4/libpod/define" + "github.com/containers/podman/v5/libpod/define" "github.com/coreos/go-systemd/v22/daemon" "github.com/sirupsen/logrus" "golang.org/x/sys/unix" diff --git a/pkg/systemd/quadlet/quadlet.go b/pkg/systemd/quadlet/quadlet.go index 62c2f53596..7a9adf366f 100644 --- a/pkg/systemd/quadlet/quadlet.go +++ b/pkg/systemd/quadlet/quadlet.go @@ -9,8 +9,8 @@ import ( "path/filepath" "strings" - "github.com/containers/podman/v4/pkg/specgenutilexternal" - "github.com/containers/podman/v4/pkg/systemd/parser" + "github.com/containers/podman/v5/pkg/specgenutilexternal" + "github.com/containers/podman/v5/pkg/systemd/parser" "github.com/containers/storage/pkg/regexp" ) diff --git a/pkg/util/mountOpts.go b/pkg/util/mountOpts.go index 2b515aa5df..2ae1fbbede 100644 --- a/pkg/util/mountOpts.go +++ b/pkg/util/mountOpts.go @@ -5,8 +5,8 @@ import ( "fmt" "strings" - "github.com/containers/podman/v4/libpod/define" - "github.com/containers/podman/v4/pkg/rootless" + "github.com/containers/podman/v5/libpod/define" + "github.com/containers/podman/v5/pkg/rootless" ) var ( diff --git a/pkg/util/utils.go b/pkg/util/utils.go index 0eefd60559..1f9474a4ac 100644 --- a/pkg/util/utils.go +++ b/pkg/util/utils.go @@ -19,11 +19,11 @@ import ( "github.com/BurntSushi/toml" "github.com/containers/common/pkg/config" "github.com/containers/image/v5/types" - "github.com/containers/podman/v4/libpod/define" - "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/podman/v5/libpod/define" + "github.com/containers/podman/v5/pkg/errorhandling" + "github.com/containers/podman/v5/pkg/namespaces" + "github.com/containers/podman/v5/pkg/rootless" + "github.com/containers/podman/v5/pkg/signal" "github.com/containers/storage/pkg/directory" "github.com/containers/storage/pkg/idtools" stypes "github.com/containers/storage/types" diff --git a/pkg/util/utils_linux.go b/pkg/util/utils_linux.go index 3cb080481b..eadc8d3ba8 100644 --- a/pkg/util/utils_linux.go +++ b/pkg/util/utils_linux.go @@ -10,8 +10,8 @@ import ( "strings" "syscall" - "github.com/containers/podman/v4/libpod/define" - "github.com/containers/podman/v4/pkg/rootless" + "github.com/containers/podman/v5/libpod/define" + "github.com/containers/podman/v5/pkg/rootless" "github.com/containers/psgo" spec "github.com/opencontainers/runtime-spec/specs-go" "github.com/opencontainers/runtime-tools/generate" diff --git a/pkg/util/utils_supported.go b/pkg/util/utils_supported.go index afa2d4f840..024c93dace 100644 --- a/pkg/util/utils_supported.go +++ b/pkg/util/utils_supported.go @@ -8,7 +8,7 @@ package util import ( "path/filepath" - "github.com/containers/podman/v4/pkg/rootless" + "github.com/containers/podman/v5/pkg/rootless" "github.com/containers/storage/pkg/homedir" ) diff --git a/test/e2e/attach_test.go b/test/e2e/attach_test.go index 7290458485..f81614fdd5 100644 --- a/test/e2e/attach_test.go +++ b/test/e2e/attach_test.go @@ -4,7 +4,7 @@ import ( "syscall" "time" - . "github.com/containers/podman/v4/test/utils" + . "github.com/containers/podman/v5/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/test/e2e/build_test.go b/test/e2e/build_test.go index 9683b165c8..8042dfcb0a 100644 --- a/test/e2e/build_test.go +++ b/test/e2e/build_test.go @@ -10,7 +10,7 @@ import ( "strings" "github.com/containers/buildah/define" - . "github.com/containers/podman/v4/test/utils" + . "github.com/containers/podman/v5/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/test/e2e/checkpoint_image_test.go b/test/e2e/checkpoint_image_test.go index 98ae33b318..8a4a10b0ea 100644 --- a/test/e2e/checkpoint_image_test.go +++ b/test/e2e/checkpoint_image_test.go @@ -6,8 +6,8 @@ import ( "strconv" "strings" - "github.com/containers/podman/v4/pkg/criu" - . "github.com/containers/podman/v4/test/utils" + "github.com/containers/podman/v5/pkg/criu" + . "github.com/containers/podman/v5/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/test/e2e/checkpoint_test.go b/test/e2e/checkpoint_test.go index 4996e0b887..7c3519af29 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/v7/stats" - "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/containers/podman/v5/pkg/checkpoint/crutils" + "github.com/containers/podman/v5/pkg/criu" + "github.com/containers/podman/v5/pkg/domain/entities" + . "github.com/containers/podman/v5/test/utils" + "github.com/containers/podman/v5/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/test/e2e/cleanup_test.go b/test/e2e/cleanup_test.go index 52278a23b6..d43e6405ab 100644 --- a/test/e2e/cleanup_test.go +++ b/test/e2e/cleanup_test.go @@ -1,7 +1,7 @@ package integration import ( - . "github.com/containers/podman/v4/test/utils" + . "github.com/containers/podman/v5/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/test/e2e/commit_test.go b/test/e2e/commit_test.go index b1bbb29b61..cf1081fb89 100644 --- a/test/e2e/commit_test.go +++ b/test/e2e/commit_test.go @@ -5,7 +5,7 @@ import ( "path/filepath" "strings" - . "github.com/containers/podman/v4/test/utils" + . "github.com/containers/podman/v5/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/test/e2e/common_test.go b/test/e2e/common_test.go index 08d27a96c8..b708d5c658 100644 --- a/test/e2e/common_test.go +++ b/test/e2e/common_test.go @@ -21,9 +21,9 @@ import ( "time" "github.com/containers/common/pkg/cgroups" - "github.com/containers/podman/v4/libpod/define" - "github.com/containers/podman/v4/pkg/inspect" - . "github.com/containers/podman/v4/test/utils" + "github.com/containers/podman/v5/libpod/define" + "github.com/containers/podman/v5/pkg/inspect" + . "github.com/containers/podman/v5/test/utils" "github.com/containers/storage/pkg/lockfile" "github.com/containers/storage/pkg/reexec" "github.com/containers/storage/pkg/stringid" diff --git a/test/e2e/container_clone_test.go b/test/e2e/container_clone_test.go index e5bd0f7429..343be45164 100644 --- a/test/e2e/container_clone_test.go +++ b/test/e2e/container_clone_test.go @@ -1,7 +1,7 @@ package integration import ( - . "github.com/containers/podman/v4/test/utils" + . "github.com/containers/podman/v5/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/test/e2e/container_create_volume_test.go b/test/e2e/container_create_volume_test.go index acd71054da..493d08ab39 100644 --- a/test/e2e/container_create_volume_test.go +++ b/test/e2e/container_create_volume_test.go @@ -5,7 +5,7 @@ import ( "os" "path/filepath" - . "github.com/containers/podman/v4/test/utils" + . "github.com/containers/podman/v5/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/test/e2e/container_inspect_test.go b/test/e2e/container_inspect_test.go index 953c6af06f..3fc516819c 100644 --- a/test/e2e/container_inspect_test.go +++ b/test/e2e/container_inspect_test.go @@ -1,9 +1,9 @@ package integration import ( - "github.com/containers/podman/v4/libpod/define" - "github.com/containers/podman/v4/pkg/annotations" - . "github.com/containers/podman/v4/test/utils" + "github.com/containers/podman/v5/libpod/define" + "github.com/containers/podman/v5/pkg/annotations" + . "github.com/containers/podman/v5/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/test/e2e/containers_conf_test.go b/test/e2e/containers_conf_test.go index 8360c79117..56d7f7eb84 100644 --- a/test/e2e/containers_conf_test.go +++ b/test/e2e/containers_conf_test.go @@ -8,8 +8,8 @@ import ( "strings" "time" - "github.com/containers/podman/v4/libpod/define" - . "github.com/containers/podman/v4/test/utils" + "github.com/containers/podman/v5/libpod/define" + . "github.com/containers/podman/v5/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/test/e2e/cp_test.go b/test/e2e/cp_test.go index a009714982..f63c778e13 100644 --- a/test/e2e/cp_test.go +++ b/test/e2e/cp_test.go @@ -6,7 +6,7 @@ import ( "os/user" "path/filepath" - . "github.com/containers/podman/v4/test/utils" + . "github.com/containers/podman/v5/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/test/e2e/create_staticip_test.go b/test/e2e/create_staticip_test.go index 89792c9a69..df5aefc85f 100644 --- a/test/e2e/create_staticip_test.go +++ b/test/e2e/create_staticip_test.go @@ -3,7 +3,7 @@ package integration import ( "time" - . "github.com/containers/podman/v4/test/utils" + . "github.com/containers/podman/v5/test/utils" . "github.com/onsi/ginkgo/v2" . "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 9b88dcaf4d..35b1f7cbe6 100644 --- a/test/e2e/create_staticmac_test.go +++ b/test/e2e/create_staticmac_test.go @@ -1,7 +1,7 @@ package integration import ( - . "github.com/containers/podman/v4/test/utils" + . "github.com/containers/podman/v5/test/utils" "github.com/containers/storage/pkg/stringid" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/test/e2e/create_test.go b/test/e2e/create_test.go index df753ce461..6d5b82232b 100644 --- a/test/e2e/create_test.go +++ b/test/e2e/create_test.go @@ -8,7 +8,7 @@ import ( "strconv" "strings" - . "github.com/containers/podman/v4/test/utils" + . "github.com/containers/podman/v5/test/utils" "github.com/containers/storage/pkg/stringid" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/test/e2e/diff_test.go b/test/e2e/diff_test.go index 1b2fa4fbe7..1db506c840 100644 --- a/test/e2e/diff_test.go +++ b/test/e2e/diff_test.go @@ -4,7 +4,7 @@ import ( "fmt" "sort" - . "github.com/containers/podman/v4/test/utils" + . "github.com/containers/podman/v5/test/utils" "github.com/containers/storage/pkg/stringid" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/test/e2e/events_test.go b/test/e2e/events_test.go index cf62c8a8de..24ead57da1 100644 --- a/test/e2e/events_test.go +++ b/test/e2e/events_test.go @@ -7,8 +7,8 @@ import ( "sync" "time" - "github.com/containers/podman/v4/libpod/events" - . "github.com/containers/podman/v4/test/utils" + "github.com/containers/podman/v5/libpod/events" + . "github.com/containers/podman/v5/test/utils" "github.com/containers/storage/pkg/stringid" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/test/e2e/exec_test.go b/test/e2e/exec_test.go index 335af01094..889e357dd6 100644 --- a/test/e2e/exec_test.go +++ b/test/e2e/exec_test.go @@ -6,7 +6,7 @@ import ( "path/filepath" "strings" - . "github.com/containers/podman/v4/test/utils" + . "github.com/containers/podman/v5/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/test/e2e/exists_test.go b/test/e2e/exists_test.go index 2728e364cf..c86ca5f5fd 100644 --- a/test/e2e/exists_test.go +++ b/test/e2e/exists_test.go @@ -1,7 +1,7 @@ package integration import ( - . "github.com/containers/podman/v4/test/utils" + . "github.com/containers/podman/v5/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/test/e2e/export_test.go b/test/e2e/export_test.go index 9500ae1df8..36ad540df4 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/v4/test/utils" + . "github.com/containers/podman/v5/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/test/e2e/farm_test.go b/test/e2e/farm_test.go index 4c6f6172bc..b676a92499 100644 --- a/test/e2e/farm_test.go +++ b/test/e2e/farm_test.go @@ -4,7 +4,7 @@ import ( "os" "path/filepath" - . "github.com/containers/podman/v4/test/utils" + . "github.com/containers/podman/v5/test/utils" . "github.com/onsi/ginkgo/v2" . "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 257a25bfb5..0a1c2f7483 100644 --- a/test/e2e/generate_kube_test.go +++ b/test/e2e/generate_kube_test.go @@ -8,11 +8,11 @@ import ( "strconv" "strings" - "github.com/containers/podman/v4/libpod/define" + "github.com/containers/podman/v5/libpod/define" - v1 "github.com/containers/podman/v4/pkg/k8s.io/api/core/v1" - "github.com/containers/podman/v4/pkg/util" - . "github.com/containers/podman/v4/test/utils" + v1 "github.com/containers/podman/v5/pkg/k8s.io/api/core/v1" + "github.com/containers/podman/v5/pkg/util" + . "github.com/containers/podman/v5/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/test/e2e/generate_spec_test.go b/test/e2e/generate_spec_test.go index 74b17defc5..8fa378393e 100644 --- a/test/e2e/generate_spec_test.go +++ b/test/e2e/generate_spec_test.go @@ -3,7 +3,7 @@ package integration import ( "path/filepath" - . "github.com/containers/podman/v4/test/utils" + . "github.com/containers/podman/v5/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/test/e2e/generate_systemd_test.go b/test/e2e/generate_systemd_test.go index 4630c2d87e..824cf65132 100644 --- a/test/e2e/generate_systemd_test.go +++ b/test/e2e/generate_systemd_test.go @@ -4,7 +4,7 @@ import ( "os" "strings" - . "github.com/containers/podman/v4/test/utils" + . "github.com/containers/podman/v5/test/utils" . "github.com/onsi/ginkgo/v2" . "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 a84ee2c325..7bab32c9ef 100644 --- a/test/e2e/healthcheck_run_test.go +++ b/test/e2e/healthcheck_run_test.go @@ -6,8 +6,8 @@ import ( "path/filepath" "time" - "github.com/containers/podman/v4/libpod/define" - . "github.com/containers/podman/v4/test/utils" + "github.com/containers/podman/v5/libpod/define" + . "github.com/containers/podman/v5/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/test/e2e/history_test.go b/test/e2e/history_test.go index 247e625212..b5251c1c09 100644 --- a/test/e2e/history_test.go +++ b/test/e2e/history_test.go @@ -1,7 +1,7 @@ package integration import ( - . "github.com/containers/podman/v4/test/utils" + . "github.com/containers/podman/v5/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/test/e2e/image_scp_test.go b/test/e2e/image_scp_test.go index e42119e278..5dd1a3a54d 100644 --- a/test/e2e/image_scp_test.go +++ b/test/e2e/image_scp_test.go @@ -4,7 +4,7 @@ import ( "os" "path/filepath" - . "github.com/containers/podman/v4/test/utils" + . "github.com/containers/podman/v5/test/utils" "github.com/containers/storage/pkg/homedir" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/test/e2e/image_sign_test.go b/test/e2e/image_sign_test.go index 6f9ed7c610..026a2e40e7 100644 --- a/test/e2e/image_sign_test.go +++ b/test/e2e/image_sign_test.go @@ -5,7 +5,7 @@ import ( "os/exec" "path/filepath" - . "github.com/containers/podman/v4/test/utils" + . "github.com/containers/podman/v5/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/test/e2e/images_test.go b/test/e2e/images_test.go index 7bb08fdf0f..6d7f45fe59 100644 --- a/test/e2e/images_test.go +++ b/test/e2e/images_test.go @@ -5,7 +5,7 @@ import ( "sort" "strings" - . "github.com/containers/podman/v4/test/utils" + . "github.com/containers/podman/v5/test/utils" "github.com/docker/go-units" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/test/e2e/import_test.go b/test/e2e/import_test.go index bd4e954d05..e22b819912 100644 --- a/test/e2e/import_test.go +++ b/test/e2e/import_test.go @@ -3,7 +3,7 @@ package integration import ( "path/filepath" - . "github.com/containers/podman/v4/test/utils" + . "github.com/containers/podman/v5/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/test/e2e/info_test.go b/test/e2e/info_test.go index c05ee29ee1..a3c96b1932 100644 --- a/test/e2e/info_test.go +++ b/test/e2e/info_test.go @@ -9,7 +9,7 @@ import ( "runtime" "strconv" - . "github.com/containers/podman/v4/test/utils" + . "github.com/containers/podman/v5/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/test/e2e/init_test.go b/test/e2e/init_test.go index e2ecbcfc87..5c8cb14f34 100644 --- a/test/e2e/init_test.go +++ b/test/e2e/init_test.go @@ -1,7 +1,7 @@ package integration import ( - . "github.com/containers/podman/v4/test/utils" + . "github.com/containers/podman/v5/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/test/e2e/inspect_test.go b/test/e2e/inspect_test.go index 1f0e7efb3f..637535f9a3 100644 --- a/test/e2e/inspect_test.go +++ b/test/e2e/inspect_test.go @@ -1,7 +1,7 @@ package integration import ( - . "github.com/containers/podman/v4/test/utils" + . "github.com/containers/podman/v5/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/test/e2e/kill_test.go b/test/e2e/kill_test.go index c30c3a299f..56f13117da 100644 --- a/test/e2e/kill_test.go +++ b/test/e2e/kill_test.go @@ -1,7 +1,7 @@ package integration import ( - . "github.com/containers/podman/v4/test/utils" + . "github.com/containers/podman/v5/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/test/e2e/load_test.go b/test/e2e/load_test.go index ac2c16cd03..f0f701ed74 100644 --- a/test/e2e/load_test.go +++ b/test/e2e/load_test.go @@ -4,7 +4,7 @@ import ( "fmt" "path/filepath" - . "github.com/containers/podman/v4/test/utils" + . "github.com/containers/podman/v5/test/utils" . "github.com/onsi/ginkgo/v2" . "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 3faedb7013..a6ca4b69ae 100644 --- a/test/e2e/login_logout_test.go +++ b/test/e2e/login_logout_test.go @@ -8,7 +8,7 @@ import ( "strconv" "strings" - . "github.com/containers/podman/v4/test/utils" + . "github.com/containers/podman/v5/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/test/e2e/logs_test.go b/test/e2e/logs_test.go index 1f256e9f84..acfb950997 100644 --- a/test/e2e/logs_test.go +++ b/test/e2e/logs_test.go @@ -6,7 +6,7 @@ import ( "os/exec" "time" - . "github.com/containers/podman/v4/test/utils" + . "github.com/containers/podman/v5/test/utils" "github.com/containers/storage/pkg/stringid" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/test/e2e/manifest_test.go b/test/e2e/manifest_test.go index 071239f4fb..297c32662c 100644 --- a/test/e2e/manifest_test.go +++ b/test/e2e/manifest_test.go @@ -7,8 +7,8 @@ import ( "strings" "github.com/containers/common/libimage/define" - podmanRegistry "github.com/containers/podman/v4/hack/podman-registry-go" - . "github.com/containers/podman/v4/test/utils" + podmanRegistry "github.com/containers/podman/v5/hack/podman-registry-go" + . "github.com/containers/podman/v5/test/utils" "github.com/containers/storage/pkg/archive" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/test/e2e/mount_rootless_test.go b/test/e2e/mount_rootless_test.go index c1df2cbac3..b8360dfa9c 100644 --- a/test/e2e/mount_rootless_test.go +++ b/test/e2e/mount_rootless_test.go @@ -1,7 +1,7 @@ package integration import ( - . "github.com/containers/podman/v4/test/utils" + . "github.com/containers/podman/v5/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/test/e2e/mount_test.go b/test/e2e/mount_test.go index 3bcb1c4364..a1be678bf9 100644 --- a/test/e2e/mount_test.go +++ b/test/e2e/mount_test.go @@ -1,7 +1,7 @@ package integration import ( - . "github.com/containers/podman/v4/test/utils" + . "github.com/containers/podman/v5/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/test/e2e/negative_test.go b/test/e2e/negative_test.go index 4e8398c6a4..7e6bfca752 100644 --- a/test/e2e/negative_test.go +++ b/test/e2e/negative_test.go @@ -1,7 +1,7 @@ package integration import ( - . "github.com/containers/podman/v4/test/utils" + . "github.com/containers/podman/v5/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/test/e2e/network_connect_disconnect_test.go b/test/e2e/network_connect_disconnect_test.go index 2f9a702511..cb3a1aae1d 100644 --- a/test/e2e/network_connect_disconnect_test.go +++ b/test/e2e/network_connect_disconnect_test.go @@ -1,7 +1,7 @@ package integration import ( - . "github.com/containers/podman/v4/test/utils" + . "github.com/containers/podman/v5/test/utils" "github.com/containers/storage/pkg/stringid" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/test/e2e/network_create_test.go b/test/e2e/network_create_test.go index 28e4346d0c..c60cd4e06a 100644 --- a/test/e2e/network_create_test.go +++ b/test/e2e/network_create_test.go @@ -5,7 +5,7 @@ import ( "net" "github.com/containers/common/libnetwork/types" - . "github.com/containers/podman/v4/test/utils" + . "github.com/containers/podman/v5/test/utils" "github.com/containers/storage/pkg/stringid" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/test/e2e/network_test.go b/test/e2e/network_test.go index 2d94f3f903..5636425acb 100644 --- a/test/e2e/network_test.go +++ b/test/e2e/network_test.go @@ -7,7 +7,7 @@ import ( "time" "github.com/containers/common/libnetwork/types" - . "github.com/containers/podman/v4/test/utils" + . "github.com/containers/podman/v5/test/utils" "github.com/containers/storage/pkg/stringid" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/test/e2e/pause_test.go b/test/e2e/pause_test.go index bfe4c3c155..9ab0be136b 100644 --- a/test/e2e/pause_test.go +++ b/test/e2e/pause_test.go @@ -6,7 +6,7 @@ import ( "path/filepath" "strings" - . "github.com/containers/podman/v4/test/utils" + . "github.com/containers/podman/v5/test/utils" . "github.com/onsi/ginkgo/v2" . "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 c79ef3a488..80157104f5 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/v4/test/utils" + . "github.com/containers/podman/v5/test/utils" . "github.com/onsi/ginkgo/v2" . "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 359bd4dc6a..efa61a9794 100644 --- a/test/e2e/play_kube_test.go +++ b/test/e2e/play_kube_test.go @@ -19,13 +19,13 @@ import ( "text/template" "time" - "github.com/containers/podman/v4/libpod/define" - "github.com/containers/podman/v4/pkg/bindings" - "github.com/containers/podman/v4/pkg/bindings/play" - v1 "github.com/containers/podman/v4/pkg/k8s.io/api/core/v1" - "github.com/containers/podman/v4/pkg/util" - . "github.com/containers/podman/v4/test/utils" - "github.com/containers/podman/v4/utils" + "github.com/containers/podman/v5/libpod/define" + "github.com/containers/podman/v5/pkg/bindings" + "github.com/containers/podman/v5/pkg/bindings/play" + v1 "github.com/containers/podman/v5/pkg/k8s.io/api/core/v1" + "github.com/containers/podman/v5/pkg/util" + . "github.com/containers/podman/v5/test/utils" + "github.com/containers/podman/v5/utils" "github.com/containers/storage/pkg/stringid" "github.com/google/uuid" . "github.com/onsi/ginkgo/v2" diff --git a/test/e2e/pod_clone_test.go b/test/e2e/pod_clone_test.go index aae89a3087..fb240c279b 100644 --- a/test/e2e/pod_clone_test.go +++ b/test/e2e/pod_clone_test.go @@ -3,7 +3,7 @@ package integration import ( "os" - . "github.com/containers/podman/v4/test/utils" + . "github.com/containers/podman/v5/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/test/e2e/pod_create_test.go b/test/e2e/pod_create_test.go index 3be0213b51..b6b579ba72 100644 --- a/test/e2e/pod_create_test.go +++ b/test/e2e/pod_create_test.go @@ -12,8 +12,8 @@ import ( "github.com/containers/common/pkg/apparmor" "github.com/containers/common/pkg/seccomp" "github.com/containers/common/pkg/sysinfo" - "github.com/containers/podman/v4/pkg/util" - . "github.com/containers/podman/v4/test/utils" + "github.com/containers/podman/v5/pkg/util" + . "github.com/containers/podman/v5/test/utils" . "github.com/onsi/ginkgo/v2" . "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 91bebaa53d..f88733e607 100644 --- a/test/e2e/pod_infra_container_test.go +++ b/test/e2e/pod_infra_container_test.go @@ -3,7 +3,7 @@ package integration import ( "strconv" - . "github.com/containers/podman/v4/test/utils" + . "github.com/containers/podman/v5/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/test/e2e/pod_initcontainers_test.go b/test/e2e/pod_initcontainers_test.go index 38487076ce..561044f115 100644 --- a/test/e2e/pod_initcontainers_test.go +++ b/test/e2e/pod_initcontainers_test.go @@ -4,8 +4,8 @@ import ( "fmt" "path/filepath" - "github.com/containers/podman/v4/libpod/define" - . "github.com/containers/podman/v4/test/utils" + "github.com/containers/podman/v5/libpod/define" + . "github.com/containers/podman/v5/test/utils" . "github.com/onsi/ginkgo/v2" . "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 1663f37fd4..84f3dfc97b 100644 --- a/test/e2e/pod_inspect_test.go +++ b/test/e2e/pod_inspect_test.go @@ -3,8 +3,8 @@ package integration import ( "encoding/json" - "github.com/containers/podman/v4/libpod/define" - . "github.com/containers/podman/v4/test/utils" + "github.com/containers/podman/v5/libpod/define" + . "github.com/containers/podman/v5/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/test/e2e/pod_kill_test.go b/test/e2e/pod_kill_test.go index 1df19462e7..c63377202e 100644 --- a/test/e2e/pod_kill_test.go +++ b/test/e2e/pod_kill_test.go @@ -1,7 +1,7 @@ package integration import ( - . "github.com/containers/podman/v4/test/utils" + . "github.com/containers/podman/v5/test/utils" . "github.com/onsi/ginkgo/v2" . "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 b3d918d895..adb173c441 100644 --- a/test/e2e/pod_pause_test.go +++ b/test/e2e/pod_pause_test.go @@ -1,7 +1,7 @@ package integration import ( - . "github.com/containers/podman/v4/test/utils" + . "github.com/containers/podman/v5/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/test/e2e/pod_pod_namespaces_test.go b/test/e2e/pod_pod_namespaces_test.go index 63a2508010..a1597bca61 100644 --- a/test/e2e/pod_pod_namespaces_test.go +++ b/test/e2e/pod_pod_namespaces_test.go @@ -1,7 +1,7 @@ package integration import ( - . "github.com/containers/podman/v4/test/utils" + . "github.com/containers/podman/v5/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/test/e2e/pod_prune_test.go b/test/e2e/pod_prune_test.go index a827ed7458..851dccabb5 100644 --- a/test/e2e/pod_prune_test.go +++ b/test/e2e/pod_prune_test.go @@ -1,7 +1,7 @@ package integration import ( - . "github.com/containers/podman/v4/test/utils" + . "github.com/containers/podman/v5/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/test/e2e/pod_ps_test.go b/test/e2e/pod_ps_test.go index 9d8515d5ac..0a223d8832 100644 --- a/test/e2e/pod_ps_test.go +++ b/test/e2e/pod_ps_test.go @@ -4,7 +4,7 @@ import ( "fmt" "sort" - . "github.com/containers/podman/v4/test/utils" + . "github.com/containers/podman/v5/test/utils" "github.com/containers/storage/pkg/stringid" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/test/e2e/pod_restart_test.go b/test/e2e/pod_restart_test.go index b051bcb68f..839b5cc764 100644 --- a/test/e2e/pod_restart_test.go +++ b/test/e2e/pod_restart_test.go @@ -1,7 +1,7 @@ package integration import ( - . "github.com/containers/podman/v4/test/utils" + . "github.com/containers/podman/v5/test/utils" . "github.com/onsi/ginkgo/v2" . "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 0fd19057f3..f7d15c5acc 100644 --- a/test/e2e/pod_rm_test.go +++ b/test/e2e/pod_rm_test.go @@ -8,7 +8,7 @@ import ( "path/filepath" "strings" - . "github.com/containers/podman/v4/test/utils" + . "github.com/containers/podman/v5/test/utils" . "github.com/onsi/ginkgo/v2" . "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 6030bac7bb..f7ca98c63e 100644 --- a/test/e2e/pod_start_test.go +++ b/test/e2e/pod_start_test.go @@ -6,7 +6,7 @@ import ( "strconv" "strings" - . "github.com/containers/podman/v4/test/utils" + . "github.com/containers/podman/v5/test/utils" . "github.com/onsi/ginkgo/v2" . "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 b872c95657..a9dd5e6f1c 100644 --- a/test/e2e/pod_stats_test.go +++ b/test/e2e/pod_stats_test.go @@ -1,7 +1,7 @@ package integration import ( - . "github.com/containers/podman/v4/test/utils" + . "github.com/containers/podman/v5/test/utils" . "github.com/onsi/ginkgo/v2" . "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 6901ee26a2..47c7335f56 100644 --- a/test/e2e/pod_stop_test.go +++ b/test/e2e/pod_stop_test.go @@ -1,7 +1,7 @@ package integration import ( - . "github.com/containers/podman/v4/test/utils" + . "github.com/containers/podman/v5/test/utils" . "github.com/onsi/ginkgo/v2" . "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 28befd554f..52b0917e5a 100644 --- a/test/e2e/pod_top_test.go +++ b/test/e2e/pod_top_test.go @@ -4,7 +4,7 @@ import ( "fmt" "time" - . "github.com/containers/podman/v4/test/utils" + . "github.com/containers/podman/v5/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/test/e2e/port_test.go b/test/e2e/port_test.go index e6c9e64a5f..281c7b776d 100644 --- a/test/e2e/port_test.go +++ b/test/e2e/port_test.go @@ -4,7 +4,7 @@ import ( "fmt" "strings" - . "github.com/containers/podman/v4/test/utils" + . "github.com/containers/podman/v5/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/test/e2e/prune_test.go b/test/e2e/prune_test.go index 9fbbe0500d..c5513e53ad 100644 --- a/test/e2e/prune_test.go +++ b/test/e2e/prune_test.go @@ -5,7 +5,7 @@ import ( "os" "path/filepath" - . "github.com/containers/podman/v4/test/utils" + . "github.com/containers/podman/v5/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/test/e2e/ps_test.go b/test/e2e/ps_test.go index 9083b7d36e..67fdea900c 100644 --- a/test/e2e/ps_test.go +++ b/test/e2e/ps_test.go @@ -6,7 +6,7 @@ import ( "sort" "strconv" - . "github.com/containers/podman/v4/test/utils" + . "github.com/containers/podman/v5/test/utils" "github.com/containers/storage/pkg/stringid" "github.com/docker/go-units" . "github.com/onsi/ginkgo/v2" diff --git a/test/e2e/pull_test.go b/test/e2e/pull_test.go index 465786917f..5a3f07f8b1 100644 --- a/test/e2e/pull_test.go +++ b/test/e2e/pull_test.go @@ -6,7 +6,7 @@ import ( "path/filepath" "runtime" - . "github.com/containers/podman/v4/test/utils" + . "github.com/containers/podman/v5/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/test/e2e/push_test.go b/test/e2e/push_test.go index 5a8944b7a3..3da5536003 100644 --- a/test/e2e/push_test.go +++ b/test/e2e/push_test.go @@ -7,7 +7,7 @@ import ( "path/filepath" "strings" - . "github.com/containers/podman/v4/test/utils" + . "github.com/containers/podman/v5/test/utils" "github.com/containers/storage/pkg/archive" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/test/e2e/quadlet_test.go b/test/e2e/quadlet_test.go index ef0057da25..8b98a0128a 100644 --- a/test/e2e/quadlet_test.go +++ b/test/e2e/quadlet_test.go @@ -9,9 +9,9 @@ import ( "regexp" "strings" - "github.com/containers/podman/v4/pkg/systemd/parser" - . "github.com/containers/podman/v4/test/utils" - "github.com/containers/podman/v4/version" + "github.com/containers/podman/v5/pkg/systemd/parser" + . "github.com/containers/podman/v5/test/utils" + "github.com/containers/podman/v5/version" "github.com/mattn/go-shellwords" . "github.com/onsi/ginkgo/v2" diff --git a/test/e2e/rename_test.go b/test/e2e/rename_test.go index b3d38a98b3..ef82e6c73d 100644 --- a/test/e2e/rename_test.go +++ b/test/e2e/rename_test.go @@ -3,7 +3,7 @@ package integration import ( "fmt" - . "github.com/containers/podman/v4/test/utils" + . "github.com/containers/podman/v5/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/test/e2e/restart_test.go b/test/e2e/restart_test.go index ac55812df3..82ec1ebdca 100644 --- a/test/e2e/restart_test.go +++ b/test/e2e/restart_test.go @@ -4,7 +4,7 @@ import ( "fmt" "time" - . "github.com/containers/podman/v4/test/utils" + . "github.com/containers/podman/v5/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/test/e2e/rm_test.go b/test/e2e/rm_test.go index 961b610dbf..308d7d93dc 100644 --- a/test/e2e/rm_test.go +++ b/test/e2e/rm_test.go @@ -3,7 +3,7 @@ package integration import ( "fmt" - . "github.com/containers/podman/v4/test/utils" + . "github.com/containers/podman/v5/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/test/e2e/rmi_test.go b/test/e2e/rmi_test.go index eeb033b463..0b3f9e28b5 100644 --- a/test/e2e/rmi_test.go +++ b/test/e2e/rmi_test.go @@ -4,7 +4,7 @@ import ( "fmt" "sync" - . "github.com/containers/podman/v4/test/utils" + . "github.com/containers/podman/v5/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/test/e2e/run_aardvark_test.go b/test/e2e/run_aardvark_test.go index e1e83bf06f..4283639a98 100644 --- a/test/e2e/run_aardvark_test.go +++ b/test/e2e/run_aardvark_test.go @@ -4,7 +4,7 @@ import ( "fmt" "strings" - . "github.com/containers/podman/v4/test/utils" + . "github.com/containers/podman/v5/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/test/e2e/run_apparmor_test.go b/test/e2e/run_apparmor_test.go index 00046c1a86..3d4f5ed63c 100644 --- a/test/e2e/run_apparmor_test.go +++ b/test/e2e/run_apparmor_test.go @@ -8,7 +8,7 @@ import ( "path/filepath" "github.com/containers/common/pkg/apparmor" - . "github.com/containers/podman/v4/test/utils" + . "github.com/containers/podman/v5/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/test/e2e/run_cgroup_parent_test.go b/test/e2e/run_cgroup_parent_test.go index 448e8c1f3a..f590087ff0 100644 --- a/test/e2e/run_cgroup_parent_test.go +++ b/test/e2e/run_cgroup_parent_test.go @@ -6,7 +6,7 @@ import ( "path/filepath" "strings" - . "github.com/containers/podman/v4/test/utils" + . "github.com/containers/podman/v5/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/test/e2e/run_cleanup_test.go b/test/e2e/run_cleanup_test.go index 62483bb10f..f0d4fab867 100644 --- a/test/e2e/run_cleanup_test.go +++ b/test/e2e/run_cleanup_test.go @@ -1,7 +1,7 @@ package integration import ( - . "github.com/containers/podman/v4/test/utils" + . "github.com/containers/podman/v5/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/test/e2e/run_cpu_test.go b/test/e2e/run_cpu_test.go index 59985b28d3..9115937818 100644 --- a/test/e2e/run_cpu_test.go +++ b/test/e2e/run_cpu_test.go @@ -3,7 +3,7 @@ package integration import ( "os" - . "github.com/containers/podman/v4/test/utils" + . "github.com/containers/podman/v5/test/utils" . "github.com/onsi/ginkgo/v2" . "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 c8c0654875..129f3cdaef 100644 --- a/test/e2e/run_device_test.go +++ b/test/e2e/run_device_test.go @@ -6,7 +6,7 @@ import ( "os/exec" "path/filepath" - . "github.com/containers/podman/v4/test/utils" + . "github.com/containers/podman/v5/test/utils" . "github.com/onsi/ginkgo/v2" . "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 5531295bc5..d6f8a4b09a 100644 --- a/test/e2e/run_dns_test.go +++ b/test/e2e/run_dns_test.go @@ -1,7 +1,7 @@ package integration import ( - . "github.com/containers/podman/v4/test/utils" + . "github.com/containers/podman/v5/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/test/e2e/run_entrypoint_test.go b/test/e2e/run_entrypoint_test.go index cb6ec278af..e39c377cce 100644 --- a/test/e2e/run_entrypoint_test.go +++ b/test/e2e/run_entrypoint_test.go @@ -1,7 +1,7 @@ package integration import ( - . "github.com/containers/podman/v4/test/utils" + . "github.com/containers/podman/v5/test/utils" . "github.com/onsi/ginkgo/v2" . "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 6b9fae90ba..e3989fad53 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/v4/test/utils" + . "github.com/containers/podman/v5/test/utils" . "github.com/onsi/ginkgo/v2" . "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 154e4820a4..e31a1a6e75 100644 --- a/test/e2e/run_exit_test.go +++ b/test/e2e/run_exit_test.go @@ -3,8 +3,8 @@ package integration import ( "fmt" - "github.com/containers/podman/v4/libpod/define" - . "github.com/containers/podman/v4/test/utils" + "github.com/containers/podman/v5/libpod/define" + . "github.com/containers/podman/v5/test/utils" . "github.com/onsi/ginkgo/v2" . "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 1eb6a216d7..b7e9703d7b 100644 --- a/test/e2e/run_memory_test.go +++ b/test/e2e/run_memory_test.go @@ -3,7 +3,7 @@ package integration import ( "fmt" - . "github.com/containers/podman/v4/test/utils" + . "github.com/containers/podman/v5/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/test/e2e/run_networking_test.go b/test/e2e/run_networking_test.go index 3f85fee821..b854e76010 100644 --- a/test/e2e/run_networking_test.go +++ b/test/e2e/run_networking_test.go @@ -11,7 +11,7 @@ import ( "github.com/containernetworking/plugins/pkg/ns" "github.com/containers/common/libnetwork/types" - . "github.com/containers/podman/v4/test/utils" + . "github.com/containers/podman/v5/test/utils" "github.com/containers/storage/pkg/stringid" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/test/e2e/run_ns_test.go b/test/e2e/run_ns_test.go index ea9ca6af81..a9f83c25e8 100644 --- a/test/e2e/run_ns_test.go +++ b/test/e2e/run_ns_test.go @@ -4,7 +4,7 @@ import ( "os/exec" "strings" - . "github.com/containers/podman/v4/test/utils" + . "github.com/containers/podman/v5/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/test/e2e/run_passwd_test.go b/test/e2e/run_passwd_test.go index 538f95078e..ea10199d95 100644 --- a/test/e2e/run_passwd_test.go +++ b/test/e2e/run_passwd_test.go @@ -3,7 +3,7 @@ package integration import ( "fmt" - . "github.com/containers/podman/v4/test/utils" + . "github.com/containers/podman/v5/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/test/e2e/run_privileged_test.go b/test/e2e/run_privileged_test.go index 155fe6d309..5e6c5fb51d 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/v4/test/utils" + . "github.com/containers/podman/v5/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "github.com/syndtr/gocapability/capability" diff --git a/test/e2e/run_restart_test.go b/test/e2e/run_restart_test.go index 58042c0d1e..1fcaf9b191 100644 --- a/test/e2e/run_restart_test.go +++ b/test/e2e/run_restart_test.go @@ -1,7 +1,7 @@ package integration import ( - . "github.com/containers/podman/v4/test/utils" + . "github.com/containers/podman/v5/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/test/e2e/run_seccomp_test.go b/test/e2e/run_seccomp_test.go index 46c82f0249..307acb2e8c 100644 --- a/test/e2e/run_seccomp_test.go +++ b/test/e2e/run_seccomp_test.go @@ -1,7 +1,7 @@ package integration import ( - . "github.com/containers/podman/v4/test/utils" + . "github.com/containers/podman/v5/test/utils" . "github.com/onsi/ginkgo/v2" . "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 67fd00f36a..380beb8e92 100644 --- a/test/e2e/run_security_labels_test.go +++ b/test/e2e/run_security_labels_test.go @@ -4,7 +4,7 @@ import ( "fmt" "strings" - . "github.com/containers/podman/v4/test/utils" + . "github.com/containers/podman/v5/test/utils" . "github.com/onsi/ginkgo/v2" . "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 697f2fac74..66a8374681 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/v4/test/utils" + . "github.com/containers/podman/v5/test/utils" . "github.com/onsi/ginkgo/v2" . "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 1305603d26..45b394429d 100644 --- a/test/e2e/run_signal_test.go +++ b/test/e2e/run_signal_test.go @@ -9,7 +9,7 @@ import ( "syscall" "time" - . "github.com/containers/podman/v4/test/utils" + . "github.com/containers/podman/v5/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "golang.org/x/sys/unix" diff --git a/test/e2e/run_staticip_test.go b/test/e2e/run_staticip_test.go index 325e09f715..b644ccbd6e 100644 --- a/test/e2e/run_staticip_test.go +++ b/test/e2e/run_staticip_test.go @@ -5,7 +5,7 @@ import ( "net/http" "time" - . "github.com/containers/podman/v4/test/utils" + . "github.com/containers/podman/v5/test/utils" "github.com/containers/storage/pkg/stringid" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/test/e2e/run_test.go b/test/e2e/run_test.go index b42b2b661c..2ca307c0b6 100644 --- a/test/e2e/run_test.go +++ b/test/e2e/run_test.go @@ -12,8 +12,8 @@ import ( "github.com/containers/common/pkg/cgroups" "github.com/containers/common/pkg/config" - "github.com/containers/podman/v4/libpod/define" - . "github.com/containers/podman/v4/test/utils" + "github.com/containers/podman/v5/libpod/define" + . "github.com/containers/podman/v5/test/utils" "github.com/containers/storage/pkg/stringid" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/test/e2e/run_transient_test.go b/test/e2e/run_transient_test.go index 2a3ce9161d..990024cf14 100644 --- a/test/e2e/run_transient_test.go +++ b/test/e2e/run_transient_test.go @@ -3,7 +3,7 @@ package integration import ( "path/filepath" - . "github.com/containers/podman/v4/test/utils" + . "github.com/containers/podman/v5/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/test/e2e/run_userns_test.go b/test/e2e/run_userns_test.go index d24251f17e..7bf1fe594c 100644 --- a/test/e2e/run_userns_test.go +++ b/test/e2e/run_userns_test.go @@ -8,7 +8,7 @@ import ( "strconv" "strings" - . "github.com/containers/podman/v4/test/utils" + . "github.com/containers/podman/v5/test/utils" "github.com/containers/storage" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/test/e2e/run_volume_test.go b/test/e2e/run_volume_test.go index 1a900053fa..29f5bf46ac 100644 --- a/test/e2e/run_volume_test.go +++ b/test/e2e/run_volume_test.go @@ -8,7 +8,7 @@ import ( "path/filepath" "strings" - . "github.com/containers/podman/v4/test/utils" + . "github.com/containers/podman/v5/test/utils" . "github.com/onsi/ginkgo/v2" . "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 7876af2bb3..9f06df9313 100644 --- a/test/e2e/run_working_dir_test.go +++ b/test/e2e/run_working_dir_test.go @@ -5,7 +5,7 @@ import ( "os" "path/filepath" - . "github.com/containers/podman/v4/test/utils" + . "github.com/containers/podman/v5/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/test/e2e/runlabel_test.go b/test/e2e/runlabel_test.go index 488b0b6ef8..259674d60b 100644 --- a/test/e2e/runlabel_test.go +++ b/test/e2e/runlabel_test.go @@ -3,7 +3,7 @@ package integration import ( "fmt" - . "github.com/containers/podman/v4/test/utils" + . "github.com/containers/podman/v5/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/test/e2e/save_test.go b/test/e2e/save_test.go index 7cbff7bb23..25cc1ab4e8 100644 --- a/test/e2e/save_test.go +++ b/test/e2e/save_test.go @@ -7,7 +7,7 @@ import ( "strconv" "strings" - . "github.com/containers/podman/v4/test/utils" + . "github.com/containers/podman/v5/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/test/e2e/search_test.go b/test/e2e/search_test.go index 0c9afd500f..df6a9f0d88 100644 --- a/test/e2e/search_test.go +++ b/test/e2e/search_test.go @@ -8,8 +8,8 @@ import ( "strconv" "text/template" - "github.com/containers/podman/v4/pkg/domain/entities" - . "github.com/containers/podman/v4/test/utils" + "github.com/containers/podman/v5/pkg/domain/entities" + . "github.com/containers/podman/v5/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/test/e2e/secret_test.go b/test/e2e/secret_test.go index 4d73c2271a..ceffb527d6 100644 --- a/test/e2e/secret_test.go +++ b/test/e2e/secret_test.go @@ -5,7 +5,7 @@ import ( "os" "path/filepath" - . "github.com/containers/podman/v4/test/utils" + . "github.com/containers/podman/v5/test/utils" "github.com/containers/storage/pkg/stringid" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/test/e2e/start_test.go b/test/e2e/start_test.go index 6b8fb601f8..df9b123545 100644 --- a/test/e2e/start_test.go +++ b/test/e2e/start_test.go @@ -6,7 +6,7 @@ import ( "strconv" "strings" - . "github.com/containers/podman/v4/test/utils" + . "github.com/containers/podman/v5/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/test/e2e/stats_test.go b/test/e2e/stats_test.go index 5f4ac82922..5aa1d0d84c 100644 --- a/test/e2e/stats_test.go +++ b/test/e2e/stats_test.go @@ -5,7 +5,7 @@ import ( "strconv" "time" - . "github.com/containers/podman/v4/test/utils" + . "github.com/containers/podman/v5/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/test/e2e/stop_test.go b/test/e2e/stop_test.go index b3c6e02720..2feff4d34e 100644 --- a/test/e2e/stop_test.go +++ b/test/e2e/stop_test.go @@ -4,7 +4,7 @@ import ( "fmt" "strings" - . "github.com/containers/podman/v4/test/utils" + . "github.com/containers/podman/v5/test/utils" . "github.com/onsi/ginkgo/v2" . "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 76bffb0d22..5757c83d36 100644 --- a/test/e2e/system_connection_test.go +++ b/test/e2e/system_connection_test.go @@ -8,7 +8,7 @@ import ( "os/user" "path/filepath" - . "github.com/containers/podman/v4/test/utils" + . "github.com/containers/podman/v5/test/utils" . "github.com/onsi/ginkgo/v2" . "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 11ec4864e8..5fad53c510 100644 --- a/test/e2e/system_df_test.go +++ b/test/e2e/system_df_test.go @@ -4,7 +4,7 @@ import ( "strconv" "strings" - . "github.com/containers/podman/v4/test/utils" + . "github.com/containers/podman/v5/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/test/e2e/system_dial_stdio_test.go b/test/e2e/system_dial_stdio_test.go index 190dbe021d..43cf47773e 100644 --- a/test/e2e/system_dial_stdio_test.go +++ b/test/e2e/system_dial_stdio_test.go @@ -1,7 +1,7 @@ package integration import ( - . "github.com/containers/podman/v4/test/utils" + . "github.com/containers/podman/v5/test/utils" . "github.com/onsi/ginkgo/v2" . "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 fd9b82d036..f71b29819e 100644 --- a/test/e2e/system_reset_test.go +++ b/test/e2e/system_reset_test.go @@ -3,7 +3,7 @@ package integration import ( "fmt" - . "github.com/containers/podman/v4/test/utils" + . "github.com/containers/podman/v5/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/test/e2e/system_service_test.go b/test/e2e/system_service_test.go index d39625a71f..1a7e9da571 100644 --- a/test/e2e/system_service_test.go +++ b/test/e2e/system_service_test.go @@ -8,7 +8,7 @@ import ( "strconv" "time" - "github.com/containers/podman/v4/utils" + "github.com/containers/podman/v5/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/test/e2e/systemd_activate_test.go b/test/e2e/systemd_activate_test.go index 129f3bd860..51344964c3 100644 --- a/test/e2e/systemd_activate_test.go +++ b/test/e2e/systemd_activate_test.go @@ -12,8 +12,8 @@ import ( "syscall" "time" - testUtils "github.com/containers/podman/v4/test/utils" - podmanUtils "github.com/containers/podman/v4/utils" + testUtils "github.com/containers/podman/v5/test/utils" + podmanUtils "github.com/containers/podman/v5/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/test/e2e/systemd_test.go b/test/e2e/systemd_test.go index da5d2ccc27..ce599e7c3e 100644 --- a/test/e2e/systemd_test.go +++ b/test/e2e/systemd_test.go @@ -6,7 +6,7 @@ import ( "path/filepath" "strings" - . "github.com/containers/podman/v4/test/utils" + . "github.com/containers/podman/v5/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/test/e2e/tag_test.go b/test/e2e/tag_test.go index 235075542b..47b931e9bb 100644 --- a/test/e2e/tag_test.go +++ b/test/e2e/tag_test.go @@ -1,7 +1,7 @@ package integration import ( - . "github.com/containers/podman/v4/test/utils" + . "github.com/containers/podman/v5/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/test/e2e/toolbox_test.go b/test/e2e/toolbox_test.go index b917d5751a..ce2537a6cb 100644 --- a/test/e2e/toolbox_test.go +++ b/test/e2e/toolbox_test.go @@ -34,8 +34,8 @@ import ( "strings" "syscall" - "github.com/containers/podman/v4/libpod/define" - . "github.com/containers/podman/v4/test/utils" + "github.com/containers/podman/v5/libpod/define" + . "github.com/containers/podman/v5/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/test/e2e/top_test.go b/test/e2e/top_test.go index cf8c095a29..4726934c36 100644 --- a/test/e2e/top_test.go +++ b/test/e2e/top_test.go @@ -4,7 +4,7 @@ import ( "os" "os/user" - . "github.com/containers/podman/v4/test/utils" + . "github.com/containers/podman/v5/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/test/e2e/tree_test.go b/test/e2e/tree_test.go index 119a25def8..86d07f978f 100644 --- a/test/e2e/tree_test.go +++ b/test/e2e/tree_test.go @@ -1,7 +1,7 @@ package integration import ( - . "github.com/containers/podman/v4/test/utils" + . "github.com/containers/podman/v5/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/test/e2e/trust_test.go b/test/e2e/trust_test.go index cc6de2eaa7..db4bf25464 100644 --- a/test/e2e/trust_test.go +++ b/test/e2e/trust_test.go @@ -5,7 +5,7 @@ import ( "os" "path/filepath" - . "github.com/containers/podman/v4/test/utils" + . "github.com/containers/podman/v5/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/test/e2e/unshare_test.go b/test/e2e/unshare_test.go index 856e1b6f82..0b4c115158 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/v4/test/utils" + . "github.com/containers/podman/v5/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/test/e2e/untag_test.go b/test/e2e/untag_test.go index 060b1168c4..628e398aee 100644 --- a/test/e2e/untag_test.go +++ b/test/e2e/untag_test.go @@ -1,7 +1,7 @@ package integration import ( - . "github.com/containers/podman/v4/test/utils" + . "github.com/containers/podman/v5/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/test/e2e/update_test.go b/test/e2e/update_test.go index 398353775c..2053d60dbd 100644 --- a/test/e2e/update_test.go +++ b/test/e2e/update_test.go @@ -2,7 +2,7 @@ package integration import ( "github.com/containers/common/pkg/cgroupv2" - . "github.com/containers/podman/v4/test/utils" + . "github.com/containers/podman/v5/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/test/e2e/version_test.go b/test/e2e/version_test.go index aaf4211d4c..ea17b01b95 100644 --- a/test/e2e/version_test.go +++ b/test/e2e/version_test.go @@ -3,8 +3,8 @@ package integration import ( "fmt" - . "github.com/containers/podman/v4/test/utils" - "github.com/containers/podman/v4/version" + . "github.com/containers/podman/v5/test/utils" + "github.com/containers/podman/v5/version" . "github.com/onsi/ginkgo/v2" . "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 348d3f5215..1b747b2d45 100644 --- a/test/e2e/volume_create_test.go +++ b/test/e2e/volume_create_test.go @@ -4,7 +4,7 @@ import ( "fmt" "path/filepath" - . "github.com/containers/podman/v4/test/utils" + . "github.com/containers/podman/v5/test/utils" . "github.com/onsi/ginkgo/v2" . "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 92432b74f7..4f92a17363 100644 --- a/test/e2e/volume_exists_test.go +++ b/test/e2e/volume_exists_test.go @@ -1,7 +1,7 @@ package integration import ( - . "github.com/containers/podman/v4/test/utils" + . "github.com/containers/podman/v5/test/utils" "github.com/containers/storage/pkg/stringid" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/test/e2e/volume_inspect_test.go b/test/e2e/volume_inspect_test.go index b3508e0253..f5866ccbc6 100644 --- a/test/e2e/volume_inspect_test.go +++ b/test/e2e/volume_inspect_test.go @@ -1,8 +1,8 @@ package integration import ( - "github.com/containers/podman/v4/libpod/define" - . "github.com/containers/podman/v4/test/utils" + "github.com/containers/podman/v5/libpod/define" + . "github.com/containers/podman/v5/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/test/e2e/volume_ls_test.go b/test/e2e/volume_ls_test.go index f2c2bf89a9..ecd31550b0 100644 --- a/test/e2e/volume_ls_test.go +++ b/test/e2e/volume_ls_test.go @@ -3,7 +3,7 @@ package integration import ( "fmt" - . "github.com/containers/podman/v4/test/utils" + . "github.com/containers/podman/v5/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/test/e2e/volume_plugin_test.go b/test/e2e/volume_plugin_test.go index 5f0a1b6b04..9792a3341b 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/v4/test/utils" + . "github.com/containers/podman/v5/test/utils" "github.com/containers/storage/pkg/stringid" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/test/e2e/volume_prune_test.go b/test/e2e/volume_prune_test.go index 82f0b35c4f..aeeffe933a 100644 --- a/test/e2e/volume_prune_test.go +++ b/test/e2e/volume_prune_test.go @@ -1,7 +1,7 @@ package integration import ( - . "github.com/containers/podman/v4/test/utils" + . "github.com/containers/podman/v5/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/test/e2e/volume_rm_test.go b/test/e2e/volume_rm_test.go index 0db4027c18..7b01fc90bf 100644 --- a/test/e2e/volume_rm_test.go +++ b/test/e2e/volume_rm_test.go @@ -1,7 +1,7 @@ package integration import ( - . "github.com/containers/podman/v4/test/utils" + . "github.com/containers/podman/v5/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/test/e2e/wait_test.go b/test/e2e/wait_test.go index 2620d235d9..7d84a88d14 100644 --- a/test/e2e/wait_test.go +++ b/test/e2e/wait_test.go @@ -1,7 +1,7 @@ package integration import ( - . "github.com/containers/podman/v4/test/utils" + . "github.com/containers/podman/v5/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/test/testvol/util.go b/test/testvol/util.go index b4961e0979..57175f8b59 100644 --- a/test/testvol/util.go +++ b/test/testvol/util.go @@ -4,7 +4,7 @@ import ( "path/filepath" "strings" - "github.com/containers/podman/v4/libpod/plugin" + "github.com/containers/podman/v5/libpod/plugin" ) const pluginSockDir = "/run/docker/plugins" diff --git a/test/utils/common_function_test.go b/test/utils/common_function_test.go index 77a9b15ae2..8f2ac2af1f 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/v4/test/utils" + . "github.com/containers/podman/v5/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/test/utils/podmansession_test.go b/test/utils/podmansession_test.go index 8e0fb70ee8..0f8b65dd17 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/v4/test/utils" + . "github.com/containers/podman/v5/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/test/utils/podmantest_test.go b/test/utils/podmantest_test.go index acb0293a83..e4288d9df9 100644 --- a/test/utils/podmantest_test.go +++ b/test/utils/podmantest_test.go @@ -1,7 +1,7 @@ package utils_test import ( - . "github.com/containers/podman/v4/test/utils" + . "github.com/containers/podman/v5/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/test/utils/utils_suite_test.go b/test/utils/utils_suite_test.go index cace354d45..7afdbaa367 100644 --- a/test/utils/utils_suite_test.go +++ b/test/utils/utils_suite_test.go @@ -6,7 +6,7 @@ import ( "strings" "testing" - . "github.com/containers/podman/v4/test/utils" + . "github.com/containers/podman/v5/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "github.com/onsi/gomega/gexec" diff --git a/test/version/main.go b/test/version/main.go index 2a68aa5fce..b1e8f8ac18 100644 --- a/test/version/main.go +++ b/test/version/main.go @@ -3,7 +3,7 @@ package main import ( "fmt" - "github.com/containers/podman/v4/version" + "github.com/containers/podman/v5/version" ) func main() { diff --git a/version/version.go b/version/version.go index cf97e02294..5bd86b1af2 100644 --- a/version/version.go +++ b/version/version.go @@ -2,7 +2,7 @@ package version import ( "github.com/blang/semver/v4" - "github.com/containers/podman/v4/version/rawversion" + "github.com/containers/podman/v5/version/rawversion" ) type (