From 2cc3be73323e9dfbeaa9d603cac7f359bb8b8f05 Mon Sep 17 00:00:00 2001 From: Brent Baude Date: Wed, 22 Apr 2026 08:27:11 -0500 Subject: [PATCH] RUN-4539: Change podman module paths The podman module paths are moving from github.com/containers/podman to go.podman.io/podman. This will help with future mobility. Signed-off-by: Brent Baude --- Makefile | 2 +- cmd/podman-testing/call.go | 6 +-- cmd/podman-testing/create.go | 4 +- cmd/podman-testing/data.go | 4 +- cmd/podman-testing/layer.go | 4 +- cmd/podman-testing/main.go | 4 +- cmd/podman-testing/remove.go | 4 +- cmd/podman-testing/store_supported.go | 6 +-- cmd/podman-testing/store_unsupported.go | 2 +- cmd/podman-wslkerninst/main.go | 2 +- cmd/podman/README.md | 12 ++--- cmd/podman/artifact/add.go | 8 ++-- cmd/podman/artifact/artifact.go | 4 +- cmd/podman/artifact/extract.go | 6 +-- cmd/podman/artifact/inspect.go | 10 ++-- cmd/podman/artifact/list.go | 8 ++-- cmd/podman/artifact/pull.go | 8 ++-- cmd/podman/artifact/push.go | 8 ++-- cmd/podman/artifact/rm.go | 6 +-- 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 | 4 +- cmd/podman/completion/completion.go | 2 +- cmd/podman/compose.go | 4 +- cmd/podman/compose_machine.go | 2 +- cmd/podman/compose_machine_unix.go | 2 +- cmd/podman/compose_machine_windows.go | 2 +- 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 | 6 +-- cmd/podman/containers/container.go | 4 +- 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 | 12 ++--- cmd/podman/containers/stop.go | 10 ++-- cmd/podman/containers/top.go | 10 ++-- cmd/podman/containers/unmount.go | 10 ++-- cmd/podman/containers/unpause.go | 10 ++-- cmd/podman/containers/update.go | 16 +++---- cmd/podman/containers/wait.go | 10 ++-- cmd/podman/diff.go | 12 ++--- cmd/podman/diff/diff.go | 4 +- 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 | 4 +- 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/buildx_inspect.go | 2 +- 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 | 8 ++-- 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 | 8 ++-- cmd/podman/images/save.go | 10 ++-- cmd/podman/images/scp.go | 8 ++-- 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 | 10 ++-- cmd/podman/kube/apply.go | 8 ++-- cmd/podman/kube/down.go | 6 +-- cmd/podman/kube/generate.go | 10 ++-- cmd/podman/kube/kube.go | 4 +- cmd/podman/kube/play.go | 20 ++++---- cmd/podman/login.go | 6 +-- cmd/podman/logout.go | 4 +- cmd/podman/machine/client9p.go | 2 +- cmd/podman/machine/cp.go | 14 +++--- cmd/podman/machine/info.go | 16 +++---- cmd/podman/machine/init.go | 14 +++--- cmd/podman/machine/inspect.go | 12 ++--- cmd/podman/machine/list.go | 14 +++--- cmd/podman/machine/machine.go | 16 +++---- 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/os/upgrade.go | 12 ++--- cmd/podman/machine/reset.go | 10 ++-- cmd/podman/machine/rm.go | 10 ++-- cmd/podman/machine/server9p.go | 4 +- cmd/podman/machine/set.go | 6 +-- cmd/podman/machine/ssh.go | 12 ++--- cmd/podman/machine/start.go | 8 ++-- cmd/podman/machine/stop.go | 6 +-- cmd/podman/main.go | 46 +++++++++---------- 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 | 8 ++-- 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 | 4 +- 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 | 4 +- 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/quadlet/install.go | 6 +-- cmd/podman/quadlet/list.go | 8 ++-- cmd/podman/quadlet/print.go | 4 +- cmd/podman/quadlet/quadlet.go | 6 +-- cmd/podman/quadlet/remove.go | 8 ++-- cmd/podman/registry/config.go | 6 +-- cmd/podman/registry/registry.go | 8 ++-- cmd/podman/registry/remote.go | 2 +- cmd/podman/root.go | 22 ++++----- 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/shell_completion_test.go | 2 +- cmd/podman/syslog_common.go | 2 +- cmd/podman/syslog_unsupported.go | 2 +- cmd/podman/system/check.go | 6 +-- 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 | 6 +-- cmd/podman/system/prune.go | 12 ++--- cmd/podman/system/renumber.go | 4 +- cmd/podman/system/reset.go | 4 +- cmd/podman/system/reset_machine.go | 14 +++--- cmd/podman/system/service.go | 12 ++--- cmd/podman/system/service_abi.go | 8 ++-- 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 | 6 +-- cmd/podman/volumes/import.go | 8 ++-- 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 | 4 +- cmd/quadlet/main.go | 8 ++-- go.mod | 2 +- hack/podman-registry-go/registry.go | 2 +- internal/domain/infra/abi/testing.go | 4 +- internal/domain/infra/abi/testing_test.go | 2 +- internal/domain/infra/runtime_abi.go | 8 ++-- internal/domain/infra/runtime_proxy.go | 8 ++-- internal/domain/infra/tunnel/testing.go | 2 +- internal/domain/infra/tunnel/testing_test.go | 2 +- internal/localapi/utils.go | 14 +++--- internal/localapi/utils_test.go | 4 +- internal/localapi/utils_unsupported.go | 2 +- internal/localapi/utils_windows_test.go | 4 +- 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 | 6 +-- libpod/container_copy_linux.go | 2 +- libpod/container_exec.go | 6 +-- libpod/container_graph.go | 6 +-- libpod/container_graph_test.go | 2 +- libpod/container_inspect.go | 8 ++-- libpod/container_inspect_freebsd.go | 2 +- libpod/container_inspect_linux.go | 4 +- libpod/container_internal.go | 22 ++++----- libpod/container_internal_common.go | 18 ++++---- libpod/container_internal_freebsd.go | 2 +- libpod/container_internal_linux.go | 6 +-- libpod/container_log.go | 6 +-- 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/container_inspect.go | 2 +- libpod/define/version.go | 2 +- libpod/diff.go | 4 +- libpod/driver/driver.go | 2 +- libpod/events.go | 4 +- libpod/events/filters.go | 2 +- libpod/events/journal_linux.go | 4 +- libpod/events/logfile.go | 2 +- libpod/healthcheck.go | 4 +- libpod/healthcheck_config.go | 4 +- libpod/healthcheck_linux.go | 8 ++-- libpod/info.go | 4 +- libpod/info_freebsd.go | 2 +- libpod/info_linux.go | 6 +-- libpod/info_test.go | 2 +- libpod/kube.go | 22 ++++----- 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_freebsd.go | 2 +- libpod/networking_linux.go | 4 +- libpod/networking_linux_test.go | 2 +- libpod/networking_rootlessport.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 | 8 ++-- libpod/oci_conmon_linux.go | 4 +- libpod/oci_missing.go | 2 +- libpod/oci_util.go | 2 +- libpod/options.go | 8 ++-- libpod/plugin/volume_api.go | 2 +- libpod/pod.go | 4 +- libpod/pod_api.go | 6 +-- 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 | 22 ++++----- libpod/runtime_cstorage.go | 2 +- libpod/runtime_ctr.go | 14 +++--- libpod/runtime_img.go | 4 +- libpod/runtime_linux.go | 4 +- libpod/runtime_migrate.go | 4 +- libpod/runtime_migrate_linux.go | 4 +- 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/volume.go | 8 ++-- libpod/volume_inspect.go | 2 +- libpod/volume_internal.go | 2 +- libpod/volume_internal_common.go | 2 +- libpod/volume_test.go | 2 +- pkg/annotations/validate.go | 2 +- pkg/annotations/validate_test.go | 2 +- pkg/api/Makefile | 2 +- pkg/api/grpcpb/noop.pb.go | 21 ++++----- pkg/api/grpcpb/noop.proto | 2 +- pkg/api/grpcpb/noop_grpc.pb.go | 7 ++- pkg/api/handlers/compat/auth.go | 8 ++-- pkg/api/handlers/compat/changes.go | 8 ++-- pkg/api/handlers/compat/containers.go | 24 +++++----- pkg/api/handlers/compat/containers_archive.go | 14 +++--- pkg/api/handlers/compat/containers_attach.go | 8 ++-- 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 ++-- pkg/api/handlers/compat/containers_stats.go | 8 ++-- .../compat/containers_stats_freebsd.go | 4 +- .../handlers/compat/containers_stats_linux.go | 4 +- 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 | 14 +++--- pkg/api/handlers/compat/exec.go | 18 ++++---- pkg/api/handlers/compat/images.go | 18 ++++---- 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 | 16 +++---- pkg/api/handlers/compat/images_remove.go | 12 ++--- 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 | 14 +++--- 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/grpc/noop.go | 4 +- pkg/api/handlers/libpod/artifacts.go | 16 +++---- pkg/api/handlers/libpod/containers.go | 20 ++++---- pkg/api/handlers/libpod/containers_create.go | 16 +++---- pkg/api/handlers/libpod/containers_stats.go | 10 ++-- pkg/api/handlers/libpod/generate.go | 10 ++-- pkg/api/handlers/libpod/healthcheck.go | 8 ++-- pkg/api/handlers/libpod/images.go | 30 ++++++------ 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/quadlets.go | 16 +++---- 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 | 4 +- 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 | 6 +-- pkg/api/handlers/utils/images.go | 10 ++-- 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_artifacts.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_quadlets.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 | 18 ++++---- pkg/autoupdate/autoupdate.go | 12 ++--- pkg/bindings/README.md | 18 ++++---- pkg/bindings/artifacts/add.go | 6 +-- pkg/bindings/artifacts/extract.go | 2 +- pkg/bindings/artifacts/inspect.go | 4 +- pkg/bindings/artifacts/list.go | 4 +- pkg/bindings/artifacts/pull.go | 6 +-- pkg/bindings/artifacts/push.go | 6 +-- pkg/bindings/artifacts/remove.go | 4 +- pkg/bindings/artifacts/types_add_options.go | 2 +- .../artifacts/types_extract_options.go | 2 +- .../artifacts/types_inspect_options.go | 2 +- pkg/bindings/artifacts/types_list_options.go | 2 +- pkg/bindings/artifacts/types_pull_options.go | 2 +- pkg/bindings/artifacts/types_push_options.go | 2 +- .../artifacts/types_remove_options.go | 2 +- pkg/bindings/connection.go | 4 +- pkg/bindings/containers/archive.go | 6 +-- pkg/bindings/containers/attach.go | 4 +- pkg/bindings/containers/checkpoint.go | 4 +- pkg/bindings/containers/commit.go | 6 +-- pkg/bindings/containers/containers.go | 10 ++-- pkg/bindings/containers/create.go | 6 +-- pkg/bindings/containers/diff.go | 2 +- pkg/bindings/containers/exec.go | 8 ++-- 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 | 6 +-- 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/generator/generator.go | 2 +- pkg/bindings/images/build.go | 14 +++--- 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_addartifact_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_check_options.go | 2 +- 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/api_response_test.go | 6 +-- 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 | 12 ++--- 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/artifact.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 | 8 ++-- 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 | 6 +-- 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/artifact.go | 2 +- pkg/domain/infra/abi/auto-update.go | 4 +- pkg/domain/infra/abi/containers.go | 34 +++++++------- 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 | 6 +-- pkg/domain/infra/abi/parse/parse.go | 4 +- pkg/domain/infra/abi/play.go | 32 ++++++------- 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 | 6 +-- pkg/domain/infra/abi/quadlet.go | 14 +++--- pkg/domain/infra/abi/runtime.go | 2 +- pkg/domain/infra/abi/secrets.go | 6 +-- pkg/domain/infra/abi/secrets_test.go | 2 +- pkg/domain/infra/abi/system.go | 10 ++-- 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 +- pkg/domain/infra/abi/trust.go | 4 +- pkg/domain/infra/abi/volumes.go | 14 +++--- pkg/domain/infra/runtime.go | 4 +- pkg/domain/infra/runtime_abi.go | 4 +- pkg/domain/infra/runtime_libpod.go | 10 ++-- pkg/domain/infra/runtime_proxy.go | 4 +- pkg/domain/infra/runtime_tunnel.go | 4 +- pkg/domain/infra/tunnel/artifact.go | 8 ++-- pkg/domain/infra/tunnel/auto-update.go | 2 +- pkg/domain/infra/tunnel/containers.go | 20 ++++---- 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 | 14 +++--- 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/quadlet.go | 2 +- 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/apple/apple.go | 12 ++--- pkg/machine/apple/ignition.go | 4 +- pkg/machine/apple/vfkit.go | 4 +- pkg/machine/apple/vfkit/helper.go | 2 +- pkg/machine/apple/vfkit/rest.go | 2 +- pkg/machine/applehv/machine.go | 4 +- pkg/machine/applehv/stubber.go | 14 +++--- pkg/machine/certificates/certificates.go | 8 ++-- pkg/machine/compression/compression_test.go | 2 +- pkg/machine/compression/decompress.go | 4 +- pkg/machine/config.go | 6 +-- pkg/machine/config_test.go | 2 +- pkg/machine/connection/add.go | 2 +- pkg/machine/connection/connection.go | 2 +- pkg/machine/define/vmfile_test.go | 2 +- pkg/machine/e2e/api_test.go | 2 +- pkg/machine/e2e/basic_test.go | 4 +- pkg/machine/e2e/compose_test.go | 2 +- pkg/machine/e2e/config_test.go | 4 +- pkg/machine/e2e/config_windows_test.go | 2 +- pkg/machine/e2e/info_test.go | 2 +- pkg/machine/e2e/init_test.go | 8 ++-- pkg/machine/e2e/init_windows_test.go | 4 +- pkg/machine/e2e/inspect_test.go | 2 +- pkg/machine/e2e/list_test.go | 2 +- pkg/machine/e2e/machine_pull_test.go | 6 +-- pkg/machine/e2e/machine_test.go | 8 ++-- pkg/machine/e2e/os_test.go | 2 +- 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/env/dir.go | 2 +- pkg/machine/env/dir_linux.go | 4 +- pkg/machine/gvproxy.go | 2 +- pkg/machine/gvproxy_unix.go | 2 +- pkg/machine/gvproxy_windows.go | 2 +- pkg/machine/hyperv/hutil.go | 2 +- pkg/machine/hyperv/stubber.go | 16 +++---- pkg/machine/hyperv/volumes.go | 8 ++-- pkg/machine/hyperv/vsock/vsock.go | 4 +- pkg/machine/ignition/ignition.go | 4 +- pkg/machine/ignition/ready.go | 2 +- pkg/machine/libkrun/stubber.go | 14 +++--- pkg/machine/lock/lock.go | 2 +- pkg/machine/machine_common.go | 2 +- pkg/machine/machine_windows.go | 6 +-- pkg/machine/ocipull/oci.go | 2 +- pkg/machine/ocipull/ociartifact.go | 6 +-- pkg/machine/ocipull/pull.go | 2 +- pkg/machine/os/machine_os.go | 6 +-- pkg/machine/ports/ports.go | 2 +- pkg/machine/provider/platform.go | 6 +-- pkg/machine/provider/platform_darwin.go | 8 ++-- pkg/machine/provider/platform_test.go | 2 +- pkg/machine/provider/platform_unix.go | 6 +-- pkg/machine/provider/platform_windows.go | 10 ++-- pkg/machine/provider/platform_windows_test.go | 2 +- pkg/machine/proxyenv/env.go | 4 +- pkg/machine/qemu/command/command.go | 2 +- pkg/machine/qemu/command/qemu_command_test.go | 2 +- pkg/machine/qemu/config_test.go | 2 +- pkg/machine/qemu/machine.go | 6 +-- pkg/machine/qemu/machine_windows.go | 2 +- pkg/machine/qemu/stubber.go | 12 ++--- pkg/machine/qemu/virtiofsd.go | 4 +- pkg/machine/shim/diskpull/diskpull.go | 6 +-- pkg/machine/shim/host.go | 26 +++++------ pkg/machine/shim/networking.go | 12 ++--- pkg/machine/shim/networking_unix.go | 6 +-- pkg/machine/shim/networking_windows.go | 10 ++-- pkg/machine/shim/volume.go | 4 +- pkg/machine/sockets/sockets.go | 2 +- pkg/machine/stdpull/local.go | 4 +- pkg/machine/stdpull/url.go | 6 +-- pkg/machine/update.go | 4 +- pkg/machine/vmconfigs/config.go | 4 +- pkg/machine/vmconfigs/config_common.go | 4 +- pkg/machine/vmconfigs/config_darwin.go | 2 +- pkg/machine/vmconfigs/config_windows.go | 6 +-- pkg/machine/vmconfigs/machine.go | 10 ++-- pkg/machine/vmconfigs/machine_unix.go | 2 +- pkg/machine/vmconfigs/machine_windows.go | 4 +- pkg/machine/vmconfigs/sockets.go | 2 +- pkg/machine/vmconfigs/sockets_darwin.go | 2 +- pkg/machine/volumes.go | 2 +- pkg/machine/wsl/config.go | 6 +-- pkg/machine/wsl/machine.go | 14 +++--- pkg/machine/wsl/stubber.go | 14 +++--- pkg/machine/wsl/usermodenet.go | 8 ++-- pkg/machine/wsl/util_windows.go | 4 +- 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/container_create_test.go | 4 +- pkg/specgen/generate/kube/kube.go | 20 ++++---- pkg/specgen/generate/kube/kube_test.go | 4 +- pkg/specgen/generate/kube/play_test.go | 12 ++--- pkg/specgen/generate/kube/seccomp.go | 4 +- pkg/specgen/generate/kube/volume.go | 4 +- pkg/specgen/generate/kube/volume_test.go | 2 +- 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 | 6 +-- pkg/specgen/generate/oci_freebsd.go | 6 +-- pkg/specgen/generate/oci_linux.go | 8 ++-- pkg/specgen/generate/pause_image.go | 2 +- 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 | 2 +- pkg/specgen/namespaces.go | 8 ++-- 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 | 6 +-- pkg/specgenutil/specgenutil_windows_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 | 6 +-- pkg/systemd/quadlet/unitdirs.go | 2 +- pkg/util/mount_opts.go | 4 +- pkg/util/rlimit.go | 2 +- pkg/util/utils.go | 8 ++-- pkg/util/utils_linux.go | 4 +- pkg/util/utils_supported.go | 2 +- rpm/podman.spec | 8 +--- test/e2e/artifact_created_test.go | 2 +- test/e2e/artifact_mount_test.go | 2 +- test/e2e/artifact_test.go | 4 +- 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 | 10 ++-- test/e2e/container_clone_test.go | 2 +- test/e2e/container_create_volume_test.go | 2 +- test/e2e/container_iface_name_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/libpod_suite_remote_test.go | 2 +- test/e2e/libpod_suite_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 | 2 +- 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_chunked_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/systemd_activate_test.go | 4 +- test/e2e/systemd_test.go | 2 +- test/e2e/tag_test.go | 2 +- test/e2e/tls_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_rm_test.go | 2 +- test/e2e/wait_test.go | 2 +- test/testvol/util.go | 2 +- test/tools/go.mod | 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 +- winmake.ps1 | 4 +- 1009 files changed, 2744 insertions(+), 2752 deletions(-) diff --git a/Makefile b/Makefile index 4060ddcad1..411c8cc490 100644 --- a/Makefile +++ b/Makefile @@ -38,7 +38,7 @@ COVERAGE_PATH ?= .coverage DESTDIR ?= EPOCH_TEST_COMMIT ?= $(shell git merge-base $${DEST_BRANCH:-main} HEAD) HEAD ?= HEAD -PROJECT := github.com/containers/podman +PROJECT := go.podman.io/podman GIT_BASE_BRANCH ?= origin/main LIBPOD_INSTANCE := libpod_dev PREFIX ?= /usr/local diff --git a/cmd/podman-testing/call.go b/cmd/podman-testing/call.go index 00eb695f93..570bbcf5bd 100644 --- a/cmd/podman-testing/call.go +++ b/cmd/podman-testing/call.go @@ -9,11 +9,11 @@ import ( "net" "strings" - "github.com/containers/podman/v6/pkg/api/grpcpb" - "github.com/containers/podman/v6/pkg/bindings" - "github.com/containers/podman/v6/pkg/domain/entities" "github.com/spf13/cobra" "go.podman.io/common/pkg/completion" + "go.podman.io/podman/v6/pkg/api/grpcpb" + "go.podman.io/podman/v6/pkg/bindings" + "go.podman.io/podman/v6/pkg/domain/entities" "google.golang.org/grpc" "google.golang.org/grpc/credentials/insecure" reflectionv1 "google.golang.org/grpc/reflection/grpc_reflection_v1" diff --git a/cmd/podman-testing/create.go b/cmd/podman-testing/create.go index 993ecb05b5..d74e79ff82 100644 --- a/cmd/podman-testing/create.go +++ b/cmd/podman-testing/create.go @@ -5,10 +5,10 @@ package main import ( "fmt" - "github.com/containers/podman/v6/cmd/podman/validate" - "github.com/containers/podman/v6/internal/domain/entities" "github.com/spf13/cobra" "go.podman.io/common/pkg/completion" + "go.podman.io/podman/v6/cmd/podman/validate" + "go.podman.io/podman/v6/internal/domain/entities" ) var ( diff --git a/cmd/podman-testing/data.go b/cmd/podman-testing/data.go index c1feffe0b1..fa4c4d203a 100644 --- a/cmd/podman-testing/data.go +++ b/cmd/podman-testing/data.go @@ -6,10 +6,10 @@ import ( "errors" "os" - "github.com/containers/podman/v6/cmd/podman/validate" - "github.com/containers/podman/v6/internal/domain/entities" "github.com/spf13/cobra" "go.podman.io/common/pkg/completion" + "go.podman.io/podman/v6/cmd/podman/validate" + "go.podman.io/podman/v6/internal/domain/entities" ) var ( diff --git a/cmd/podman-testing/layer.go b/cmd/podman-testing/layer.go index f098d4ef6f..dd29b01b74 100644 --- a/cmd/podman-testing/layer.go +++ b/cmd/podman-testing/layer.go @@ -6,10 +6,10 @@ import ( "errors" "os" - "github.com/containers/podman/v6/cmd/podman/validate" - "github.com/containers/podman/v6/internal/domain/entities" "github.com/spf13/cobra" "go.podman.io/common/pkg/completion" + "go.podman.io/podman/v6/cmd/podman/validate" + "go.podman.io/podman/v6/internal/domain/entities" ) var ( diff --git a/cmd/podman-testing/main.go b/cmd/podman-testing/main.go index b83d8c4de6..f2b8e9c1f7 100644 --- a/cmd/podman-testing/main.go +++ b/cmd/podman-testing/main.go @@ -8,11 +8,11 @@ import ( "os/exec" "syscall" - _ "github.com/containers/podman/v6/cmd/podman/completion" - "github.com/containers/podman/v6/pkg/domain/entities" "github.com/sirupsen/logrus" "github.com/spf13/cobra" "go.podman.io/common/pkg/config" + _ "go.podman.io/podman/v6/cmd/podman/completion" + "go.podman.io/podman/v6/pkg/domain/entities" "go.podman.io/storage/pkg/reexec" "go.podman.io/storage/pkg/unshare" ) diff --git a/cmd/podman-testing/remove.go b/cmd/podman-testing/remove.go index 6d90ffecae..2b1927d3c0 100644 --- a/cmd/podman-testing/remove.go +++ b/cmd/podman-testing/remove.go @@ -5,10 +5,10 @@ package main import ( "fmt" - "github.com/containers/podman/v6/cmd/podman/validate" - "github.com/containers/podman/v6/internal/domain/entities" "github.com/spf13/cobra" "go.podman.io/common/pkg/completion" + "go.podman.io/podman/v6/cmd/podman/validate" + "go.podman.io/podman/v6/internal/domain/entities" ) var ( diff --git a/cmd/podman-testing/store_supported.go b/cmd/podman-testing/store_supported.go index 70602ec65a..5cddc424ae 100644 --- a/cmd/podman-testing/store_supported.go +++ b/cmd/podman-testing/store_supported.go @@ -6,9 +6,9 @@ import ( "fmt" "os" - ientities "github.com/containers/podman/v6/internal/domain/entities" - "github.com/containers/podman/v6/internal/domain/infra" - "github.com/containers/podman/v6/pkg/domain/entities" + ientities "go.podman.io/podman/v6/internal/domain/entities" + "go.podman.io/podman/v6/internal/domain/infra" + "go.podman.io/podman/v6/pkg/domain/entities" "go.podman.io/storage" ) diff --git a/cmd/podman-testing/store_unsupported.go b/cmd/podman-testing/store_unsupported.go index ac21a731fa..80e40b8851 100644 --- a/cmd/podman-testing/store_unsupported.go +++ b/cmd/podman-testing/store_unsupported.go @@ -3,7 +3,7 @@ package main import ( - "github.com/containers/podman/v6/pkg/domain/entities" + "go.podman.io/podman/v6/pkg/domain/entities" ) var engineMode = entities.TunnelMode diff --git a/cmd/podman-wslkerninst/main.go b/cmd/podman-wslkerninst/main.go index 632128061d..d0357da4f2 100644 --- a/cmd/podman-wslkerninst/main.go +++ b/cmd/podman-wslkerninst/main.go @@ -10,8 +10,8 @@ import ( "time" "unsafe" - "github.com/containers/podman/v6/pkg/machine/wsl/wutil" "github.com/sirupsen/logrus" + "go.podman.io/podman/v6/pkg/machine/wsl/wutil" "golang.org/x/sys/windows/svc/eventlog" ) diff --git a/cmd/podman/README.md b/cmd/podman/README.md index d2fdeffbad..3aaa260f24 100644 --- a/cmd/podman/README.md +++ b/cmd/podman/README.md @@ -19,9 +19,9 @@ Create the file ```$GOPATH/src/github.com/containers/podman/cmd/podman/manifest/ package manifest import ( - "github.com/containers/podman/cmd/podman/registry" - "github.com/containers/podman/cmd/podman/validate" - "github.com/containers/podman/pkg/domain/entities" + "go.podman.io/podman/v6/cmd/podman/registry" + "go.podman.io/podman/v6/cmd/podman/validate" + "go.podman.io/podman/v6/pkg/domain/entities" "github.com/spf13/cobra" ) @@ -48,7 +48,7 @@ To "wire" in the `manifest` command, edit the file ```$GOPATH/src/github.com/con ```go package main -import _ "github.com/containers/podman/cmd/podman/manifest" +import _ "go.podman.io/podman/v6/cmd/podman/manifest" ``` ## Adding a new sub command `podman manifest list` @@ -57,8 +57,8 @@ Create the file ```$GOPATH/src/github.com/containers/podman/cmd/podman/manifest/ package manifest import ( - "github.com/containers/podman/cmd/podman/registry" - "github.com/containers/podman/pkg/domain/entities" + "go.podman.io/podman/v6/cmd/podman/registry" + "go.podman.io/podman/v6/pkg/domain/entities" "github.com/spf13/cobra" ) diff --git a/cmd/podman/artifact/add.go b/cmd/podman/artifact/add.go index 7a0720ea40..f7424fd755 100644 --- a/cmd/podman/artifact/add.go +++ b/cmd/podman/artifact/add.go @@ -4,12 +4,12 @@ import ( "fmt" "path/filepath" - "github.com/containers/podman/v6/cmd/podman/common" - "github.com/containers/podman/v6/cmd/podman/registry" - "github.com/containers/podman/v6/pkg/domain/entities" - "github.com/containers/podman/v6/pkg/domain/utils" "github.com/spf13/cobra" "go.podman.io/common/pkg/completion" + "go.podman.io/podman/v6/cmd/podman/common" + "go.podman.io/podman/v6/cmd/podman/registry" + "go.podman.io/podman/v6/pkg/domain/entities" + "go.podman.io/podman/v6/pkg/domain/utils" ) var addCmd = &cobra.Command{ diff --git a/cmd/podman/artifact/artifact.go b/cmd/podman/artifact/artifact.go index f4a53c5646..fa502df649 100644 --- a/cmd/podman/artifact/artifact.go +++ b/cmd/podman/artifact/artifact.go @@ -1,9 +1,9 @@ package artifact import ( - "github.com/containers/podman/v6/cmd/podman/registry" - "github.com/containers/podman/v6/cmd/podman/validate" "github.com/spf13/cobra" + "go.podman.io/podman/v6/cmd/podman/registry" + "go.podman.io/podman/v6/cmd/podman/validate" ) // Command: podman _artifact_ diff --git a/cmd/podman/artifact/extract.go b/cmd/podman/artifact/extract.go index a45b3b6675..c51ca03a5b 100644 --- a/cmd/podman/artifact/extract.go +++ b/cmd/podman/artifact/extract.go @@ -1,11 +1,11 @@ package artifact import ( - "github.com/containers/podman/v6/cmd/podman/common" - "github.com/containers/podman/v6/cmd/podman/registry" - "github.com/containers/podman/v6/pkg/domain/entities" "github.com/spf13/cobra" "go.podman.io/common/pkg/completion" + "go.podman.io/podman/v6/cmd/podman/common" + "go.podman.io/podman/v6/cmd/podman/registry" + "go.podman.io/podman/v6/pkg/domain/entities" ) var extractCmd = &cobra.Command{ diff --git a/cmd/podman/artifact/inspect.go b/cmd/podman/artifact/inspect.go index 964da1dd36..c33d7bbf4a 100644 --- a/cmd/podman/artifact/inspect.go +++ b/cmd/podman/artifact/inspect.go @@ -3,13 +3,13 @@ package artifact import ( "os" - "github.com/containers/podman/v6/cmd/podman/common" - "github.com/containers/podman/v6/cmd/podman/inspect" - "github.com/containers/podman/v6/cmd/podman/registry" - "github.com/containers/podman/v6/cmd/podman/utils" - "github.com/containers/podman/v6/pkg/domain/entities" "github.com/spf13/cobra" "go.podman.io/common/pkg/report" + "go.podman.io/podman/v6/cmd/podman/common" + "go.podman.io/podman/v6/cmd/podman/inspect" + "go.podman.io/podman/v6/cmd/podman/registry" + "go.podman.io/podman/v6/cmd/podman/utils" + "go.podman.io/podman/v6/pkg/domain/entities" ) var ( diff --git a/cmd/podman/artifact/list.go b/cmd/podman/artifact/list.go index 15fde710c4..31a4d40001 100644 --- a/cmd/podman/artifact/list.go +++ b/cmd/podman/artifact/list.go @@ -5,16 +5,16 @@ import ( "os" "time" - "github.com/containers/podman/v6/cmd/podman/common" - "github.com/containers/podman/v6/cmd/podman/registry" - "github.com/containers/podman/v6/cmd/podman/validate" - "github.com/containers/podman/v6/pkg/domain/entities" "github.com/docker/go-units" imgspecv1 "github.com/opencontainers/image-spec/specs-go/v1" "github.com/spf13/cobra" "go.podman.io/common/pkg/completion" "go.podman.io/common/pkg/report" "go.podman.io/image/v5/docker/reference" + "go.podman.io/podman/v6/cmd/podman/common" + "go.podman.io/podman/v6/cmd/podman/registry" + "go.podman.io/podman/v6/cmd/podman/validate" + "go.podman.io/podman/v6/pkg/domain/entities" ) var ( diff --git a/cmd/podman/artifact/pull.go b/cmd/podman/artifact/pull.go index bb2904fb62..08814d4a57 100644 --- a/cmd/podman/artifact/pull.go +++ b/cmd/podman/artifact/pull.go @@ -4,15 +4,15 @@ import ( "fmt" "os" - "github.com/containers/podman/v6/cmd/podman/common" - "github.com/containers/podman/v6/cmd/podman/registry" - "github.com/containers/podman/v6/pkg/domain/entities" - "github.com/containers/podman/v6/pkg/util" "github.com/spf13/cobra" "go.podman.io/buildah/pkg/cli" "go.podman.io/common/pkg/auth" "go.podman.io/common/pkg/completion" "go.podman.io/image/v5/types" + "go.podman.io/podman/v6/cmd/podman/common" + "go.podman.io/podman/v6/cmd/podman/registry" + "go.podman.io/podman/v6/pkg/domain/entities" + "go.podman.io/podman/v6/pkg/util" ) // pullOptionsWrapper wraps entities.ImagePullOptions and prevents leaking diff --git a/cmd/podman/artifact/push.go b/cmd/podman/artifact/push.go index 0d666e8d7b..3f4e3bd404 100644 --- a/cmd/podman/artifact/push.go +++ b/cmd/podman/artifact/push.go @@ -4,15 +4,15 @@ import ( "fmt" "os" - "github.com/containers/podman/v6/cmd/podman/common" - "github.com/containers/podman/v6/cmd/podman/registry" - "github.com/containers/podman/v6/pkg/domain/entities" - "github.com/containers/podman/v6/pkg/util" "github.com/spf13/cobra" "go.podman.io/buildah/pkg/cli" "go.podman.io/common/pkg/auth" "go.podman.io/common/pkg/completion" "go.podman.io/image/v5/types" + "go.podman.io/podman/v6/cmd/podman/common" + "go.podman.io/podman/v6/cmd/podman/registry" + "go.podman.io/podman/v6/pkg/domain/entities" + "go.podman.io/podman/v6/pkg/util" ) // pushOptionsWrapper wraps entities.ImagepushOptions and prevents leaking diff --git a/cmd/podman/artifact/rm.go b/cmd/podman/artifact/rm.go index 0822a3d9b1..fe6ea18fb0 100644 --- a/cmd/podman/artifact/rm.go +++ b/cmd/podman/artifact/rm.go @@ -4,10 +4,10 @@ import ( "errors" "fmt" - "github.com/containers/podman/v6/cmd/podman/common" - "github.com/containers/podman/v6/cmd/podman/registry" - "github.com/containers/podman/v6/pkg/domain/entities" "github.com/spf13/cobra" + "go.podman.io/podman/v6/cmd/podman/common" + "go.podman.io/podman/v6/cmd/podman/registry" + "go.podman.io/podman/v6/pkg/domain/entities" ) var ( diff --git a/cmd/podman/auto-update.go b/cmd/podman/auto-update.go index 46fcd1394a..d6292ee013 100644 --- a/cmd/podman/auto-update.go +++ b/cmd/podman/auto-update.go @@ -5,15 +5,15 @@ import ( "fmt" "os" - "github.com/containers/podman/v6/cmd/podman/common" - "github.com/containers/podman/v6/cmd/podman/registry" - "github.com/containers/podman/v6/pkg/domain/entities" - "github.com/containers/podman/v6/pkg/errorhandling" "github.com/spf13/cobra" "go.podman.io/common/pkg/auth" "go.podman.io/common/pkg/completion" "go.podman.io/common/pkg/report" "go.podman.io/image/v5/types" + "go.podman.io/podman/v6/cmd/podman/common" + "go.podman.io/podman/v6/cmd/podman/registry" + "go.podman.io/podman/v6/pkg/domain/entities" + "go.podman.io/podman/v6/pkg/errorhandling" ) type cliAutoUpdateOptions struct { diff --git a/cmd/podman/client.go b/cmd/podman/client.go index d04007f378..50108cf58d 100644 --- a/cmd/podman/client.go +++ b/cmd/podman/client.go @@ -1,6 +1,6 @@ package main -import "github.com/containers/podman/v6/libpod/define" +import "go.podman.io/podman/v6/libpod/define" type clientInfo struct { OSArch string `json:"OS"` diff --git a/cmd/podman/client_supported.go b/cmd/podman/client_supported.go index 8cd8bd0eac..f5a61d3e24 100644 --- a/cmd/podman/client_supported.go +++ b/cmd/podman/client_supported.go @@ -3,7 +3,7 @@ package main import ( - "github.com/containers/podman/v6/pkg/machine/provider" + "go.podman.io/podman/v6/pkg/machine/provider" ) func getProvider() (string, error) { diff --git a/cmd/podman/common/build.go b/cmd/podman/common/build.go index 8389f47ea1..41cdc9533a 100644 --- a/cmd/podman/common/build.go +++ b/cmd/podman/common/build.go @@ -15,10 +15,6 @@ import ( encconfig "github.com/containers/ocicrypt/config" enchelpers "github.com/containers/ocicrypt/helpers" - "github.com/containers/podman/v6/cmd/podman/registry" - "github.com/containers/podman/v6/cmd/podman/utils" - "github.com/containers/podman/v6/pkg/domain/entities" - "github.com/containers/podman/v6/pkg/env" "github.com/openshift/imagebuilder" "github.com/sirupsen/logrus" "github.com/spf13/cobra" @@ -31,6 +27,10 @@ import ( "go.podman.io/common/pkg/config" "go.podman.io/image/v5/docker/reference" "go.podman.io/image/v5/types" + "go.podman.io/podman/v6/cmd/podman/registry" + "go.podman.io/podman/v6/cmd/podman/utils" + "go.podman.io/podman/v6/pkg/domain/entities" + "go.podman.io/podman/v6/pkg/env" ) // BuildFlagsWrapper are local to cmd/ as the build code is using Buildah-internal diff --git a/cmd/podman/common/completion.go b/cmd/podman/common/completion.go index 81dd731b4b..e0173cd972 100644 --- a/cmd/podman/common/completion.go +++ b/cmd/podman/common/completion.go @@ -13,14 +13,6 @@ import ( "strings" "unicode" - "github.com/containers/podman/v6/cmd/podman/registry" - "github.com/containers/podman/v6/libpod/define" - "github.com/containers/podman/v6/libpod/events" - "github.com/containers/podman/v6/pkg/domain/entities" - "github.com/containers/podman/v6/pkg/inspect" - "github.com/containers/podman/v6/pkg/signal" - systemdDefine "github.com/containers/podman/v6/pkg/systemd/define" - "github.com/containers/podman/v6/pkg/util" securejoin "github.com/cyphar/filepath-securejoin" "github.com/spf13/cobra" libimageDefine "go.podman.io/common/libimage/define" @@ -29,6 +21,14 @@ import ( "go.podman.io/common/pkg/ssh" "go.podman.io/image/v5/pkg/sysregistriesv2" imageTypes "go.podman.io/image/v5/types" + "go.podman.io/podman/v6/cmd/podman/registry" + "go.podman.io/podman/v6/libpod/define" + "go.podman.io/podman/v6/libpod/events" + "go.podman.io/podman/v6/pkg/domain/entities" + "go.podman.io/podman/v6/pkg/inspect" + "go.podman.io/podman/v6/pkg/signal" + systemdDefine "go.podman.io/podman/v6/pkg/systemd/define" + "go.podman.io/podman/v6/pkg/util" ) var ( diff --git a/cmd/podman/common/completion_test.go b/cmd/podman/common/completion_test.go index 4a4b62073e..763124f51f 100644 --- a/cmd/podman/common/completion_test.go +++ b/cmd/podman/common/completion_test.go @@ -3,9 +3,9 @@ package common_test import ( "testing" - "github.com/containers/podman/v6/cmd/podman/common" "github.com/spf13/cobra" "github.com/stretchr/testify/assert" + "go.podman.io/podman/v6/cmd/podman/common" ) //nolint:recvcheck // We like to test mixed pointer receiver and non-pointer receiver diff --git a/cmd/podman/common/create.go b/cmd/podman/common/create.go index e61d48a318..9e48a24d3c 100644 --- a/cmd/podman/common/create.go +++ b/cmd/podman/common/create.go @@ -4,14 +4,14 @@ import ( "errors" "time" - "github.com/containers/podman/v6/cmd/podman/registry" - "github.com/containers/podman/v6/libpod/define" - "github.com/containers/podman/v6/pkg/domain/entities" "github.com/spf13/cobra" "go.podman.io/common/pkg/auth" "go.podman.io/common/pkg/completion" commonFlag "go.podman.io/common/pkg/flag" "go.podman.io/image/v5/manifest" + "go.podman.io/podman/v6/cmd/podman/registry" + "go.podman.io/podman/v6/libpod/define" + "go.podman.io/podman/v6/pkg/domain/entities" ) const sizeWithUnitFormat = "(format: `[]`, where unit = b (bytes), k (kibibytes), m (mebibytes), or g (gibibytes))" diff --git a/cmd/podman/common/create_opts.go b/cmd/podman/common/create_opts.go index 65c0f793a5..46fde7fce0 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/v6/cmd/podman/registry" - "github.com/containers/podman/v6/libpod/define" - "github.com/containers/podman/v6/pkg/domain/entities" + "go.podman.io/podman/v6/cmd/podman/registry" + "go.podman.io/podman/v6/libpod/define" + "go.podman.io/podman/v6/pkg/domain/entities" ) func ulimits() []string { diff --git a/cmd/podman/common/create_test.go b/cmd/podman/common/create_test.go index e9cfc47185..28c811f0c8 100644 --- a/cmd/podman/common/create_test.go +++ b/cmd/podman/common/create_test.go @@ -5,9 +5,9 @@ import ( "strings" "testing" - "github.com/containers/podman/v6/cmd/podman/common" - "github.com/containers/podman/v6/pkg/domain/entities" "github.com/stretchr/testify/assert" + "go.podman.io/podman/v6/cmd/podman/common" + "go.podman.io/podman/v6/pkg/domain/entities" ) func TestPodOptions(t *testing.T) { diff --git a/cmd/podman/common/default.go b/cmd/podman/common/default.go index 936d9e1af1..1150a1d48c 100644 --- a/cmd/podman/common/default.go +++ b/cmd/podman/common/default.go @@ -1,7 +1,7 @@ package common import ( - "github.com/containers/podman/v6/cmd/podman/registry" + "go.podman.io/podman/v6/cmd/podman/registry" ) // Pull in configured json library diff --git a/cmd/podman/common/netflags.go b/cmd/podman/common/netflags.go index bce95e3f25..ba4ba9a079 100644 --- a/cmd/podman/common/netflags.go +++ b/cmd/podman/common/netflags.go @@ -5,15 +5,15 @@ import ( "fmt" "net" - "github.com/containers/podman/v6/cmd/podman/parse" - "github.com/containers/podman/v6/libpod/define" - "github.com/containers/podman/v6/pkg/domain/entities" - "github.com/containers/podman/v6/pkg/specgen" - "github.com/containers/podman/v6/pkg/specgenutil" "github.com/spf13/cobra" "github.com/spf13/pflag" "go.podman.io/common/libnetwork/types" "go.podman.io/common/pkg/completion" + "go.podman.io/podman/v6/cmd/podman/parse" + "go.podman.io/podman/v6/libpod/define" + "go.podman.io/podman/v6/pkg/domain/entities" + "go.podman.io/podman/v6/pkg/specgen" + "go.podman.io/podman/v6/pkg/specgenutil" ) func DefineNetFlags(cmd *cobra.Command) { diff --git a/cmd/podman/common/sign.go b/cmd/podman/common/sign.go index a85295bdfa..1c73a1e18e 100644 --- a/cmd/podman/common/sign.go +++ b/cmd/podman/common/sign.go @@ -4,8 +4,6 @@ import ( "fmt" "os" - "github.com/containers/podman/v6/cmd/podman/registry" - "github.com/containers/podman/v6/pkg/domain/entities" "github.com/spf13/cobra" "go.podman.io/common/pkg/completion" "go.podman.io/common/pkg/ssh" @@ -13,6 +11,8 @@ import ( "go.podman.io/image/v5/pkg/cli/sigstore" "go.podman.io/image/v5/signature/signer" "go.podman.io/image/v5/signature/simplesequoia" + "go.podman.io/podman/v6/cmd/podman/registry" + "go.podman.io/podman/v6/pkg/domain/entities" ) // SigningCLIOnlyOptions contains signing-related CLI options. diff --git a/cmd/podman/completion/completion.go b/cmd/podman/completion/completion.go index 858c2e4b38..6a8efc6bd9 100644 --- a/cmd/podman/completion/completion.go +++ b/cmd/podman/completion/completion.go @@ -6,9 +6,9 @@ import ( "os" "strings" - "github.com/containers/podman/v6/cmd/podman/registry" "github.com/spf13/cobra" commonComp "go.podman.io/common/pkg/completion" + "go.podman.io/podman/v6/cmd/podman/registry" ) const ( diff --git a/cmd/podman/compose.go b/cmd/podman/compose.go index 93a84cad6f..7edb4b1b08 100644 --- a/cmd/podman/compose.go +++ b/cmd/podman/compose.go @@ -12,11 +12,11 @@ import ( "strings" "text/template" - "github.com/containers/podman/v6/cmd/podman/registry" - "github.com/containers/podman/v6/pkg/errorhandling" "github.com/sirupsen/logrus" "github.com/spf13/cobra" "github.com/spf13/pflag" + "go.podman.io/podman/v6/cmd/podman/registry" + "go.podman.io/podman/v6/pkg/errorhandling" ) var composeCommand = &cobra.Command{ diff --git a/cmd/podman/compose_machine.go b/cmd/podman/compose_machine.go index e9b5db31d4..8481bbedf5 100644 --- a/cmd/podman/compose_machine.go +++ b/cmd/podman/compose_machine.go @@ -5,7 +5,7 @@ package main import ( "net/url" - "github.com/containers/podman/v6/internal/localapi" + "go.podman.io/podman/v6/internal/localapi" ) func getMachineConn(connectionURI string, parsedConnection *url.URL) (string, error) { diff --git a/cmd/podman/compose_machine_unix.go b/cmd/podman/compose_machine_unix.go index 65c3db6731..383fd3fb6a 100644 --- a/cmd/podman/compose_machine_unix.go +++ b/cmd/podman/compose_machine_unix.go @@ -5,7 +5,7 @@ package main import ( "errors" - "github.com/containers/podman/v6/pkg/machine/define" + "go.podman.io/podman/v6/pkg/machine/define" ) func extractConnectionString(podmanSocket *define.VMFile, _ *define.VMFile) (string, error) { diff --git a/cmd/podman/compose_machine_windows.go b/cmd/podman/compose_machine_windows.go index ed6fce2eec..e08742924a 100644 --- a/cmd/podman/compose_machine_windows.go +++ b/cmd/podman/compose_machine_windows.go @@ -4,7 +4,7 @@ import ( "errors" "path/filepath" - "github.com/containers/podman/v6/pkg/machine/define" + "go.podman.io/podman/v6/pkg/machine/define" ) func extractConnectionString(_ *define.VMFile, podmanPipe *define.VMFile) (string, error) { diff --git a/cmd/podman/containers/attach.go b/cmd/podman/containers/attach.go index f09a3136e3..589a12a380 100644 --- a/cmd/podman/containers/attach.go +++ b/cmd/podman/containers/attach.go @@ -5,11 +5,11 @@ import ( "os" "strings" - "github.com/containers/podman/v6/cmd/podman/common" - "github.com/containers/podman/v6/cmd/podman/registry" - "github.com/containers/podman/v6/cmd/podman/validate" - "github.com/containers/podman/v6/pkg/domain/entities" "github.com/spf13/cobra" + "go.podman.io/podman/v6/cmd/podman/common" + "go.podman.io/podman/v6/cmd/podman/registry" + "go.podman.io/podman/v6/cmd/podman/validate" + "go.podman.io/podman/v6/pkg/domain/entities" ) var ( diff --git a/cmd/podman/containers/checkpoint.go b/cmd/podman/containers/checkpoint.go index 070bf5812b..eabc561a03 100644 --- a/cmd/podman/containers/checkpoint.go +++ b/cmd/podman/containers/checkpoint.go @@ -7,15 +7,15 @@ import ( "strings" "time" - "github.com/containers/podman/v6/cmd/podman/common" - "github.com/containers/podman/v6/cmd/podman/registry" - "github.com/containers/podman/v6/cmd/podman/utils" - "github.com/containers/podman/v6/cmd/podman/validate" - "github.com/containers/podman/v6/pkg/criu" - "github.com/containers/podman/v6/pkg/domain/entities" - "github.com/containers/podman/v6/pkg/rootless" "github.com/spf13/cobra" "go.podman.io/common/pkg/completion" + "go.podman.io/podman/v6/cmd/podman/common" + "go.podman.io/podman/v6/cmd/podman/registry" + "go.podman.io/podman/v6/cmd/podman/utils" + "go.podman.io/podman/v6/cmd/podman/validate" + "go.podman.io/podman/v6/pkg/criu" + "go.podman.io/podman/v6/pkg/domain/entities" + "go.podman.io/podman/v6/pkg/rootless" "go.podman.io/storage/pkg/archive" ) diff --git a/cmd/podman/containers/cleanup.go b/cmd/podman/containers/cleanup.go index fec819d97e..a73e59f89c 100644 --- a/cmd/podman/containers/cleanup.go +++ b/cmd/podman/containers/cleanup.go @@ -4,14 +4,14 @@ import ( "errors" "fmt" - "github.com/containers/podman/v6/cmd/podman/common" - "github.com/containers/podman/v6/cmd/podman/registry" - "github.com/containers/podman/v6/cmd/podman/utils" - "github.com/containers/podman/v6/cmd/podman/validate" - "github.com/containers/podman/v6/pkg/domain/entities" "github.com/sirupsen/logrus" "github.com/spf13/cobra" "go.podman.io/common/pkg/completion" + "go.podman.io/podman/v6/cmd/podman/common" + "go.podman.io/podman/v6/cmd/podman/registry" + "go.podman.io/podman/v6/cmd/podman/utils" + "go.podman.io/podman/v6/cmd/podman/validate" + "go.podman.io/podman/v6/pkg/domain/entities" ) var ( diff --git a/cmd/podman/containers/clone.go b/cmd/podman/containers/clone.go index 19476d1ea0..bb7d4b4415 100644 --- a/cmd/podman/containers/clone.go +++ b/cmd/podman/containers/clone.go @@ -3,11 +3,11 @@ package containers import ( "fmt" - "github.com/containers/podman/v6/cmd/podman/common" - "github.com/containers/podman/v6/cmd/podman/registry" - "github.com/containers/podman/v6/libpod/define" - "github.com/containers/podman/v6/pkg/domain/entities" "github.com/spf13/cobra" + "go.podman.io/podman/v6/cmd/podman/common" + "go.podman.io/podman/v6/cmd/podman/registry" + "go.podman.io/podman/v6/libpod/define" + "go.podman.io/podman/v6/pkg/domain/entities" ) var ( diff --git a/cmd/podman/containers/commit.go b/cmd/podman/containers/commit.go index 9b612a3c58..453b6d6a92 100644 --- a/cmd/podman/containers/commit.go +++ b/cmd/podman/containers/commit.go @@ -6,11 +6,11 @@ import ( "os" "strings" - "github.com/containers/podman/v6/cmd/podman/common" - "github.com/containers/podman/v6/cmd/podman/registry" - "github.com/containers/podman/v6/pkg/domain/entities" "github.com/spf13/cobra" "go.podman.io/common/pkg/completion" + "go.podman.io/podman/v6/cmd/podman/common" + "go.podman.io/podman/v6/cmd/podman/registry" + "go.podman.io/podman/v6/pkg/domain/entities" ) var ( diff --git a/cmd/podman/containers/container.go b/cmd/podman/containers/container.go index f950901261..ddd8f14634 100644 --- a/cmd/podman/containers/container.go +++ b/cmd/podman/containers/container.go @@ -1,9 +1,9 @@ package containers import ( - "github.com/containers/podman/v6/cmd/podman/registry" - "github.com/containers/podman/v6/cmd/podman/validate" "github.com/spf13/cobra" + "go.podman.io/podman/v6/cmd/podman/registry" + "go.podman.io/podman/v6/cmd/podman/validate" ) var ( diff --git a/cmd/podman/containers/cp.go b/cmd/podman/containers/cp.go index 9471cf1391..858dd7d26f 100644 --- a/cmd/podman/containers/cp.go +++ b/cmd/podman/containers/cp.go @@ -11,14 +11,14 @@ import ( "strconv" "strings" - "github.com/containers/podman/v6/cmd/podman/common" - "github.com/containers/podman/v6/cmd/podman/registry" - "github.com/containers/podman/v6/pkg/copy" - "github.com/containers/podman/v6/pkg/domain/entities" - "github.com/containers/podman/v6/pkg/errorhandling" "github.com/sirupsen/logrus" "github.com/spf13/cobra" buildahCopiah "go.podman.io/buildah/copier" + "go.podman.io/podman/v6/cmd/podman/common" + "go.podman.io/podman/v6/cmd/podman/registry" + "go.podman.io/podman/v6/pkg/copy" + "go.podman.io/podman/v6/pkg/domain/entities" + "go.podman.io/podman/v6/pkg/errorhandling" "go.podman.io/storage/pkg/archive" "go.podman.io/storage/pkg/idtools" ) diff --git a/cmd/podman/containers/create.go b/cmd/podman/containers/create.go index c48d5d7578..97c1a409fa 100644 --- a/cmd/podman/containers/create.go +++ b/cmd/podman/containers/create.go @@ -9,14 +9,6 @@ import ( "strconv" "strings" - "github.com/containers/podman/v6/cmd/podman/common" - "github.com/containers/podman/v6/cmd/podman/registry" - "github.com/containers/podman/v6/cmd/podman/utils" - "github.com/containers/podman/v6/libpod/define" - "github.com/containers/podman/v6/pkg/domain/entities" - "github.com/containers/podman/v6/pkg/specgen" - "github.com/containers/podman/v6/pkg/specgenutil" - "github.com/containers/podman/v6/pkg/util" "github.com/sirupsen/logrus" "github.com/spf13/cobra" "go.podman.io/buildah/pkg/cli" @@ -24,6 +16,14 @@ import ( "go.podman.io/common/pkg/config" "go.podman.io/image/v5/transports/alltransports" "go.podman.io/image/v5/types" + "go.podman.io/podman/v6/cmd/podman/common" + "go.podman.io/podman/v6/cmd/podman/registry" + "go.podman.io/podman/v6/cmd/podman/utils" + "go.podman.io/podman/v6/libpod/define" + "go.podman.io/podman/v6/pkg/domain/entities" + "go.podman.io/podman/v6/pkg/specgen" + "go.podman.io/podman/v6/pkg/specgenutil" + "go.podman.io/podman/v6/pkg/util" "golang.org/x/term" ) diff --git a/cmd/podman/containers/diff.go b/cmd/podman/containers/diff.go index 6936cbe660..a9035835fb 100644 --- a/cmd/podman/containers/diff.go +++ b/cmd/podman/containers/diff.go @@ -3,13 +3,13 @@ package containers import ( "errors" - "github.com/containers/podman/v6/cmd/podman/common" - "github.com/containers/podman/v6/cmd/podman/diff" - "github.com/containers/podman/v6/cmd/podman/registry" - "github.com/containers/podman/v6/cmd/podman/validate" - "github.com/containers/podman/v6/libpod/define" - "github.com/containers/podman/v6/pkg/domain/entities" "github.com/spf13/cobra" + "go.podman.io/podman/v6/cmd/podman/common" + "go.podman.io/podman/v6/cmd/podman/diff" + "go.podman.io/podman/v6/cmd/podman/registry" + "go.podman.io/podman/v6/cmd/podman/validate" + "go.podman.io/podman/v6/libpod/define" + "go.podman.io/podman/v6/pkg/domain/entities" ) var ( diff --git a/cmd/podman/containers/exec.go b/cmd/podman/containers/exec.go index 22dfd27b0d..2d0b36abde 100644 --- a/cmd/podman/containers/exec.go +++ b/cmd/podman/containers/exec.go @@ -9,15 +9,15 @@ import ( "strings" "time" - "github.com/containers/podman/v6/cmd/podman/common" - "github.com/containers/podman/v6/cmd/podman/registry" - "github.com/containers/podman/v6/cmd/podman/validate" - "github.com/containers/podman/v6/libpod/define" - "github.com/containers/podman/v6/pkg/domain/entities" - envLib "github.com/containers/podman/v6/pkg/env" - "github.com/containers/podman/v6/pkg/rootless" "github.com/spf13/cobra" "go.podman.io/common/pkg/completion" + "go.podman.io/podman/v6/cmd/podman/common" + "go.podman.io/podman/v6/cmd/podman/registry" + "go.podman.io/podman/v6/cmd/podman/validate" + "go.podman.io/podman/v6/libpod/define" + "go.podman.io/podman/v6/pkg/domain/entities" + envLib "go.podman.io/podman/v6/pkg/env" + "go.podman.io/podman/v6/pkg/rootless" ) var ( diff --git a/cmd/podman/containers/exists.go b/cmd/podman/containers/exists.go index 60080bd525..1e3ad87394 100644 --- a/cmd/podman/containers/exists.go +++ b/cmd/podman/containers/exists.go @@ -4,10 +4,10 @@ import ( "context" "strings" - "github.com/containers/podman/v6/cmd/podman/common" - "github.com/containers/podman/v6/cmd/podman/registry" - "github.com/containers/podman/v6/pkg/domain/entities" "github.com/spf13/cobra" + "go.podman.io/podman/v6/cmd/podman/common" + "go.podman.io/podman/v6/cmd/podman/registry" + "go.podman.io/podman/v6/pkg/domain/entities" ) var ( diff --git a/cmd/podman/containers/export.go b/cmd/podman/containers/export.go index 83c17e04db..721b9eaf9b 100644 --- a/cmd/podman/containers/export.go +++ b/cmd/podman/containers/export.go @@ -6,12 +6,12 @@ import ( "os" "strings" - "github.com/containers/podman/v6/cmd/podman/common" - "github.com/containers/podman/v6/cmd/podman/parse" - "github.com/containers/podman/v6/cmd/podman/registry" - "github.com/containers/podman/v6/pkg/domain/entities" "github.com/spf13/cobra" "go.podman.io/common/pkg/completion" + "go.podman.io/podman/v6/cmd/podman/common" + "go.podman.io/podman/v6/cmd/podman/parse" + "go.podman.io/podman/v6/cmd/podman/registry" + "go.podman.io/podman/v6/pkg/domain/entities" "golang.org/x/term" ) diff --git a/cmd/podman/containers/init.go b/cmd/podman/containers/init.go index 95a6b78736..77c2507ccc 100644 --- a/cmd/podman/containers/init.go +++ b/cmd/podman/containers/init.go @@ -3,13 +3,13 @@ package containers import ( "fmt" - "github.com/containers/podman/v6/cmd/podman/common" - "github.com/containers/podman/v6/cmd/podman/registry" - "github.com/containers/podman/v6/cmd/podman/utils" - "github.com/containers/podman/v6/cmd/podman/validate" - "github.com/containers/podman/v6/pkg/domain/entities" "github.com/spf13/cobra" "github.com/spf13/pflag" + "go.podman.io/podman/v6/cmd/podman/common" + "go.podman.io/podman/v6/cmd/podman/registry" + "go.podman.io/podman/v6/cmd/podman/utils" + "go.podman.io/podman/v6/cmd/podman/validate" + "go.podman.io/podman/v6/pkg/domain/entities" ) var ( diff --git a/cmd/podman/containers/inspect.go b/cmd/podman/containers/inspect.go index 7829d276c5..a99b96f9a9 100644 --- a/cmd/podman/containers/inspect.go +++ b/cmd/podman/containers/inspect.go @@ -1,13 +1,13 @@ package containers import ( - "github.com/containers/podman/v6/cmd/podman/common" - "github.com/containers/podman/v6/cmd/podman/inspect" - "github.com/containers/podman/v6/cmd/podman/registry" - "github.com/containers/podman/v6/cmd/podman/validate" - "github.com/containers/podman/v6/libpod/define" - "github.com/containers/podman/v6/pkg/domain/entities" "github.com/spf13/cobra" + "go.podman.io/podman/v6/cmd/podman/common" + "go.podman.io/podman/v6/cmd/podman/inspect" + "go.podman.io/podman/v6/cmd/podman/registry" + "go.podman.io/podman/v6/cmd/podman/validate" + "go.podman.io/podman/v6/libpod/define" + "go.podman.io/podman/v6/pkg/domain/entities" ) var ( diff --git a/cmd/podman/containers/kill.go b/cmd/podman/containers/kill.go index c187813fb6..e8572cc9e6 100644 --- a/cmd/podman/containers/kill.go +++ b/cmd/podman/containers/kill.go @@ -7,14 +7,14 @@ import ( "os" "strings" - "github.com/containers/podman/v6/cmd/podman/common" - "github.com/containers/podman/v6/cmd/podman/registry" - "github.com/containers/podman/v6/cmd/podman/utils" - "github.com/containers/podman/v6/cmd/podman/validate" - "github.com/containers/podman/v6/pkg/domain/entities" - "github.com/containers/podman/v6/pkg/signal" "github.com/spf13/cobra" "go.podman.io/common/pkg/completion" + "go.podman.io/podman/v6/cmd/podman/common" + "go.podman.io/podman/v6/cmd/podman/registry" + "go.podman.io/podman/v6/cmd/podman/utils" + "go.podman.io/podman/v6/cmd/podman/validate" + "go.podman.io/podman/v6/pkg/domain/entities" + "go.podman.io/podman/v6/pkg/signal" ) var ( diff --git a/cmd/podman/containers/list.go b/cmd/podman/containers/list.go index 1cb20e8835..e28ce03cb1 100644 --- a/cmd/podman/containers/list.go +++ b/cmd/podman/containers/list.go @@ -1,10 +1,10 @@ package containers import ( - "github.com/containers/podman/v6/cmd/podman/registry" - "github.com/containers/podman/v6/cmd/podman/validate" "github.com/spf13/cobra" "go.podman.io/common/pkg/completion" + "go.podman.io/podman/v6/cmd/podman/registry" + "go.podman.io/podman/v6/cmd/podman/validate" ) // podman container _list_ diff --git a/cmd/podman/containers/logs.go b/cmd/podman/containers/logs.go index eeefa97c3d..c9ca808817 100644 --- a/cmd/podman/containers/logs.go +++ b/cmd/podman/containers/logs.go @@ -5,14 +5,14 @@ import ( "fmt" "os" - "github.com/containers/podman/v6/cmd/podman/common" - "github.com/containers/podman/v6/cmd/podman/registry" - "github.com/containers/podman/v6/cmd/podman/utils" - "github.com/containers/podman/v6/cmd/podman/validate" - "github.com/containers/podman/v6/pkg/domain/entities" - "github.com/containers/podman/v6/pkg/util" "github.com/spf13/cobra" "go.podman.io/common/pkg/completion" + "go.podman.io/podman/v6/cmd/podman/common" + "go.podman.io/podman/v6/cmd/podman/registry" + "go.podman.io/podman/v6/cmd/podman/utils" + "go.podman.io/podman/v6/cmd/podman/validate" + "go.podman.io/podman/v6/pkg/domain/entities" + "go.podman.io/podman/v6/pkg/util" ) // logsOptionsWrapper wraps entities.LogsOptions and prevents leaking diff --git a/cmd/podman/containers/mount.go b/cmd/podman/containers/mount.go index 1cb180b368..b3ec270948 100644 --- a/cmd/podman/containers/mount.go +++ b/cmd/podman/containers/mount.go @@ -5,13 +5,13 @@ import ( "fmt" "os" - "github.com/containers/podman/v6/cmd/podman/common" - "github.com/containers/podman/v6/cmd/podman/registry" - "github.com/containers/podman/v6/cmd/podman/utils" - "github.com/containers/podman/v6/cmd/podman/validate" - "github.com/containers/podman/v6/pkg/domain/entities" "github.com/spf13/cobra" "go.podman.io/common/pkg/report" + "go.podman.io/podman/v6/cmd/podman/common" + "go.podman.io/podman/v6/cmd/podman/registry" + "go.podman.io/podman/v6/cmd/podman/utils" + "go.podman.io/podman/v6/cmd/podman/validate" + "go.podman.io/podman/v6/pkg/domain/entities" ) var ( diff --git a/cmd/podman/containers/pause.go b/cmd/podman/containers/pause.go index 723851e8ac..6d51dc4ef0 100644 --- a/cmd/podman/containers/pause.go +++ b/cmd/podman/containers/pause.go @@ -6,13 +6,13 @@ import ( "os" "strings" - "github.com/containers/podman/v6/cmd/podman/common" - "github.com/containers/podman/v6/cmd/podman/registry" - "github.com/containers/podman/v6/cmd/podman/utils" - "github.com/containers/podman/v6/cmd/podman/validate" - "github.com/containers/podman/v6/pkg/domain/entities" "github.com/spf13/cobra" "go.podman.io/common/pkg/completion" + "go.podman.io/podman/v6/cmd/podman/common" + "go.podman.io/podman/v6/cmd/podman/registry" + "go.podman.io/podman/v6/cmd/podman/utils" + "go.podman.io/podman/v6/cmd/podman/validate" + "go.podman.io/podman/v6/pkg/domain/entities" ) var ( diff --git a/cmd/podman/containers/port.go b/cmd/podman/containers/port.go index 35b5c9ad97..64ea98a416 100644 --- a/cmd/podman/containers/port.go +++ b/cmd/podman/containers/port.go @@ -6,12 +6,12 @@ import ( "strconv" "strings" - "github.com/containers/podman/v6/cmd/podman/common" - "github.com/containers/podman/v6/cmd/podman/registry" - "github.com/containers/podman/v6/cmd/podman/validate" - "github.com/containers/podman/v6/pkg/domain/entities" "github.com/spf13/cobra" "github.com/spf13/pflag" + "go.podman.io/podman/v6/cmd/podman/common" + "go.podman.io/podman/v6/cmd/podman/registry" + "go.podman.io/podman/v6/cmd/podman/validate" + "go.podman.io/podman/v6/pkg/domain/entities" ) var ( diff --git a/cmd/podman/containers/prune.go b/cmd/podman/containers/prune.go index 0385d51a14..23a587ac35 100644 --- a/cmd/podman/containers/prune.go +++ b/cmd/podman/containers/prune.go @@ -7,14 +7,14 @@ import ( "os" "strings" - "github.com/containers/podman/v6/cmd/podman/common" - "github.com/containers/podman/v6/cmd/podman/parse" - "github.com/containers/podman/v6/cmd/podman/registry" - "github.com/containers/podman/v6/cmd/podman/utils" - "github.com/containers/podman/v6/cmd/podman/validate" - "github.com/containers/podman/v6/pkg/domain/entities" "github.com/spf13/cobra" "go.podman.io/common/pkg/completion" + "go.podman.io/podman/v6/cmd/podman/common" + "go.podman.io/podman/v6/cmd/podman/parse" + "go.podman.io/podman/v6/cmd/podman/registry" + "go.podman.io/podman/v6/cmd/podman/utils" + "go.podman.io/podman/v6/cmd/podman/validate" + "go.podman.io/podman/v6/pkg/domain/entities" ) var ( diff --git a/cmd/podman/containers/ps.go b/cmd/podman/containers/ps.go index 56dad9ee50..fe2264d643 100644 --- a/cmd/podman/containers/ps.go +++ b/cmd/podman/containers/ps.go @@ -10,17 +10,17 @@ import ( "strings" "time" - "github.com/containers/podman/v6/cmd/podman/common" - "github.com/containers/podman/v6/cmd/podman/registry" - "github.com/containers/podman/v6/cmd/podman/utils" - "github.com/containers/podman/v6/cmd/podman/validate" - "github.com/containers/podman/v6/pkg/domain/entities" "github.com/docker/go-units" "github.com/sirupsen/logrus" "github.com/spf13/cobra" "go.podman.io/common/libnetwork/types" "go.podman.io/common/pkg/completion" "go.podman.io/common/pkg/report" + "go.podman.io/podman/v6/cmd/podman/common" + "go.podman.io/podman/v6/cmd/podman/registry" + "go.podman.io/podman/v6/cmd/podman/utils" + "go.podman.io/podman/v6/cmd/podman/validate" + "go.podman.io/podman/v6/pkg/domain/entities" ) var ( diff --git a/cmd/podman/containers/rename.go b/cmd/podman/containers/rename.go index c91b38b360..69c4c70227 100644 --- a/cmd/podman/containers/rename.go +++ b/cmd/podman/containers/rename.go @@ -3,11 +3,11 @@ package containers import ( "errors" - "github.com/containers/podman/v6/cmd/podman/common" - "github.com/containers/podman/v6/cmd/podman/registry" - "github.com/containers/podman/v6/cmd/podman/utils" - "github.com/containers/podman/v6/pkg/domain/entities" "github.com/spf13/cobra" + "go.podman.io/podman/v6/cmd/podman/common" + "go.podman.io/podman/v6/cmd/podman/registry" + "go.podman.io/podman/v6/cmd/podman/utils" + "go.podman.io/podman/v6/pkg/domain/entities" ) var ( diff --git a/cmd/podman/containers/restart.go b/cmd/podman/containers/restart.go index 126aedf16d..38aa2eb176 100644 --- a/cmd/podman/containers/restart.go +++ b/cmd/podman/containers/restart.go @@ -6,13 +6,13 @@ import ( "os" "strings" - "github.com/containers/podman/v6/cmd/podman/common" - "github.com/containers/podman/v6/cmd/podman/registry" - "github.com/containers/podman/v6/cmd/podman/utils" - "github.com/containers/podman/v6/cmd/podman/validate" - "github.com/containers/podman/v6/pkg/domain/entities" "github.com/spf13/cobra" "go.podman.io/common/pkg/completion" + "go.podman.io/podman/v6/cmd/podman/common" + "go.podman.io/podman/v6/cmd/podman/registry" + "go.podman.io/podman/v6/cmd/podman/utils" + "go.podman.io/podman/v6/cmd/podman/validate" + "go.podman.io/podman/v6/pkg/domain/entities" ) var ( diff --git a/cmd/podman/containers/restore.go b/cmd/podman/containers/restore.go index 5513b2b778..1c1806b6de 100644 --- a/cmd/podman/containers/restore.go +++ b/cmd/podman/containers/restore.go @@ -5,14 +5,14 @@ import ( "fmt" "time" - "github.com/containers/podman/v6/cmd/podman/common" - "github.com/containers/podman/v6/cmd/podman/registry" - "github.com/containers/podman/v6/cmd/podman/utils" - "github.com/containers/podman/v6/cmd/podman/validate" - "github.com/containers/podman/v6/pkg/domain/entities" - "github.com/containers/podman/v6/pkg/rootless" "github.com/spf13/cobra" "go.podman.io/common/pkg/completion" + "go.podman.io/podman/v6/cmd/podman/common" + "go.podman.io/podman/v6/cmd/podman/registry" + "go.podman.io/podman/v6/cmd/podman/utils" + "go.podman.io/podman/v6/cmd/podman/validate" + "go.podman.io/podman/v6/pkg/domain/entities" + "go.podman.io/podman/v6/pkg/rootless" ) var ( diff --git a/cmd/podman/containers/rm.go b/cmd/podman/containers/rm.go index 6d2e26bba8..d91113da78 100644 --- a/cmd/podman/containers/rm.go +++ b/cmd/podman/containers/rm.go @@ -7,15 +7,15 @@ import ( "os" "strings" - "github.com/containers/podman/v6/cmd/podman/common" - "github.com/containers/podman/v6/cmd/podman/registry" - "github.com/containers/podman/v6/cmd/podman/utils" - "github.com/containers/podman/v6/cmd/podman/validate" - "github.com/containers/podman/v6/libpod/define" - "github.com/containers/podman/v6/pkg/domain/entities" "github.com/sirupsen/logrus" "github.com/spf13/cobra" "go.podman.io/common/pkg/completion" + "go.podman.io/podman/v6/cmd/podman/common" + "go.podman.io/podman/v6/cmd/podman/registry" + "go.podman.io/podman/v6/cmd/podman/utils" + "go.podman.io/podman/v6/cmd/podman/validate" + "go.podman.io/podman/v6/libpod/define" + "go.podman.io/podman/v6/pkg/domain/entities" ) var ( diff --git a/cmd/podman/containers/run.go b/cmd/podman/containers/run.go index e8b6cf0f15..3e58c6e628 100644 --- a/cmd/podman/containers/run.go +++ b/cmd/podman/containers/run.go @@ -6,18 +6,18 @@ import ( "os" "strings" - "github.com/containers/podman/v6/cmd/podman/common" - "github.com/containers/podman/v6/cmd/podman/registry" - "github.com/containers/podman/v6/cmd/podman/utils" - "github.com/containers/podman/v6/libpod/define" - "github.com/containers/podman/v6/pkg/domain/entities" - "github.com/containers/podman/v6/pkg/rootless" - "github.com/containers/podman/v6/pkg/specgen" - "github.com/containers/podman/v6/pkg/specgenutil" "github.com/sirupsen/logrus" "github.com/spf13/cobra" "go.podman.io/common/pkg/auth" "go.podman.io/common/pkg/completion" + "go.podman.io/podman/v6/cmd/podman/common" + "go.podman.io/podman/v6/cmd/podman/registry" + "go.podman.io/podman/v6/cmd/podman/utils" + "go.podman.io/podman/v6/libpod/define" + "go.podman.io/podman/v6/pkg/domain/entities" + "go.podman.io/podman/v6/pkg/rootless" + "go.podman.io/podman/v6/pkg/specgen" + "go.podman.io/podman/v6/pkg/specgenutil" "golang.org/x/term" ) diff --git a/cmd/podman/containers/runlabel.go b/cmd/podman/containers/runlabel.go index 75f54928ee..003078e51b 100644 --- a/cmd/podman/containers/runlabel.go +++ b/cmd/podman/containers/runlabel.go @@ -4,14 +4,14 @@ import ( "context" "strings" - "github.com/containers/podman/v6/cmd/podman/common" - "github.com/containers/podman/v6/cmd/podman/registry" - "github.com/containers/podman/v6/pkg/domain/entities" "github.com/sirupsen/logrus" "github.com/spf13/cobra" "go.podman.io/common/pkg/auth" "go.podman.io/common/pkg/completion" "go.podman.io/image/v5/types" + "go.podman.io/podman/v6/cmd/podman/common" + "go.podman.io/podman/v6/cmd/podman/registry" + "go.podman.io/podman/v6/pkg/domain/entities" ) // runlabelOptionsWrapper allows for combining API-only with CLI-only options diff --git a/cmd/podman/containers/start.go b/cmd/podman/containers/start.go index b6af15e5d2..4f7e6ffb19 100644 --- a/cmd/podman/containers/start.go +++ b/cmd/podman/containers/start.go @@ -6,13 +6,13 @@ import ( "os" "strings" - "github.com/containers/podman/v6/cmd/podman/common" - "github.com/containers/podman/v6/cmd/podman/registry" - "github.com/containers/podman/v6/cmd/podman/utils" - "github.com/containers/podman/v6/cmd/podman/validate" - "github.com/containers/podman/v6/libpod/define" - "github.com/containers/podman/v6/pkg/domain/entities" "github.com/spf13/cobra" + "go.podman.io/podman/v6/cmd/podman/common" + "go.podman.io/podman/v6/cmd/podman/registry" + "go.podman.io/podman/v6/cmd/podman/utils" + "go.podman.io/podman/v6/cmd/podman/validate" + "go.podman.io/podman/v6/libpod/define" + "go.podman.io/podman/v6/pkg/domain/entities" ) var ( diff --git a/cmd/podman/containers/stats.go b/cmd/podman/containers/stats.go index 7ec7214e2f..76f7a0018c 100644 --- a/cmd/podman/containers/stats.go +++ b/cmd/podman/containers/stats.go @@ -6,16 +6,16 @@ import ( "os" "strconv" - "github.com/containers/podman/v6/cmd/podman/common" - "github.com/containers/podman/v6/cmd/podman/registry" - putils "github.com/containers/podman/v6/cmd/podman/utils" - "github.com/containers/podman/v6/cmd/podman/validate" - "github.com/containers/podman/v6/libpod/define" - "github.com/containers/podman/v6/pkg/domain/entities" "github.com/docker/go-units" "github.com/spf13/cobra" "go.podman.io/common/pkg/completion" "go.podman.io/common/pkg/report" + "go.podman.io/podman/v6/cmd/podman/common" + "go.podman.io/podman/v6/cmd/podman/registry" + putils "go.podman.io/podman/v6/cmd/podman/utils" + "go.podman.io/podman/v6/cmd/podman/validate" + "go.podman.io/podman/v6/libpod/define" + "go.podman.io/podman/v6/pkg/domain/entities" ) var ( diff --git a/cmd/podman/containers/stop.go b/cmd/podman/containers/stop.go index 2c87eb5de3..1a283e6ae9 100644 --- a/cmd/podman/containers/stop.go +++ b/cmd/podman/containers/stop.go @@ -7,13 +7,13 @@ import ( "os" "strings" - "github.com/containers/podman/v6/cmd/podman/common" - "github.com/containers/podman/v6/cmd/podman/registry" - "github.com/containers/podman/v6/cmd/podman/utils" - "github.com/containers/podman/v6/cmd/podman/validate" - "github.com/containers/podman/v6/pkg/domain/entities" "github.com/spf13/cobra" "go.podman.io/common/pkg/completion" + "go.podman.io/podman/v6/cmd/podman/common" + "go.podman.io/podman/v6/cmd/podman/registry" + "go.podman.io/podman/v6/cmd/podman/utils" + "go.podman.io/podman/v6/cmd/podman/validate" + "go.podman.io/podman/v6/pkg/domain/entities" ) var ( diff --git a/cmd/podman/containers/top.go b/cmd/podman/containers/top.go index 90300abb4c..7ec186995e 100644 --- a/cmd/podman/containers/top.go +++ b/cmd/podman/containers/top.go @@ -7,14 +7,14 @@ import ( "os" "strings" - "github.com/containers/podman/v6/cmd/podman/common" - "github.com/containers/podman/v6/cmd/podman/registry" - "github.com/containers/podman/v6/cmd/podman/validate" - "github.com/containers/podman/v6/pkg/domain/entities" - "github.com/containers/podman/v6/pkg/util" "github.com/spf13/cobra" "github.com/spf13/pflag" "go.podman.io/common/pkg/report" + "go.podman.io/podman/v6/cmd/podman/common" + "go.podman.io/podman/v6/cmd/podman/registry" + "go.podman.io/podman/v6/cmd/podman/validate" + "go.podman.io/podman/v6/pkg/domain/entities" + "go.podman.io/podman/v6/pkg/util" ) var ( diff --git a/cmd/podman/containers/unmount.go b/cmd/podman/containers/unmount.go index 9355628095..214d20316d 100644 --- a/cmd/podman/containers/unmount.go +++ b/cmd/podman/containers/unmount.go @@ -3,13 +3,13 @@ package containers import ( "fmt" - "github.com/containers/podman/v6/cmd/podman/common" - "github.com/containers/podman/v6/cmd/podman/registry" - "github.com/containers/podman/v6/cmd/podman/utils" - "github.com/containers/podman/v6/cmd/podman/validate" - "github.com/containers/podman/v6/pkg/domain/entities" "github.com/spf13/cobra" "github.com/spf13/pflag" + "go.podman.io/podman/v6/cmd/podman/common" + "go.podman.io/podman/v6/cmd/podman/registry" + "go.podman.io/podman/v6/cmd/podman/utils" + "go.podman.io/podman/v6/cmd/podman/validate" + "go.podman.io/podman/v6/pkg/domain/entities" ) var ( diff --git a/cmd/podman/containers/unpause.go b/cmd/podman/containers/unpause.go index 1b6b6cd863..cff1544b8e 100644 --- a/cmd/podman/containers/unpause.go +++ b/cmd/podman/containers/unpause.go @@ -6,13 +6,13 @@ import ( "os" "strings" - "github.com/containers/podman/v6/cmd/podman/common" - "github.com/containers/podman/v6/cmd/podman/registry" - "github.com/containers/podman/v6/cmd/podman/utils" - "github.com/containers/podman/v6/cmd/podman/validate" - "github.com/containers/podman/v6/pkg/domain/entities" "github.com/spf13/cobra" "go.podman.io/common/pkg/completion" + "go.podman.io/podman/v6/cmd/podman/common" + "go.podman.io/podman/v6/cmd/podman/registry" + "go.podman.io/podman/v6/cmd/podman/utils" + "go.podman.io/podman/v6/cmd/podman/validate" + "go.podman.io/podman/v6/pkg/domain/entities" ) var ( diff --git a/cmd/podman/containers/update.go b/cmd/podman/containers/update.go index aba582ac7b..26222399da 100644 --- a/cmd/podman/containers/update.go +++ b/cmd/podman/containers/update.go @@ -5,16 +5,16 @@ import ( "fmt" "strings" - "github.com/containers/podman/v6/cmd/podman/common" - "github.com/containers/podman/v6/cmd/podman/registry" - "github.com/containers/podman/v6/cmd/podman/validate" - "github.com/containers/podman/v6/libpod/define" - "github.com/containers/podman/v6/pkg/domain/entities" - "github.com/containers/podman/v6/pkg/specgen" - "github.com/containers/podman/v6/pkg/specgenutil" - "github.com/containers/podman/v6/pkg/util" "github.com/opencontainers/runtime-spec/specs-go" "github.com/spf13/cobra" + "go.podman.io/podman/v6/cmd/podman/common" + "go.podman.io/podman/v6/cmd/podman/registry" + "go.podman.io/podman/v6/cmd/podman/validate" + "go.podman.io/podman/v6/libpod/define" + "go.podman.io/podman/v6/pkg/domain/entities" + "go.podman.io/podman/v6/pkg/specgen" + "go.podman.io/podman/v6/pkg/specgenutil" + "go.podman.io/podman/v6/pkg/util" ) var ( diff --git a/cmd/podman/containers/wait.go b/cmd/podman/containers/wait.go index c8fdd88674..574b9f1c42 100644 --- a/cmd/podman/containers/wait.go +++ b/cmd/podman/containers/wait.go @@ -6,13 +6,13 @@ import ( "fmt" "time" - "github.com/containers/podman/v6/cmd/podman/common" - "github.com/containers/podman/v6/cmd/podman/registry" - "github.com/containers/podman/v6/cmd/podman/utils" - "github.com/containers/podman/v6/cmd/podman/validate" - "github.com/containers/podman/v6/pkg/domain/entities" "github.com/spf13/cobra" "go.podman.io/common/pkg/completion" + "go.podman.io/podman/v6/cmd/podman/common" + "go.podman.io/podman/v6/cmd/podman/registry" + "go.podman.io/podman/v6/cmd/podman/utils" + "go.podman.io/podman/v6/cmd/podman/validate" + "go.podman.io/podman/v6/pkg/domain/entities" ) var ( diff --git a/cmd/podman/diff.go b/cmd/podman/diff.go index 3b80637e33..8d7c02c05e 100644 --- a/cmd/podman/diff.go +++ b/cmd/podman/diff.go @@ -1,13 +1,13 @@ package main import ( - "github.com/containers/podman/v6/cmd/podman/common" - "github.com/containers/podman/v6/cmd/podman/diff" - "github.com/containers/podman/v6/cmd/podman/registry" - "github.com/containers/podman/v6/cmd/podman/validate" - "github.com/containers/podman/v6/libpod/define" - "github.com/containers/podman/v6/pkg/domain/entities" "github.com/spf13/cobra" + "go.podman.io/podman/v6/cmd/podman/common" + "go.podman.io/podman/v6/cmd/podman/diff" + "go.podman.io/podman/v6/cmd/podman/registry" + "go.podman.io/podman/v6/cmd/podman/validate" + "go.podman.io/podman/v6/libpod/define" + "go.podman.io/podman/v6/pkg/domain/entities" ) // Inspect is one of the outlier commands in that it operates on images/containers/... diff --git a/cmd/podman/diff/diff.go b/cmd/podman/diff/diff.go index 53823dedfe..1d01ba17ec 100644 --- a/cmd/podman/diff/diff.go +++ b/cmd/podman/diff/diff.go @@ -6,10 +6,10 @@ import ( "fmt" "os" - "github.com/containers/podman/v6/cmd/podman/registry" - "github.com/containers/podman/v6/pkg/domain/entities" "github.com/spf13/cobra" "go.podman.io/common/pkg/report" + "go.podman.io/podman/v6/cmd/podman/registry" + "go.podman.io/podman/v6/pkg/domain/entities" "go.podman.io/storage/pkg/archive" ) diff --git a/cmd/podman/farm/build.go b/cmd/podman/farm/build.go index c70e37d3ac..940fee8086 100644 --- a/cmd/podman/farm/build.go +++ b/cmd/podman/farm/build.go @@ -6,13 +6,13 @@ import ( "os" "strings" - "github.com/containers/podman/v6/cmd/podman/common" - "github.com/containers/podman/v6/cmd/podman/registry" - "github.com/containers/podman/v6/cmd/podman/utils" - "github.com/containers/podman/v6/pkg/farm" "github.com/sirupsen/logrus" "github.com/spf13/cobra" "go.podman.io/common/pkg/completion" + "go.podman.io/podman/v6/cmd/podman/common" + "go.podman.io/podman/v6/cmd/podman/registry" + "go.podman.io/podman/v6/cmd/podman/utils" + "go.podman.io/podman/v6/pkg/farm" ) type buildOptions struct { diff --git a/cmd/podman/farm/create.go b/cmd/podman/farm/create.go index 5fb5c2a1f8..5456e2870c 100644 --- a/cmd/podman/farm/create.go +++ b/cmd/podman/farm/create.go @@ -4,11 +4,11 @@ import ( "fmt" "slices" - "github.com/containers/podman/v6/cmd/podman/registry" - "github.com/containers/podman/v6/cmd/podman/validate" "github.com/spf13/cobra" "go.podman.io/common/pkg/completion" "go.podman.io/common/pkg/config" + "go.podman.io/podman/v6/cmd/podman/registry" + "go.podman.io/podman/v6/cmd/podman/validate" ) var ( diff --git a/cmd/podman/farm/farm.go b/cmd/podman/farm/farm.go index eb35d3c017..54919373ef 100644 --- a/cmd/podman/farm/farm.go +++ b/cmd/podman/farm/farm.go @@ -1,9 +1,9 @@ package farm import ( - "github.com/containers/podman/v6/cmd/podman/registry" - "github.com/containers/podman/v6/cmd/podman/validate" "github.com/spf13/cobra" + "go.podman.io/podman/v6/cmd/podman/registry" + "go.podman.io/podman/v6/cmd/podman/validate" ) // Command: podman _farm_ diff --git a/cmd/podman/farm/list.go b/cmd/podman/farm/list.go index b736c6a0ed..ec5a68b7c3 100644 --- a/cmd/podman/farm/list.go +++ b/cmd/podman/farm/list.go @@ -5,13 +5,13 @@ import ( "os" "sort" - "github.com/containers/podman/v6/cmd/podman/common" - "github.com/containers/podman/v6/cmd/podman/registry" - "github.com/containers/podman/v6/cmd/podman/validate" "github.com/spf13/cobra" "go.podman.io/common/pkg/completion" "go.podman.io/common/pkg/config" "go.podman.io/common/pkg/report" + "go.podman.io/podman/v6/cmd/podman/common" + "go.podman.io/podman/v6/cmd/podman/registry" + "go.podman.io/podman/v6/cmd/podman/validate" ) var ( diff --git a/cmd/podman/farm/remove.go b/cmd/podman/farm/remove.go index 670b882eb1..277aeae67a 100644 --- a/cmd/podman/farm/remove.go +++ b/cmd/podman/farm/remove.go @@ -4,12 +4,12 @@ import ( "errors" "fmt" - "github.com/containers/podman/v6/cmd/podman/common" - "github.com/containers/podman/v6/cmd/podman/registry" - "github.com/containers/podman/v6/cmd/podman/validate" "github.com/sirupsen/logrus" "github.com/spf13/cobra" "go.podman.io/common/pkg/config" + "go.podman.io/podman/v6/cmd/podman/common" + "go.podman.io/podman/v6/cmd/podman/registry" + "go.podman.io/podman/v6/cmd/podman/validate" ) var ( diff --git a/cmd/podman/farm/update.go b/cmd/podman/farm/update.go index 0afdfc27d4..fb9b4c6fd2 100644 --- a/cmd/podman/farm/update.go +++ b/cmd/podman/farm/update.go @@ -5,12 +5,12 @@ import ( "fmt" "slices" - "github.com/containers/podman/v6/cmd/podman/common" - "github.com/containers/podman/v6/cmd/podman/registry" - "github.com/containers/podman/v6/cmd/podman/validate" "github.com/spf13/cobra" "go.podman.io/common/pkg/completion" "go.podman.io/common/pkg/config" + "go.podman.io/podman/v6/cmd/podman/common" + "go.podman.io/podman/v6/cmd/podman/registry" + "go.podman.io/podman/v6/cmd/podman/validate" ) var ( diff --git a/cmd/podman/generate/generate.go b/cmd/podman/generate/generate.go index d4b86fde7b..e9596f7893 100644 --- a/cmd/podman/generate/generate.go +++ b/cmd/podman/generate/generate.go @@ -1,9 +1,9 @@ package generate import ( - "github.com/containers/podman/v6/cmd/podman/registry" - "github.com/containers/podman/v6/cmd/podman/validate" "github.com/spf13/cobra" + "go.podman.io/podman/v6/cmd/podman/registry" + "go.podman.io/podman/v6/cmd/podman/validate" ) var ( diff --git a/cmd/podman/generate/spec.go b/cmd/podman/generate/spec.go index 7bfccb5219..5c05122806 100644 --- a/cmd/podman/generate/spec.go +++ b/cmd/podman/generate/spec.go @@ -4,12 +4,12 @@ import ( "fmt" "os" - "github.com/containers/podman/v6/cmd/podman/common" - "github.com/containers/podman/v6/cmd/podman/registry" - "github.com/containers/podman/v6/cmd/podman/utils" - "github.com/containers/podman/v6/pkg/domain/entities" "github.com/spf13/cobra" "go.podman.io/common/pkg/completion" + "go.podman.io/podman/v6/cmd/podman/common" + "go.podman.io/podman/v6/cmd/podman/registry" + "go.podman.io/podman/v6/cmd/podman/utils" + "go.podman.io/podman/v6/pkg/domain/entities" ) var specCmd = &cobra.Command{ diff --git a/cmd/podman/generate/systemd.go b/cmd/podman/generate/systemd.go index 9ea5bc6f59..e29ee1af0a 100644 --- a/cmd/podman/generate/systemd.go +++ b/cmd/podman/generate/systemd.go @@ -7,16 +7,16 @@ import ( "os" "path/filepath" - "github.com/containers/podman/v6/cmd/podman/common" - "github.com/containers/podman/v6/cmd/podman/registry" - "github.com/containers/podman/v6/cmd/podman/utils" - "github.com/containers/podman/v6/pkg/domain/entities" - envLib "github.com/containers/podman/v6/pkg/env" - systemDefine "github.com/containers/podman/v6/pkg/systemd/define" "github.com/sirupsen/logrus" "github.com/spf13/cobra" "go.podman.io/common/pkg/completion" "go.podman.io/common/pkg/report" + "go.podman.io/podman/v6/cmd/podman/common" + "go.podman.io/podman/v6/cmd/podman/registry" + "go.podman.io/podman/v6/cmd/podman/utils" + "go.podman.io/podman/v6/pkg/domain/entities" + envLib "go.podman.io/podman/v6/pkg/env" + systemDefine "go.podman.io/podman/v6/pkg/systemd/define" ) const ( diff --git a/cmd/podman/healthcheck/healthcheck.go b/cmd/podman/healthcheck/healthcheck.go index 85a9c21e64..a79f55e381 100644 --- a/cmd/podman/healthcheck/healthcheck.go +++ b/cmd/podman/healthcheck/healthcheck.go @@ -1,9 +1,9 @@ package healthcheck import ( - "github.com/containers/podman/v6/cmd/podman/registry" - "github.com/containers/podman/v6/cmd/podman/validate" "github.com/spf13/cobra" + "go.podman.io/podman/v6/cmd/podman/registry" + "go.podman.io/podman/v6/cmd/podman/validate" ) var healthCmd = &cobra.Command{ diff --git a/cmd/podman/healthcheck/run.go b/cmd/podman/healthcheck/run.go index 449d299104..5009317b1b 100644 --- a/cmd/podman/healthcheck/run.go +++ b/cmd/podman/healthcheck/run.go @@ -4,11 +4,11 @@ import ( "context" "fmt" - "github.com/containers/podman/v6/cmd/podman/common" - "github.com/containers/podman/v6/cmd/podman/registry" - "github.com/containers/podman/v6/libpod/define" - "github.com/containers/podman/v6/pkg/domain/entities" "github.com/spf13/cobra" + "go.podman.io/podman/v6/cmd/podman/common" + "go.podman.io/podman/v6/cmd/podman/registry" + "go.podman.io/podman/v6/libpod/define" + "go.podman.io/podman/v6/pkg/domain/entities" ) var runCmd = &cobra.Command{ diff --git a/cmd/podman/images/build.go b/cmd/podman/images/build.go index be1b710018..5f9fbb3ee3 100644 --- a/cmd/podman/images/build.go +++ b/cmd/podman/images/build.go @@ -5,12 +5,12 @@ import ( "os" "os/exec" - "github.com/containers/podman/v6/cmd/podman/common" - "github.com/containers/podman/v6/cmd/podman/registry" - "github.com/containers/podman/v6/cmd/podman/utils" "github.com/sirupsen/logrus" "github.com/spf13/cobra" buildahCLI "go.podman.io/buildah/pkg/cli" + "go.podman.io/podman/v6/cmd/podman/common" + "go.podman.io/podman/v6/cmd/podman/registry" + "go.podman.io/podman/v6/cmd/podman/utils" ) var ( diff --git a/cmd/podman/images/buildx.go b/cmd/podman/images/buildx.go index 4d3bfb22bb..45f9ae7d97 100644 --- a/cmd/podman/images/buildx.go +++ b/cmd/podman/images/buildx.go @@ -1,9 +1,9 @@ package images import ( - "github.com/containers/podman/v6/cmd/podman/registry" - "github.com/containers/podman/v6/cmd/podman/validate" "github.com/spf13/cobra" + "go.podman.io/podman/v6/cmd/podman/registry" + "go.podman.io/podman/v6/cmd/podman/validate" ) // Command: podman _buildx_ diff --git a/cmd/podman/images/buildx_inspect.go b/cmd/podman/images/buildx_inspect.go index 22d1073700..e43ca51194 100644 --- a/cmd/podman/images/buildx_inspect.go +++ b/cmd/podman/images/buildx_inspect.go @@ -4,8 +4,8 @@ import ( "fmt" "strings" - "github.com/containers/podman/v6/cmd/podman/registry" "github.com/spf13/cobra" + "go.podman.io/podman/v6/cmd/podman/registry" ) type buildNode struct { diff --git a/cmd/podman/images/diff.go b/cmd/podman/images/diff.go index 6f465d0d51..570d633581 100644 --- a/cmd/podman/images/diff.go +++ b/cmd/podman/images/diff.go @@ -1,13 +1,13 @@ package images import ( - "github.com/containers/podman/v6/cmd/podman/common" - "github.com/containers/podman/v6/cmd/podman/diff" - "github.com/containers/podman/v6/cmd/podman/registry" - "github.com/containers/podman/v6/libpod/define" - "github.com/containers/podman/v6/pkg/domain/entities" "github.com/spf13/cobra" "github.com/spf13/pflag" + "go.podman.io/podman/v6/cmd/podman/common" + "go.podman.io/podman/v6/cmd/podman/diff" + "go.podman.io/podman/v6/cmd/podman/registry" + "go.podman.io/podman/v6/libpod/define" + "go.podman.io/podman/v6/pkg/domain/entities" ) var ( diff --git a/cmd/podman/images/exists.go b/cmd/podman/images/exists.go index 541494d132..ffc96f6223 100644 --- a/cmd/podman/images/exists.go +++ b/cmd/podman/images/exists.go @@ -1,9 +1,9 @@ package images import ( - "github.com/containers/podman/v6/cmd/podman/common" - "github.com/containers/podman/v6/cmd/podman/registry" "github.com/spf13/cobra" + "go.podman.io/podman/v6/cmd/podman/common" + "go.podman.io/podman/v6/cmd/podman/registry" ) var existsCmd = &cobra.Command{ diff --git a/cmd/podman/images/history.go b/cmd/podman/images/history.go index 9e697de81c..0d96aae594 100644 --- a/cmd/podman/images/history.go +++ b/cmd/podman/images/history.go @@ -5,13 +5,13 @@ import ( "os" "time" - "github.com/containers/podman/v6/cmd/podman/common" - "github.com/containers/podman/v6/cmd/podman/registry" - "github.com/containers/podman/v6/cmd/podman/utils" - "github.com/containers/podman/v6/pkg/domain/entities" "github.com/docker/go-units" "github.com/spf13/cobra" "go.podman.io/common/pkg/report" + "go.podman.io/podman/v6/cmd/podman/common" + "go.podman.io/podman/v6/cmd/podman/registry" + "go.podman.io/podman/v6/cmd/podman/utils" + "go.podman.io/podman/v6/pkg/domain/entities" ) var ( diff --git a/cmd/podman/images/image.go b/cmd/podman/images/image.go index 4fd9c64d35..36c039ae0e 100644 --- a/cmd/podman/images/image.go +++ b/cmd/podman/images/image.go @@ -1,9 +1,9 @@ package images import ( - "github.com/containers/podman/v6/cmd/podman/registry" - "github.com/containers/podman/v6/cmd/podman/validate" "github.com/spf13/cobra" + "go.podman.io/podman/v6/cmd/podman/registry" + "go.podman.io/podman/v6/cmd/podman/validate" ) var ( diff --git a/cmd/podman/images/import.go b/cmd/podman/images/import.go index f7cfb19694..7e585e14b0 100644 --- a/cmd/podman/images/import.go +++ b/cmd/podman/images/import.go @@ -8,13 +8,13 @@ import ( "os" "strings" - "github.com/containers/podman/v6/cmd/podman/common" - "github.com/containers/podman/v6/cmd/podman/parse" - "github.com/containers/podman/v6/cmd/podman/registry" - "github.com/containers/podman/v6/pkg/domain/entities" "github.com/hashicorp/go-multierror" "github.com/spf13/cobra" "go.podman.io/common/pkg/completion" + "go.podman.io/podman/v6/cmd/podman/common" + "go.podman.io/podman/v6/cmd/podman/parse" + "go.podman.io/podman/v6/cmd/podman/registry" + "go.podman.io/podman/v6/pkg/domain/entities" ) var ( diff --git a/cmd/podman/images/inspect.go b/cmd/podman/images/inspect.go index c447f74eeb..5b702dbc36 100644 --- a/cmd/podman/images/inspect.go +++ b/cmd/podman/images/inspect.go @@ -1,12 +1,12 @@ package images import ( - "github.com/containers/podman/v6/cmd/podman/common" - "github.com/containers/podman/v6/cmd/podman/inspect" - "github.com/containers/podman/v6/cmd/podman/registry" - "github.com/containers/podman/v6/pkg/domain/entities" - inspectTypes "github.com/containers/podman/v6/pkg/inspect" "github.com/spf13/cobra" + "go.podman.io/podman/v6/cmd/podman/common" + "go.podman.io/podman/v6/cmd/podman/inspect" + "go.podman.io/podman/v6/cmd/podman/registry" + "go.podman.io/podman/v6/pkg/domain/entities" + inspectTypes "go.podman.io/podman/v6/pkg/inspect" ) var ( diff --git a/cmd/podman/images/list.go b/cmd/podman/images/list.go index 30384b3080..fb3dd5b104 100644 --- a/cmd/podman/images/list.go +++ b/cmd/podman/images/list.go @@ -10,14 +10,14 @@ import ( "time" "unicode" - "github.com/containers/podman/v6/cmd/podman/common" - "github.com/containers/podman/v6/cmd/podman/registry" - "github.com/containers/podman/v6/cmd/podman/validate" - "github.com/containers/podman/v6/pkg/domain/entities" "github.com/docker/go-units" "github.com/spf13/cobra" "go.podman.io/common/pkg/report" "go.podman.io/image/v5/docker/reference" + "go.podman.io/podman/v6/cmd/podman/common" + "go.podman.io/podman/v6/cmd/podman/registry" + "go.podman.io/podman/v6/cmd/podman/validate" + "go.podman.io/podman/v6/pkg/domain/entities" ) type listFlagType struct { diff --git a/cmd/podman/images/load.go b/cmd/podman/images/load.go index b2b469b6c7..daf7bacf67 100644 --- a/cmd/podman/images/load.go +++ b/cmd/podman/images/load.go @@ -8,13 +8,13 @@ import ( "os" "strings" - "github.com/containers/podman/v6/cmd/podman/registry" - "github.com/containers/podman/v6/cmd/podman/validate" - "github.com/containers/podman/v6/pkg/domain/entities" - "github.com/containers/podman/v6/pkg/util" "github.com/spf13/cobra" "go.podman.io/common/pkg/completion" "go.podman.io/common/pkg/download" + "go.podman.io/podman/v6/cmd/podman/registry" + "go.podman.io/podman/v6/cmd/podman/validate" + "go.podman.io/podman/v6/pkg/domain/entities" + "go.podman.io/podman/v6/pkg/util" "go.podman.io/storage/pkg/fileutils" "golang.org/x/term" ) diff --git a/cmd/podman/images/mount.go b/cmd/podman/images/mount.go index bdda456a78..6ada43a286 100644 --- a/cmd/podman/images/mount.go +++ b/cmd/podman/images/mount.go @@ -5,11 +5,11 @@ import ( "fmt" "os" - "github.com/containers/podman/v6/cmd/podman/common" - "github.com/containers/podman/v6/cmd/podman/registry" - "github.com/containers/podman/v6/pkg/domain/entities" "github.com/spf13/cobra" "go.podman.io/common/pkg/report" + "go.podman.io/podman/v6/cmd/podman/common" + "go.podman.io/podman/v6/cmd/podman/registry" + "go.podman.io/podman/v6/pkg/domain/entities" ) var ( diff --git a/cmd/podman/images/prune.go b/cmd/podman/images/prune.go index c51fe7913b..077ca33482 100644 --- a/cmd/podman/images/prune.go +++ b/cmd/podman/images/prune.go @@ -6,14 +6,14 @@ import ( "os" "strings" - "github.com/containers/podman/v6/cmd/podman/common" - "github.com/containers/podman/v6/cmd/podman/parse" - "github.com/containers/podman/v6/cmd/podman/registry" - "github.com/containers/podman/v6/cmd/podman/utils" - "github.com/containers/podman/v6/cmd/podman/validate" - "github.com/containers/podman/v6/pkg/domain/entities" "github.com/spf13/cobra" "go.podman.io/common/pkg/completion" + "go.podman.io/podman/v6/cmd/podman/common" + "go.podman.io/podman/v6/cmd/podman/parse" + "go.podman.io/podman/v6/cmd/podman/registry" + "go.podman.io/podman/v6/cmd/podman/utils" + "go.podman.io/podman/v6/cmd/podman/validate" + "go.podman.io/podman/v6/pkg/domain/entities" ) var ( diff --git a/cmd/podman/images/pull.go b/cmd/podman/images/pull.go index 2ecf0c6f40..670f9575ad 100644 --- a/cmd/podman/images/pull.go +++ b/cmd/podman/images/pull.go @@ -6,17 +6,17 @@ import ( "os" "strings" - "github.com/containers/podman/v6/cmd/podman/common" - "github.com/containers/podman/v6/cmd/podman/registry" - "github.com/containers/podman/v6/cmd/podman/utils" - "github.com/containers/podman/v6/pkg/domain/entities" - "github.com/containers/podman/v6/pkg/util" "github.com/spf13/cobra" "go.podman.io/buildah/pkg/cli" "go.podman.io/common/pkg/auth" "go.podman.io/common/pkg/completion" "go.podman.io/common/pkg/config" "go.podman.io/image/v5/types" + "go.podman.io/podman/v6/cmd/podman/common" + "go.podman.io/podman/v6/cmd/podman/registry" + "go.podman.io/podman/v6/cmd/podman/utils" + "go.podman.io/podman/v6/pkg/domain/entities" + "go.podman.io/podman/v6/pkg/util" ) // pullOptionsWrapper wraps entities.ImagePullOptions and prevents leaking diff --git a/cmd/podman/images/push.go b/cmd/podman/images/push.go index afac5b40d5..5f5d09abe4 100644 --- a/cmd/podman/images/push.go +++ b/cmd/podman/images/push.go @@ -4,15 +4,15 @@ import ( "fmt" "os" - "github.com/containers/podman/v6/cmd/podman/common" - "github.com/containers/podman/v6/cmd/podman/registry" - "github.com/containers/podman/v6/pkg/domain/entities" - "github.com/containers/podman/v6/pkg/util" "github.com/spf13/cobra" "go.podman.io/buildah/pkg/cli" "go.podman.io/common/pkg/auth" "go.podman.io/common/pkg/completion" "go.podman.io/image/v5/types" + "go.podman.io/podman/v6/cmd/podman/common" + "go.podman.io/podman/v6/cmd/podman/registry" + "go.podman.io/podman/v6/pkg/domain/entities" + "go.podman.io/podman/v6/pkg/util" ) // pushOptionsWrapper wraps entities.ImagepushOptions and prevents leaking diff --git a/cmd/podman/images/rm.go b/cmd/podman/images/rm.go index 336c16213f..70b4830dd8 100644 --- a/cmd/podman/images/rm.go +++ b/cmd/podman/images/rm.go @@ -4,12 +4,12 @@ import ( "errors" "fmt" - "github.com/containers/podman/v6/cmd/podman/common" - "github.com/containers/podman/v6/cmd/podman/registry" - "github.com/containers/podman/v6/pkg/domain/entities" - "github.com/containers/podman/v6/pkg/errorhandling" "github.com/spf13/cobra" "github.com/spf13/pflag" + "go.podman.io/podman/v6/cmd/podman/common" + "go.podman.io/podman/v6/cmd/podman/registry" + "go.podman.io/podman/v6/pkg/domain/entities" + "go.podman.io/podman/v6/pkg/errorhandling" ) var ( diff --git a/cmd/podman/images/save.go b/cmd/podman/images/save.go index 718b529117..6c896e2f10 100644 --- a/cmd/podman/images/save.go +++ b/cmd/podman/images/save.go @@ -8,13 +8,13 @@ import ( "slices" "strings" - "github.com/containers/podman/v6/cmd/podman/common" - "github.com/containers/podman/v6/cmd/podman/parse" - "github.com/containers/podman/v6/cmd/podman/registry" - "github.com/containers/podman/v6/libpod/define" - "github.com/containers/podman/v6/pkg/domain/entities" "github.com/spf13/cobra" "go.podman.io/common/pkg/completion" + "go.podman.io/podman/v6/cmd/podman/common" + "go.podman.io/podman/v6/cmd/podman/parse" + "go.podman.io/podman/v6/cmd/podman/registry" + "go.podman.io/podman/v6/libpod/define" + "go.podman.io/podman/v6/pkg/domain/entities" "golang.org/x/term" ) diff --git a/cmd/podman/images/scp.go b/cmd/podman/images/scp.go index bb822946a8..c87d3b2033 100644 --- a/cmd/podman/images/scp.go +++ b/cmd/podman/images/scp.go @@ -4,12 +4,12 @@ import ( "os" "strings" - "github.com/containers/podman/v6/cmd/podman/common" - "github.com/containers/podman/v6/cmd/podman/registry" - "github.com/containers/podman/v6/cmd/podman/validate" - "github.com/containers/podman/v6/pkg/domain/entities" "github.com/spf13/cobra" "go.podman.io/common/pkg/ssh" + "go.podman.io/podman/v6/cmd/podman/common" + "go.podman.io/podman/v6/cmd/podman/registry" + "go.podman.io/podman/v6/cmd/podman/validate" + "go.podman.io/podman/v6/pkg/domain/entities" ) var ( diff --git a/cmd/podman/images/search.go b/cmd/podman/images/search.go index 1ad42f57c0..a60a009930 100644 --- a/cmd/podman/images/search.go +++ b/cmd/podman/images/search.go @@ -6,15 +6,15 @@ import ( "os" "strings" - "github.com/containers/podman/v6/cmd/podman/common" - "github.com/containers/podman/v6/cmd/podman/registry" - "github.com/containers/podman/v6/pkg/domain/entities" - "github.com/containers/podman/v6/pkg/util" "github.com/spf13/cobra" "go.podman.io/common/pkg/auth" "go.podman.io/common/pkg/completion" "go.podman.io/common/pkg/report" "go.podman.io/image/v5/types" + "go.podman.io/podman/v6/cmd/podman/common" + "go.podman.io/podman/v6/cmd/podman/registry" + "go.podman.io/podman/v6/pkg/domain/entities" + "go.podman.io/podman/v6/pkg/util" ) // searchOptionsWrapper wraps entities.ImagePullOptions and prevents leaking diff --git a/cmd/podman/images/sign.go b/cmd/podman/images/sign.go index 15bac426ba..24b2845256 100644 --- a/cmd/podman/images/sign.go +++ b/cmd/podman/images/sign.go @@ -3,12 +3,12 @@ package images import ( "errors" - "github.com/containers/podman/v6/cmd/podman/common" - "github.com/containers/podman/v6/cmd/podman/registry" - "github.com/containers/podman/v6/pkg/domain/entities" "github.com/spf13/cobra" "go.podman.io/common/pkg/auth" "go.podman.io/common/pkg/completion" + "go.podman.io/podman/v6/cmd/podman/common" + "go.podman.io/podman/v6/cmd/podman/registry" + "go.podman.io/podman/v6/pkg/domain/entities" "go.podman.io/storage/pkg/fileutils" ) diff --git a/cmd/podman/images/tag.go b/cmd/podman/images/tag.go index 64cdd33417..7caee49564 100644 --- a/cmd/podman/images/tag.go +++ b/cmd/podman/images/tag.go @@ -1,10 +1,10 @@ package images import ( - "github.com/containers/podman/v6/cmd/podman/common" - "github.com/containers/podman/v6/cmd/podman/registry" - "github.com/containers/podman/v6/pkg/domain/entities" "github.com/spf13/cobra" + "go.podman.io/podman/v6/cmd/podman/common" + "go.podman.io/podman/v6/cmd/podman/registry" + "go.podman.io/podman/v6/pkg/domain/entities" ) var ( diff --git a/cmd/podman/images/tree.go b/cmd/podman/images/tree.go index bec78c296b..bfbfed65da 100644 --- a/cmd/podman/images/tree.go +++ b/cmd/podman/images/tree.go @@ -3,10 +3,10 @@ package images import ( "fmt" - "github.com/containers/podman/v6/cmd/podman/common" - "github.com/containers/podman/v6/cmd/podman/registry" - "github.com/containers/podman/v6/pkg/domain/entities" "github.com/spf13/cobra" + "go.podman.io/podman/v6/cmd/podman/common" + "go.podman.io/podman/v6/cmd/podman/registry" + "go.podman.io/podman/v6/pkg/domain/entities" ) var ( diff --git a/cmd/podman/images/trust.go b/cmd/podman/images/trust.go index 20c1e415c9..0be9b5ba0d 100644 --- a/cmd/podman/images/trust.go +++ b/cmd/podman/images/trust.go @@ -1,9 +1,9 @@ package images import ( - "github.com/containers/podman/v6/cmd/podman/registry" - "github.com/containers/podman/v6/cmd/podman/validate" "github.com/spf13/cobra" + "go.podman.io/podman/v6/cmd/podman/registry" + "go.podman.io/podman/v6/cmd/podman/validate" ) var ( diff --git a/cmd/podman/images/trust_set.go b/cmd/podman/images/trust_set.go index 876fcd165d..abb7f7bc78 100644 --- a/cmd/podman/images/trust_set.go +++ b/cmd/podman/images/trust_set.go @@ -6,11 +6,11 @@ import ( "regexp" "slices" - "github.com/containers/podman/v6/cmd/podman/common" - "github.com/containers/podman/v6/cmd/podman/registry" - "github.com/containers/podman/v6/pkg/domain/entities" "github.com/spf13/cobra" "go.podman.io/common/pkg/completion" + "go.podman.io/podman/v6/cmd/podman/common" + "go.podman.io/podman/v6/cmd/podman/registry" + "go.podman.io/podman/v6/pkg/domain/entities" ) var ( diff --git a/cmd/podman/images/trust_show.go b/cmd/podman/images/trust_show.go index 75582cedd7..62dcbe1ebe 100644 --- a/cmd/podman/images/trust_show.go +++ b/cmd/podman/images/trust_show.go @@ -4,12 +4,12 @@ import ( "fmt" "os" - "github.com/containers/podman/v6/cmd/podman/common" - "github.com/containers/podman/v6/cmd/podman/registry" - "github.com/containers/podman/v6/pkg/domain/entities" "github.com/spf13/cobra" "go.podman.io/common/pkg/completion" "go.podman.io/common/pkg/report" + "go.podman.io/podman/v6/cmd/podman/common" + "go.podman.io/podman/v6/cmd/podman/registry" + "go.podman.io/podman/v6/pkg/domain/entities" ) var ( diff --git a/cmd/podman/images/unmount.go b/cmd/podman/images/unmount.go index ff7413480c..e5ea92a4eb 100644 --- a/cmd/podman/images/unmount.go +++ b/cmd/podman/images/unmount.go @@ -4,12 +4,12 @@ import ( "errors" "fmt" - "github.com/containers/podman/v6/cmd/podman/common" - "github.com/containers/podman/v6/cmd/podman/registry" - "github.com/containers/podman/v6/cmd/podman/utils" - "github.com/containers/podman/v6/pkg/domain/entities" "github.com/spf13/cobra" "github.com/spf13/pflag" + "go.podman.io/podman/v6/cmd/podman/common" + "go.podman.io/podman/v6/cmd/podman/registry" + "go.podman.io/podman/v6/cmd/podman/utils" + "go.podman.io/podman/v6/pkg/domain/entities" ) var ( diff --git a/cmd/podman/images/untag.go b/cmd/podman/images/untag.go index 7659afc98e..5fa1d1ecc0 100644 --- a/cmd/podman/images/untag.go +++ b/cmd/podman/images/untag.go @@ -1,10 +1,10 @@ package images import ( - "github.com/containers/podman/v6/cmd/podman/common" - "github.com/containers/podman/v6/cmd/podman/registry" - "github.com/containers/podman/v6/pkg/domain/entities" "github.com/spf13/cobra" + "go.podman.io/podman/v6/cmd/podman/common" + "go.podman.io/podman/v6/cmd/podman/registry" + "go.podman.io/podman/v6/pkg/domain/entities" ) var ( diff --git a/cmd/podman/images/version.go b/cmd/podman/images/version.go index 190464662d..1435febf54 100644 --- a/cmd/podman/images/version.go +++ b/cmd/podman/images/version.go @@ -3,11 +3,11 @@ package images import ( "fmt" - "github.com/containers/podman/v6/cmd/podman/registry" - "github.com/containers/podman/v6/cmd/podman/validate" "github.com/spf13/cobra" "go.podman.io/buildah/define" "go.podman.io/common/pkg/completion" + "go.podman.io/podman/v6/cmd/podman/registry" + "go.podman.io/podman/v6/cmd/podman/validate" ) var ( diff --git a/cmd/podman/inspect.go b/cmd/podman/inspect.go index 1b6cc4330e..084f13b274 100644 --- a/cmd/podman/inspect.go +++ b/cmd/podman/inspect.go @@ -1,11 +1,11 @@ package main import ( - "github.com/containers/podman/v6/cmd/podman/common" - "github.com/containers/podman/v6/cmd/podman/inspect" - "github.com/containers/podman/v6/cmd/podman/registry" - "github.com/containers/podman/v6/pkg/domain/entities" "github.com/spf13/cobra" + "go.podman.io/podman/v6/cmd/podman/common" + "go.podman.io/podman/v6/cmd/podman/inspect" + "go.podman.io/podman/v6/cmd/podman/registry" + "go.podman.io/podman/v6/pkg/domain/entities" ) var ( diff --git a/cmd/podman/inspect/inspect.go b/cmd/podman/inspect/inspect.go index 86ff15363f..b2f5d18f65 100644 --- a/cmd/podman/inspect/inspect.go +++ b/cmd/podman/inspect/inspect.go @@ -8,13 +8,13 @@ import ( "regexp" "strings" - "github.com/containers/podman/v6/cmd/podman/common" - "github.com/containers/podman/v6/cmd/podman/registry" - "github.com/containers/podman/v6/cmd/podman/utils" - "github.com/containers/podman/v6/cmd/podman/validate" - "github.com/containers/podman/v6/pkg/domain/entities" "github.com/spf13/cobra" "go.podman.io/common/pkg/report" + "go.podman.io/podman/v6/cmd/podman/common" + "go.podman.io/podman/v6/cmd/podman/registry" + "go.podman.io/podman/v6/cmd/podman/utils" + "go.podman.io/podman/v6/cmd/podman/validate" + "go.podman.io/podman/v6/pkg/domain/entities" ) // AddInspectFlagSet takes a command and adds the inspect flags and returns an diff --git a/cmd/podman/kube/apply.go b/cmd/podman/kube/apply.go index 10fce92727..64bc876a1e 100644 --- a/cmd/podman/kube/apply.go +++ b/cmd/podman/kube/apply.go @@ -6,12 +6,12 @@ import ( "io" "os" - "github.com/containers/podman/v6/cmd/podman/common" - "github.com/containers/podman/v6/cmd/podman/registry" - "github.com/containers/podman/v6/cmd/podman/utils" - "github.com/containers/podman/v6/pkg/domain/entities" "github.com/spf13/cobra" "go.podman.io/common/pkg/completion" + "go.podman.io/podman/v6/cmd/podman/common" + "go.podman.io/podman/v6/cmd/podman/registry" + "go.podman.io/podman/v6/cmd/podman/utils" + "go.podman.io/podman/v6/pkg/domain/entities" ) var ( diff --git a/cmd/podman/kube/down.go b/cmd/podman/kube/down.go index 194f320d6f..9176e96cde 100644 --- a/cmd/podman/kube/down.go +++ b/cmd/podman/kube/down.go @@ -1,11 +1,11 @@ package kube import ( - "github.com/containers/podman/v6/cmd/podman/registry" - "github.com/containers/podman/v6/cmd/podman/utils" - "github.com/containers/podman/v6/pkg/domain/entities" "github.com/spf13/cobra" "go.podman.io/common/pkg/completion" + "go.podman.io/podman/v6/cmd/podman/registry" + "go.podman.io/podman/v6/cmd/podman/utils" + "go.podman.io/podman/v6/pkg/domain/entities" ) type downKubeOptions struct { diff --git a/cmd/podman/kube/generate.go b/cmd/podman/kube/generate.go index 9b542ac952..75babdacab 100644 --- a/cmd/podman/kube/generate.go +++ b/cmd/podman/kube/generate.go @@ -5,13 +5,13 @@ import ( "io" "os" - "github.com/containers/podman/v6/cmd/podman/common" - "github.com/containers/podman/v6/cmd/podman/generate" - "github.com/containers/podman/v6/cmd/podman/registry" - "github.com/containers/podman/v6/cmd/podman/utils" - "github.com/containers/podman/v6/pkg/domain/entities" "github.com/spf13/cobra" "go.podman.io/common/pkg/completion" + "go.podman.io/podman/v6/cmd/podman/common" + "go.podman.io/podman/v6/cmd/podman/generate" + "go.podman.io/podman/v6/cmd/podman/registry" + "go.podman.io/podman/v6/cmd/podman/utils" + "go.podman.io/podman/v6/pkg/domain/entities" "go.podman.io/storage/pkg/fileutils" ) diff --git a/cmd/podman/kube/kube.go b/cmd/podman/kube/kube.go index ede6f789d8..a71761773a 100644 --- a/cmd/podman/kube/kube.go +++ b/cmd/podman/kube/kube.go @@ -1,9 +1,9 @@ package kube import ( - "github.com/containers/podman/v6/cmd/podman/registry" - "github.com/containers/podman/v6/cmd/podman/validate" "github.com/spf13/cobra" + "go.podman.io/podman/v6/cmd/podman/registry" + "go.podman.io/podman/v6/cmd/podman/validate" ) var ( diff --git a/cmd/podman/kube/play.go b/cmd/podman/kube/play.go index 7d97355569..c7ec3d35cd 100644 --- a/cmd/podman/kube/play.go +++ b/cmd/podman/kube/play.go @@ -12,21 +12,21 @@ import ( "strings" "syscall" - "github.com/containers/podman/v6/cmd/podman/common" - "github.com/containers/podman/v6/cmd/podman/parse" - "github.com/containers/podman/v6/cmd/podman/registry" - "github.com/containers/podman/v6/cmd/podman/utils" - "github.com/containers/podman/v6/libpod/define" - "github.com/containers/podman/v6/libpod/shutdown" - "github.com/containers/podman/v6/pkg/annotations" - "github.com/containers/podman/v6/pkg/domain/entities" - "github.com/containers/podman/v6/pkg/errorhandling" - "github.com/containers/podman/v6/pkg/util" "github.com/spf13/cobra" buildahParse "go.podman.io/buildah/pkg/parse" "go.podman.io/common/pkg/auth" "go.podman.io/common/pkg/completion" "go.podman.io/image/v5/types" + "go.podman.io/podman/v6/cmd/podman/common" + "go.podman.io/podman/v6/cmd/podman/parse" + "go.podman.io/podman/v6/cmd/podman/registry" + "go.podman.io/podman/v6/cmd/podman/utils" + "go.podman.io/podman/v6/libpod/define" + "go.podman.io/podman/v6/libpod/shutdown" + "go.podman.io/podman/v6/pkg/annotations" + "go.podman.io/podman/v6/pkg/domain/entities" + "go.podman.io/podman/v6/pkg/errorhandling" + "go.podman.io/podman/v6/pkg/util" ) // playKubeOptionsWrapper allows for separating CLI-only fields from API-only diff --git a/cmd/podman/login.go b/cmd/podman/login.go index 537f536c23..670efdda9c 100644 --- a/cmd/podman/login.go +++ b/cmd/podman/login.go @@ -6,14 +6,14 @@ import ( "fmt" "os" - "github.com/containers/podman/v6/cmd/podman/common" - "github.com/containers/podman/v6/cmd/podman/registry" - "github.com/containers/podman/v6/pkg/domain/entities" "github.com/spf13/cobra" "go.podman.io/common/pkg/auth" "go.podman.io/common/pkg/completion" "go.podman.io/image/v5/pkg/cli/basetls/tlsdetails" "go.podman.io/image/v5/types" + "go.podman.io/podman/v6/cmd/podman/common" + "go.podman.io/podman/v6/cmd/podman/registry" + "go.podman.io/podman/v6/pkg/domain/entities" ) type loginOptionsWrapper struct { diff --git a/cmd/podman/logout.go b/cmd/podman/logout.go index 3ffec1ae4b..f74a1437b9 100644 --- a/cmd/podman/logout.go +++ b/cmd/podman/logout.go @@ -3,13 +3,13 @@ package main import ( "os" - "github.com/containers/podman/v6/cmd/podman/common" - "github.com/containers/podman/v6/cmd/podman/registry" "github.com/spf13/cobra" "go.podman.io/common/pkg/auth" "go.podman.io/common/pkg/completion" "go.podman.io/image/v5/pkg/cli/basetls/tlsdetails" "go.podman.io/image/v5/types" + "go.podman.io/podman/v6/cmd/podman/common" + "go.podman.io/podman/v6/cmd/podman/registry" ) var ( diff --git a/cmd/podman/machine/client9p.go b/cmd/podman/machine/client9p.go index 683ed65831..4ffb295c19 100644 --- a/cmd/podman/machine/client9p.go +++ b/cmd/podman/machine/client9p.go @@ -10,11 +10,11 @@ import ( "strconv" "time" - "github.com/containers/podman/v6/cmd/podman/registry" "github.com/mdlayher/vsock" "github.com/sirupsen/logrus" "github.com/spf13/cobra" "go.podman.io/common/pkg/completion" + "go.podman.io/podman/v6/cmd/podman/registry" ) var client9pCommand = &cobra.Command{ diff --git a/cmd/podman/machine/cp.go b/cmd/podman/machine/cp.go index 16aa50ae77..c33dceeb03 100644 --- a/cmd/podman/machine/cp.go +++ b/cmd/podman/machine/cp.go @@ -6,14 +6,14 @@ import ( "errors" "fmt" - "github.com/containers/podman/v6/cmd/podman/registry" - "github.com/containers/podman/v6/libpod/events" - "github.com/containers/podman/v6/pkg/copy" - "github.com/containers/podman/v6/pkg/machine" - "github.com/containers/podman/v6/pkg/machine/define" - "github.com/containers/podman/v6/pkg/machine/shim" - "github.com/containers/podman/v6/pkg/specgen" "github.com/spf13/cobra" + "go.podman.io/podman/v6/cmd/podman/registry" + "go.podman.io/podman/v6/libpod/events" + "go.podman.io/podman/v6/pkg/copy" + "go.podman.io/podman/v6/pkg/machine" + "go.podman.io/podman/v6/pkg/machine/define" + "go.podman.io/podman/v6/pkg/machine/shim" + "go.podman.io/podman/v6/pkg/specgen" ) type cpOptions struct { diff --git a/cmd/podman/machine/info.go b/cmd/podman/machine/info.go index 14821df3b3..5ad5d48990 100644 --- a/cmd/podman/machine/info.go +++ b/cmd/podman/machine/info.go @@ -7,17 +7,17 @@ import ( "os" "runtime" - "github.com/containers/podman/v6/cmd/podman/common" - "github.com/containers/podman/v6/cmd/podman/registry" - "github.com/containers/podman/v6/cmd/podman/validate" - "github.com/containers/podman/v6/libpod/define" - "github.com/containers/podman/v6/pkg/domain/entities" - machineDefine "github.com/containers/podman/v6/pkg/machine/define" - "github.com/containers/podman/v6/pkg/machine/env" - "github.com/containers/podman/v6/pkg/machine/vmconfigs" "github.com/spf13/cobra" "go.podman.io/common/pkg/completion" "go.podman.io/common/pkg/report" + "go.podman.io/podman/v6/cmd/podman/common" + "go.podman.io/podman/v6/cmd/podman/registry" + "go.podman.io/podman/v6/cmd/podman/validate" + "go.podman.io/podman/v6/libpod/define" + "go.podman.io/podman/v6/pkg/domain/entities" + machineDefine "go.podman.io/podman/v6/pkg/machine/define" + "go.podman.io/podman/v6/pkg/machine/env" + "go.podman.io/podman/v6/pkg/machine/vmconfigs" "gopkg.in/yaml.v3" ) diff --git a/cmd/podman/machine/init.go b/cmd/podman/machine/init.go index 1173ff4179..eb20439958 100644 --- a/cmd/podman/machine/init.go +++ b/cmd/podman/machine/init.go @@ -9,19 +9,19 @@ import ( "runtime" "slices" - "github.com/containers/podman/v6/cmd/podman/registry" - ldefine "github.com/containers/podman/v6/libpod/define" - "github.com/containers/podman/v6/libpod/events" - "github.com/containers/podman/v6/pkg/machine/define" - "github.com/containers/podman/v6/pkg/machine/provider" - "github.com/containers/podman/v6/pkg/machine/shim" - "github.com/containers/podman/v6/pkg/machine/vmconfigs" "github.com/shirou/gopsutil/v4/mem" "github.com/sirupsen/logrus" "github.com/spf13/cobra" "go.podman.io/common/pkg/completion" "go.podman.io/common/pkg/strongunits" "go.podman.io/image/v5/types" + "go.podman.io/podman/v6/cmd/podman/registry" + ldefine "go.podman.io/podman/v6/libpod/define" + "go.podman.io/podman/v6/libpod/events" + "go.podman.io/podman/v6/pkg/machine/define" + "go.podman.io/podman/v6/pkg/machine/provider" + "go.podman.io/podman/v6/pkg/machine/shim" + "go.podman.io/podman/v6/pkg/machine/vmconfigs" ) var ( diff --git a/cmd/podman/machine/inspect.go b/cmd/podman/machine/inspect.go index 82eef1a7c2..54df3923c8 100644 --- a/cmd/podman/machine/inspect.go +++ b/cmd/podman/machine/inspect.go @@ -5,14 +5,14 @@ package machine import ( "os" - "github.com/containers/podman/v6/cmd/podman/common" - "github.com/containers/podman/v6/cmd/podman/registry" - "github.com/containers/podman/v6/cmd/podman/utils" - "github.com/containers/podman/v6/pkg/machine" - "github.com/containers/podman/v6/pkg/machine/env" - "github.com/containers/podman/v6/pkg/machine/shim" "github.com/spf13/cobra" "go.podman.io/common/pkg/report" + "go.podman.io/podman/v6/cmd/podman/common" + "go.podman.io/podman/v6/cmd/podman/registry" + "go.podman.io/podman/v6/cmd/podman/utils" + "go.podman.io/podman/v6/pkg/machine" + "go.podman.io/podman/v6/pkg/machine/env" + "go.podman.io/podman/v6/pkg/machine/shim" ) var ( diff --git a/cmd/podman/machine/list.go b/cmd/podman/machine/list.go index 23a9e4a048..16f98ab406 100644 --- a/cmd/podman/machine/list.go +++ b/cmd/podman/machine/list.go @@ -10,18 +10,18 @@ import ( "strings" "time" - "github.com/containers/podman/v6/cmd/podman/common" - "github.com/containers/podman/v6/cmd/podman/registry" - "github.com/containers/podman/v6/cmd/podman/validate" - "github.com/containers/podman/v6/pkg/domain/entities" - "github.com/containers/podman/v6/pkg/machine" - provider2 "github.com/containers/podman/v6/pkg/machine/provider" - "github.com/containers/podman/v6/pkg/machine/shim" "github.com/docker/go-units" "github.com/spf13/cobra" "go.podman.io/common/pkg/completion" "go.podman.io/common/pkg/config" "go.podman.io/common/pkg/report" + "go.podman.io/podman/v6/cmd/podman/common" + "go.podman.io/podman/v6/cmd/podman/registry" + "go.podman.io/podman/v6/cmd/podman/validate" + "go.podman.io/podman/v6/pkg/domain/entities" + "go.podman.io/podman/v6/pkg/machine" + provider2 "go.podman.io/podman/v6/pkg/machine/provider" + "go.podman.io/podman/v6/pkg/machine/shim" ) var ( diff --git a/cmd/podman/machine/machine.go b/cmd/podman/machine/machine.go index 288a36d086..257d78a882 100644 --- a/cmd/podman/machine/machine.go +++ b/cmd/podman/machine/machine.go @@ -12,16 +12,16 @@ import ( "sync" "time" - "github.com/containers/podman/v6/cmd/podman/common" - "github.com/containers/podman/v6/cmd/podman/registry" - "github.com/containers/podman/v6/cmd/podman/validate" - "github.com/containers/podman/v6/libpod/events" - "github.com/containers/podman/v6/pkg/machine/env" - provider2 "github.com/containers/podman/v6/pkg/machine/provider" - "github.com/containers/podman/v6/pkg/machine/vmconfigs" - "github.com/containers/podman/v6/pkg/util" "github.com/sirupsen/logrus" "github.com/spf13/cobra" + "go.podman.io/podman/v6/cmd/podman/common" + "go.podman.io/podman/v6/cmd/podman/registry" + "go.podman.io/podman/v6/cmd/podman/validate" + "go.podman.io/podman/v6/libpod/events" + "go.podman.io/podman/v6/pkg/machine/env" + provider2 "go.podman.io/podman/v6/pkg/machine/provider" + "go.podman.io/podman/v6/pkg/machine/vmconfigs" + "go.podman.io/podman/v6/pkg/util" ) var ( diff --git a/cmd/podman/machine/machine_unix.go b/cmd/podman/machine/machine_unix.go index 7af406a2f4..96fc918e7f 100644 --- a/cmd/podman/machine/machine_unix.go +++ b/cmd/podman/machine/machine_unix.go @@ -6,8 +6,8 @@ import ( "fmt" "os" - "github.com/containers/podman/v6/pkg/rootless" "github.com/spf13/cobra" + "go.podman.io/podman/v6/pkg/rootless" ) func isUnixSocket(file os.DirEntry) bool { diff --git a/cmd/podman/machine/os.go b/cmd/podman/machine/os.go index 2901ca99f4..5dc551593c 100644 --- a/cmd/podman/machine/os.go +++ b/cmd/podman/machine/os.go @@ -3,9 +3,9 @@ package machine import ( - "github.com/containers/podman/v6/cmd/podman/registry" - "github.com/containers/podman/v6/cmd/podman/validate" "github.com/spf13/cobra" + "go.podman.io/podman/v6/cmd/podman/registry" + "go.podman.io/podman/v6/cmd/podman/validate" ) var OSCmd = &cobra.Command{ diff --git a/cmd/podman/machine/os/apply.go b/cmd/podman/machine/os/apply.go index f01bbb23de..54f8df91ee 100644 --- a/cmd/podman/machine/os/apply.go +++ b/cmd/podman/machine/os/apply.go @@ -3,12 +3,12 @@ package os import ( - "github.com/containers/podman/v6/cmd/podman/common" - "github.com/containers/podman/v6/cmd/podman/machine" - "github.com/containers/podman/v6/cmd/podman/registry" - "github.com/containers/podman/v6/cmd/podman/validate" - "github.com/containers/podman/v6/pkg/machine/os" "github.com/spf13/cobra" + "go.podman.io/podman/v6/cmd/podman/common" + "go.podman.io/podman/v6/cmd/podman/machine" + "go.podman.io/podman/v6/cmd/podman/registry" + "go.podman.io/podman/v6/cmd/podman/validate" + "go.podman.io/podman/v6/pkg/machine/os" ) var applyCmd = &cobra.Command{ diff --git a/cmd/podman/machine/os/manager.go b/cmd/podman/machine/os/manager.go index 99b7984ec7..7dc6156bcb 100644 --- a/cmd/podman/machine/os/manager.go +++ b/cmd/podman/machine/os/manager.go @@ -8,10 +8,10 @@ import ( "os" "strings" - "github.com/containers/podman/v6/pkg/machine/define" - pkgOS "github.com/containers/podman/v6/pkg/machine/os" - "github.com/containers/podman/v6/pkg/machine/shim" machineconfig "go.podman.io/common/pkg/machine" + "go.podman.io/podman/v6/pkg/machine/define" + pkgOS "go.podman.io/podman/v6/pkg/machine/os" + "go.podman.io/podman/v6/pkg/machine/shim" ) type ManagerOpts struct { diff --git a/cmd/podman/machine/os/upgrade.go b/cmd/podman/machine/os/upgrade.go index b13524fd92..47e66a09cc 100644 --- a/cmd/podman/machine/os/upgrade.go +++ b/cmd/podman/machine/os/upgrade.go @@ -7,14 +7,14 @@ import ( "errors" "github.com/blang/semver/v4" - "github.com/containers/podman/v6/cmd/podman/common" - "github.com/containers/podman/v6/cmd/podman/machine" - "github.com/containers/podman/v6/cmd/podman/registry" - "github.com/containers/podman/v6/cmd/podman/validate" - "github.com/containers/podman/v6/pkg/machine/os" - "github.com/containers/podman/v6/version" "github.com/spf13/cobra" "go.podman.io/common/pkg/completion" + "go.podman.io/podman/v6/cmd/podman/common" + "go.podman.io/podman/v6/cmd/podman/machine" + "go.podman.io/podman/v6/cmd/podman/registry" + "go.podman.io/podman/v6/cmd/podman/validate" + "go.podman.io/podman/v6/pkg/machine/os" + "go.podman.io/podman/v6/version" ) var upgradeCmd = &cobra.Command{ diff --git a/cmd/podman/machine/reset.go b/cmd/podman/machine/reset.go index 37159e7f96..96e1b3d61e 100644 --- a/cmd/podman/machine/reset.go +++ b/cmd/podman/machine/reset.go @@ -9,14 +9,14 @@ import ( "strings" "text/tabwriter" - "github.com/containers/podman/v6/cmd/podman/registry" - "github.com/containers/podman/v6/cmd/podman/validate" - "github.com/containers/podman/v6/pkg/machine" - provider2 "github.com/containers/podman/v6/pkg/machine/provider" - "github.com/containers/podman/v6/pkg/machine/shim" "github.com/sirupsen/logrus" "github.com/spf13/cobra" "go.podman.io/common/pkg/completion" + "go.podman.io/podman/v6/cmd/podman/registry" + "go.podman.io/podman/v6/cmd/podman/validate" + "go.podman.io/podman/v6/pkg/machine" + provider2 "go.podman.io/podman/v6/pkg/machine/provider" + "go.podman.io/podman/v6/pkg/machine/shim" ) var resetCmd = &cobra.Command{ diff --git a/cmd/podman/machine/rm.go b/cmd/podman/machine/rm.go index 90fb733a58..5a68579866 100644 --- a/cmd/podman/machine/rm.go +++ b/cmd/podman/machine/rm.go @@ -5,12 +5,12 @@ package machine import ( "errors" - "github.com/containers/podman/v6/cmd/podman/registry" - "github.com/containers/podman/v6/libpod/events" - "github.com/containers/podman/v6/pkg/machine" - "github.com/containers/podman/v6/pkg/machine/define" - "github.com/containers/podman/v6/pkg/machine/shim" "github.com/spf13/cobra" + "go.podman.io/podman/v6/cmd/podman/registry" + "go.podman.io/podman/v6/libpod/events" + "go.podman.io/podman/v6/pkg/machine" + "go.podman.io/podman/v6/pkg/machine/define" + "go.podman.io/podman/v6/pkg/machine/shim" ) var rmCmd = &cobra.Command{ diff --git a/cmd/podman/machine/server9p.go b/cmd/podman/machine/server9p.go index d1b7a47dfa..de9a948d6e 100644 --- a/cmd/podman/machine/server9p.go +++ b/cmd/podman/machine/server9p.go @@ -8,12 +8,12 @@ import ( "strings" "time" - "github.com/containers/podman/v6/cmd/podman/registry" - "github.com/containers/podman/v6/pkg/fileserver" psutil "github.com/shirou/gopsutil/v4/process" "github.com/sirupsen/logrus" "github.com/spf13/cobra" "go.podman.io/common/pkg/completion" + "go.podman.io/podman/v6/cmd/podman/registry" + "go.podman.io/podman/v6/pkg/fileserver" ) var server9pCommand = &cobra.Command{ diff --git a/cmd/podman/machine/set.go b/cmd/podman/machine/set.go index 4bd88ddc68..3049284264 100644 --- a/cmd/podman/machine/set.go +++ b/cmd/podman/machine/set.go @@ -3,12 +3,12 @@ package machine import ( - "github.com/containers/podman/v6/cmd/podman/registry" - "github.com/containers/podman/v6/pkg/machine/define" - "github.com/containers/podman/v6/pkg/machine/shim" "github.com/spf13/cobra" "go.podman.io/common/pkg/completion" "go.podman.io/common/pkg/strongunits" + "go.podman.io/podman/v6/cmd/podman/registry" + "go.podman.io/podman/v6/pkg/machine/define" + "go.podman.io/podman/v6/pkg/machine/shim" ) var setCmd = &cobra.Command{ diff --git a/cmd/podman/machine/ssh.go b/cmd/podman/machine/ssh.go index 4803cd0905..77e91658fc 100644 --- a/cmd/podman/machine/ssh.go +++ b/cmd/podman/machine/ssh.go @@ -6,14 +6,14 @@ import ( "errors" "fmt" - "github.com/containers/podman/v6/cmd/podman/registry" - "github.com/containers/podman/v6/cmd/podman/utils" - "github.com/containers/podman/v6/pkg/machine" - "github.com/containers/podman/v6/pkg/machine/define" - "github.com/containers/podman/v6/pkg/machine/shim" - "github.com/containers/podman/v6/pkg/machine/vmconfigs" "github.com/spf13/cobra" "go.podman.io/common/pkg/completion" + "go.podman.io/podman/v6/cmd/podman/registry" + "go.podman.io/podman/v6/cmd/podman/utils" + "go.podman.io/podman/v6/pkg/machine" + "go.podman.io/podman/v6/pkg/machine/define" + "go.podman.io/podman/v6/pkg/machine/shim" + "go.podman.io/podman/v6/pkg/machine/vmconfigs" ) var sshCmd = &cobra.Command{ diff --git a/cmd/podman/machine/start.go b/cmd/podman/machine/start.go index 8c1b5fd7c2..c083b80b73 100644 --- a/cmd/podman/machine/start.go +++ b/cmd/podman/machine/start.go @@ -5,11 +5,11 @@ package machine import ( "fmt" - "github.com/containers/podman/v6/cmd/podman/registry" - "github.com/containers/podman/v6/libpod/events" - "github.com/containers/podman/v6/pkg/machine" - "github.com/containers/podman/v6/pkg/machine/shim" "github.com/spf13/cobra" + "go.podman.io/podman/v6/cmd/podman/registry" + "go.podman.io/podman/v6/libpod/events" + "go.podman.io/podman/v6/pkg/machine" + "go.podman.io/podman/v6/pkg/machine/shim" ) var ( diff --git a/cmd/podman/machine/stop.go b/cmd/podman/machine/stop.go index 873ef64d11..958ec4cf74 100644 --- a/cmd/podman/machine/stop.go +++ b/cmd/podman/machine/stop.go @@ -5,10 +5,10 @@ package machine import ( "fmt" - "github.com/containers/podman/v6/cmd/podman/registry" - "github.com/containers/podman/v6/libpod/events" - "github.com/containers/podman/v6/pkg/machine/shim" "github.com/spf13/cobra" + "go.podman.io/podman/v6/cmd/podman/registry" + "go.podman.io/podman/v6/libpod/events" + "go.podman.io/podman/v6/pkg/machine/shim" ) var stopCmd = &cobra.Command{ diff --git a/cmd/podman/main.go b/cmd/podman/main.go index 1ce01bac57..d883757913 100644 --- a/cmd/podman/main.go +++ b/cmd/podman/main.go @@ -7,31 +7,31 @@ import ( "strconv" "strings" - _ "github.com/containers/podman/v6/cmd/podman/artifact" - _ "github.com/containers/podman/v6/cmd/podman/completion" - _ "github.com/containers/podman/v6/cmd/podman/farm" - _ "github.com/containers/podman/v6/cmd/podman/generate" - _ "github.com/containers/podman/v6/cmd/podman/healthcheck" - _ "github.com/containers/podman/v6/cmd/podman/images" - _ "github.com/containers/podman/v6/cmd/podman/kube" - _ "github.com/containers/podman/v6/cmd/podman/machine" - _ "github.com/containers/podman/v6/cmd/podman/machine/os" - _ "github.com/containers/podman/v6/cmd/podman/manifest" - _ "github.com/containers/podman/v6/cmd/podman/networks" - _ "github.com/containers/podman/v6/cmd/podman/pods" - _ "github.com/containers/podman/v6/cmd/podman/quadlet" - "github.com/containers/podman/v6/cmd/podman/registry" - _ "github.com/containers/podman/v6/cmd/podman/secrets" - _ "github.com/containers/podman/v6/cmd/podman/system" - _ "github.com/containers/podman/v6/cmd/podman/system/connection" - "github.com/containers/podman/v6/cmd/podman/validate" - _ "github.com/containers/podman/v6/cmd/podman/volumes" - "github.com/containers/podman/v6/pkg/domain/entities" - "github.com/containers/podman/v6/pkg/logiface" - "github.com/containers/podman/v6/pkg/rootless" - "github.com/containers/podman/v6/pkg/terminal" "github.com/sirupsen/logrus" "github.com/spf13/cobra" + _ "go.podman.io/podman/v6/cmd/podman/artifact" + _ "go.podman.io/podman/v6/cmd/podman/completion" + _ "go.podman.io/podman/v6/cmd/podman/farm" + _ "go.podman.io/podman/v6/cmd/podman/generate" + _ "go.podman.io/podman/v6/cmd/podman/healthcheck" + _ "go.podman.io/podman/v6/cmd/podman/images" + _ "go.podman.io/podman/v6/cmd/podman/kube" + _ "go.podman.io/podman/v6/cmd/podman/machine" + _ "go.podman.io/podman/v6/cmd/podman/machine/os" + _ "go.podman.io/podman/v6/cmd/podman/manifest" + _ "go.podman.io/podman/v6/cmd/podman/networks" + _ "go.podman.io/podman/v6/cmd/podman/pods" + _ "go.podman.io/podman/v6/cmd/podman/quadlet" + "go.podman.io/podman/v6/cmd/podman/registry" + _ "go.podman.io/podman/v6/cmd/podman/secrets" + _ "go.podman.io/podman/v6/cmd/podman/system" + _ "go.podman.io/podman/v6/cmd/podman/system/connection" + "go.podman.io/podman/v6/cmd/podman/validate" + _ "go.podman.io/podman/v6/cmd/podman/volumes" + "go.podman.io/podman/v6/pkg/domain/entities" + "go.podman.io/podman/v6/pkg/logiface" + "go.podman.io/podman/v6/pkg/rootless" + "go.podman.io/podman/v6/pkg/terminal" "go.podman.io/storage/pkg/reexec" "golang.org/x/term" ) diff --git a/cmd/podman/manifest/add.go b/cmd/podman/manifest/add.go index 5ecba15760..17281b827e 100644 --- a/cmd/podman/manifest/add.go +++ b/cmd/podman/manifest/add.go @@ -7,15 +7,15 @@ import ( "os" "strings" - "github.com/containers/podman/v6/cmd/podman/common" - "github.com/containers/podman/v6/cmd/podman/registry" - "github.com/containers/podman/v6/pkg/domain/entities" - "github.com/containers/podman/v6/pkg/util" imgspecv1 "github.com/opencontainers/image-spec/specs-go/v1" "github.com/spf13/cobra" "go.podman.io/common/pkg/auth" "go.podman.io/common/pkg/completion" "go.podman.io/image/v5/types" + "go.podman.io/podman/v6/cmd/podman/common" + "go.podman.io/podman/v6/cmd/podman/registry" + "go.podman.io/podman/v6/pkg/domain/entities" + "go.podman.io/podman/v6/pkg/util" ) // manifestAddOptsWrapper wraps entities.ManifestAddOptions and prevents diff --git a/cmd/podman/manifest/annotate.go b/cmd/podman/manifest/annotate.go index 962401f963..c5fb2415e5 100644 --- a/cmd/podman/manifest/annotate.go +++ b/cmd/podman/manifest/annotate.go @@ -5,11 +5,11 @@ import ( "fmt" "strings" - "github.com/containers/podman/v6/cmd/podman/common" - "github.com/containers/podman/v6/cmd/podman/registry" - "github.com/containers/podman/v6/pkg/domain/entities" "github.com/spf13/cobra" "go.podman.io/common/pkg/completion" + "go.podman.io/podman/v6/cmd/podman/common" + "go.podman.io/podman/v6/cmd/podman/registry" + "go.podman.io/podman/v6/pkg/domain/entities" ) // manifestAnnotateOptsWrapper wraps entities.ManifestAnnotateOptions and diff --git a/cmd/podman/manifest/create.go b/cmd/podman/manifest/create.go index 9573da94b1..4406017931 100644 --- a/cmd/podman/manifest/create.go +++ b/cmd/podman/manifest/create.go @@ -5,12 +5,12 @@ import ( "fmt" "strings" - "github.com/containers/podman/v6/cmd/podman/common" - "github.com/containers/podman/v6/cmd/podman/registry" - "github.com/containers/podman/v6/pkg/domain/entities" "github.com/spf13/cobra" "go.podman.io/common/pkg/completion" "go.podman.io/image/v5/types" + "go.podman.io/podman/v6/cmd/podman/common" + "go.podman.io/podman/v6/cmd/podman/registry" + "go.podman.io/podman/v6/pkg/domain/entities" ) // manifestCreateOptsWrapper wraps entities.ManifestCreateOptions and prevents leaking diff --git a/cmd/podman/manifest/exists.go b/cmd/podman/manifest/exists.go index 7be901e6bb..990ef0f9d8 100644 --- a/cmd/podman/manifest/exists.go +++ b/cmd/podman/manifest/exists.go @@ -1,9 +1,9 @@ package manifest import ( - "github.com/containers/podman/v6/cmd/podman/common" - "github.com/containers/podman/v6/cmd/podman/registry" "github.com/spf13/cobra" + "go.podman.io/podman/v6/cmd/podman/common" + "go.podman.io/podman/v6/cmd/podman/registry" ) var existsCmd = &cobra.Command{ diff --git a/cmd/podman/manifest/inspect.go b/cmd/podman/manifest/inspect.go index 067fa6cf65..7cc9247fa7 100644 --- a/cmd/podman/manifest/inspect.go +++ b/cmd/podman/manifest/inspect.go @@ -4,13 +4,13 @@ import ( "encoding/json" "fmt" - "github.com/containers/podman/v6/cmd/podman/common" - "github.com/containers/podman/v6/cmd/podman/registry" - "github.com/containers/podman/v6/pkg/domain/entities" "github.com/spf13/cobra" "go.podman.io/common/pkg/auth" "go.podman.io/common/pkg/completion" "go.podman.io/image/v5/types" + "go.podman.io/podman/v6/cmd/podman/common" + "go.podman.io/podman/v6/cmd/podman/registry" + "go.podman.io/podman/v6/pkg/domain/entities" ) var ( diff --git a/cmd/podman/manifest/manifest.go b/cmd/podman/manifest/manifest.go index 02774e9dff..38da4e5bbf 100644 --- a/cmd/podman/manifest/manifest.go +++ b/cmd/podman/manifest/manifest.go @@ -1,9 +1,9 @@ package manifest import ( - "github.com/containers/podman/v6/cmd/podman/registry" - "github.com/containers/podman/v6/cmd/podman/validate" "github.com/spf13/cobra" + "go.podman.io/podman/v6/cmd/podman/registry" + "go.podman.io/podman/v6/cmd/podman/validate" ) var ( diff --git a/cmd/podman/manifest/push.go b/cmd/podman/manifest/push.go index 5ac479f91d..cf9db81c05 100644 --- a/cmd/podman/manifest/push.go +++ b/cmd/podman/manifest/push.go @@ -5,15 +5,15 @@ import ( "fmt" "os" - "github.com/containers/podman/v6/cmd/podman/common" - "github.com/containers/podman/v6/cmd/podman/registry" - "github.com/containers/podman/v6/cmd/podman/utils" - "github.com/containers/podman/v6/pkg/domain/entities" - "github.com/containers/podman/v6/pkg/util" "github.com/spf13/cobra" "go.podman.io/common/pkg/auth" "go.podman.io/common/pkg/completion" "go.podman.io/image/v5/types" + "go.podman.io/podman/v6/cmd/podman/common" + "go.podman.io/podman/v6/cmd/podman/registry" + "go.podman.io/podman/v6/cmd/podman/utils" + "go.podman.io/podman/v6/pkg/domain/entities" + "go.podman.io/podman/v6/pkg/util" ) // manifestPushOptsWrapper wraps entities.ManifestPushOptions and prevents leaking diff --git a/cmd/podman/manifest/remove.go b/cmd/podman/manifest/remove.go index f3aee2e733..a6864017a3 100644 --- a/cmd/podman/manifest/remove.go +++ b/cmd/podman/manifest/remove.go @@ -3,9 +3,9 @@ package manifest import ( "fmt" - "github.com/containers/podman/v6/cmd/podman/common" - "github.com/containers/podman/v6/cmd/podman/registry" "github.com/spf13/cobra" + "go.podman.io/podman/v6/cmd/podman/common" + "go.podman.io/podman/v6/cmd/podman/registry" ) var removeCmd = &cobra.Command{ diff --git a/cmd/podman/manifest/rm.go b/cmd/podman/manifest/rm.go index 475ddecf3a..07e99289d6 100644 --- a/cmd/podman/manifest/rm.go +++ b/cmd/podman/manifest/rm.go @@ -4,11 +4,11 @@ import ( "context" "fmt" - "github.com/containers/podman/v6/cmd/podman/common" - "github.com/containers/podman/v6/cmd/podman/registry" - "github.com/containers/podman/v6/pkg/domain/entities" - "github.com/containers/podman/v6/pkg/errorhandling" "github.com/spf13/cobra" + "go.podman.io/podman/v6/cmd/podman/common" + "go.podman.io/podman/v6/cmd/podman/registry" + "go.podman.io/podman/v6/pkg/domain/entities" + "go.podman.io/podman/v6/pkg/errorhandling" ) var ( diff --git a/cmd/podman/networks/connect.go b/cmd/podman/networks/connect.go index 9cbd8f8588..c6a9677d67 100644 --- a/cmd/podman/networks/connect.go +++ b/cmd/podman/networks/connect.go @@ -3,12 +3,12 @@ package network import ( "net" - "github.com/containers/podman/v6/cmd/podman/common" - "github.com/containers/podman/v6/cmd/podman/registry" - "github.com/containers/podman/v6/pkg/domain/entities" "github.com/spf13/cobra" "go.podman.io/common/libnetwork/types" "go.podman.io/common/pkg/completion" + "go.podman.io/podman/v6/cmd/podman/common" + "go.podman.io/podman/v6/cmd/podman/registry" + "go.podman.io/podman/v6/pkg/domain/entities" ) var ( diff --git a/cmd/podman/networks/create.go b/cmd/podman/networks/create.go index f42768443a..84fb48a7f4 100644 --- a/cmd/podman/networks/create.go +++ b/cmd/podman/networks/create.go @@ -7,14 +7,14 @@ import ( "strconv" "strings" - "github.com/containers/podman/v6/cmd/podman/common" - "github.com/containers/podman/v6/cmd/podman/parse" - "github.com/containers/podman/v6/cmd/podman/registry" - "github.com/containers/podman/v6/pkg/domain/entities" "github.com/spf13/cobra" "go.podman.io/common/libnetwork/types" "go.podman.io/common/libnetwork/util" "go.podman.io/common/pkg/completion" + "go.podman.io/podman/v6/cmd/podman/common" + "go.podman.io/podman/v6/cmd/podman/parse" + "go.podman.io/podman/v6/cmd/podman/registry" + "go.podman.io/podman/v6/pkg/domain/entities" ) var ( diff --git a/cmd/podman/networks/disconnect.go b/cmd/podman/networks/disconnect.go index 5b37ec8b2f..96979ed824 100644 --- a/cmd/podman/networks/disconnect.go +++ b/cmd/podman/networks/disconnect.go @@ -1,11 +1,11 @@ package network import ( - "github.com/containers/podman/v6/cmd/podman/common" - "github.com/containers/podman/v6/cmd/podman/registry" - "github.com/containers/podman/v6/pkg/domain/entities" "github.com/spf13/cobra" "github.com/spf13/pflag" + "go.podman.io/podman/v6/cmd/podman/common" + "go.podman.io/podman/v6/cmd/podman/registry" + "go.podman.io/podman/v6/pkg/domain/entities" ) var ( diff --git a/cmd/podman/networks/exists.go b/cmd/podman/networks/exists.go index f6a55d1987..9883a69b08 100644 --- a/cmd/podman/networks/exists.go +++ b/cmd/podman/networks/exists.go @@ -1,9 +1,9 @@ package network import ( - "github.com/containers/podman/v6/cmd/podman/common" - "github.com/containers/podman/v6/cmd/podman/registry" "github.com/spf13/cobra" + "go.podman.io/podman/v6/cmd/podman/common" + "go.podman.io/podman/v6/cmd/podman/registry" ) var ( diff --git a/cmd/podman/networks/inspect.go b/cmd/podman/networks/inspect.go index 871ae1f8e2..816a568a10 100644 --- a/cmd/podman/networks/inspect.go +++ b/cmd/podman/networks/inspect.go @@ -1,11 +1,11 @@ package network import ( - "github.com/containers/podman/v6/cmd/podman/common" - "github.com/containers/podman/v6/cmd/podman/inspect" - "github.com/containers/podman/v6/cmd/podman/registry" - "github.com/containers/podman/v6/pkg/domain/entities" "github.com/spf13/cobra" + "go.podman.io/podman/v6/cmd/podman/common" + "go.podman.io/podman/v6/cmd/podman/inspect" + "go.podman.io/podman/v6/cmd/podman/registry" + "go.podman.io/podman/v6/pkg/domain/entities" ) var ( diff --git a/cmd/podman/networks/list.go b/cmd/podman/networks/list.go index d9e4c8620a..efeb6ce075 100644 --- a/cmd/podman/networks/list.go +++ b/cmd/podman/networks/list.go @@ -6,16 +6,16 @@ import ( "sort" "strings" - "github.com/containers/podman/v6/cmd/podman/common" - "github.com/containers/podman/v6/cmd/podman/parse" - "github.com/containers/podman/v6/cmd/podman/registry" - "github.com/containers/podman/v6/cmd/podman/validate" - "github.com/containers/podman/v6/pkg/domain/entities" "github.com/spf13/cobra" "github.com/spf13/pflag" "go.podman.io/common/libnetwork/types" "go.podman.io/common/pkg/completion" "go.podman.io/common/pkg/report" + "go.podman.io/podman/v6/cmd/podman/common" + "go.podman.io/podman/v6/cmd/podman/parse" + "go.podman.io/podman/v6/cmd/podman/registry" + "go.podman.io/podman/v6/cmd/podman/validate" + "go.podman.io/podman/v6/pkg/domain/entities" ) var ( diff --git a/cmd/podman/networks/network.go b/cmd/podman/networks/network.go index 8fd8ddde34..93d6f38b32 100644 --- a/cmd/podman/networks/network.go +++ b/cmd/podman/networks/network.go @@ -1,9 +1,9 @@ package network import ( - "github.com/containers/podman/v6/cmd/podman/registry" - "github.com/containers/podman/v6/cmd/podman/validate" "github.com/spf13/cobra" + "go.podman.io/podman/v6/cmd/podman/registry" + "go.podman.io/podman/v6/cmd/podman/validate" ) var ( diff --git a/cmd/podman/networks/prune.go b/cmd/podman/networks/prune.go index f4a7f6c958..045a387b39 100644 --- a/cmd/podman/networks/prune.go +++ b/cmd/podman/networks/prune.go @@ -6,14 +6,14 @@ import ( "os" "strings" - "github.com/containers/podman/v6/cmd/podman/common" - "github.com/containers/podman/v6/cmd/podman/parse" - "github.com/containers/podman/v6/cmd/podman/registry" - "github.com/containers/podman/v6/cmd/podman/utils" - "github.com/containers/podman/v6/cmd/podman/validate" - "github.com/containers/podman/v6/pkg/domain/entities" "github.com/spf13/cobra" "github.com/spf13/pflag" + "go.podman.io/podman/v6/cmd/podman/common" + "go.podman.io/podman/v6/cmd/podman/parse" + "go.podman.io/podman/v6/cmd/podman/registry" + "go.podman.io/podman/v6/cmd/podman/utils" + "go.podman.io/podman/v6/cmd/podman/validate" + "go.podman.io/podman/v6/pkg/domain/entities" ) var ( diff --git a/cmd/podman/networks/reload.go b/cmd/podman/networks/reload.go index 94610257c5..a9bc2ba296 100644 --- a/cmd/podman/networks/reload.go +++ b/cmd/podman/networks/reload.go @@ -3,13 +3,13 @@ package network import ( "fmt" - "github.com/containers/podman/v6/cmd/podman/common" - "github.com/containers/podman/v6/cmd/podman/registry" - "github.com/containers/podman/v6/cmd/podman/utils" - "github.com/containers/podman/v6/cmd/podman/validate" - "github.com/containers/podman/v6/pkg/domain/entities" "github.com/spf13/cobra" "github.com/spf13/pflag" + "go.podman.io/podman/v6/cmd/podman/common" + "go.podman.io/podman/v6/cmd/podman/registry" + "go.podman.io/podman/v6/cmd/podman/utils" + "go.podman.io/podman/v6/cmd/podman/validate" + "go.podman.io/podman/v6/pkg/domain/entities" ) var ( diff --git a/cmd/podman/networks/rm.go b/cmd/podman/networks/rm.go index 67a5e4370f..9392702633 100644 --- a/cmd/podman/networks/rm.go +++ b/cmd/podman/networks/rm.go @@ -5,14 +5,14 @@ import ( "fmt" "strings" - "github.com/containers/podman/v6/cmd/podman/common" - "github.com/containers/podman/v6/cmd/podman/registry" - "github.com/containers/podman/v6/cmd/podman/utils" - "github.com/containers/podman/v6/libpod/define" - "github.com/containers/podman/v6/pkg/domain/entities" "github.com/spf13/cobra" "github.com/spf13/pflag" "go.podman.io/common/pkg/completion" + "go.podman.io/podman/v6/cmd/podman/common" + "go.podman.io/podman/v6/cmd/podman/registry" + "go.podman.io/podman/v6/cmd/podman/utils" + "go.podman.io/podman/v6/libpod/define" + "go.podman.io/podman/v6/pkg/domain/entities" ) var ( diff --git a/cmd/podman/networks/update.go b/cmd/podman/networks/update.go index 4e92b4bab0..0347cbe2be 100644 --- a/cmd/podman/networks/update.go +++ b/cmd/podman/networks/update.go @@ -3,11 +3,11 @@ package network import ( "fmt" - "github.com/containers/podman/v6/cmd/podman/common" - "github.com/containers/podman/v6/cmd/podman/registry" - "github.com/containers/podman/v6/pkg/domain/entities" "github.com/spf13/cobra" "go.podman.io/common/pkg/completion" + "go.podman.io/podman/v6/cmd/podman/common" + "go.podman.io/podman/v6/cmd/podman/registry" + "go.podman.io/podman/v6/pkg/domain/entities" ) var ( diff --git a/cmd/podman/pods/clone.go b/cmd/podman/pods/clone.go index 364a8e8196..1e181d4c61 100644 --- a/cmd/podman/pods/clone.go +++ b/cmd/podman/pods/clone.go @@ -4,12 +4,12 @@ import ( "context" "fmt" - "github.com/containers/podman/v6/cmd/podman/common" - "github.com/containers/podman/v6/cmd/podman/registry" - "github.com/containers/podman/v6/libpod/define" - "github.com/containers/podman/v6/pkg/domain/entities" "github.com/spf13/cobra" "go.podman.io/common/pkg/completion" + "go.podman.io/podman/v6/cmd/podman/common" + "go.podman.io/podman/v6/cmd/podman/registry" + "go.podman.io/podman/v6/libpod/define" + "go.podman.io/podman/v6/pkg/domain/entities" ) var ( diff --git a/cmd/podman/pods/create.go b/cmd/podman/pods/create.go index 67c0fb3f64..09675c69cb 100644 --- a/cmd/podman/pods/create.go +++ b/cmd/podman/pods/create.go @@ -9,20 +9,20 @@ import ( "strconv" "strings" - "github.com/containers/podman/v6/cmd/podman/common" - "github.com/containers/podman/v6/cmd/podman/containers" - "github.com/containers/podman/v6/cmd/podman/parse" - "github.com/containers/podman/v6/cmd/podman/registry" - "github.com/containers/podman/v6/cmd/podman/utils" - "github.com/containers/podman/v6/libpod/define" - "github.com/containers/podman/v6/pkg/domain/entities" - "github.com/containers/podman/v6/pkg/specgen" - "github.com/containers/podman/v6/pkg/specgenutil" - "github.com/containers/podman/v6/pkg/util" "github.com/sirupsen/logrus" "github.com/spf13/cobra" "go.podman.io/common/pkg/completion" "go.podman.io/common/pkg/sysinfo" + "go.podman.io/podman/v6/cmd/podman/common" + "go.podman.io/podman/v6/cmd/podman/containers" + "go.podman.io/podman/v6/cmd/podman/parse" + "go.podman.io/podman/v6/cmd/podman/registry" + "go.podman.io/podman/v6/cmd/podman/utils" + "go.podman.io/podman/v6/libpod/define" + "go.podman.io/podman/v6/pkg/domain/entities" + "go.podman.io/podman/v6/pkg/specgen" + "go.podman.io/podman/v6/pkg/specgenutil" + "go.podman.io/podman/v6/pkg/util" "go.podman.io/storage/pkg/parsers" ) diff --git a/cmd/podman/pods/exists.go b/cmd/podman/pods/exists.go index cffac98be3..7b0a884984 100644 --- a/cmd/podman/pods/exists.go +++ b/cmd/podman/pods/exists.go @@ -3,9 +3,9 @@ package pods import ( "context" - "github.com/containers/podman/v6/cmd/podman/common" - "github.com/containers/podman/v6/cmd/podman/registry" "github.com/spf13/cobra" + "go.podman.io/podman/v6/cmd/podman/common" + "go.podman.io/podman/v6/cmd/podman/registry" ) var ( diff --git a/cmd/podman/pods/inspect.go b/cmd/podman/pods/inspect.go index 4e44eae842..1331b91d18 100644 --- a/cmd/podman/pods/inspect.go +++ b/cmd/podman/pods/inspect.go @@ -1,12 +1,12 @@ package pods import ( - "github.com/containers/podman/v6/cmd/podman/common" - "github.com/containers/podman/v6/cmd/podman/inspect" - "github.com/containers/podman/v6/cmd/podman/registry" - "github.com/containers/podman/v6/cmd/podman/validate" - "github.com/containers/podman/v6/pkg/domain/entities" "github.com/spf13/cobra" + "go.podman.io/podman/v6/cmd/podman/common" + "go.podman.io/podman/v6/cmd/podman/inspect" + "go.podman.io/podman/v6/cmd/podman/registry" + "go.podman.io/podman/v6/cmd/podman/validate" + "go.podman.io/podman/v6/pkg/domain/entities" ) var ( diff --git a/cmd/podman/pods/kill.go b/cmd/podman/pods/kill.go index 2e8a719a49..9ea10202e7 100644 --- a/cmd/podman/pods/kill.go +++ b/cmd/podman/pods/kill.go @@ -4,12 +4,12 @@ import ( "context" "fmt" - "github.com/containers/podman/v6/cmd/podman/common" - "github.com/containers/podman/v6/cmd/podman/registry" - "github.com/containers/podman/v6/cmd/podman/utils" - "github.com/containers/podman/v6/cmd/podman/validate" - "github.com/containers/podman/v6/pkg/domain/entities" "github.com/spf13/cobra" + "go.podman.io/podman/v6/cmd/podman/common" + "go.podman.io/podman/v6/cmd/podman/registry" + "go.podman.io/podman/v6/cmd/podman/utils" + "go.podman.io/podman/v6/cmd/podman/validate" + "go.podman.io/podman/v6/pkg/domain/entities" ) var ( diff --git a/cmd/podman/pods/logs.go b/cmd/podman/pods/logs.go index c0d24e70b2..4108cb8c76 100644 --- a/cmd/podman/pods/logs.go +++ b/cmd/podman/pods/logs.go @@ -5,14 +5,14 @@ import ( "fmt" "os" - "github.com/containers/podman/v6/cmd/podman/common" - "github.com/containers/podman/v6/cmd/podman/registry" - "github.com/containers/podman/v6/cmd/podman/validate" - "github.com/containers/podman/v6/libpod/define" - "github.com/containers/podman/v6/pkg/domain/entities" - "github.com/containers/podman/v6/pkg/util" "github.com/spf13/cobra" "go.podman.io/common/pkg/completion" + "go.podman.io/podman/v6/cmd/podman/common" + "go.podman.io/podman/v6/cmd/podman/registry" + "go.podman.io/podman/v6/cmd/podman/validate" + "go.podman.io/podman/v6/libpod/define" + "go.podman.io/podman/v6/pkg/domain/entities" + "go.podman.io/podman/v6/pkg/util" ) // logsOptionsWrapper wraps entities.LogsOptions and prevents leaking diff --git a/cmd/podman/pods/pause.go b/cmd/podman/pods/pause.go index 371d219c19..b8c580f4e1 100644 --- a/cmd/podman/pods/pause.go +++ b/cmd/podman/pods/pause.go @@ -4,12 +4,12 @@ import ( "context" "fmt" - "github.com/containers/podman/v6/cmd/podman/common" - "github.com/containers/podman/v6/cmd/podman/registry" - "github.com/containers/podman/v6/cmd/podman/utils" - "github.com/containers/podman/v6/cmd/podman/validate" - "github.com/containers/podman/v6/pkg/domain/entities" "github.com/spf13/cobra" + "go.podman.io/podman/v6/cmd/podman/common" + "go.podman.io/podman/v6/cmd/podman/registry" + "go.podman.io/podman/v6/cmd/podman/utils" + "go.podman.io/podman/v6/cmd/podman/validate" + "go.podman.io/podman/v6/pkg/domain/entities" ) var ( diff --git a/cmd/podman/pods/pod.go b/cmd/podman/pods/pod.go index 9028867663..1a106f9f18 100644 --- a/cmd/podman/pods/pod.go +++ b/cmd/podman/pods/pod.go @@ -1,9 +1,9 @@ package pods import ( - "github.com/containers/podman/v6/cmd/podman/registry" - "github.com/containers/podman/v6/cmd/podman/validate" "github.com/spf13/cobra" + "go.podman.io/podman/v6/cmd/podman/registry" + "go.podman.io/podman/v6/cmd/podman/validate" ) var ( diff --git a/cmd/podman/pods/prune.go b/cmd/podman/pods/prune.go index b17447260d..007fb5d905 100644 --- a/cmd/podman/pods/prune.go +++ b/cmd/podman/pods/prune.go @@ -7,12 +7,12 @@ import ( "os" "strings" - "github.com/containers/podman/v6/cmd/podman/registry" - "github.com/containers/podman/v6/cmd/podman/utils" - "github.com/containers/podman/v6/cmd/podman/validate" - "github.com/containers/podman/v6/pkg/domain/entities" "github.com/spf13/cobra" "go.podman.io/common/pkg/completion" + "go.podman.io/podman/v6/cmd/podman/registry" + "go.podman.io/podman/v6/cmd/podman/utils" + "go.podman.io/podman/v6/cmd/podman/validate" + "go.podman.io/podman/v6/pkg/domain/entities" ) var pruneOptions = entities.PodPruneOptions{} diff --git a/cmd/podman/pods/ps.go b/cmd/podman/pods/ps.go index a566fb1aa1..9a2b2a2fff 100644 --- a/cmd/podman/pods/ps.go +++ b/cmd/podman/pods/ps.go @@ -10,15 +10,15 @@ import ( "strings" "time" - "github.com/containers/podman/v6/cmd/podman/common" - "github.com/containers/podman/v6/cmd/podman/registry" - "github.com/containers/podman/v6/cmd/podman/utils" - "github.com/containers/podman/v6/cmd/podman/validate" - "github.com/containers/podman/v6/pkg/domain/entities" "github.com/docker/go-units" "github.com/spf13/cobra" "go.podman.io/common/pkg/completion" "go.podman.io/common/pkg/report" + "go.podman.io/podman/v6/cmd/podman/common" + "go.podman.io/podman/v6/cmd/podman/registry" + "go.podman.io/podman/v6/cmd/podman/utils" + "go.podman.io/podman/v6/cmd/podman/validate" + "go.podman.io/podman/v6/pkg/domain/entities" ) var ( diff --git a/cmd/podman/pods/restart.go b/cmd/podman/pods/restart.go index e97d2a9e65..916d537704 100644 --- a/cmd/podman/pods/restart.go +++ b/cmd/podman/pods/restart.go @@ -4,12 +4,12 @@ import ( "context" "fmt" - "github.com/containers/podman/v6/cmd/podman/common" - "github.com/containers/podman/v6/cmd/podman/registry" - "github.com/containers/podman/v6/cmd/podman/utils" - "github.com/containers/podman/v6/cmd/podman/validate" - "github.com/containers/podman/v6/pkg/domain/entities" "github.com/spf13/cobra" + "go.podman.io/podman/v6/cmd/podman/common" + "go.podman.io/podman/v6/cmd/podman/registry" + "go.podman.io/podman/v6/cmd/podman/utils" + "go.podman.io/podman/v6/cmd/podman/validate" + "go.podman.io/podman/v6/pkg/domain/entities" ) var ( diff --git a/cmd/podman/pods/rm.go b/cmd/podman/pods/rm.go index 76215f45ce..6a7023506a 100644 --- a/cmd/podman/pods/rm.go +++ b/cmd/podman/pods/rm.go @@ -7,15 +7,15 @@ import ( "os" "strings" - "github.com/containers/podman/v6/cmd/podman/common" - "github.com/containers/podman/v6/cmd/podman/registry" - "github.com/containers/podman/v6/cmd/podman/utils" - "github.com/containers/podman/v6/cmd/podman/validate" - "github.com/containers/podman/v6/libpod/define" - "github.com/containers/podman/v6/pkg/domain/entities" - "github.com/containers/podman/v6/pkg/specgenutil" "github.com/spf13/cobra" "go.podman.io/common/pkg/completion" + "go.podman.io/podman/v6/cmd/podman/common" + "go.podman.io/podman/v6/cmd/podman/registry" + "go.podman.io/podman/v6/cmd/podman/utils" + "go.podman.io/podman/v6/cmd/podman/validate" + "go.podman.io/podman/v6/libpod/define" + "go.podman.io/podman/v6/pkg/domain/entities" + "go.podman.io/podman/v6/pkg/specgenutil" ) // allows for splitting API and CLI-only options diff --git a/cmd/podman/pods/start.go b/cmd/podman/pods/start.go index a5f6d97929..d22a57dcd3 100644 --- a/cmd/podman/pods/start.go +++ b/cmd/podman/pods/start.go @@ -4,14 +4,14 @@ import ( "context" "fmt" - "github.com/containers/podman/v6/cmd/podman/common" - "github.com/containers/podman/v6/cmd/podman/registry" - "github.com/containers/podman/v6/cmd/podman/utils" - "github.com/containers/podman/v6/cmd/podman/validate" - "github.com/containers/podman/v6/pkg/domain/entities" - "github.com/containers/podman/v6/pkg/specgenutil" "github.com/spf13/cobra" "go.podman.io/common/pkg/completion" + "go.podman.io/podman/v6/cmd/podman/common" + "go.podman.io/podman/v6/cmd/podman/registry" + "go.podman.io/podman/v6/cmd/podman/utils" + "go.podman.io/podman/v6/cmd/podman/validate" + "go.podman.io/podman/v6/pkg/domain/entities" + "go.podman.io/podman/v6/pkg/specgenutil" ) // allows for splitting API and CLI-only options diff --git a/cmd/podman/pods/stats.go b/cmd/podman/pods/stats.go index b6ab325403..3c10f5e83a 100644 --- a/cmd/podman/pods/stats.go +++ b/cmd/podman/pods/stats.go @@ -6,12 +6,12 @@ import ( "os" "time" - "github.com/containers/podman/v6/cmd/podman/common" - "github.com/containers/podman/v6/cmd/podman/registry" - "github.com/containers/podman/v6/cmd/podman/validate" - "github.com/containers/podman/v6/pkg/domain/entities" "github.com/spf13/cobra" "go.podman.io/common/pkg/report" + "go.podman.io/podman/v6/cmd/podman/common" + "go.podman.io/podman/v6/cmd/podman/registry" + "go.podman.io/podman/v6/cmd/podman/validate" + "go.podman.io/podman/v6/pkg/domain/entities" ) type podStatsOptionsWrapper struct { diff --git a/cmd/podman/pods/stop.go b/cmd/podman/pods/stop.go index ced1e4d721..4651ac7ec3 100644 --- a/cmd/podman/pods/stop.go +++ b/cmd/podman/pods/stop.go @@ -4,14 +4,14 @@ import ( "context" "fmt" - "github.com/containers/podman/v6/cmd/podman/common" - "github.com/containers/podman/v6/cmd/podman/registry" - "github.com/containers/podman/v6/cmd/podman/utils" - "github.com/containers/podman/v6/cmd/podman/validate" - "github.com/containers/podman/v6/pkg/domain/entities" - "github.com/containers/podman/v6/pkg/specgenutil" "github.com/spf13/cobra" "go.podman.io/common/pkg/completion" + "go.podman.io/podman/v6/cmd/podman/common" + "go.podman.io/podman/v6/cmd/podman/registry" + "go.podman.io/podman/v6/cmd/podman/utils" + "go.podman.io/podman/v6/cmd/podman/validate" + "go.podman.io/podman/v6/pkg/domain/entities" + "go.podman.io/podman/v6/pkg/specgenutil" ) // allows for splitting API and CLI-only options diff --git a/cmd/podman/pods/top.go b/cmd/podman/pods/top.go index d9a723ed83..29d223a7ba 100644 --- a/cmd/podman/pods/top.go +++ b/cmd/podman/pods/top.go @@ -7,13 +7,13 @@ import ( "os" "strings" - "github.com/containers/podman/v6/cmd/podman/common" - "github.com/containers/podman/v6/cmd/podman/registry" - "github.com/containers/podman/v6/cmd/podman/validate" - "github.com/containers/podman/v6/pkg/domain/entities" - "github.com/containers/podman/v6/pkg/util" "github.com/spf13/cobra" "go.podman.io/common/pkg/report" + "go.podman.io/podman/v6/cmd/podman/common" + "go.podman.io/podman/v6/cmd/podman/registry" + "go.podman.io/podman/v6/cmd/podman/validate" + "go.podman.io/podman/v6/pkg/domain/entities" + "go.podman.io/podman/v6/pkg/util" ) var ( diff --git a/cmd/podman/pods/unpause.go b/cmd/podman/pods/unpause.go index d59a1f84d8..5d55c9ac3f 100644 --- a/cmd/podman/pods/unpause.go +++ b/cmd/podman/pods/unpause.go @@ -4,12 +4,12 @@ import ( "context" "fmt" - "github.com/containers/podman/v6/cmd/podman/common" - "github.com/containers/podman/v6/cmd/podman/registry" - "github.com/containers/podman/v6/cmd/podman/utils" - "github.com/containers/podman/v6/cmd/podman/validate" - "github.com/containers/podman/v6/pkg/domain/entities" "github.com/spf13/cobra" + "go.podman.io/podman/v6/cmd/podman/common" + "go.podman.io/podman/v6/cmd/podman/registry" + "go.podman.io/podman/v6/cmd/podman/utils" + "go.podman.io/podman/v6/cmd/podman/validate" + "go.podman.io/podman/v6/pkg/domain/entities" ) var ( diff --git a/cmd/podman/quadlet/install.go b/cmd/podman/quadlet/install.go index 3abb15996b..13f58ecb47 100644 --- a/cmd/podman/quadlet/install.go +++ b/cmd/podman/quadlet/install.go @@ -4,11 +4,11 @@ import ( "errors" "fmt" - "github.com/containers/podman/v6/cmd/podman/registry" - "github.com/containers/podman/v6/cmd/podman/utils" - "github.com/containers/podman/v6/pkg/domain/entities" "github.com/spf13/cobra" "go.podman.io/common/pkg/completion" + "go.podman.io/podman/v6/cmd/podman/registry" + "go.podman.io/podman/v6/cmd/podman/utils" + "go.podman.io/podman/v6/pkg/domain/entities" ) var ( diff --git a/cmd/podman/quadlet/list.go b/cmd/podman/quadlet/list.go index 9458c1870c..516e444ffc 100644 --- a/cmd/podman/quadlet/list.go +++ b/cmd/podman/quadlet/list.go @@ -4,13 +4,13 @@ import ( "fmt" "os" - "github.com/containers/podman/v6/cmd/podman/common" - "github.com/containers/podman/v6/cmd/podman/registry" - "github.com/containers/podman/v6/cmd/podman/validate" - "github.com/containers/podman/v6/pkg/domain/entities" "github.com/spf13/cobra" "go.podman.io/common/pkg/completion" "go.podman.io/common/pkg/report" + "go.podman.io/podman/v6/cmd/podman/common" + "go.podman.io/podman/v6/cmd/podman/registry" + "go.podman.io/podman/v6/cmd/podman/validate" + "go.podman.io/podman/v6/pkg/domain/entities" ) var ( diff --git a/cmd/podman/quadlet/print.go b/cmd/podman/quadlet/print.go index aad5d73497..c945078b09 100644 --- a/cmd/podman/quadlet/print.go +++ b/cmd/podman/quadlet/print.go @@ -3,9 +3,9 @@ package quadlet import ( "fmt" - "github.com/containers/podman/v6/cmd/podman/common" - "github.com/containers/podman/v6/cmd/podman/registry" "github.com/spf13/cobra" + "go.podman.io/podman/v6/cmd/podman/common" + "go.podman.io/podman/v6/cmd/podman/registry" ) var ( diff --git a/cmd/podman/quadlet/quadlet.go b/cmd/podman/quadlet/quadlet.go index d05b9c4fb9..690550ad8a 100644 --- a/cmd/podman/quadlet/quadlet.go +++ b/cmd/podman/quadlet/quadlet.go @@ -1,11 +1,11 @@ package quadlet import ( - "github.com/containers/podman/v6/cmd/podman/registry" - "github.com/containers/podman/v6/cmd/podman/validate" - "github.com/containers/podman/v6/pkg/logiface" "github.com/sirupsen/logrus" "github.com/spf13/cobra" + "go.podman.io/podman/v6/cmd/podman/registry" + "go.podman.io/podman/v6/cmd/podman/validate" + "go.podman.io/podman/v6/pkg/logiface" ) // logrusLogger implements the logiface.Logger interface using logrus diff --git a/cmd/podman/quadlet/remove.go b/cmd/podman/quadlet/remove.go index 832f3e58c4..2737881739 100644 --- a/cmd/podman/quadlet/remove.go +++ b/cmd/podman/quadlet/remove.go @@ -4,11 +4,11 @@ import ( "errors" "fmt" - "github.com/containers/podman/v6/cmd/podman/common" - "github.com/containers/podman/v6/cmd/podman/registry" - "github.com/containers/podman/v6/cmd/podman/utils" - "github.com/containers/podman/v6/pkg/domain/entities" "github.com/spf13/cobra" + "go.podman.io/podman/v6/cmd/podman/common" + "go.podman.io/podman/v6/cmd/podman/registry" + "go.podman.io/podman/v6/cmd/podman/utils" + "go.podman.io/podman/v6/pkg/domain/entities" ) var ( diff --git a/cmd/podman/registry/config.go b/cmd/podman/registry/config.go index 97925c6a0f..8d3526cc66 100644 --- a/cmd/podman/registry/config.go +++ b/cmd/podman/registry/config.go @@ -7,12 +7,12 @@ import ( "runtime" "sync" - "github.com/containers/podman/v6/pkg/domain/entities" - "github.com/containers/podman/v6/pkg/rootless" - "github.com/containers/podman/v6/pkg/util" "github.com/spf13/cobra" "github.com/spf13/pflag" "go.podman.io/common/pkg/config" + "go.podman.io/podman/v6/pkg/domain/entities" + "go.podman.io/podman/v6/pkg/rootless" + "go.podman.io/podman/v6/pkg/util" "go.podman.io/storage/pkg/fileutils" ) diff --git a/cmd/podman/registry/registry.go b/cmd/podman/registry/registry.go index e1f9ad311e..42419074d6 100644 --- a/cmd/podman/registry/registry.go +++ b/cmd/podman/registry/registry.go @@ -4,12 +4,12 @@ import ( "context" "path/filepath" - "github.com/containers/podman/v6/pkg/domain/entities" - "github.com/containers/podman/v6/pkg/domain/infra" - "github.com/containers/podman/v6/pkg/rootless" - "github.com/containers/podman/v6/pkg/util" "github.com/sirupsen/logrus" "github.com/spf13/cobra" + "go.podman.io/podman/v6/pkg/domain/entities" + "go.podman.io/podman/v6/pkg/domain/infra" + "go.podman.io/podman/v6/pkg/rootless" + "go.podman.io/podman/v6/pkg/util" ) // DefaultRootAPIAddress is the default path of the REST socket with unix:// prefix diff --git a/cmd/podman/registry/remote.go b/cmd/podman/registry/remote.go index 8b4705b2e1..3c48bebc40 100644 --- a/cmd/podman/registry/remote.go +++ b/cmd/podman/registry/remote.go @@ -6,8 +6,8 @@ import ( "strings" "sync" - "github.com/containers/podman/v6/pkg/domain/entities" "github.com/spf13/pflag" + "go.podman.io/podman/v6/pkg/domain/entities" ) // Value for --remote given on command line diff --git a/cmd/podman/root.go b/cmd/podman/root.go index 6a330171ec..e093be435a 100644 --- a/cmd/podman/root.go +++ b/cmd/podman/root.go @@ -12,22 +12,22 @@ import ( "strconv" "strings" - "github.com/containers/podman/v6/cmd/podman/common" - "github.com/containers/podman/v6/cmd/podman/registry" - "github.com/containers/podman/v6/cmd/podman/system" - "github.com/containers/podman/v6/cmd/podman/validate" - "github.com/containers/podman/v6/libpod/define" - "github.com/containers/podman/v6/libpod/shutdown" - "github.com/containers/podman/v6/pkg/bindings" - "github.com/containers/podman/v6/pkg/checkpoint/crutils" - "github.com/containers/podman/v6/pkg/domain/entities" - "github.com/containers/podman/v6/pkg/parallel" - "github.com/containers/podman/v6/version" "github.com/sirupsen/logrus" "github.com/spf13/cobra" "github.com/spf13/pflag" "go.podman.io/common/pkg/completion" "go.podman.io/common/pkg/ssh" + "go.podman.io/podman/v6/cmd/podman/common" + "go.podman.io/podman/v6/cmd/podman/registry" + "go.podman.io/podman/v6/cmd/podman/system" + "go.podman.io/podman/v6/cmd/podman/validate" + "go.podman.io/podman/v6/libpod/define" + "go.podman.io/podman/v6/libpod/shutdown" + "go.podman.io/podman/v6/pkg/bindings" + "go.podman.io/podman/v6/pkg/checkpoint/crutils" + "go.podman.io/podman/v6/pkg/domain/entities" + "go.podman.io/podman/v6/pkg/parallel" + "go.podman.io/podman/v6/version" "go.podman.io/storage" "sigs.k8s.io/yaml" ) diff --git a/cmd/podman/root_test.go b/cmd/podman/root_test.go index e9a80c730b..9964a342ae 100644 --- a/cmd/podman/root_test.go +++ b/cmd/podman/root_test.go @@ -6,7 +6,7 @@ import ( "strings" "testing" - "github.com/containers/podman/v6/libpod/define" + "go.podman.io/podman/v6/libpod/define" ) func TestFormatError(t *testing.T) { diff --git a/cmd/podman/secrets/create.go b/cmd/podman/secrets/create.go index 9c138d4051..271811d657 100644 --- a/cmd/podman/secrets/create.go +++ b/cmd/podman/secrets/create.go @@ -8,12 +8,12 @@ import ( "os" "strings" - "github.com/containers/podman/v6/cmd/podman/common" - "github.com/containers/podman/v6/cmd/podman/parse" - "github.com/containers/podman/v6/cmd/podman/registry" - "github.com/containers/podman/v6/pkg/domain/entities" "github.com/spf13/cobra" "go.podman.io/common/pkg/completion" + "go.podman.io/podman/v6/cmd/podman/common" + "go.podman.io/podman/v6/cmd/podman/parse" + "go.podman.io/podman/v6/cmd/podman/registry" + "go.podman.io/podman/v6/pkg/domain/entities" ) var createCmd = &cobra.Command{ diff --git a/cmd/podman/secrets/exists.go b/cmd/podman/secrets/exists.go index 9303396b79..d0360acd54 100644 --- a/cmd/podman/secrets/exists.go +++ b/cmd/podman/secrets/exists.go @@ -1,9 +1,9 @@ package secrets import ( - "github.com/containers/podman/v6/cmd/podman/common" - "github.com/containers/podman/v6/cmd/podman/registry" "github.com/spf13/cobra" + "go.podman.io/podman/v6/cmd/podman/common" + "go.podman.io/podman/v6/cmd/podman/registry" ) var existsCmd = &cobra.Command{ diff --git a/cmd/podman/secrets/inspect.go b/cmd/podman/secrets/inspect.go index 595fecbbd8..4ea8136413 100644 --- a/cmd/podman/secrets/inspect.go +++ b/cmd/podman/secrets/inspect.go @@ -6,11 +6,11 @@ import ( "fmt" "os" - "github.com/containers/podman/v6/cmd/podman/common" - "github.com/containers/podman/v6/cmd/podman/registry" - "github.com/containers/podman/v6/pkg/domain/entities" "github.com/spf13/cobra" "go.podman.io/common/pkg/report" + "go.podman.io/podman/v6/cmd/podman/common" + "go.podman.io/podman/v6/cmd/podman/registry" + "go.podman.io/podman/v6/pkg/domain/entities" ) var inspectCmd = &cobra.Command{ diff --git a/cmd/podman/secrets/list.go b/cmd/podman/secrets/list.go index 072fb89ebb..2abd5356fc 100644 --- a/cmd/podman/secrets/list.go +++ b/cmd/podman/secrets/list.go @@ -6,15 +6,15 @@ import ( "os" "time" - "github.com/containers/podman/v6/cmd/podman/common" - "github.com/containers/podman/v6/cmd/podman/parse" - "github.com/containers/podman/v6/cmd/podman/registry" - "github.com/containers/podman/v6/cmd/podman/validate" - "github.com/containers/podman/v6/pkg/domain/entities" "github.com/docker/go-units" "github.com/spf13/cobra" "go.podman.io/common/pkg/completion" "go.podman.io/common/pkg/report" + "go.podman.io/podman/v6/cmd/podman/common" + "go.podman.io/podman/v6/cmd/podman/parse" + "go.podman.io/podman/v6/cmd/podman/registry" + "go.podman.io/podman/v6/cmd/podman/validate" + "go.podman.io/podman/v6/pkg/domain/entities" ) var ( diff --git a/cmd/podman/secrets/rm.go b/cmd/podman/secrets/rm.go index 22ed429937..5825e941b0 100644 --- a/cmd/podman/secrets/rm.go +++ b/cmd/podman/secrets/rm.go @@ -5,11 +5,11 @@ import ( "errors" "fmt" - "github.com/containers/podman/v6/cmd/podman/common" - "github.com/containers/podman/v6/cmd/podman/registry" - "github.com/containers/podman/v6/cmd/podman/utils" - "github.com/containers/podman/v6/pkg/domain/entities" "github.com/spf13/cobra" + "go.podman.io/podman/v6/cmd/podman/common" + "go.podman.io/podman/v6/cmd/podman/registry" + "go.podman.io/podman/v6/cmd/podman/utils" + "go.podman.io/podman/v6/pkg/domain/entities" ) var rmCmd = &cobra.Command{ diff --git a/cmd/podman/secrets/secret.go b/cmd/podman/secrets/secret.go index 18875c149c..260f40d505 100644 --- a/cmd/podman/secrets/secret.go +++ b/cmd/podman/secrets/secret.go @@ -1,9 +1,9 @@ package secrets import ( - "github.com/containers/podman/v6/cmd/podman/registry" - "github.com/containers/podman/v6/cmd/podman/validate" "github.com/spf13/cobra" + "go.podman.io/podman/v6/cmd/podman/registry" + "go.podman.io/podman/v6/cmd/podman/validate" ) // Command: podman _secret_ diff --git a/cmd/podman/shell_completion_test.go b/cmd/podman/shell_completion_test.go index 2472e5d95f..f52acf8ed9 100644 --- a/cmd/podman/shell_completion_test.go +++ b/cmd/podman/shell_completion_test.go @@ -6,7 +6,7 @@ function set. (except boolean, hidden and deprecated flags) Shell completion functions are defined in: - - "github.com/containers/podman/v6/cmd/podman/common/completion.go" + - "go.podman.io/podman/v6/cmd/podman/common/completion.go" - "go.podman.io/common/pkg/completion" and are called Autocomplete... diff --git a/cmd/podman/syslog_common.go b/cmd/podman/syslog_common.go index 35ec07ce71..e63399bf6f 100644 --- a/cmd/podman/syslog_common.go +++ b/cmd/podman/syslog_common.go @@ -5,9 +5,9 @@ package main import ( "log/syslog" - "github.com/containers/podman/v6/cmd/podman/registry" "github.com/sirupsen/logrus" logrusSyslog "github.com/sirupsen/logrus/hooks/syslog" + "go.podman.io/podman/v6/cmd/podman/registry" ) func syslogHook() { diff --git a/cmd/podman/syslog_unsupported.go b/cmd/podman/syslog_unsupported.go index 7136cbf6f2..4456255217 100644 --- a/cmd/podman/syslog_unsupported.go +++ b/cmd/podman/syslog_unsupported.go @@ -7,7 +7,7 @@ import ( "os" "runtime" - "github.com/containers/podman/v6/cmd/podman/registry" + "go.podman.io/podman/v6/cmd/podman/registry" ) func syslogHook() { diff --git a/cmd/podman/system/check.go b/cmd/podman/system/check.go index 53180e63fb..e0c36516ac 100644 --- a/cmd/podman/system/check.go +++ b/cmd/podman/system/check.go @@ -6,12 +6,12 @@ import ( "fmt" "time" - "github.com/containers/podman/v6/cmd/podman/registry" - "github.com/containers/podman/v6/cmd/podman/validate" - "github.com/containers/podman/v6/pkg/domain/entities/types" multierror "github.com/hashicorp/go-multierror" "github.com/spf13/cobra" "go.podman.io/common/pkg/completion" + "go.podman.io/podman/v6/cmd/podman/registry" + "go.podman.io/podman/v6/cmd/podman/validate" + "go.podman.io/podman/v6/pkg/domain/entities/types" ) var ( diff --git a/cmd/podman/system/connection.go b/cmd/podman/system/connection.go index 81e3561467..3950a29c50 100644 --- a/cmd/podman/system/connection.go +++ b/cmd/podman/system/connection.go @@ -1,9 +1,9 @@ package system import ( - "github.com/containers/podman/v6/cmd/podman/registry" - "github.com/containers/podman/v6/cmd/podman/validate" "github.com/spf13/cobra" + "go.podman.io/podman/v6/cmd/podman/registry" + "go.podman.io/podman/v6/cmd/podman/validate" ) // ConnectionCmd skips creating engines (PersistentPreRunE/PersistentPostRunE are No-Op's) since diff --git a/cmd/podman/system/connection/add.go b/cmd/podman/system/connection/add.go index c4c88958f1..f630e42ba0 100644 --- a/cmd/podman/system/connection/add.go +++ b/cmd/podman/system/connection/add.go @@ -8,14 +8,14 @@ import ( "regexp" "strings" - "github.com/containers/podman/v6/cmd/podman/common" - "github.com/containers/podman/v6/cmd/podman/registry" - "github.com/containers/podman/v6/cmd/podman/system" "github.com/sirupsen/logrus" "github.com/spf13/cobra" "go.podman.io/common/pkg/completion" "go.podman.io/common/pkg/config" "go.podman.io/common/pkg/ssh" + "go.podman.io/podman/v6/cmd/podman/common" + "go.podman.io/podman/v6/cmd/podman/registry" + "go.podman.io/podman/v6/cmd/podman/system" ) var ( diff --git a/cmd/podman/system/connection/default.go b/cmd/podman/system/connection/default.go index b38e991782..c2b50f3a95 100644 --- a/cmd/podman/system/connection/default.go +++ b/cmd/podman/system/connection/default.go @@ -3,11 +3,11 @@ package connection import ( "fmt" - "github.com/containers/podman/v6/cmd/podman/common" - "github.com/containers/podman/v6/cmd/podman/registry" - "github.com/containers/podman/v6/cmd/podman/system" "github.com/spf13/cobra" "go.podman.io/common/pkg/config" + "go.podman.io/podman/v6/cmd/podman/common" + "go.podman.io/podman/v6/cmd/podman/registry" + "go.podman.io/podman/v6/cmd/podman/system" ) var ( diff --git a/cmd/podman/system/connection/list.go b/cmd/podman/system/connection/list.go index 42a9a90959..fcfb3178ee 100644 --- a/cmd/podman/system/connection/list.go +++ b/cmd/podman/system/connection/list.go @@ -6,14 +6,14 @@ import ( "slices" "sort" - "github.com/containers/podman/v6/cmd/podman/common" - "github.com/containers/podman/v6/cmd/podman/registry" - "github.com/containers/podman/v6/cmd/podman/system" - "github.com/containers/podman/v6/cmd/podman/validate" "github.com/spf13/cobra" "go.podman.io/common/pkg/completion" "go.podman.io/common/pkg/config" "go.podman.io/common/pkg/report" + "go.podman.io/podman/v6/cmd/podman/common" + "go.podman.io/podman/v6/cmd/podman/registry" + "go.podman.io/podman/v6/cmd/podman/system" + "go.podman.io/podman/v6/cmd/podman/validate" ) var ( diff --git a/cmd/podman/system/connection/remove.go b/cmd/podman/system/connection/remove.go index c4f45b706d..2bc034a5a2 100644 --- a/cmd/podman/system/connection/remove.go +++ b/cmd/podman/system/connection/remove.go @@ -3,11 +3,11 @@ package connection import ( "slices" - "github.com/containers/podman/v6/cmd/podman/common" - "github.com/containers/podman/v6/cmd/podman/registry" - "github.com/containers/podman/v6/cmd/podman/system" "github.com/spf13/cobra" "go.podman.io/common/pkg/config" + "go.podman.io/podman/v6/cmd/podman/common" + "go.podman.io/podman/v6/cmd/podman/registry" + "go.podman.io/podman/v6/cmd/podman/system" ) var ( diff --git a/cmd/podman/system/connection/rename.go b/cmd/podman/system/connection/rename.go index c91b967ca0..f53196e76e 100644 --- a/cmd/podman/system/connection/rename.go +++ b/cmd/podman/system/connection/rename.go @@ -3,11 +3,11 @@ package connection import ( "fmt" - "github.com/containers/podman/v6/cmd/podman/common" - "github.com/containers/podman/v6/cmd/podman/registry" - "github.com/containers/podman/v6/cmd/podman/system" "github.com/spf13/cobra" "go.podman.io/common/pkg/config" + "go.podman.io/podman/v6/cmd/podman/common" + "go.podman.io/podman/v6/cmd/podman/registry" + "go.podman.io/podman/v6/cmd/podman/system" ) // Skip creating engines since this command will obtain connection information to said engines diff --git a/cmd/podman/system/context.go b/cmd/podman/system/context.go index 3ab7b5f129..f17a5ad366 100644 --- a/cmd/podman/system/context.go +++ b/cmd/podman/system/context.go @@ -1,9 +1,9 @@ package system import ( - "github.com/containers/podman/v6/cmd/podman/registry" - "github.com/containers/podman/v6/cmd/podman/validate" "github.com/spf13/cobra" + "go.podman.io/podman/v6/cmd/podman/registry" + "go.podman.io/podman/v6/cmd/podman/validate" ) // ContextCmd skips creating engines (PersistentPreRunE/PersistentPostRunE are No-Op's) since diff --git a/cmd/podman/system/df.go b/cmd/podman/system/df.go index 2bfe03bb9b..ad69383bcb 100644 --- a/cmd/podman/system/df.go +++ b/cmd/podman/system/df.go @@ -8,14 +8,14 @@ import ( "strings" "time" - "github.com/containers/podman/v6/cmd/podman/common" - "github.com/containers/podman/v6/cmd/podman/registry" - "github.com/containers/podman/v6/cmd/podman/validate" - "github.com/containers/podman/v6/pkg/domain/entities" "github.com/docker/go-units" "github.com/spf13/cobra" "go.podman.io/common/pkg/completion" "go.podman.io/common/pkg/report" + "go.podman.io/podman/v6/cmd/podman/common" + "go.podman.io/podman/v6/cmd/podman/registry" + "go.podman.io/podman/v6/cmd/podman/validate" + "go.podman.io/podman/v6/pkg/domain/entities" ) var ( diff --git a/cmd/podman/system/dial_stdio.go b/cmd/podman/system/dial_stdio.go index dd33c245f1..64cc439dc4 100644 --- a/cmd/podman/system/dial_stdio.go +++ b/cmd/podman/system/dial_stdio.go @@ -7,11 +7,11 @@ import ( "io" "os" - "github.com/containers/podman/v6/cmd/podman/registry" - "github.com/containers/podman/v6/cmd/podman/validate" - "github.com/containers/podman/v6/pkg/bindings" "github.com/sirupsen/logrus" "github.com/spf13/cobra" + "go.podman.io/podman/v6/cmd/podman/registry" + "go.podman.io/podman/v6/cmd/podman/validate" + "go.podman.io/podman/v6/pkg/bindings" ) var dialStdioCommand = &cobra.Command{ diff --git a/cmd/podman/system/events.go b/cmd/podman/system/events.go index 42cff5ebea..e8803f71a2 100644 --- a/cmd/podman/system/events.go +++ b/cmd/podman/system/events.go @@ -5,15 +5,15 @@ import ( "fmt" "os" - "github.com/containers/podman/v6/cmd/podman/common" - "github.com/containers/podman/v6/cmd/podman/registry" - "github.com/containers/podman/v6/cmd/podman/validate" - "github.com/containers/podman/v6/libpod/events" - "github.com/containers/podman/v6/pkg/domain/entities" "github.com/sirupsen/logrus" "github.com/spf13/cobra" "go.podman.io/common/pkg/completion" "go.podman.io/common/pkg/report" + "go.podman.io/podman/v6/cmd/podman/common" + "go.podman.io/podman/v6/cmd/podman/registry" + "go.podman.io/podman/v6/cmd/podman/validate" + "go.podman.io/podman/v6/libpod/events" + "go.podman.io/podman/v6/pkg/domain/entities" ) var ( diff --git a/cmd/podman/system/info.go b/cmd/podman/system/info.go index 0f756558a6..f51ad51e6a 100644 --- a/cmd/podman/system/info.go +++ b/cmd/podman/system/info.go @@ -4,13 +4,13 @@ import ( "fmt" "os" - "github.com/containers/podman/v6/cmd/podman/common" - "github.com/containers/podman/v6/cmd/podman/registry" - "github.com/containers/podman/v6/cmd/podman/validate" - "github.com/containers/podman/v6/libpod/define" "github.com/spf13/cobra" "go.podman.io/common/pkg/completion" "go.podman.io/common/pkg/report" + "go.podman.io/podman/v6/cmd/podman/common" + "go.podman.io/podman/v6/cmd/podman/registry" + "go.podman.io/podman/v6/cmd/podman/validate" + "go.podman.io/podman/v6/libpod/define" "sigs.k8s.io/yaml" ) diff --git a/cmd/podman/system/locks.go b/cmd/podman/system/locks.go index cc15906f96..8eb7125d83 100644 --- a/cmd/podman/system/locks.go +++ b/cmd/podman/system/locks.go @@ -3,9 +3,9 @@ package system import ( "fmt" - "github.com/containers/podman/v6/cmd/podman/registry" - "github.com/containers/podman/v6/cmd/podman/validate" "github.com/spf13/cobra" + "go.podman.io/podman/v6/cmd/podman/registry" + "go.podman.io/podman/v6/cmd/podman/validate" ) var locksCommand = &cobra.Command{ diff --git a/cmd/podman/system/migrate.go b/cmd/podman/system/migrate.go index 7933520a7c..7bf36bf308 100644 --- a/cmd/podman/system/migrate.go +++ b/cmd/podman/system/migrate.go @@ -3,11 +3,11 @@ package system import ( - "github.com/containers/podman/v6/cmd/podman/registry" - "github.com/containers/podman/v6/cmd/podman/validate" - "github.com/containers/podman/v6/pkg/domain/entities" "github.com/spf13/cobra" "go.podman.io/common/pkg/completion" + "go.podman.io/podman/v6/cmd/podman/registry" + "go.podman.io/podman/v6/cmd/podman/validate" + "go.podman.io/podman/v6/pkg/domain/entities" ) var ( diff --git a/cmd/podman/system/prune.go b/cmd/podman/system/prune.go index f5d44eb259..95f065715f 100644 --- a/cmd/podman/system/prune.go +++ b/cmd/podman/system/prune.go @@ -7,15 +7,15 @@ import ( "os" "strings" - "github.com/containers/podman/v6/cmd/podman/common" - "github.com/containers/podman/v6/cmd/podman/parse" - "github.com/containers/podman/v6/cmd/podman/registry" - "github.com/containers/podman/v6/cmd/podman/utils" - "github.com/containers/podman/v6/cmd/podman/validate" - "github.com/containers/podman/v6/pkg/domain/entities" "github.com/docker/go-units" "github.com/spf13/cobra" "go.podman.io/common/pkg/completion" + "go.podman.io/podman/v6/cmd/podman/common" + "go.podman.io/podman/v6/cmd/podman/parse" + "go.podman.io/podman/v6/cmd/podman/registry" + "go.podman.io/podman/v6/cmd/podman/utils" + "go.podman.io/podman/v6/cmd/podman/validate" + "go.podman.io/podman/v6/pkg/domain/entities" ) var ( diff --git a/cmd/podman/system/renumber.go b/cmd/podman/system/renumber.go index d244aa9cfd..c68284b9c8 100644 --- a/cmd/podman/system/renumber.go +++ b/cmd/podman/system/renumber.go @@ -3,10 +3,10 @@ package system import ( - "github.com/containers/podman/v6/cmd/podman/registry" - "github.com/containers/podman/v6/cmd/podman/validate" "github.com/spf13/cobra" "go.podman.io/common/pkg/completion" + "go.podman.io/podman/v6/cmd/podman/registry" + "go.podman.io/podman/v6/cmd/podman/validate" ) var ( diff --git a/cmd/podman/system/reset.go b/cmd/podman/system/reset.go index 0da6495caa..b9bd966fb7 100644 --- a/cmd/podman/system/reset.go +++ b/cmd/podman/system/reset.go @@ -8,12 +8,12 @@ import ( "os" "strings" - "github.com/containers/podman/v6/cmd/podman/registry" - "github.com/containers/podman/v6/cmd/podman/validate" "github.com/sirupsen/logrus" "github.com/spf13/cobra" "go.podman.io/buildah/pkg/volumes" "go.podman.io/common/pkg/completion" + "go.podman.io/podman/v6/cmd/podman/registry" + "go.podman.io/podman/v6/cmd/podman/validate" ) var ( diff --git a/cmd/podman/system/reset_machine.go b/cmd/podman/system/reset_machine.go index 6eed7fa337..ccc5a9672a 100644 --- a/cmd/podman/system/reset_machine.go +++ b/cmd/podman/system/reset_machine.go @@ -3,14 +3,14 @@ package system import ( - "github.com/containers/podman/v6/pkg/machine/connection" - "github.com/containers/podman/v6/pkg/machine/define" - "github.com/containers/podman/v6/pkg/machine/env" - p "github.com/containers/podman/v6/pkg/machine/provider" - "github.com/containers/podman/v6/pkg/machine/shim" - "github.com/containers/podman/v6/pkg/machine/vmconfigs" - "github.com/containers/podman/v6/utils" "github.com/sirupsen/logrus" + "go.podman.io/podman/v6/pkg/machine/connection" + "go.podman.io/podman/v6/pkg/machine/define" + "go.podman.io/podman/v6/pkg/machine/env" + p "go.podman.io/podman/v6/pkg/machine/provider" + "go.podman.io/podman/v6/pkg/machine/shim" + "go.podman.io/podman/v6/pkg/machine/vmconfigs" + "go.podman.io/podman/v6/utils" ) func resetMachine() error { diff --git a/cmd/podman/system/service.go b/cmd/podman/system/service.go index dde6bc4e91..4f9510166b 100644 --- a/cmd/podman/system/service.go +++ b/cmd/podman/system/service.go @@ -10,16 +10,16 @@ import ( "syscall" "time" - "github.com/containers/podman/v6/cmd/podman/common" - "github.com/containers/podman/v6/cmd/podman/registry" - "github.com/containers/podman/v6/pkg/domain/entities" - "github.com/containers/podman/v6/pkg/rootless" - "github.com/containers/podman/v6/pkg/systemd" - "github.com/containers/podman/v6/pkg/util" "github.com/sirupsen/logrus" "github.com/spf13/cobra" "github.com/spf13/pflag" "go.podman.io/common/pkg/completion" + "go.podman.io/podman/v6/cmd/podman/common" + "go.podman.io/podman/v6/cmd/podman/registry" + "go.podman.io/podman/v6/pkg/domain/entities" + "go.podman.io/podman/v6/pkg/rootless" + "go.podman.io/podman/v6/pkg/systemd" + "go.podman.io/podman/v6/pkg/util" ) var ( diff --git a/cmd/podman/system/service_abi.go b/cmd/podman/system/service_abi.go index 1e9ef6eff6..7ad4096294 100644 --- a/cmd/podman/system/service_abi.go +++ b/cmd/podman/system/service_abi.go @@ -10,13 +10,13 @@ import ( "os" "path/filepath" - "github.com/containers/podman/v6/cmd/podman/registry" - api "github.com/containers/podman/v6/pkg/api/server" - "github.com/containers/podman/v6/pkg/domain/entities" - "github.com/containers/podman/v6/pkg/domain/infra" "github.com/coreos/go-systemd/v22/activation" "github.com/sirupsen/logrus" "github.com/spf13/pflag" + "go.podman.io/podman/v6/cmd/podman/registry" + api "go.podman.io/podman/v6/pkg/api/server" + "go.podman.io/podman/v6/pkg/domain/entities" + "go.podman.io/podman/v6/pkg/domain/infra" "golang.org/x/sys/unix" ) diff --git a/cmd/podman/system/system.go b/cmd/podman/system/system.go index ebfbec2e4b..e93aca0188 100644 --- a/cmd/podman/system/system.go +++ b/cmd/podman/system/system.go @@ -1,9 +1,9 @@ package system import ( - "github.com/containers/podman/v6/cmd/podman/registry" - "github.com/containers/podman/v6/cmd/podman/validate" "github.com/spf13/cobra" + "go.podman.io/podman/v6/cmd/podman/registry" + "go.podman.io/podman/v6/cmd/podman/validate" ) var ( diff --git a/cmd/podman/system/unshare.go b/cmd/podman/system/unshare.go index c64467c747..5c1cc06791 100644 --- a/cmd/podman/system/unshare.go +++ b/cmd/podman/system/unshare.go @@ -4,12 +4,12 @@ import ( "errors" "os" - "github.com/containers/podman/v6/cmd/podman/registry" - "github.com/containers/podman/v6/cmd/podman/utils" - "github.com/containers/podman/v6/pkg/domain/entities" - "github.com/containers/podman/v6/pkg/rootless" "github.com/spf13/cobra" "go.podman.io/common/pkg/completion" + "go.podman.io/podman/v6/cmd/podman/registry" + "go.podman.io/podman/v6/cmd/podman/utils" + "go.podman.io/podman/v6/pkg/domain/entities" + "go.podman.io/podman/v6/pkg/rootless" ) var ( diff --git a/cmd/podman/system/version.go b/cmd/podman/system/version.go index 993f9124e5..8c2d0958f5 100644 --- a/cmd/podman/system/version.go +++ b/cmd/podman/system/version.go @@ -5,14 +5,14 @@ import ( "os" "strings" - "github.com/containers/podman/v6/cmd/podman/common" - "github.com/containers/podman/v6/cmd/podman/registry" - "github.com/containers/podman/v6/cmd/podman/validate" - "github.com/containers/podman/v6/pkg/domain/entities" "github.com/sirupsen/logrus" "github.com/spf13/cobra" "go.podman.io/common/pkg/completion" "go.podman.io/common/pkg/report" + "go.podman.io/podman/v6/cmd/podman/common" + "go.podman.io/podman/v6/cmd/podman/registry" + "go.podman.io/podman/v6/cmd/podman/validate" + "go.podman.io/podman/v6/pkg/domain/entities" ) var ( diff --git a/cmd/podman/utils/error.go b/cmd/podman/utils/error.go index c590c9379c..46b1f66135 100644 --- a/cmd/podman/utils/error.go +++ b/cmd/podman/utils/error.go @@ -8,8 +8,8 @@ import ( "strconv" "strings" - "github.com/containers/podman/v6/cmd/podman/registry" buildahCLI "go.podman.io/buildah/pkg/cli" + "go.podman.io/podman/v6/cmd/podman/registry" ) type OutputErrors []error diff --git a/cmd/podman/utils/utils.go b/cmd/podman/utils/utils.go index a0c1366182..3573bc1c0b 100644 --- a/cmd/podman/utils/utils.go +++ b/cmd/podman/utils/utils.go @@ -7,10 +7,10 @@ import ( "os" "strings" - "github.com/containers/podman/v6/cmd/podman/registry" - "github.com/containers/podman/v6/libpod/define" - "github.com/containers/podman/v6/pkg/domain/entities" - "github.com/containers/podman/v6/pkg/domain/entities/reports" + "go.podman.io/podman/v6/cmd/podman/registry" + "go.podman.io/podman/v6/libpod/define" + "go.podman.io/podman/v6/pkg/domain/entities" + "go.podman.io/podman/v6/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 9a3c20731c..6726700e0a 100644 --- a/cmd/podman/validate/args.go +++ b/cmd/podman/validate/args.go @@ -6,8 +6,8 @@ import ( "strconv" "strings" - "github.com/containers/podman/v6/cmd/podman/registry" "github.com/spf13/cobra" + "go.podman.io/podman/v6/cmd/podman/registry" ) // NoArgs returns an error if any args are included. diff --git a/cmd/podman/validate/latest.go b/cmd/podman/validate/latest.go index 9890bd245c..ba5370bea9 100644 --- a/cmd/podman/validate/latest.go +++ b/cmd/podman/validate/latest.go @@ -1,8 +1,8 @@ package validate import ( - "github.com/containers/podman/v6/cmd/podman/registry" "github.com/spf13/cobra" + "go.podman.io/podman/v6/cmd/podman/registry" ) func AddLatestFlag(cmd *cobra.Command, b *bool) { diff --git a/cmd/podman/volumes/create.go b/cmd/podman/volumes/create.go index 38d4f8ebf2..5c01f04753 100644 --- a/cmd/podman/volumes/create.go +++ b/cmd/podman/volumes/create.go @@ -4,11 +4,11 @@ import ( "context" "fmt" - "github.com/containers/podman/v6/cmd/podman/parse" - "github.com/containers/podman/v6/cmd/podman/registry" - "github.com/containers/podman/v6/pkg/domain/entities" "github.com/spf13/cobra" "go.podman.io/common/pkg/completion" + "go.podman.io/podman/v6/cmd/podman/parse" + "go.podman.io/podman/v6/cmd/podman/registry" + "go.podman.io/podman/v6/pkg/domain/entities" ) var ( diff --git a/cmd/podman/volumes/exists.go b/cmd/podman/volumes/exists.go index 42edaa7cef..72b3b982b6 100644 --- a/cmd/podman/volumes/exists.go +++ b/cmd/podman/volumes/exists.go @@ -1,9 +1,9 @@ package volumes import ( - "github.com/containers/podman/v6/cmd/podman/common" - "github.com/containers/podman/v6/cmd/podman/registry" "github.com/spf13/cobra" + "go.podman.io/podman/v6/cmd/podman/common" + "go.podman.io/podman/v6/cmd/podman/registry" ) var ( diff --git a/cmd/podman/volumes/export.go b/cmd/podman/volumes/export.go index b4825742bd..e5f560dc87 100644 --- a/cmd/podman/volumes/export.go +++ b/cmd/podman/volumes/export.go @@ -6,11 +6,11 @@ import ( "fmt" "os" - "github.com/containers/podman/v6/cmd/podman/common" - "github.com/containers/podman/v6/cmd/podman/registry" - "github.com/containers/podman/v6/pkg/domain/entities" "github.com/spf13/cobra" "go.podman.io/common/pkg/completion" + "go.podman.io/podman/v6/cmd/podman/common" + "go.podman.io/podman/v6/cmd/podman/registry" + "go.podman.io/podman/v6/pkg/domain/entities" "golang.org/x/term" ) diff --git a/cmd/podman/volumes/import.go b/cmd/podman/volumes/import.go index 26f0db646e..46f0aa06b9 100644 --- a/cmd/podman/volumes/import.go +++ b/cmd/podman/volumes/import.go @@ -5,11 +5,11 @@ import ( "fmt" "os" - "github.com/containers/podman/v6/cmd/podman/common" - "github.com/containers/podman/v6/cmd/podman/parse" - "github.com/containers/podman/v6/cmd/podman/registry" - "github.com/containers/podman/v6/pkg/domain/entities" "github.com/spf13/cobra" + "go.podman.io/podman/v6/cmd/podman/common" + "go.podman.io/podman/v6/cmd/podman/parse" + "go.podman.io/podman/v6/cmd/podman/registry" + "go.podman.io/podman/v6/pkg/domain/entities" ) var ( diff --git a/cmd/podman/volumes/inspect.go b/cmd/podman/volumes/inspect.go index 1a036c01b8..817b0071a8 100644 --- a/cmd/podman/volumes/inspect.go +++ b/cmd/podman/volumes/inspect.go @@ -3,12 +3,12 @@ package volumes import ( "errors" - "github.com/containers/podman/v6/cmd/podman/common" - "github.com/containers/podman/v6/cmd/podman/inspect" - "github.com/containers/podman/v6/cmd/podman/registry" - "github.com/containers/podman/v6/libpod/define" - "github.com/containers/podman/v6/pkg/domain/entities" "github.com/spf13/cobra" + "go.podman.io/podman/v6/cmd/podman/common" + "go.podman.io/podman/v6/cmd/podman/inspect" + "go.podman.io/podman/v6/cmd/podman/registry" + "go.podman.io/podman/v6/libpod/define" + "go.podman.io/podman/v6/pkg/domain/entities" ) var ( diff --git a/cmd/podman/volumes/list.go b/cmd/podman/volumes/list.go index cb2f9c2123..aca9842ce1 100644 --- a/cmd/podman/volumes/list.go +++ b/cmd/podman/volumes/list.go @@ -6,14 +6,14 @@ import ( "fmt" "os" - "github.com/containers/podman/v6/cmd/podman/common" - "github.com/containers/podman/v6/cmd/podman/parse" - "github.com/containers/podman/v6/cmd/podman/registry" - "github.com/containers/podman/v6/cmd/podman/validate" - "github.com/containers/podman/v6/pkg/domain/entities" "github.com/spf13/cobra" "go.podman.io/common/pkg/completion" "go.podman.io/common/pkg/report" + "go.podman.io/podman/v6/cmd/podman/common" + "go.podman.io/podman/v6/cmd/podman/parse" + "go.podman.io/podman/v6/cmd/podman/registry" + "go.podman.io/podman/v6/cmd/podman/validate" + "go.podman.io/podman/v6/pkg/domain/entities" ) var ( diff --git a/cmd/podman/volumes/mount.go b/cmd/podman/volumes/mount.go index 288822a6e3..95081f6fa4 100644 --- a/cmd/podman/volumes/mount.go +++ b/cmd/podman/volumes/mount.go @@ -3,10 +3,10 @@ package volumes import ( "fmt" - "github.com/containers/podman/v6/cmd/podman/common" - "github.com/containers/podman/v6/cmd/podman/registry" - "github.com/containers/podman/v6/cmd/podman/utils" "github.com/spf13/cobra" + "go.podman.io/podman/v6/cmd/podman/common" + "go.podman.io/podman/v6/cmd/podman/registry" + "go.podman.io/podman/v6/cmd/podman/utils" ) var ( diff --git a/cmd/podman/volumes/prune.go b/cmd/podman/volumes/prune.go index 4aa21ed891..7b478d4e7f 100644 --- a/cmd/podman/volumes/prune.go +++ b/cmd/podman/volumes/prune.go @@ -8,14 +8,14 @@ import ( "os" "strings" - "github.com/containers/podman/v6/cmd/podman/common" - "github.com/containers/podman/v6/cmd/podman/parse" - "github.com/containers/podman/v6/cmd/podman/registry" - "github.com/containers/podman/v6/cmd/podman/utils" - "github.com/containers/podman/v6/cmd/podman/validate" - "github.com/containers/podman/v6/pkg/domain/entities" "github.com/spf13/cobra" "go.podman.io/common/pkg/completion" + "go.podman.io/podman/v6/cmd/podman/common" + "go.podman.io/podman/v6/cmd/podman/parse" + "go.podman.io/podman/v6/cmd/podman/registry" + "go.podman.io/podman/v6/cmd/podman/utils" + "go.podman.io/podman/v6/cmd/podman/validate" + "go.podman.io/podman/v6/pkg/domain/entities" ) var ( diff --git a/cmd/podman/volumes/reload.go b/cmd/podman/volumes/reload.go index 8d0115d13d..e103cf5196 100644 --- a/cmd/podman/volumes/reload.go +++ b/cmd/podman/volumes/reload.go @@ -3,11 +3,11 @@ package volumes import ( "fmt" - "github.com/containers/podman/v6/cmd/podman/registry" - "github.com/containers/podman/v6/cmd/podman/utils" - "github.com/containers/podman/v6/cmd/podman/validate" "github.com/spf13/cobra" "go.podman.io/common/pkg/completion" + "go.podman.io/podman/v6/cmd/podman/registry" + "go.podman.io/podman/v6/cmd/podman/utils" + "go.podman.io/podman/v6/cmd/podman/validate" ) var ( diff --git a/cmd/podman/volumes/rm.go b/cmd/podman/volumes/rm.go index f0d555935f..ac2983076d 100644 --- a/cmd/podman/volumes/rm.go +++ b/cmd/podman/volumes/rm.go @@ -6,13 +6,13 @@ import ( "fmt" "strings" - "github.com/containers/podman/v6/cmd/podman/common" - "github.com/containers/podman/v6/cmd/podman/registry" - "github.com/containers/podman/v6/cmd/podman/utils" - "github.com/containers/podman/v6/libpod/define" - "github.com/containers/podman/v6/pkg/domain/entities" "github.com/spf13/cobra" "go.podman.io/common/pkg/completion" + "go.podman.io/podman/v6/cmd/podman/common" + "go.podman.io/podman/v6/cmd/podman/registry" + "go.podman.io/podman/v6/cmd/podman/utils" + "go.podman.io/podman/v6/libpod/define" + "go.podman.io/podman/v6/pkg/domain/entities" ) var ( diff --git a/cmd/podman/volumes/unmount.go b/cmd/podman/volumes/unmount.go index 595ac72fe0..f9203d8fd1 100644 --- a/cmd/podman/volumes/unmount.go +++ b/cmd/podman/volumes/unmount.go @@ -3,10 +3,10 @@ package volumes import ( "fmt" - "github.com/containers/podman/v6/cmd/podman/common" - "github.com/containers/podman/v6/cmd/podman/registry" - "github.com/containers/podman/v6/cmd/podman/utils" "github.com/spf13/cobra" + "go.podman.io/podman/v6/cmd/podman/common" + "go.podman.io/podman/v6/cmd/podman/registry" + "go.podman.io/podman/v6/cmd/podman/utils" ) var ( diff --git a/cmd/podman/volumes/volume.go b/cmd/podman/volumes/volume.go index 6a2a35e5cc..b1cfa97dc0 100644 --- a/cmd/podman/volumes/volume.go +++ b/cmd/podman/volumes/volume.go @@ -1,9 +1,9 @@ package volumes import ( - "github.com/containers/podman/v6/cmd/podman/registry" - "github.com/containers/podman/v6/cmd/podman/validate" "github.com/spf13/cobra" + "go.podman.io/podman/v6/cmd/podman/registry" + "go.podman.io/podman/v6/cmd/podman/validate" ) var ( diff --git a/cmd/quadlet/main.go b/cmd/quadlet/main.go index 815edb2360..7b8e8fc2c7 100644 --- a/cmd/quadlet/main.go +++ b/cmd/quadlet/main.go @@ -11,10 +11,10 @@ import ( "strings" "unicode" - "github.com/containers/podman/v6/pkg/logiface" - "github.com/containers/podman/v6/pkg/systemd/parser" - "github.com/containers/podman/v6/pkg/systemd/quadlet" - "github.com/containers/podman/v6/version/rawversion" + "go.podman.io/podman/v6/pkg/logiface" + "go.podman.io/podman/v6/pkg/systemd/parser" + "go.podman.io/podman/v6/pkg/systemd/quadlet" + "go.podman.io/podman/v6/version/rawversion" ) // This commandline app is the systemd generator (system and user, diff --git a/go.mod b/go.mod index 1fdbc7d747..29030792de 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/containers/podman/v6 +module go.podman.io/podman/v6 // Warning: if there is a "toolchain" directive anywhere in this file (and most of the // time there shouldn't be), its version must be an exact match to the "go" directive. diff --git a/hack/podman-registry-go/registry.go b/hack/podman-registry-go/registry.go index 748f9088d7..a03591f324 100644 --- a/hack/podman-registry-go/registry.go +++ b/hack/podman-registry-go/registry.go @@ -5,8 +5,8 @@ import ( "os" "strings" - "github.com/containers/podman/v6/utils" "github.com/sirupsen/logrus" + "go.podman.io/podman/v6/utils" ) const ( diff --git a/internal/domain/infra/abi/testing.go b/internal/domain/infra/abi/testing.go index 0657b466e9..5d016b8277 100644 --- a/internal/domain/infra/abi/testing.go +++ b/internal/domain/infra/abi/testing.go @@ -9,9 +9,9 @@ import ( "os" "path/filepath" - "github.com/containers/podman/v6/internal/domain/entities" - "github.com/containers/podman/v6/libpod" "go.podman.io/image/v5/manifest" + "go.podman.io/podman/v6/internal/domain/entities" + "go.podman.io/podman/v6/libpod" "go.podman.io/storage" graphdriver "go.podman.io/storage/drivers" "go.podman.io/storage/pkg/chrootarchive" diff --git a/internal/domain/infra/abi/testing_test.go b/internal/domain/infra/abi/testing_test.go index e171de88b9..a378e7274a 100644 --- a/internal/domain/infra/abi/testing_test.go +++ b/internal/domain/infra/abi/testing_test.go @@ -2,6 +2,6 @@ package abi -import "github.com/containers/podman/v6/internal/domain/entities" +import "go.podman.io/podman/v6/internal/domain/entities" var _ entities.TestingEngine = &TestingEngine{} diff --git a/internal/domain/infra/runtime_abi.go b/internal/domain/infra/runtime_abi.go index 0913234e02..ce40e39675 100644 --- a/internal/domain/infra/runtime_abi.go +++ b/internal/domain/infra/runtime_abi.go @@ -6,10 +6,10 @@ import ( "context" "fmt" - ientities "github.com/containers/podman/v6/internal/domain/entities" - "github.com/containers/podman/v6/internal/domain/infra/tunnel" - "github.com/containers/podman/v6/pkg/bindings" - "github.com/containers/podman/v6/pkg/domain/entities" + ientities "go.podman.io/podman/v6/internal/domain/entities" + "go.podman.io/podman/v6/internal/domain/infra/tunnel" + "go.podman.io/podman/v6/pkg/bindings" + "go.podman.io/podman/v6/pkg/domain/entities" ) // NewTestingEngine factory provides a libpod runtime for testing-specific operations diff --git a/internal/domain/infra/runtime_proxy.go b/internal/domain/infra/runtime_proxy.go index 53ec738704..fd3682aead 100644 --- a/internal/domain/infra/runtime_proxy.go +++ b/internal/domain/infra/runtime_proxy.go @@ -5,11 +5,11 @@ package infra import ( "context" - ientities "github.com/containers/podman/v6/internal/domain/entities" - "github.com/containers/podman/v6/internal/domain/infra/abi" - "github.com/containers/podman/v6/pkg/domain/entities" - "github.com/containers/podman/v6/pkg/domain/infra" flag "github.com/spf13/pflag" + ientities "go.podman.io/podman/v6/internal/domain/entities" + "go.podman.io/podman/v6/internal/domain/infra/abi" + "go.podman.io/podman/v6/pkg/domain/entities" + "go.podman.io/podman/v6/pkg/domain/infra" "go.podman.io/storage" ) diff --git a/internal/domain/infra/tunnel/testing.go b/internal/domain/infra/tunnel/testing.go index 374abca272..88ee2d01c1 100644 --- a/internal/domain/infra/tunnel/testing.go +++ b/internal/domain/infra/tunnel/testing.go @@ -6,7 +6,7 @@ import ( "context" "syscall" - "github.com/containers/podman/v6/internal/domain/entities" + "go.podman.io/podman/v6/internal/domain/entities" ) type TestingEngine struct { diff --git a/internal/domain/infra/tunnel/testing_test.go b/internal/domain/infra/tunnel/testing_test.go index b4262fb68f..9b058e53fe 100644 --- a/internal/domain/infra/tunnel/testing_test.go +++ b/internal/domain/infra/tunnel/testing_test.go @@ -2,6 +2,6 @@ package tunnel -import "github.com/containers/podman/v6/internal/domain/entities" +import "go.podman.io/podman/v6/internal/domain/entities" var _ entities.TestingEngine = &TestingEngine{} diff --git a/internal/localapi/utils.go b/internal/localapi/utils.go index fa74dde812..3aa62cbdab 100644 --- a/internal/localapi/utils.go +++ b/internal/localapi/utils.go @@ -13,14 +13,14 @@ import ( "strconv" "strings" - "github.com/containers/podman/v6/pkg/bindings" - "github.com/containers/podman/v6/pkg/domain/entities" - "github.com/containers/podman/v6/pkg/machine/define" - "github.com/containers/podman/v6/pkg/machine/env" - "github.com/containers/podman/v6/pkg/machine/provider" - "github.com/containers/podman/v6/pkg/machine/vmconfigs" - "github.com/containers/podman/v6/pkg/specgen" "github.com/sirupsen/logrus" + "go.podman.io/podman/v6/pkg/bindings" + "go.podman.io/podman/v6/pkg/domain/entities" + "go.podman.io/podman/v6/pkg/machine/define" + "go.podman.io/podman/v6/pkg/machine/env" + "go.podman.io/podman/v6/pkg/machine/provider" + "go.podman.io/podman/v6/pkg/machine/vmconfigs" + "go.podman.io/podman/v6/pkg/specgen" "go.podman.io/storage/pkg/fileutils" ) diff --git a/internal/localapi/utils_test.go b/internal/localapi/utils_test.go index c82b82a636..fd939cdfb4 100644 --- a/internal/localapi/utils_test.go +++ b/internal/localapi/utils_test.go @@ -5,10 +5,10 @@ package localapi import ( "testing" - "github.com/containers/podman/v6/pkg/machine/define" - "github.com/containers/podman/v6/pkg/machine/vmconfigs" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "go.podman.io/podman/v6/pkg/machine/define" + "go.podman.io/podman/v6/pkg/machine/vmconfigs" ) func TestIsPathAvailableOnMachine_Unix(t *testing.T) { diff --git a/internal/localapi/utils_unsupported.go b/internal/localapi/utils_unsupported.go index 6880099e4e..a0beb036d7 100644 --- a/internal/localapi/utils_unsupported.go +++ b/internal/localapi/utils_unsupported.go @@ -5,8 +5,8 @@ package localapi import ( "context" - "github.com/containers/podman/v6/pkg/domain/entities" "github.com/sirupsen/logrus" + "go.podman.io/podman/v6/pkg/domain/entities" ) func CheckPathOnRunningMachine(ctx context.Context, path string) (*LocalAPIMap, bool) { diff --git a/internal/localapi/utils_windows_test.go b/internal/localapi/utils_windows_test.go index 9170e97789..4e440c4772 100644 --- a/internal/localapi/utils_windows_test.go +++ b/internal/localapi/utils_windows_test.go @@ -5,10 +5,10 @@ package localapi import ( "testing" - "github.com/containers/podman/v6/pkg/machine/define" - "github.com/containers/podman/v6/pkg/machine/vmconfigs" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "go.podman.io/podman/v6/pkg/machine/define" + "go.podman.io/podman/v6/pkg/machine/vmconfigs" ) func TestIsPathAvailableOnMachine_Windows(t *testing.T) { diff --git a/libpod/common_test.go b/libpod/common_test.go index 404e064dd0..e1445c8050 100644 --- a/libpod/common_test.go +++ b/libpod/common_test.go @@ -9,13 +9,13 @@ import ( "testing" "time" - "github.com/containers/podman/v6/libpod/define" - "github.com/containers/podman/v6/libpod/lock" "github.com/opencontainers/runtime-tools/generate" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.podman.io/common/libnetwork/types" "go.podman.io/common/pkg/config" + "go.podman.io/podman/v6/libpod/define" + "go.podman.io/podman/v6/libpod/lock" ) func getTestContainer(id, name string, manager lock.Manager) (*Container, error) { diff --git a/libpod/container.go b/libpod/container.go index b9a696916b..8b7653780c 100644 --- a/libpod/container.go +++ b/libpod/container.go @@ -14,8 +14,6 @@ import ( "strings" "time" - "github.com/containers/podman/v6/libpod/define" - "github.com/containers/podman/v6/libpod/lock" spec "github.com/opencontainers/runtime-spec/specs-go" "github.com/sirupsen/logrus" "go.podman.io/common/libnetwork/pasta" @@ -23,6 +21,8 @@ import ( "go.podman.io/common/pkg/config" "go.podman.io/common/pkg/secrets" "go.podman.io/image/v5/manifest" + "go.podman.io/podman/v6/libpod/define" + "go.podman.io/podman/v6/libpod/lock" "go.podman.io/storage" "golang.org/x/sys/unix" ) diff --git a/libpod/container_api.go b/libpod/container_api.go index 234ff8f5e6..e96cb2e0a2 100644 --- a/libpod/container_api.go +++ b/libpod/container_api.go @@ -11,11 +11,11 @@ import ( "os" "time" - "github.com/containers/podman/v6/libpod/define" - "github.com/containers/podman/v6/libpod/events" - "github.com/containers/podman/v6/pkg/domain/entities" "github.com/sirupsen/logrus" "go.podman.io/common/pkg/resize" + "go.podman.io/podman/v6/libpod/define" + "go.podman.io/podman/v6/libpod/events" + "go.podman.io/podman/v6/pkg/domain/entities" "go.podman.io/storage/pkg/archive" "golang.org/x/sys/unix" ) diff --git a/libpod/container_commit.go b/libpod/container_commit.go index d8a31c85f3..52e448af11 100644 --- a/libpod/container_commit.go +++ b/libpod/container_commit.go @@ -9,13 +9,13 @@ import ( "slices" "strings" - "github.com/containers/podman/v6/libpod/define" - "github.com/containers/podman/v6/libpod/events" "github.com/sirupsen/logrus" "go.podman.io/buildah" "go.podman.io/common/libimage" is "go.podman.io/image/v5/storage" "go.podman.io/image/v5/types" + "go.podman.io/podman/v6/libpod/define" + "go.podman.io/podman/v6/libpod/events" ) // ContainerCommitOptions is a struct used to commit a container to an image diff --git a/libpod/container_config.go b/libpod/container_config.go index 9fcf57a9d3..380c3b5750 100644 --- a/libpod/container_config.go +++ b/libpod/container_config.go @@ -6,13 +6,13 @@ import ( "net" "time" - "github.com/containers/podman/v6/libpod/define" - "github.com/containers/podman/v6/pkg/namespaces" - "github.com/containers/podman/v6/pkg/specgen" spec "github.com/opencontainers/runtime-spec/specs-go" "go.podman.io/common/libnetwork/types" "go.podman.io/common/pkg/secrets" "go.podman.io/image/v5/manifest" + "go.podman.io/podman/v6/libpod/define" + "go.podman.io/podman/v6/pkg/namespaces" + "go.podman.io/podman/v6/pkg/specgen" "go.podman.io/storage" ) diff --git a/libpod/container_copy_common.go b/libpod/container_copy_common.go index ecdd1144bc..8009e5e429 100644 --- a/libpod/container_copy_common.go +++ b/libpod/container_copy_common.go @@ -10,14 +10,14 @@ import ( "path/filepath" "strings" - "github.com/containers/podman/v6/libpod/define" - "github.com/containers/podman/v6/libpod/shutdown" - "github.com/containers/podman/v6/pkg/rootless" "github.com/opencontainers/runtime-spec/specs-go" "github.com/sirupsen/logrus" buildahCopiah "go.podman.io/buildah/copier" "go.podman.io/buildah/pkg/chrootuser" "go.podman.io/buildah/util" + "go.podman.io/podman/v6/libpod/define" + "go.podman.io/podman/v6/libpod/shutdown" + "go.podman.io/podman/v6/pkg/rootless" "go.podman.io/storage/pkg/archive" "go.podman.io/storage/pkg/idtools" "go.podman.io/storage/pkg/stringid" diff --git a/libpod/container_copy_linux.go b/libpod/container_copy_linux.go index 931164fb18..9ff2fc6f41 100644 --- a/libpod/container_copy_linux.go +++ b/libpod/container_copy_linux.go @@ -7,7 +7,7 @@ import ( "os" "runtime" - "github.com/containers/podman/v6/libpod/define" + "go.podman.io/podman/v6/libpod/define" "golang.org/x/sys/unix" ) diff --git a/libpod/container_exec.go b/libpod/container_exec.go index 14bd5c4504..288161e7f9 100644 --- a/libpod/container_exec.go +++ b/libpod/container_exec.go @@ -12,12 +12,12 @@ import ( "strconv" "time" - "github.com/containers/podman/v6/libpod/define" - "github.com/containers/podman/v6/libpod/events" - "github.com/containers/podman/v6/pkg/pidhandle" "github.com/sirupsen/logrus" "go.podman.io/common/pkg/resize" "go.podman.io/common/pkg/util" + "go.podman.io/podman/v6/libpod/define" + "go.podman.io/podman/v6/libpod/events" + "go.podman.io/podman/v6/pkg/pidhandle" "go.podman.io/storage/pkg/stringid" "golang.org/x/sys/unix" ) diff --git a/libpod/container_graph.go b/libpod/container_graph.go index 2272a281fe..97689b2c39 100644 --- a/libpod/container_graph.go +++ b/libpod/container_graph.go @@ -9,10 +9,10 @@ import ( "strings" "sync" - "github.com/containers/podman/v6/libpod/define" - "github.com/containers/podman/v6/pkg/parallel" - "github.com/containers/podman/v6/pkg/syncmap" "github.com/sirupsen/logrus" + "go.podman.io/podman/v6/libpod/define" + "go.podman.io/podman/v6/pkg/parallel" + "go.podman.io/podman/v6/pkg/syncmap" ) type containerNode struct { diff --git a/libpod/container_graph_test.go b/libpod/container_graph_test.go index bc14f6219a..db3606c7f8 100644 --- a/libpod/container_graph_test.go +++ b/libpod/container_graph_test.go @@ -5,8 +5,8 @@ package libpod import ( "testing" - "github.com/containers/podman/v6/libpod/lock" "github.com/stretchr/testify/assert" + "go.podman.io/podman/v6/libpod/lock" ) func TestBuildContainerGraphNoCtrsIsEmpty(t *testing.T) { diff --git a/libpod/container_inspect.go b/libpod/container_inspect.go index bb44b740c8..d0730eacf3 100644 --- a/libpod/container_inspect.go +++ b/libpod/container_inspect.go @@ -8,13 +8,13 @@ import ( "maps" "strings" - "github.com/containers/podman/v6/libpod/define" - "github.com/containers/podman/v6/libpod/driver" - "github.com/containers/podman/v6/pkg/signal" - "github.com/containers/podman/v6/pkg/util" "github.com/docker/go-units" spec "github.com/opencontainers/runtime-spec/specs-go" "github.com/sirupsen/logrus" + "go.podman.io/podman/v6/libpod/define" + "go.podman.io/podman/v6/libpod/driver" + "go.podman.io/podman/v6/pkg/signal" + "go.podman.io/podman/v6/pkg/util" ) // inspectLocked inspects a container for low-level information. diff --git a/libpod/container_inspect_freebsd.go b/libpod/container_inspect_freebsd.go index 62e42d4a8b..2d42e5d6ba 100644 --- a/libpod/container_inspect_freebsd.go +++ b/libpod/container_inspect_freebsd.go @@ -3,8 +3,8 @@ package libpod import ( - "github.com/containers/podman/v6/libpod/define" spec "github.com/opencontainers/runtime-spec/specs-go" + "go.podman.io/podman/v6/libpod/define" ) func (c *Container) platformInspectContainerHostConfig(ctrSpec *spec.Spec, hostConfig *define.InspectContainerHostConfig) error { diff --git a/libpod/container_inspect_linux.go b/libpod/container_inspect_linux.go index d3fba9449d..12bca74f87 100644 --- a/libpod/container_inspect_linux.go +++ b/libpod/container_inspect_linux.go @@ -7,12 +7,12 @@ import ( "sort" "strings" - "github.com/containers/podman/v6/libpod/define" - "github.com/containers/podman/v6/pkg/util" "github.com/moby/sys/capability" spec "github.com/opencontainers/runtime-spec/specs-go" "github.com/sirupsen/logrus" "go.podman.io/common/pkg/config" + "go.podman.io/podman/v6/libpod/define" + "go.podman.io/podman/v6/pkg/util" "go.podman.io/storage/types" ) diff --git a/libpod/container_internal.go b/libpod/container_internal.go index a0ebcbc049..4799f5ed4d 100644 --- a/libpod/container_internal.go +++ b/libpod/container_internal.go @@ -20,17 +20,6 @@ import ( "time" metadata "github.com/checkpoint-restore/checkpointctl/lib" - "github.com/containers/podman/v6/libpod/define" - "github.com/containers/podman/v6/libpod/events" - "github.com/containers/podman/v6/libpod/shutdown" - "github.com/containers/podman/v6/pkg/ctime" - "github.com/containers/podman/v6/pkg/domain/entities" - envLib "github.com/containers/podman/v6/pkg/env" - "github.com/containers/podman/v6/pkg/lookup" - "github.com/containers/podman/v6/pkg/rootless" - "github.com/containers/podman/v6/pkg/selinux" - "github.com/containers/podman/v6/pkg/systemd/notifyproxy" - "github.com/containers/podman/v6/pkg/util" "github.com/coreos/go-systemd/v22/daemon" securejoin "github.com/cyphar/filepath-securejoin" spec "github.com/opencontainers/runtime-spec/specs-go" @@ -47,6 +36,17 @@ import ( "go.podman.io/common/pkg/hooks/exec" "go.podman.io/common/pkg/timezone" cutil "go.podman.io/common/pkg/util" + "go.podman.io/podman/v6/libpod/define" + "go.podman.io/podman/v6/libpod/events" + "go.podman.io/podman/v6/libpod/shutdown" + "go.podman.io/podman/v6/pkg/ctime" + "go.podman.io/podman/v6/pkg/domain/entities" + envLib "go.podman.io/podman/v6/pkg/env" + "go.podman.io/podman/v6/pkg/lookup" + "go.podman.io/podman/v6/pkg/rootless" + "go.podman.io/podman/v6/pkg/selinux" + "go.podman.io/podman/v6/pkg/systemd/notifyproxy" + "go.podman.io/podman/v6/pkg/util" "go.podman.io/storage" "go.podman.io/storage/pkg/chrootarchive" "go.podman.io/storage/pkg/directory" diff --git a/libpod/container_internal_common.go b/libpod/container_internal_common.go index 2ca407ba07..ac7c79af2c 100644 --- a/libpod/container_internal_common.go +++ b/libpod/container_internal_common.go @@ -23,15 +23,6 @@ import ( metadata "github.com/checkpoint-restore/checkpointctl/lib" "github.com/checkpoint-restore/go-criu/v7/stats" - "github.com/containers/podman/v6/libpod/define" - "github.com/containers/podman/v6/libpod/events" - "github.com/containers/podman/v6/pkg/annotations" - "github.com/containers/podman/v6/pkg/checkpoint/crutils" - "github.com/containers/podman/v6/pkg/criu" - "github.com/containers/podman/v6/pkg/lookup" - "github.com/containers/podman/v6/pkg/rootless" - "github.com/containers/podman/v6/pkg/util" - "github.com/containers/podman/v6/version" securejoin "github.com/cyphar/filepath-securejoin" runcuser "github.com/moby/sys/user" spec "github.com/opencontainers/runtime-spec/specs-go" @@ -54,6 +45,15 @@ import ( "go.podman.io/common/pkg/subscriptions" "go.podman.io/common/pkg/umask" is "go.podman.io/image/v5/storage" + "go.podman.io/podman/v6/libpod/define" + "go.podman.io/podman/v6/libpod/events" + "go.podman.io/podman/v6/pkg/annotations" + "go.podman.io/podman/v6/pkg/checkpoint/crutils" + "go.podman.io/podman/v6/pkg/criu" + "go.podman.io/podman/v6/pkg/lookup" + "go.podman.io/podman/v6/pkg/rootless" + "go.podman.io/podman/v6/pkg/util" + "go.podman.io/podman/v6/version" "go.podman.io/storage/pkg/archive" "go.podman.io/storage/pkg/chrootarchive" "go.podman.io/storage/pkg/fileutils" diff --git a/libpod/container_internal_freebsd.go b/libpod/container_internal_freebsd.go index df3a1b7bbf..aa0c9271f9 100644 --- a/libpod/container_internal_freebsd.go +++ b/libpod/container_internal_freebsd.go @@ -12,12 +12,12 @@ import ( "syscall" "time" - "github.com/containers/podman/v6/pkg/rootless" securejoin "github.com/cyphar/filepath-securejoin" spec "github.com/opencontainers/runtime-spec/specs-go" "github.com/opencontainers/runtime-tools/generate" "github.com/sirupsen/logrus" "go.podman.io/common/libnetwork/types" + "go.podman.io/podman/v6/pkg/rootless" "golang.org/x/sys/unix" ) diff --git a/libpod/container_internal_linux.go b/libpod/container_internal_linux.go index bea1e5efc0..64131eb55d 100644 --- a/libpod/container_internal_linux.go +++ b/libpod/container_internal_linux.go @@ -13,9 +13,6 @@ import ( "syscall" "time" - "github.com/containers/podman/v6/libpod/define" - "github.com/containers/podman/v6/libpod/shutdown" - "github.com/containers/podman/v6/pkg/rootless" "github.com/cyphar/filepath-securejoin/pathrs-lite" "github.com/moby/sys/capability" spec "github.com/opencontainers/runtime-spec/specs-go" @@ -25,6 +22,9 @@ import ( "go.podman.io/common/libnetwork/types" "go.podman.io/common/pkg/cgroups" "go.podman.io/common/pkg/config" + "go.podman.io/podman/v6/libpod/define" + "go.podman.io/podman/v6/libpod/shutdown" + "go.podman.io/podman/v6/pkg/rootless" "golang.org/x/sys/unix" ) diff --git a/libpod/container_log.go b/libpod/container_log.go index b08959df14..75ef55bb0d 100644 --- a/libpod/container_log.go +++ b/libpod/container_log.go @@ -9,12 +9,12 @@ import ( "os" "time" - "github.com/containers/podman/v6/libpod/define" - "github.com/containers/podman/v6/libpod/logs" - systemdDefine "github.com/containers/podman/v6/pkg/systemd/define" "github.com/nxadm/tail" "github.com/nxadm/tail/watch" "github.com/sirupsen/logrus" + "go.podman.io/podman/v6/libpod/define" + "go.podman.io/podman/v6/libpod/logs" + systemdDefine "go.podman.io/podman/v6/pkg/systemd/define" ) // logDrivers stores the currently available log drivers, do not modify diff --git a/libpod/container_log_linux.go b/libpod/container_log_linux.go index bccbf3f9af..c84c38a66a 100644 --- a/libpod/container_log_linux.go +++ b/libpod/container_log_linux.go @@ -10,12 +10,12 @@ import ( "strings" "time" - "github.com/containers/podman/v6/libpod/define" - "github.com/containers/podman/v6/libpod/events" - "github.com/containers/podman/v6/libpod/logs" - "github.com/containers/podman/v6/pkg/rootless" "github.com/coreos/go-systemd/v22/sdjournal" "github.com/sirupsen/logrus" + "go.podman.io/podman/v6/libpod/define" + "go.podman.io/podman/v6/libpod/events" + "go.podman.io/podman/v6/libpod/logs" + "go.podman.io/podman/v6/pkg/rootless" ) const ( diff --git a/libpod/container_log_unsupported.go b/libpod/container_log_unsupported.go index 7d7a7dad42..a531ac0f74 100644 --- a/libpod/container_log_unsupported.go +++ b/libpod/container_log_unsupported.go @@ -6,8 +6,8 @@ import ( "context" "fmt" - "github.com/containers/podman/v6/libpod/define" - "github.com/containers/podman/v6/libpod/logs" + "go.podman.io/podman/v6/libpod/define" + "go.podman.io/podman/v6/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 2aab95e161..acf45fa76d 100644 --- a/libpod/container_path_resolution.go +++ b/libpod/container_path_resolution.go @@ -7,10 +7,10 @@ import ( "path/filepath" "strings" - "github.com/containers/podman/v6/libpod/define" securejoin "github.com/cyphar/filepath-securejoin" "github.com/opencontainers/runtime-spec/specs-go" "github.com/sirupsen/logrus" + "go.podman.io/podman/v6/libpod/define" ) // pathAbs returns an absolute path. If the specified path is diff --git a/libpod/container_stat_common.go b/libpod/container_stat_common.go index b565f3515c..acd0048a16 100644 --- a/libpod/container_stat_common.go +++ b/libpod/container_stat_common.go @@ -9,9 +9,9 @@ import ( "path/filepath" "strings" - "github.com/containers/podman/v6/libpod/define" - "github.com/containers/podman/v6/pkg/copy" "go.podman.io/buildah/copier" + "go.podman.io/podman/v6/libpod/define" + "go.podman.io/podman/v6/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 c70b858b5a..cc120b11bc 100644 --- a/libpod/container_stat_linux.go +++ b/libpod/container_stat_linux.go @@ -3,8 +3,8 @@ package libpod import ( - "github.com/containers/podman/v6/libpod/define" "go.podman.io/buildah/copier" + "go.podman.io/podman/v6/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 f15527887b..74e863d10c 100644 --- a/libpod/container_top_freebsd.go +++ b/libpod/container_top_freebsd.go @@ -10,10 +10,10 @@ import ( "strings" "sync" - "github.com/containers/podman/v6/libpod/define" - "github.com/containers/podman/v6/pkg/util" "github.com/google/shlex" "github.com/sirupsen/logrus" + "go.podman.io/podman/v6/libpod/define" + "go.podman.io/podman/v6/pkg/util" ) var isDescriptor = map[string]bool{} diff --git a/libpod/container_top_linux.go b/libpod/container_top_linux.go index d33af04b29..04e05becc6 100644 --- a/libpod/container_top_linux.go +++ b/libpod/container_top_linux.go @@ -17,11 +17,11 @@ import ( "syscall" "unsafe" - "github.com/containers/podman/v6/libpod/define" - "github.com/containers/podman/v6/pkg/rootless" "github.com/containers/psgo" "github.com/google/shlex" "github.com/sirupsen/logrus" + "go.podman.io/podman/v6/libpod/define" + "go.podman.io/podman/v6/pkg/rootless" "go.podman.io/storage/pkg/reexec" "golang.org/x/sys/unix" ) diff --git a/libpod/container_validate.go b/libpod/container_validate.go index c9e12d9b64..2e264a09a2 100644 --- a/libpod/container_validate.go +++ b/libpod/container_validate.go @@ -7,12 +7,12 @@ import ( "fmt" "strings" - "github.com/containers/podman/v6/libpod/define" spec "github.com/opencontainers/runtime-spec/specs-go" "go.podman.io/common/pkg/libartifact" "go.podman.io/image/v5/docker" "go.podman.io/image/v5/pkg/shortnames" "go.podman.io/image/v5/transports/alltransports" + "go.podman.io/podman/v6/libpod/define" ) // Validate that the configuration of a container is valid. diff --git a/libpod/define/container_inspect.go b/libpod/define/container_inspect.go index 5f4646dfda..ba2df4fab9 100644 --- a/libpod/define/container_inspect.go +++ b/libpod/define/container_inspect.go @@ -6,8 +6,8 @@ import ( "strings" "time" - "github.com/containers/podman/v6/pkg/signal" "go.podman.io/image/v5/manifest" + "go.podman.io/podman/v6/pkg/signal" ) type InspectIDMappings struct { diff --git a/libpod/define/version.go b/libpod/define/version.go index 1a57791cb0..972b445db8 100644 --- a/libpod/define/version.go +++ b/libpod/define/version.go @@ -5,7 +5,7 @@ import ( "strconv" "time" - "github.com/containers/podman/v6/version" + "go.podman.io/podman/v6/version" ) // Overwritten at build time diff --git a/libpod/diff.go b/libpod/diff.go index 743ff3e0a1..1974d37f6b 100644 --- a/libpod/diff.go +++ b/libpod/diff.go @@ -5,8 +5,8 @@ package libpod import ( "fmt" - "github.com/containers/podman/v6/libpod/define" - "github.com/containers/podman/v6/libpod/layers" + "go.podman.io/podman/v6/libpod/define" + "go.podman.io/podman/v6/libpod/layers" "go.podman.io/storage/pkg/archive" ) diff --git a/libpod/driver/driver.go b/libpod/driver/driver.go index 26334cdb9e..bb37a7d58e 100644 --- a/libpod/driver/driver.go +++ b/libpod/driver/driver.go @@ -1,7 +1,7 @@ package driver import ( - "github.com/containers/podman/v6/libpod/define" + "go.podman.io/podman/v6/libpod/define" "go.podman.io/storage" ) diff --git a/libpod/events.go b/libpod/events.go index dc69d4abdf..a4ff9197be 100644 --- a/libpod/events.go +++ b/libpod/events.go @@ -7,9 +7,9 @@ import ( "fmt" "path/filepath" - "github.com/containers/podman/v6/libpod/define" - "github.com/containers/podman/v6/libpod/events" "github.com/sirupsen/logrus" + "go.podman.io/podman/v6/libpod/define" + "go.podman.io/podman/v6/libpod/events" ) // newEventer returns an eventer that can be used to read/write events diff --git a/libpod/events/filters.go b/libpod/events/filters.go index 7b23cb91c5..fab5fe3631 100644 --- a/libpod/events/filters.go +++ b/libpod/events/filters.go @@ -7,7 +7,7 @@ import ( "strings" "time" - "github.com/containers/podman/v6/pkg/util" + "go.podman.io/podman/v6/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 21a77b9020..8f9f2a6f32 100644 --- a/libpod/events/journal_linux.go +++ b/libpod/events/journal_linux.go @@ -10,11 +10,11 @@ import ( "strconv" "time" - "github.com/containers/podman/v6/pkg/rootless" - "github.com/containers/podman/v6/pkg/util" "github.com/coreos/go-systemd/v22/journal" "github.com/coreos/go-systemd/v22/sdjournal" "github.com/sirupsen/logrus" + "go.podman.io/podman/v6/pkg/rootless" + "go.podman.io/podman/v6/pkg/util" ) // EventJournalD is the journald implementation of an eventer diff --git a/libpod/events/logfile.go b/libpod/events/logfile.go index 0e33a0b448..b7ce336abb 100644 --- a/libpod/events/logfile.go +++ b/libpod/events/logfile.go @@ -13,9 +13,9 @@ import ( "path/filepath" "time" - "github.com/containers/podman/v6/pkg/util" "github.com/nxadm/tail" "github.com/sirupsen/logrus" + "go.podman.io/podman/v6/pkg/util" "go.podman.io/storage/pkg/lockfile" "golang.org/x/sys/unix" ) diff --git a/libpod/healthcheck.go b/libpod/healthcheck.go index 7d12132c4a..ba42954767 100644 --- a/libpod/healthcheck.go +++ b/libpod/healthcheck.go @@ -14,9 +14,9 @@ import ( "strings" "time" - "github.com/containers/podman/v6/libpod/define" - "github.com/containers/podman/v6/libpod/shutdown" "github.com/sirupsen/logrus" + "go.podman.io/podman/v6/libpod/define" + "go.podman.io/podman/v6/libpod/shutdown" "golang.org/x/sys/unix" ) diff --git a/libpod/healthcheck_config.go b/libpod/healthcheck_config.go index 2a3dc20fba..c71f9bf31f 100644 --- a/libpod/healthcheck_config.go +++ b/libpod/healthcheck_config.go @@ -7,9 +7,9 @@ import ( "strings" "time" - "github.com/containers/podman/v6/libpod/define" - "github.com/containers/podman/v6/pkg/specgenutil" "go.podman.io/image/v5/manifest" + "go.podman.io/podman/v6/libpod/define" + "go.podman.io/podman/v6/pkg/specgenutil" ) type HealthCheckConfig struct { diff --git a/libpod/healthcheck_linux.go b/libpod/healthcheck_linux.go index 965604dfeb..5f1835aea6 100644 --- a/libpod/healthcheck_linux.go +++ b/libpod/healthcheck_linux.go @@ -11,12 +11,12 @@ import ( "os/exec" "strings" - "github.com/containers/podman/v6/pkg/errorhandling" - "github.com/containers/podman/v6/pkg/rootless" - "github.com/containers/podman/v6/pkg/specgenutil" - "github.com/containers/podman/v6/pkg/systemd" "github.com/sirupsen/logrus" systemdCommon "go.podman.io/common/pkg/systemd" + "go.podman.io/podman/v6/pkg/errorhandling" + "go.podman.io/podman/v6/pkg/rootless" + "go.podman.io/podman/v6/pkg/specgenutil" + "go.podman.io/podman/v6/pkg/systemd" ) // createTimer systemd timers for healthchecks of a container diff --git a/libpod/info.go b/libpod/info.go index bc55ff0cbb..8140fb12e0 100644 --- a/libpod/info.go +++ b/libpod/info.go @@ -14,14 +14,14 @@ import ( "syscall" "time" - "github.com/containers/podman/v6/libpod/define" - "github.com/containers/podman/v6/libpod/linkmode" "github.com/sirupsen/logrus" "go.podman.io/buildah" "go.podman.io/buildah/pkg/parse" "go.podman.io/buildah/pkg/util" "go.podman.io/common/pkg/version" "go.podman.io/image/v5/pkg/sysregistriesv2" + "go.podman.io/podman/v6/libpod/define" + "go.podman.io/podman/v6/libpod/linkmode" "go.podman.io/storage/pkg/system" ) diff --git a/libpod/info_freebsd.go b/libpod/info_freebsd.go index e8158006af..66ef0041cd 100644 --- a/libpod/info_freebsd.go +++ b/libpod/info_freebsd.go @@ -6,7 +6,7 @@ import ( "fmt" "unsafe" - "github.com/containers/podman/v6/libpod/define" + "go.podman.io/podman/v6/libpod/define" "golang.org/x/sys/unix" ) diff --git a/libpod/info_linux.go b/libpod/info_linux.go index 012ade9f1b..ef35256726 100644 --- a/libpod/info_linux.go +++ b/libpod/info_linux.go @@ -10,9 +10,6 @@ import ( "strconv" "strings" - "github.com/containers/podman/v6/libpod/define" - "github.com/containers/podman/v6/pkg/rootless" - "github.com/containers/podman/v6/pkg/util" "github.com/opencontainers/selinux/go-selinux" "github.com/sirupsen/logrus" "go.podman.io/common/libnetwork/pasta" @@ -20,6 +17,9 @@ import ( "go.podman.io/common/pkg/cgroups" "go.podman.io/common/pkg/seccomp" "go.podman.io/common/pkg/version" + "go.podman.io/podman/v6/libpod/define" + "go.podman.io/podman/v6/pkg/rootless" + "go.podman.io/podman/v6/pkg/util" "go.podman.io/storage/pkg/unshare" ) diff --git a/libpod/info_test.go b/libpod/info_test.go index caf9f2e89a..aa7f526014 100644 --- a/libpod/info_test.go +++ b/libpod/info_test.go @@ -6,8 +6,8 @@ import ( "fmt" "testing" - "github.com/containers/podman/v6/libpod/define" "github.com/stretchr/testify/assert" + "go.podman.io/podman/v6/libpod/define" ) func Test_statToPercent(t *testing.T) { diff --git a/libpod/kube.go b/libpod/kube.go index 5de8fd33d3..023a1f03f3 100644 --- a/libpod/kube.go +++ b/libpod/kube.go @@ -16,21 +16,21 @@ import ( "strings" "time" - "github.com/containers/podman/v6/libpod/define" - "github.com/containers/podman/v6/pkg/domain/entities" - "github.com/containers/podman/v6/pkg/env" - v1 "github.com/containers/podman/v6/pkg/k8s.io/api/core/v1" - "github.com/containers/podman/v6/pkg/k8s.io/apimachinery/pkg/api/resource" - v12 "github.com/containers/podman/v6/pkg/k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/containers/podman/v6/pkg/k8s.io/apimachinery/pkg/util/intstr" - "github.com/containers/podman/v6/pkg/lookup" - "github.com/containers/podman/v6/pkg/namespaces" - "github.com/containers/podman/v6/pkg/specgen" - "github.com/containers/podman/v6/pkg/util" "github.com/opencontainers/runtime-spec/specs-go" "github.com/sirupsen/logrus" "go.podman.io/common/libnetwork/types" "go.podman.io/common/pkg/config" + "go.podman.io/podman/v6/libpod/define" + "go.podman.io/podman/v6/pkg/domain/entities" + "go.podman.io/podman/v6/pkg/env" + v1 "go.podman.io/podman/v6/pkg/k8s.io/api/core/v1" + "go.podman.io/podman/v6/pkg/k8s.io/apimachinery/pkg/api/resource" + v12 "go.podman.io/podman/v6/pkg/k8s.io/apimachinery/pkg/apis/meta/v1" + "go.podman.io/podman/v6/pkg/k8s.io/apimachinery/pkg/util/intstr" + "go.podman.io/podman/v6/pkg/lookup" + "go.podman.io/podman/v6/pkg/namespaces" + "go.podman.io/podman/v6/pkg/specgen" + "go.podman.io/podman/v6/pkg/util" ) // GenerateForKube takes a slice of libpod containers and generates diff --git a/libpod/lock/file_lock_manager.go b/libpod/lock/file_lock_manager.go index b929b1725c..60ee596f01 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/v6/libpod/define" - "github.com/containers/podman/v6/libpod/lock/file" + "go.podman.io/podman/v6/libpod/define" + "go.podman.io/podman/v6/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 79bafba462..358784fffb 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/v6/libpod/lock/shm" + "go.podman.io/podman/v6/libpod/lock/shm" ) // SHMLockManager manages shared memory locks. diff --git a/libpod/logs/log.go b/libpod/logs/log.go index dde16e4435..c3625dcf3e 100644 --- a/libpod/logs/log.go +++ b/libpod/logs/log.go @@ -9,9 +9,9 @@ import ( "sync" "time" - "github.com/containers/podman/v6/libpod/logs/reversereader" "github.com/nxadm/tail" "github.com/sirupsen/logrus" + "go.podman.io/podman/v6/libpod/logs/reversereader" ) const ( diff --git a/libpod/networking_common.go b/libpod/networking_common.go index 5c6818d244..01f2e5088b 100644 --- a/libpod/networking_common.go +++ b/libpod/networking_common.go @@ -9,15 +9,15 @@ import ( "slices" "sort" - "github.com/containers/podman/v6/libpod/define" - "github.com/containers/podman/v6/libpod/events" - "github.com/containers/podman/v6/pkg/namespaces" - "github.com/containers/podman/v6/pkg/rootless" "github.com/sirupsen/logrus" "go.podman.io/common/libnetwork/etchosts" "go.podman.io/common/libnetwork/types" "go.podman.io/common/pkg/config" "go.podman.io/common/pkg/machine" + "go.podman.io/podman/v6/libpod/define" + "go.podman.io/podman/v6/libpod/events" + "go.podman.io/podman/v6/pkg/namespaces" + "go.podman.io/podman/v6/pkg/rootless" "go.podman.io/storage/pkg/lockfile" ) diff --git a/libpod/networking_freebsd.go b/libpod/networking_freebsd.go index cb2e2e4815..e296f996f0 100644 --- a/libpod/networking_freebsd.go +++ b/libpod/networking_freebsd.go @@ -9,10 +9,10 @@ import ( "fmt" "os/exec" - "github.com/containers/podman/v6/libpod/define" "github.com/sirupsen/logrus" "go.podman.io/buildah/pkg/jail" "go.podman.io/common/libnetwork/types" + "go.podman.io/podman/v6/libpod/define" ) type Netstat struct { diff --git a/libpod/networking_linux.go b/libpod/networking_linux.go index b8f59aca32..f16b95504c 100644 --- a/libpod/networking_linux.go +++ b/libpod/networking_linux.go @@ -7,13 +7,13 @@ import ( "net" "strings" - "github.com/containers/podman/v6/libpod/define" - "github.com/containers/podman/v6/pkg/rootless" "github.com/opencontainers/runtime-spec/specs-go" "github.com/sirupsen/logrus" "github.com/vishvananda/netlink" "go.podman.io/common/libnetwork/types" "go.podman.io/common/pkg/netns" + "go.podman.io/podman/v6/libpod/define" + "go.podman.io/podman/v6/pkg/rootless" ) // Create and configure a new network namespace for a container diff --git a/libpod/networking_linux_test.go b/libpod/networking_linux_test.go index 3bfb05b045..91ea188e01 100644 --- a/libpod/networking_linux_test.go +++ b/libpod/networking_linux_test.go @@ -7,8 +7,8 @@ import ( "reflect" "testing" - "github.com/containers/podman/v6/libpod/define" "go.podman.io/common/libnetwork/types" + "go.podman.io/podman/v6/libpod/define" ) func Test_resultToBasicNetworkConfig(t *testing.T) { diff --git a/libpod/networking_rootlessport.go b/libpod/networking_rootlessport.go index 9a4abd1507..7756c57697 100644 --- a/libpod/networking_rootlessport.go +++ b/libpod/networking_rootlessport.go @@ -8,10 +8,10 @@ import ( "os" "path/filepath" - "github.com/containers/podman/v6/pkg/errorhandling" "github.com/sirupsen/logrus" "go.podman.io/common/libnetwork/slirp4netns" // RootlessKit port mapping only, not the removed slirp4netns backend "go.podman.io/common/libnetwork/types" + "go.podman.io/podman/v6/pkg/errorhandling" ) func (r *Runtime) setupRootlessPortMappingViaRLK(ctr *Container, netnsPath string, netStatus map[string]types.StatusBlock) error { diff --git a/libpod/oci.go b/libpod/oci.go index 731534c8a8..3aedcad0b2 100644 --- a/libpod/oci.go +++ b/libpod/oci.go @@ -5,9 +5,9 @@ package libpod import ( "net/http" - "github.com/containers/podman/v6/libpod/define" "github.com/opencontainers/runtime-spec/specs-go" "go.podman.io/common/pkg/resize" + "go.podman.io/podman/v6/libpod/define" ) // OCIRuntime is an implementation of an OCI runtime. diff --git a/libpod/oci_conmon_attach_common.go b/libpod/oci_conmon_attach_common.go index 7e2422289d..0a92c92564 100644 --- a/libpod/oci_conmon_attach_common.go +++ b/libpod/oci_conmon_attach_common.go @@ -11,13 +11,13 @@ import ( "path/filepath" "syscall" - "github.com/containers/podman/v6/libpod/define" - "github.com/containers/podman/v6/pkg/errorhandling" "github.com/moby/term" "github.com/sirupsen/logrus" "go.podman.io/common/pkg/config" "go.podman.io/common/pkg/detach" "go.podman.io/common/pkg/resize" + "go.podman.io/podman/v6/libpod/define" + "go.podman.io/podman/v6/pkg/errorhandling" "golang.org/x/sys/unix" ) diff --git a/libpod/oci_conmon_common.go b/libpod/oci_conmon_common.go index 4b4b680a2e..91028d8c35 100644 --- a/libpod/oci_conmon_common.go +++ b/libpod/oci_conmon_common.go @@ -21,20 +21,20 @@ import ( "text/template" "time" - "github.com/containers/podman/v6/libpod/define" - "github.com/containers/podman/v6/libpod/logs" - "github.com/containers/podman/v6/pkg/checkpoint/crutils" - "github.com/containers/podman/v6/pkg/errorhandling" - "github.com/containers/podman/v6/pkg/rootless" - "github.com/containers/podman/v6/pkg/specgenutil" - "github.com/containers/podman/v6/pkg/util" - "github.com/containers/podman/v6/utils" spec "github.com/opencontainers/runtime-spec/specs-go" "github.com/sirupsen/logrus" "go.podman.io/common/pkg/config" "go.podman.io/common/pkg/detach" "go.podman.io/common/pkg/resize" "go.podman.io/common/pkg/version" + "go.podman.io/podman/v6/libpod/define" + "go.podman.io/podman/v6/libpod/logs" + "go.podman.io/podman/v6/pkg/checkpoint/crutils" + "go.podman.io/podman/v6/pkg/errorhandling" + "go.podman.io/podman/v6/pkg/rootless" + "go.podman.io/podman/v6/pkg/specgenutil" + "go.podman.io/podman/v6/pkg/util" + "go.podman.io/podman/v6/utils" "go.podman.io/storage/pkg/idtools" "go.podman.io/storage/pkg/regexp" "golang.org/x/sys/unix" diff --git a/libpod/oci_conmon_exec_common.go b/libpod/oci_conmon_exec_common.go index 8194a50efa..8037e07be0 100644 --- a/libpod/oci_conmon_exec_common.go +++ b/libpod/oci_conmon_exec_common.go @@ -15,15 +15,15 @@ import ( "syscall" "time" - "github.com/containers/podman/v6/libpod/define" - "github.com/containers/podman/v6/pkg/errorhandling" - "github.com/containers/podman/v6/pkg/lookup" - "github.com/containers/podman/v6/pkg/pidhandle" spec "github.com/opencontainers/runtime-spec/specs-go" "github.com/sirupsen/logrus" "go.podman.io/common/pkg/config" "go.podman.io/common/pkg/detach" "go.podman.io/common/pkg/resize" + "go.podman.io/podman/v6/libpod/define" + "go.podman.io/podman/v6/pkg/errorhandling" + "go.podman.io/podman/v6/pkg/lookup" + "go.podman.io/podman/v6/pkg/pidhandle" "golang.org/x/sys/unix" ) diff --git a/libpod/oci_conmon_linux.go b/libpod/oci_conmon_linux.go index bb80700d69..e0eddb9ce4 100644 --- a/libpod/oci_conmon_linux.go +++ b/libpod/oci_conmon_linux.go @@ -13,8 +13,6 @@ import ( "strings" "sync" - "github.com/containers/podman/v6/pkg/errorhandling" - "github.com/containers/podman/v6/pkg/rootless" runcconfig "github.com/opencontainers/cgroups" devices "github.com/opencontainers/cgroups/devices/config" spec "github.com/opencontainers/runtime-spec/specs-go" @@ -23,6 +21,8 @@ import ( "go.podman.io/common/pkg/cgroups" "go.podman.io/common/pkg/config" "go.podman.io/common/pkg/systemd" + "go.podman.io/podman/v6/pkg/errorhandling" + "go.podman.io/podman/v6/pkg/rootless" pmount "go.podman.io/storage/pkg/mount" "golang.org/x/sys/unix" ) diff --git a/libpod/oci_missing.go b/libpod/oci_missing.go index 0a5ca34ce0..37898e6e9b 100644 --- a/libpod/oci_missing.go +++ b/libpod/oci_missing.go @@ -8,10 +8,10 @@ import ( "path/filepath" "sync" - "github.com/containers/podman/v6/libpod/define" spec "github.com/opencontainers/runtime-spec/specs-go" "github.com/sirupsen/logrus" "go.podman.io/common/pkg/resize" + "go.podman.io/podman/v6/libpod/define" ) var ( diff --git a/libpod/oci_util.go b/libpod/oci_util.go index 512a2b7add..d19addfa9f 100644 --- a/libpod/oci_util.go +++ b/libpod/oci_util.go @@ -10,9 +10,9 @@ import ( "strings" "time" - "github.com/containers/podman/v6/libpod/define" "github.com/sirupsen/logrus" "go.podman.io/common/libnetwork/types" + "go.podman.io/podman/v6/libpod/define" ) // Timeout before declaring that runtime has failed to kill a given diff --git a/libpod/options.go b/libpod/options.go index b7612ca609..0224b39c4d 100644 --- a/libpod/options.go +++ b/libpod/options.go @@ -14,10 +14,6 @@ import ( "syscall" "time" - "github.com/containers/podman/v6/libpod/define" - "github.com/containers/podman/v6/libpod/events" - "github.com/containers/podman/v6/pkg/namespaces" - "github.com/containers/podman/v6/pkg/util" "github.com/opencontainers/runtime-spec/specs-go" "github.com/opencontainers/runtime-tools/generate" "github.com/sirupsen/logrus" @@ -26,6 +22,10 @@ import ( "go.podman.io/common/pkg/secrets" "go.podman.io/image/v5/manifest" "go.podman.io/image/v5/pkg/cli/basetls" + "go.podman.io/podman/v6/libpod/define" + "go.podman.io/podman/v6/libpod/events" + "go.podman.io/podman/v6/pkg/namespaces" + "go.podman.io/podman/v6/pkg/util" "go.podman.io/storage" "go.podman.io/storage/pkg/fileutils" "go.podman.io/storage/pkg/idtools" diff --git a/libpod/plugin/volume_api.go b/libpod/plugin/volume_api.go index ec58890ec7..4eb8b2c06d 100644 --- a/libpod/plugin/volume_api.go +++ b/libpod/plugin/volume_api.go @@ -15,12 +15,12 @@ import ( "sync" "time" - "github.com/containers/podman/v6/libpod/define" "github.com/docker/go-plugins-helpers/sdk" "github.com/docker/go-plugins-helpers/volume" jsoniter "github.com/json-iterator/go" "github.com/sirupsen/logrus" "go.podman.io/common/pkg/config" + "go.podman.io/podman/v6/libpod/define" "go.podman.io/storage/pkg/fileutils" ) diff --git a/libpod/pod.go b/libpod/pod.go index 8c7449c27c..d5a1413496 100644 --- a/libpod/pod.go +++ b/libpod/pod.go @@ -10,10 +10,10 @@ import ( "strings" "time" - "github.com/containers/podman/v6/libpod/define" - "github.com/containers/podman/v6/libpod/lock" "github.com/opencontainers/runtime-spec/specs-go" "go.podman.io/common/pkg/config" + "go.podman.io/podman/v6/libpod/define" + "go.podman.io/podman/v6/libpod/lock" ) // Pod represents a group of containers that are managed together. diff --git a/libpod/pod_api.go b/libpod/pod_api.go index f579f50c73..9167d39a40 100644 --- a/libpod/pod_api.go +++ b/libpod/pod_api.go @@ -10,11 +10,11 @@ import ( "sort" "strings" - "github.com/containers/podman/v6/libpod/define" - "github.com/containers/podman/v6/libpod/events" - "github.com/containers/podman/v6/pkg/parallel" "github.com/opencontainers/runtime-spec/specs-go" "github.com/sirupsen/logrus" + "go.podman.io/podman/v6/libpod/define" + "go.podman.io/podman/v6/libpod/events" + "go.podman.io/podman/v6/pkg/parallel" ) // startInitContainers starts a pod's init containers. diff --git a/libpod/pod_internal.go b/libpod/pod_internal.go index 85571539ae..3111ec0812 100644 --- a/libpod/pod_internal.go +++ b/libpod/pod_internal.go @@ -6,7 +6,7 @@ import ( "fmt" "time" - "github.com/containers/podman/v6/libpod/define" + "go.podman.io/podman/v6/libpod/define" "go.podman.io/storage/pkg/stringid" ) diff --git a/libpod/pod_internal_linux.go b/libpod/pod_internal_linux.go index 10d9495d29..96df6db99c 100644 --- a/libpod/pod_internal_linux.go +++ b/libpod/pod_internal_linux.go @@ -6,10 +6,10 @@ import ( "fmt" "path/filepath" - "github.com/containers/podman/v6/libpod/define" - "github.com/containers/podman/v6/pkg/rootless" "github.com/sirupsen/logrus" "go.podman.io/common/pkg/config" + "go.podman.io/podman/v6/libpod/define" + "go.podman.io/podman/v6/pkg/rootless" ) func (p *Pod) platformRefresh() error { diff --git a/libpod/pod_status.go b/libpod/pod_status.go index bd4e2e7ace..711d0edf6d 100644 --- a/libpod/pod_status.go +++ b/libpod/pod_status.go @@ -2,7 +2,7 @@ package libpod -import "github.com/containers/podman/v6/libpod/define" +import "go.podman.io/podman/v6/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 3c4bdbb5cc..8cfff3c84b 100644 --- a/libpod/pod_top_freebsd.go +++ b/libpod/pod_top_freebsd.go @@ -6,7 +6,7 @@ import ( "fmt" "strings" - "github.com/containers/podman/v6/libpod/define" + "go.podman.io/podman/v6/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 8d93b59695..28371b41ac 100644 --- a/libpod/pod_top_linux.go +++ b/libpod/pod_top_linux.go @@ -6,9 +6,9 @@ import ( "strconv" "strings" - "github.com/containers/podman/v6/libpod/define" - "github.com/containers/podman/v6/pkg/rootless" "github.com/containers/psgo" + "go.podman.io/podman/v6/libpod/define" + "go.podman.io/podman/v6/pkg/rootless" ) // GetPodPidInformation returns process-related data of all processes in diff --git a/libpod/reset.go b/libpod/reset.go index aa370e2453..deae7e7009 100644 --- a/libpod/reset.go +++ b/libpod/reset.go @@ -9,13 +9,13 @@ import ( "os" "path/filepath" - "github.com/containers/podman/v6/libpod/define" - "github.com/containers/podman/v6/pkg/errorhandling" - "github.com/containers/podman/v6/pkg/util" "github.com/sirupsen/logrus" "go.podman.io/common/libimage" "go.podman.io/common/libnetwork/types" blobinfocache "go.podman.io/image/v5/pkg/blobinfocache" + "go.podman.io/podman/v6/libpod/define" + "go.podman.io/podman/v6/pkg/errorhandling" + "go.podman.io/podman/v6/pkg/util" "go.podman.io/storage/pkg/lockfile" ) diff --git a/libpod/runtime.go b/libpod/runtime.go index 49c2910f9b..5bb1769b30 100644 --- a/libpod/runtime.go +++ b/libpod/runtime.go @@ -15,17 +15,6 @@ import ( "syscall" "time" - "github.com/containers/podman/v6/libpod/define" - "github.com/containers/podman/v6/libpod/events" - "github.com/containers/podman/v6/libpod/lock" - "github.com/containers/podman/v6/libpod/namesgenerator" - "github.com/containers/podman/v6/libpod/plugin" - "github.com/containers/podman/v6/libpod/shutdown" - "github.com/containers/podman/v6/pkg/domain/entities" - "github.com/containers/podman/v6/pkg/domain/entities/reports" - "github.com/containers/podman/v6/pkg/rootless" - "github.com/containers/podman/v6/pkg/systemd" - "github.com/containers/podman/v6/pkg/util" "github.com/hashicorp/go-multierror" jsoniter "github.com/json-iterator/go" spec "github.com/opencontainers/runtime-spec/specs-go" @@ -40,6 +29,17 @@ import ( systemdCommon "go.podman.io/common/pkg/systemd" is "go.podman.io/image/v5/storage" "go.podman.io/image/v5/types" + "go.podman.io/podman/v6/libpod/define" + "go.podman.io/podman/v6/libpod/events" + "go.podman.io/podman/v6/libpod/lock" + "go.podman.io/podman/v6/libpod/namesgenerator" + "go.podman.io/podman/v6/libpod/plugin" + "go.podman.io/podman/v6/libpod/shutdown" + "go.podman.io/podman/v6/pkg/domain/entities" + "go.podman.io/podman/v6/pkg/domain/entities/reports" + "go.podman.io/podman/v6/pkg/rootless" + "go.podman.io/podman/v6/pkg/systemd" + "go.podman.io/podman/v6/pkg/util" "go.podman.io/storage" "go.podman.io/storage/pkg/fileutils" "go.podman.io/storage/pkg/lockfile" diff --git a/libpod/runtime_cstorage.go b/libpod/runtime_cstorage.go index 68fb7eb86c..0ee1030617 100644 --- a/libpod/runtime_cstorage.go +++ b/libpod/runtime_cstorage.go @@ -7,8 +7,8 @@ import ( "fmt" "time" - "github.com/containers/podman/v6/libpod/define" "github.com/sirupsen/logrus" + "go.podman.io/podman/v6/libpod/define" "go.podman.io/storage" ) diff --git a/libpod/runtime_ctr.go b/libpod/runtime_ctr.go index 88a346a9bf..f9e51d3b3a 100644 --- a/libpod/runtime_ctr.go +++ b/libpod/runtime_ctr.go @@ -15,13 +15,6 @@ import ( "strings" "time" - "github.com/containers/podman/v6/libpod/define" - "github.com/containers/podman/v6/libpod/events" - "github.com/containers/podman/v6/libpod/shutdown" - "github.com/containers/podman/v6/pkg/domain/entities/reports" - "github.com/containers/podman/v6/pkg/rootless" - "github.com/containers/podman/v6/pkg/specgen" - "github.com/containers/podman/v6/pkg/util" "github.com/docker/go-units" spec "github.com/opencontainers/runtime-spec/specs-go" "github.com/opencontainers/runtime-tools/generate" @@ -29,6 +22,13 @@ import ( "go.podman.io/buildah" "go.podman.io/common/libnetwork/types" "go.podman.io/common/pkg/config" + "go.podman.io/podman/v6/libpod/define" + "go.podman.io/podman/v6/libpod/events" + "go.podman.io/podman/v6/libpod/shutdown" + "go.podman.io/podman/v6/pkg/domain/entities/reports" + "go.podman.io/podman/v6/pkg/rootless" + "go.podman.io/podman/v6/pkg/specgen" + "go.podman.io/podman/v6/pkg/util" "go.podman.io/storage" "go.podman.io/storage/pkg/stringid" ) diff --git a/libpod/runtime_img.go b/libpod/runtime_img.go index 4936b204da..3d907bf5a0 100644 --- a/libpod/runtime_img.go +++ b/libpod/runtime_img.go @@ -7,13 +7,13 @@ import ( "errors" "fmt" - "github.com/containers/podman/v6/libpod/define" - "github.com/containers/podman/v6/libpod/events" "github.com/sirupsen/logrus" buildahDefine "go.podman.io/buildah/define" "go.podman.io/buildah/imagebuildah" "go.podman.io/common/libimage" "go.podman.io/image/v5/docker/reference" + "go.podman.io/podman/v6/libpod/define" + "go.podman.io/podman/v6/libpod/events" ) // Runtime API diff --git a/libpod/runtime_linux.go b/libpod/runtime_linux.go index 33c0c2cc67..a4db118537 100644 --- a/libpod/runtime_linux.go +++ b/libpod/runtime_linux.go @@ -9,9 +9,9 @@ import ( "golang.org/x/sys/unix" - "github.com/containers/podman/v6/pkg/rootless" - "github.com/containers/podman/v6/pkg/systemd" "github.com/sirupsen/logrus" + "go.podman.io/podman/v6/pkg/rootless" + "go.podman.io/podman/v6/pkg/systemd" ) func checkCgroups2UnifiedMode(runtime *Runtime) { diff --git a/libpod/runtime_migrate.go b/libpod/runtime_migrate.go index 71d0d05766..b624ef4bb3 100644 --- a/libpod/runtime_migrate.go +++ b/libpod/runtime_migrate.go @@ -7,9 +7,9 @@ import ( "path/filepath" "strings" - "github.com/containers/podman/v6/libpod/define" - "github.com/containers/podman/v6/pkg/namespaces" "github.com/sirupsen/logrus" + "go.podman.io/podman/v6/libpod/define" + "go.podman.io/podman/v6/pkg/namespaces" ) // Migrate stops the rootless pause process and performs any necessary database diff --git a/libpod/runtime_migrate_linux.go b/libpod/runtime_migrate_linux.go index d3a62cfb7f..e2e34ef42f 100644 --- a/libpod/runtime_migrate_linux.go +++ b/libpod/runtime_migrate_linux.go @@ -9,9 +9,9 @@ import ( "strconv" "syscall" - "github.com/containers/podman/v6/pkg/rootless" - "github.com/containers/podman/v6/pkg/util" "github.com/sirupsen/logrus" + "go.podman.io/podman/v6/pkg/rootless" + "go.podman.io/podman/v6/pkg/util" ) func (r *Runtime) stopPauseProcess() error { diff --git a/libpod/runtime_pod.go b/libpod/runtime_pod.go index 9544720050..87dad7fcd5 100644 --- a/libpod/runtime_pod.go +++ b/libpod/runtime_pod.go @@ -9,7 +9,7 @@ import ( "slices" "time" - "github.com/containers/podman/v6/libpod/define" + "go.podman.io/podman/v6/libpod/define" ) // Contains the public Runtime API for pods diff --git a/libpod/runtime_pod_common.go b/libpod/runtime_pod_common.go index 3fa487a149..f21eb17b02 100644 --- a/libpod/runtime_pod_common.go +++ b/libpod/runtime_pod_common.go @@ -7,11 +7,11 @@ import ( "errors" "fmt" - "github.com/containers/podman/v6/libpod/define" - "github.com/containers/podman/v6/libpod/events" - "github.com/containers/podman/v6/pkg/specgen" "github.com/hashicorp/go-multierror" "github.com/sirupsen/logrus" + "go.podman.io/podman/v6/libpod/define" + "go.podman.io/podman/v6/libpod/events" + "go.podman.io/podman/v6/pkg/specgen" ) // NewPod makes a new, empty pod diff --git a/libpod/runtime_pod_linux.go b/libpod/runtime_pod_linux.go index b52b565ba5..759d82e77d 100644 --- a/libpod/runtime_pod_linux.go +++ b/libpod/runtime_pod_linux.go @@ -8,12 +8,12 @@ import ( "path/filepath" "strings" - "github.com/containers/podman/v6/libpod/define" - "github.com/containers/podman/v6/pkg/rootless" spec "github.com/opencontainers/runtime-spec/specs-go" "github.com/sirupsen/logrus" "go.podman.io/common/pkg/cgroups" "go.podman.io/common/pkg/config" + "go.podman.io/podman/v6/libpod/define" + "go.podman.io/podman/v6/pkg/rootless" ) func (r *Runtime) platformMakePod(pod *Pod, resourceLimits *spec.LinuxResources) (string, error) { diff --git a/libpod/runtime_renumber.go b/libpod/runtime_renumber.go index 849d16aed1..97e494c219 100644 --- a/libpod/runtime_renumber.go +++ b/libpod/runtime_renumber.go @@ -5,8 +5,8 @@ package libpod import ( "fmt" - "github.com/containers/podman/v6/libpod/define" - "github.com/containers/podman/v6/libpod/events" + "go.podman.io/podman/v6/libpod/define" + "go.podman.io/podman/v6/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 db64a85b40..0290cd58d9 100644 --- a/libpod/runtime_volume.go +++ b/libpod/runtime_volume.go @@ -6,9 +6,9 @@ import ( "context" "errors" - "github.com/containers/podman/v6/libpod/define" - "github.com/containers/podman/v6/libpod/events" - "github.com/containers/podman/v6/pkg/domain/entities/reports" + "go.podman.io/podman/v6/libpod/define" + "go.podman.io/podman/v6/libpod/events" + "go.podman.io/podman/v6/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 bdcb40aa1a..fa1920a748 100644 --- a/libpod/runtime_volume_common.go +++ b/libpod/runtime_volume_common.go @@ -11,12 +11,12 @@ import ( "strings" "time" - "github.com/containers/podman/v6/libpod/define" - "github.com/containers/podman/v6/libpod/events" - volplugin "github.com/containers/podman/v6/libpod/plugin" pluginapi "github.com/docker/go-plugins-helpers/volume" "github.com/opencontainers/selinux/go-selinux" "github.com/sirupsen/logrus" + "go.podman.io/podman/v6/libpod/define" + "go.podman.io/podman/v6/libpod/events" + volplugin "go.podman.io/podman/v6/libpod/plugin" "go.podman.io/storage" "go.podman.io/storage/drivers/quota" "go.podman.io/storage/pkg/fileutils" diff --git a/libpod/service.go b/libpod/service.go index b733b540a0..c4b0164fbf 100644 --- a/libpod/service.go +++ b/libpod/service.go @@ -7,8 +7,8 @@ import ( "errors" "fmt" - "github.com/containers/podman/v6/libpod/define" "github.com/sirupsen/logrus" + "go.podman.io/podman/v6/libpod/define" "golang.org/x/sys/unix" ) diff --git a/libpod/sqlite_state.go b/libpod/sqlite_state.go index 42d3114722..125d429296 100644 --- a/libpod/sqlite_state.go +++ b/libpod/sqlite_state.go @@ -12,10 +12,10 @@ import ( "strings" "time" - "github.com/containers/podman/v6/libpod/define" "github.com/sirupsen/logrus" "go.podman.io/common/libnetwork/types" "go.podman.io/common/pkg/config" + "go.podman.io/podman/v6/libpod/define" "go.podman.io/storage" // SQLite backend for database/sql diff --git a/libpod/sqlite_state_internal.go b/libpod/sqlite_state_internal.go index a6daf5e95f..7487abec84 100644 --- a/libpod/sqlite_state_internal.go +++ b/libpod/sqlite_state_internal.go @@ -11,9 +11,9 @@ import ( "sort" "strings" - "github.com/containers/podman/v6/libpod/define" "github.com/sirupsen/logrus" "go.podman.io/common/libnetwork/types" + "go.podman.io/podman/v6/libpod/define" // SQLite backend for database/sql _ "github.com/mattn/go-sqlite3" diff --git a/libpod/state_test.go b/libpod/state_test.go index e2ba6a0be1..2d6d8fc77b 100644 --- a/libpod/state_test.go +++ b/libpod/state_test.go @@ -7,11 +7,11 @@ import ( "testing" "time" - "github.com/containers/podman/v6/libpod/define" - "github.com/containers/podman/v6/libpod/lock" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.podman.io/common/pkg/config" + "go.podman.io/podman/v6/libpod/define" + "go.podman.io/podman/v6/libpod/lock" "go.podman.io/storage" ) diff --git a/libpod/stats_common.go b/libpod/stats_common.go index 4d1d2e368e..1faac570c6 100644 --- a/libpod/stats_common.go +++ b/libpod/stats_common.go @@ -5,7 +5,7 @@ package libpod import ( "fmt" - "github.com/containers/podman/v6/libpod/define" + "go.podman.io/podman/v6/libpod/define" ) // GetContainerStats gets the running stats for a given container. diff --git a/libpod/stats_freebsd.go b/libpod/stats_freebsd.go index f8f2748671..9f35ec1048 100644 --- a/libpod/stats_freebsd.go +++ b/libpod/stats_freebsd.go @@ -7,9 +7,9 @@ import ( "math" "time" - "github.com/containers/podman/v6/libpod/define" - "github.com/containers/podman/v6/pkg/rctl" "github.com/sirupsen/logrus" + "go.podman.io/podman/v6/libpod/define" + "go.podman.io/podman/v6/pkg/rctl" "go.podman.io/storage/pkg/system" "golang.org/x/sys/unix" ) diff --git a/libpod/stats_linux.go b/libpod/stats_linux.go index bc4ea54101..c65d2583e1 100644 --- a/libpod/stats_linux.go +++ b/libpod/stats_linux.go @@ -9,9 +9,9 @@ import ( "syscall" "time" - "github.com/containers/podman/v6/libpod/define" runccgroup "github.com/opencontainers/cgroups" "go.podman.io/common/pkg/cgroups" + "go.podman.io/podman/v6/libpod/define" "golang.org/x/sys/unix" ) diff --git a/libpod/storage.go b/libpod/storage.go index 9a74e1feae..145bcddd51 100644 --- a/libpod/storage.go +++ b/libpod/storage.go @@ -7,11 +7,11 @@ import ( "errors" "time" - "github.com/containers/podman/v6/libpod/define" v1 "github.com/opencontainers/image-spec/specs-go/v1" "github.com/sirupsen/logrus" istorage "go.podman.io/image/v5/storage" "go.podman.io/image/v5/types" + "go.podman.io/podman/v6/libpod/define" "go.podman.io/storage" "go.podman.io/storage/pkg/idtools" ) diff --git a/libpod/util.go b/libpod/util.go index c8aec9da42..2a2da2ac7a 100644 --- a/libpod/util.go +++ b/libpod/util.go @@ -16,13 +16,13 @@ import ( "strconv" "strings" - "github.com/containers/podman/v6/libpod/define" - "github.com/containers/podman/v6/pkg/api/handlers/utils/apiutil" spec "github.com/opencontainers/runtime-spec/specs-go" "github.com/opencontainers/selinux/go-selinux/label" "github.com/sirupsen/logrus" "go.podman.io/common/libnetwork/types" "go.podman.io/common/pkg/config" + "go.podman.io/podman/v6/libpod/define" + "go.podman.io/podman/v6/pkg/api/handlers/utils/apiutil" "go.podman.io/storage/pkg/fileutils" "golang.org/x/sys/unix" ) diff --git a/libpod/util_linux.go b/libpod/util_linux.go index f264d79695..084a00e10b 100644 --- a/libpod/util_linux.go +++ b/libpod/util_linux.go @@ -9,13 +9,13 @@ import ( "strings" "syscall" - "github.com/containers/podman/v6/libpod/define" - "github.com/containers/podman/v6/pkg/rootless" spec "github.com/opencontainers/runtime-spec/specs-go" "github.com/opencontainers/selinux/go-selinux" "github.com/opencontainers/selinux/go-selinux/label" "github.com/sirupsen/logrus" "go.podman.io/common/pkg/cgroups" + "go.podman.io/podman/v6/libpod/define" + "go.podman.io/podman/v6/pkg/rootless" "go.podman.io/storage/pkg/fileutils" "golang.org/x/sys/unix" ) diff --git a/libpod/volume.go b/libpod/volume.go index 321b5be01d..c383b7ec34 100644 --- a/libpod/volume.go +++ b/libpod/volume.go @@ -8,11 +8,11 @@ import ( "maps" "time" - "github.com/containers/podman/v6/libpod/define" - "github.com/containers/podman/v6/libpod/lock" - "github.com/containers/podman/v6/libpod/plugin" - "github.com/containers/podman/v6/utils" "github.com/sirupsen/logrus" + "go.podman.io/podman/v6/libpod/define" + "go.podman.io/podman/v6/libpod/lock" + "go.podman.io/podman/v6/libpod/plugin" + "go.podman.io/podman/v6/utils" "go.podman.io/storage/pkg/chrootarchive" "go.podman.io/storage/pkg/directory" ) diff --git a/libpod/volume_inspect.go b/libpod/volume_inspect.go index e2c60354b4..d8e9260903 100644 --- a/libpod/volume_inspect.go +++ b/libpod/volume_inspect.go @@ -6,9 +6,9 @@ import ( "fmt" "maps" - "github.com/containers/podman/v6/libpod/define" pluginapi "github.com/docker/go-plugins-helpers/volume" "github.com/sirupsen/logrus" + "go.podman.io/podman/v6/libpod/define" ) // Inspect provides detailed information about the configuration of the given diff --git a/libpod/volume_internal.go b/libpod/volume_internal.go index 614f3decb7..be65697d51 100644 --- a/libpod/volume_internal.go +++ b/libpod/volume_internal.go @@ -7,7 +7,7 @@ import ( "os" "path/filepath" - "github.com/containers/podman/v6/libpod/define" + "go.podman.io/podman/v6/libpod/define" ) // Creates a new volume diff --git a/libpod/volume_internal_common.go b/libpod/volume_internal_common.go index 693e08921e..d7453b0a0c 100644 --- a/libpod/volume_internal_common.go +++ b/libpod/volume_internal_common.go @@ -8,9 +8,9 @@ import ( "os/exec" "strings" - "github.com/containers/podman/v6/libpod/define" pluginapi "github.com/docker/go-plugins-helpers/volume" "github.com/sirupsen/logrus" + "go.podman.io/podman/v6/libpod/define" "golang.org/x/sys/unix" ) diff --git a/libpod/volume_test.go b/libpod/volume_test.go index 8dc0ecccf2..ddc263b492 100644 --- a/libpod/volume_test.go +++ b/libpod/volume_test.go @@ -5,9 +5,9 @@ package libpod import ( "testing" - "github.com/containers/podman/v6/libpod/define" "github.com/stretchr/testify/assert" "go.podman.io/common/pkg/config" + "go.podman.io/podman/v6/libpod/define" ) // Regression test for issue #27858. diff --git a/pkg/annotations/validate.go b/pkg/annotations/validate.go index d7b191d8ab..bfa058f42d 100644 --- a/pkg/annotations/validate.go +++ b/pkg/annotations/validate.go @@ -6,7 +6,7 @@ import ( "regexp" "strings" - "github.com/containers/podman/v6/libpod/define" + "go.podman.io/podman/v6/libpod/define" ) // regexErrorMsg returns a string explanation of a regex validation failure. diff --git a/pkg/annotations/validate_test.go b/pkg/annotations/validate_test.go index 31565a8689..36ec3b5d8b 100644 --- a/pkg/annotations/validate_test.go +++ b/pkg/annotations/validate_test.go @@ -20,7 +20,7 @@ import ( "strings" "testing" - "github.com/containers/podman/v6/libpod/define" + "go.podman.io/podman/v6/libpod/define" ) func TestValidateAnnotations(t *testing.T) { diff --git a/pkg/api/Makefile b/pkg/api/Makefile index 5ba0216b8e..1727198a3b 100644 --- a/pkg/api/Makefile +++ b/pkg/api/Makefile @@ -12,4 +12,4 @@ serve: ${SWAGGER_OUT} ${SWAGGER_OUT}: # generate doesn't remove file on error rm -f ${SWAGGER_OUT} - $(SWAGGER) generate spec -c github.com/containers/podman -x github.com/sigstore/rekor -x github.com/moby/moby/api/types/network -x github.com/docker/docker/api/types/network -x github.com/moby/moby/api -o ${SWAGGER_OUT} -i tags.yaml -w ./ -m + $(SWAGGER) generate spec -c go.podman.io/podman -x github.com/sigstore/rekor -x github.com/moby/moby/api/types/network -x github.com/docker/docker/api/types/network -x github.com/moby/moby/api -o ${SWAGGER_OUT} -i tags.yaml -w ./ -m diff --git a/pkg/api/grpcpb/noop.pb.go b/pkg/api/grpcpb/noop.pb.go index 0a9f7bb85a..82accbba59 100644 --- a/pkg/api/grpcpb/noop.pb.go +++ b/pkg/api/grpcpb/noop.pb.go @@ -1,18 +1,17 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.36.10 +// protoc-gen-go v1.36.11 // protoc v3.19.6 // source: noop.proto package grpcpb import ( + protoreflect "google.golang.org/protobuf/reflect/protoreflect" + protoimpl "google.golang.org/protobuf/runtime/protoimpl" reflect "reflect" sync "sync" unsafe "unsafe" - - protoreflect "google.golang.org/protobuf/reflect/protoreflect" - protoimpl "google.golang.org/protobuf/runtime/protoimpl" ) const ( @@ -121,7 +120,7 @@ const file_noop_proto_rawDesc = "" + "\fNoopResponse\x12\x18\n" + "\aignored\x18\x01 \x01(\tR\aignored2E\n" + "\x04Noop\x12=\n" + - "\x04Noop\x12\x19.io.podman.v1.NoopRequest\x1a\x1a.io.podman.v1.NoopResponseB0Z.github.com/containers/podman/v6/pkg/api/grpcpbb\x06proto3" + "\x04Noop\x12\x19.io.podman.v1.NoopRequest\x1a\x1a.io.podman.v1.NoopResponseB'Z%go.podman.io/podman/v6/pkg/api/grpcpbb\x06proto3" var ( file_noop_proto_rawDescOnce sync.Once @@ -135,13 +134,11 @@ func file_noop_proto_rawDescGZIP() []byte { return file_noop_proto_rawDescData } -var ( - file_noop_proto_msgTypes = make([]protoimpl.MessageInfo, 2) - file_noop_proto_goTypes = []any{ - (*NoopRequest)(nil), // 0: io.podman.v1.NoopRequest - (*NoopResponse)(nil), // 1: io.podman.v1.NoopResponse - } -) +var file_noop_proto_msgTypes = make([]protoimpl.MessageInfo, 2) +var file_noop_proto_goTypes = []any{ + (*NoopRequest)(nil), // 0: io.podman.v1.NoopRequest + (*NoopResponse)(nil), // 1: io.podman.v1.NoopResponse +} var file_noop_proto_depIdxs = []int32{ 0, // 0: io.podman.v1.Noop.Noop:input_type -> io.podman.v1.NoopRequest 1, // 1: io.podman.v1.Noop.Noop:output_type -> io.podman.v1.NoopResponse diff --git a/pkg/api/grpcpb/noop.proto b/pkg/api/grpcpb/noop.proto index 13829c23ea..1e0de5e0e7 100644 --- a/pkg/api/grpcpb/noop.proto +++ b/pkg/api/grpcpb/noop.proto @@ -2,7 +2,7 @@ syntax = "proto3"; package io.podman.v1; -option go_package = "github.com/containers/podman/v6/pkg/api/grpcpb"; +option go_package = "go.podman.io/podman/v6/pkg/api/grpcpb"; service Noop { rpc Noop(NoopRequest) returns (NoopResponse); diff --git a/pkg/api/grpcpb/noop_grpc.pb.go b/pkg/api/grpcpb/noop_grpc.pb.go index 715aa1d610..fefbae8885 100644 --- a/pkg/api/grpcpb/noop_grpc.pb.go +++ b/pkg/api/grpcpb/noop_grpc.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go-grpc. DO NOT EDIT. // versions: -// - protoc-gen-go-grpc v1.5.1 +// - protoc-gen-go-grpc v1.6.1 // - protoc v3.19.6 // source: noop.proto @@ -8,7 +8,6 @@ package grpcpb import ( context "context" - grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" @@ -64,7 +63,7 @@ type NoopServer interface { type UnimplementedNoopServer struct{} func (UnimplementedNoopServer) Noop(context.Context, *NoopRequest) (*NoopResponse, error) { - return nil, status.Errorf(codes.Unimplemented, "method Noop not implemented") + return nil, status.Error(codes.Unimplemented, "method Noop not implemented") } func (UnimplementedNoopServer) mustEmbedUnimplementedNoopServer() {} func (UnimplementedNoopServer) testEmbeddedByValue() {} @@ -77,7 +76,7 @@ type UnsafeNoopServer interface { } func RegisterNoopServer(s grpc.ServiceRegistrar, srv NoopServer) { - // If the following call pancis, it indicates UnimplementedNoopServer was + // If the following call panics, it indicates UnimplementedNoopServer was // embedded by pointer and is nil. This will cause panics if an // unimplemented method is ever invoked, so we test this at initialization // time to prevent it from happening at runtime later due to I/O. diff --git a/pkg/api/handlers/compat/auth.go b/pkg/api/handlers/compat/auth.go index 73c0c323e1..a6d2f02ecb 100644 --- a/pkg/api/handlers/compat/auth.go +++ b/pkg/api/handlers/compat/auth.go @@ -10,14 +10,14 @@ import ( "net/http" "strings" - "github.com/containers/podman/v6/libpod" - "github.com/containers/podman/v6/pkg/api/handlers/utils" - api "github.com/containers/podman/v6/pkg/api/types" - "github.com/containers/podman/v6/pkg/domain/entities" "github.com/moby/moby/api/types/registry" "go.podman.io/common/pkg/auth" DockerClient "go.podman.io/image/v5/docker" "go.podman.io/image/v5/types" + "go.podman.io/podman/v6/libpod" + "go.podman.io/podman/v6/pkg/api/handlers/utils" + api "go.podman.io/podman/v6/pkg/api/types" + "go.podman.io/podman/v6/pkg/domain/entities" ) func Auth(w http.ResponseWriter, r *http.Request) { diff --git a/pkg/api/handlers/compat/changes.go b/pkg/api/handlers/compat/changes.go index 8eac0597d8..9179d382d1 100644 --- a/pkg/api/handlers/compat/changes.go +++ b/pkg/api/handlers/compat/changes.go @@ -6,10 +6,10 @@ import ( "fmt" "net/http" - "github.com/containers/podman/v6/libpod" - "github.com/containers/podman/v6/libpod/define" - "github.com/containers/podman/v6/pkg/api/handlers/utils" - api "github.com/containers/podman/v6/pkg/api/types" + "go.podman.io/podman/v6/libpod" + "go.podman.io/podman/v6/libpod/define" + "go.podman.io/podman/v6/pkg/api/handlers/utils" + api "go.podman.io/podman/v6/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 ff93ec24dc..39b728182e 100644 --- a/pkg/api/handlers/compat/containers.go +++ b/pkg/api/handlers/compat/containers.go @@ -14,18 +14,6 @@ import ( "syscall" "time" - "github.com/containers/podman/v6/libpod" - "github.com/containers/podman/v6/libpod/define" - "github.com/containers/podman/v6/pkg/api/handlers" - "github.com/containers/podman/v6/pkg/api/handlers/utils" - api "github.com/containers/podman/v6/pkg/api/types" - "github.com/containers/podman/v6/pkg/domain/entities" - "github.com/containers/podman/v6/pkg/domain/filters" - "github.com/containers/podman/v6/pkg/domain/infra/abi" - "github.com/containers/podman/v6/pkg/ps" - "github.com/containers/podman/v6/pkg/signal" - "github.com/containers/podman/v6/pkg/specgenutil" - "github.com/containers/podman/v6/pkg/util" "github.com/docker/go-connections/nat" "github.com/docker/go-units" "github.com/moby/moby/api/types/container" @@ -33,6 +21,18 @@ import ( "github.com/moby/moby/api/types/storage" spec "github.com/opencontainers/runtime-spec/specs-go" "github.com/sirupsen/logrus" + "go.podman.io/podman/v6/libpod" + "go.podman.io/podman/v6/libpod/define" + "go.podman.io/podman/v6/pkg/api/handlers" + "go.podman.io/podman/v6/pkg/api/handlers/utils" + api "go.podman.io/podman/v6/pkg/api/types" + "go.podman.io/podman/v6/pkg/domain/entities" + "go.podman.io/podman/v6/pkg/domain/filters" + "go.podman.io/podman/v6/pkg/domain/infra/abi" + "go.podman.io/podman/v6/pkg/ps" + "go.podman.io/podman/v6/pkg/signal" + "go.podman.io/podman/v6/pkg/specgenutil" + "go.podman.io/podman/v6/pkg/util" ) func RemoveContainer(w http.ResponseWriter, r *http.Request) { diff --git a/pkg/api/handlers/compat/containers_archive.go b/pkg/api/handlers/compat/containers_archive.go index 4c9f321e91..f5ceade63c 100644 --- a/pkg/api/handlers/compat/containers_archive.go +++ b/pkg/api/handlers/compat/containers_archive.go @@ -10,15 +10,15 @@ import ( "os" "strings" - "github.com/containers/podman/v6/libpod" - "github.com/containers/podman/v6/libpod/define" - "github.com/containers/podman/v6/pkg/api/handlers/utils" - api "github.com/containers/podman/v6/pkg/api/types" - "github.com/containers/podman/v6/pkg/copy" - "github.com/containers/podman/v6/pkg/domain/entities" - "github.com/containers/podman/v6/pkg/domain/infra/abi" "github.com/gorilla/schema" "github.com/sirupsen/logrus" + "go.podman.io/podman/v6/libpod" + "go.podman.io/podman/v6/libpod/define" + "go.podman.io/podman/v6/pkg/api/handlers/utils" + api "go.podman.io/podman/v6/pkg/api/types" + "go.podman.io/podman/v6/pkg/copy" + "go.podman.io/podman/v6/pkg/domain/entities" + "go.podman.io/podman/v6/pkg/domain/infra/abi" ) func Archive(w http.ResponseWriter, r *http.Request) { diff --git a/pkg/api/handlers/compat/containers_attach.go b/pkg/api/handlers/compat/containers_attach.go index 755d94d249..c870462074 100644 --- a/pkg/api/handlers/compat/containers_attach.go +++ b/pkg/api/handlers/compat/containers_attach.go @@ -6,11 +6,11 @@ import ( "errors" "net/http" - "github.com/containers/podman/v6/libpod" - "github.com/containers/podman/v6/pkg/api/handlers/utils" - "github.com/containers/podman/v6/pkg/api/server/idle" - api "github.com/containers/podman/v6/pkg/api/types" "github.com/sirupsen/logrus" + "go.podman.io/podman/v6/libpod" + "go.podman.io/podman/v6/pkg/api/handlers/utils" + "go.podman.io/podman/v6/pkg/api/server/idle" + api "go.podman.io/podman/v6/pkg/api/types" ) func AttachContainer(w http.ResponseWriter, r *http.Request) { diff --git a/pkg/api/handlers/compat/containers_create.go b/pkg/api/handlers/compat/containers_create.go index afad135f0d..f181b8c6db 100644 --- a/pkg/api/handlers/compat/containers_create.go +++ b/pkg/api/handlers/compat/containers_create.go @@ -13,21 +13,21 @@ import ( "strconv" "strings" - "github.com/containers/podman/v6/libpod" - "github.com/containers/podman/v6/libpod/define" - "github.com/containers/podman/v6/pkg/api/handlers" - "github.com/containers/podman/v6/pkg/api/handlers/utils" - api "github.com/containers/podman/v6/pkg/api/types" - "github.com/containers/podman/v6/pkg/domain/entities" - "github.com/containers/podman/v6/pkg/domain/infra/abi" - "github.com/containers/podman/v6/pkg/rootless" - "github.com/containers/podman/v6/pkg/specgen" - "github.com/containers/podman/v6/pkg/specgenutil" "github.com/moby/moby/api/types/mount" "go.podman.io/buildah/pkg/parse" "go.podman.io/common/libimage" "go.podman.io/common/libnetwork/types" "go.podman.io/common/pkg/config" + "go.podman.io/podman/v6/libpod" + "go.podman.io/podman/v6/libpod/define" + "go.podman.io/podman/v6/pkg/api/handlers" + "go.podman.io/podman/v6/pkg/api/handlers/utils" + api "go.podman.io/podman/v6/pkg/api/types" + "go.podman.io/podman/v6/pkg/domain/entities" + "go.podman.io/podman/v6/pkg/domain/infra/abi" + "go.podman.io/podman/v6/pkg/rootless" + "go.podman.io/podman/v6/pkg/specgen" + "go.podman.io/podman/v6/pkg/specgenutil" "go.podman.io/storage" "go.podman.io/storage/pkg/fileutils" ) diff --git a/pkg/api/handlers/compat/containers_export.go b/pkg/api/handlers/compat/containers_export.go index e522622026..70f846b68b 100644 --- a/pkg/api/handlers/compat/containers_export.go +++ b/pkg/api/handlers/compat/containers_export.go @@ -6,9 +6,9 @@ import ( "fmt" "net/http" - "github.com/containers/podman/v6/libpod" - "github.com/containers/podman/v6/pkg/api/handlers/utils" - api "github.com/containers/podman/v6/pkg/api/types" + "go.podman.io/podman/v6/libpod" + "go.podman.io/podman/v6/pkg/api/handlers/utils" + api "go.podman.io/podman/v6/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 3da73b275b..f80d2ff579 100644 --- a/pkg/api/handlers/compat/containers_logs.go +++ b/pkg/api/handlers/compat/containers_logs.go @@ -12,12 +12,12 @@ import ( "sync" "time" - "github.com/containers/podman/v6/libpod" - "github.com/containers/podman/v6/libpod/logs" - "github.com/containers/podman/v6/pkg/api/handlers/utils" - api "github.com/containers/podman/v6/pkg/api/types" - "github.com/containers/podman/v6/pkg/util" log "github.com/sirupsen/logrus" + "go.podman.io/podman/v6/libpod" + "go.podman.io/podman/v6/libpod/logs" + "go.podman.io/podman/v6/pkg/api/handlers/utils" + api "go.podman.io/podman/v6/pkg/api/types" + "go.podman.io/podman/v6/pkg/util" ) func LogsFromContainer(w http.ResponseWriter, r *http.Request) { diff --git a/pkg/api/handlers/compat/containers_pause.go b/pkg/api/handlers/compat/containers_pause.go index be80852963..43c4e39216 100644 --- a/pkg/api/handlers/compat/containers_pause.go +++ b/pkg/api/handlers/compat/containers_pause.go @@ -5,9 +5,9 @@ package compat import ( "net/http" - "github.com/containers/podman/v6/libpod" - "github.com/containers/podman/v6/pkg/api/handlers/utils" - api "github.com/containers/podman/v6/pkg/api/types" + "go.podman.io/podman/v6/libpod" + "go.podman.io/podman/v6/pkg/api/handlers/utils" + api "go.podman.io/podman/v6/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 5f8d4b82eb..a31a5579fb 100644 --- a/pkg/api/handlers/compat/containers_prune.go +++ b/pkg/api/handlers/compat/containers_prune.go @@ -8,13 +8,13 @@ import ( "fmt" "net/http" - "github.com/containers/podman/v6/libpod" - "github.com/containers/podman/v6/pkg/api/handlers" - "github.com/containers/podman/v6/pkg/api/handlers/utils" - api "github.com/containers/podman/v6/pkg/api/types" - "github.com/containers/podman/v6/pkg/domain/entities/reports" - "github.com/containers/podman/v6/pkg/domain/filters" - "github.com/containers/podman/v6/pkg/util" + "go.podman.io/podman/v6/libpod" + "go.podman.io/podman/v6/pkg/api/handlers" + "go.podman.io/podman/v6/pkg/api/handlers/utils" + api "go.podman.io/podman/v6/pkg/api/types" + "go.podman.io/podman/v6/pkg/domain/entities/reports" + "go.podman.io/podman/v6/pkg/domain/filters" + "go.podman.io/podman/v6/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 12526a1b74..830878eac8 100644 --- a/pkg/api/handlers/compat/containers_restart.go +++ b/pkg/api/handlers/compat/containers_restart.go @@ -7,12 +7,12 @@ import ( "fmt" "net/http" - "github.com/containers/podman/v6/libpod" - "github.com/containers/podman/v6/libpod/define" - "github.com/containers/podman/v6/pkg/api/handlers/utils" - api "github.com/containers/podman/v6/pkg/api/types" - "github.com/containers/podman/v6/pkg/domain/entities" - "github.com/containers/podman/v6/pkg/domain/infra/abi" + "go.podman.io/podman/v6/libpod" + "go.podman.io/podman/v6/libpod/define" + "go.podman.io/podman/v6/pkg/api/handlers/utils" + api "go.podman.io/podman/v6/pkg/api/types" + "go.podman.io/podman/v6/pkg/domain/entities" + "go.podman.io/podman/v6/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 2c2b952fbf..d0e1c5a616 100644 --- a/pkg/api/handlers/compat/containers_start.go +++ b/pkg/api/handlers/compat/containers_start.go @@ -6,12 +6,12 @@ import ( "errors" "net/http" - api "github.com/containers/podman/v6/pkg/api/types" "github.com/sirupsen/logrus" + api "go.podman.io/podman/v6/pkg/api/types" - "github.com/containers/podman/v6/libpod" - "github.com/containers/podman/v6/libpod/define" - "github.com/containers/podman/v6/pkg/api/handlers/utils" + "go.podman.io/podman/v6/libpod" + "go.podman.io/podman/v6/libpod/define" + "go.podman.io/podman/v6/pkg/api/handlers/utils" ) func StartContainer(w http.ResponseWriter, r *http.Request) { diff --git a/pkg/api/handlers/compat/containers_stats.go b/pkg/api/handlers/compat/containers_stats.go index e11405e49b..95e158b75b 100644 --- a/pkg/api/handlers/compat/containers_stats.go +++ b/pkg/api/handlers/compat/containers_stats.go @@ -8,11 +8,11 @@ import ( "net/http" "time" - "github.com/containers/podman/v6/libpod" - "github.com/containers/podman/v6/libpod/define" - "github.com/containers/podman/v6/pkg/api/handlers/utils" - api "github.com/containers/podman/v6/pkg/api/types" "github.com/sirupsen/logrus" + "go.podman.io/podman/v6/libpod" + "go.podman.io/podman/v6/libpod/define" + "go.podman.io/podman/v6/pkg/api/handlers/utils" + api "go.podman.io/podman/v6/pkg/api/types" ) const defaultStatsPeriod = 5 * time.Second diff --git a/pkg/api/handlers/compat/containers_stats_freebsd.go b/pkg/api/handlers/compat/containers_stats_freebsd.go index 26f0a414fd..abf676ea0a 100644 --- a/pkg/api/handlers/compat/containers_stats_freebsd.go +++ b/pkg/api/handlers/compat/containers_stats_freebsd.go @@ -5,9 +5,9 @@ package compat import ( "time" - "github.com/containers/podman/v6/libpod" - "github.com/containers/podman/v6/libpod/define" "github.com/moby/moby/api/types/container" + "go.podman.io/podman/v6/libpod" + "go.podman.io/podman/v6/libpod/define" ) func getPreCPUStats(stats *define.ContainerStats) CPUStats { diff --git a/pkg/api/handlers/compat/containers_stats_linux.go b/pkg/api/handlers/compat/containers_stats_linux.go index 9f9f15cccb..e6309f9b18 100644 --- a/pkg/api/handlers/compat/containers_stats_linux.go +++ b/pkg/api/handlers/compat/containers_stats_linux.go @@ -6,12 +6,12 @@ import ( "encoding/json" "time" - "github.com/containers/podman/v6/libpod" - "github.com/containers/podman/v6/libpod/define" "github.com/moby/moby/api/types/container" runccgroups "github.com/opencontainers/cgroups" "github.com/sirupsen/logrus" "go.podman.io/common/pkg/cgroups" + "go.podman.io/podman/v6/libpod" + "go.podman.io/podman/v6/libpod/define" "go.podman.io/storage/pkg/system" ) diff --git a/pkg/api/handlers/compat/containers_stop.go b/pkg/api/handlers/compat/containers_stop.go index 6ffdce468c..0e14596f4e 100644 --- a/pkg/api/handlers/compat/containers_stop.go +++ b/pkg/api/handlers/compat/containers_stop.go @@ -7,13 +7,13 @@ import ( "fmt" "net/http" - "github.com/containers/podman/v6/libpod" - "github.com/containers/podman/v6/libpod/define" - "github.com/containers/podman/v6/pkg/api/handlers/utils" - api "github.com/containers/podman/v6/pkg/api/types" - "github.com/containers/podman/v6/pkg/domain/entities" - "github.com/containers/podman/v6/pkg/domain/infra/abi" - "github.com/containers/podman/v6/pkg/util" + "go.podman.io/podman/v6/libpod" + "go.podman.io/podman/v6/libpod/define" + "go.podman.io/podman/v6/pkg/api/handlers/utils" + api "go.podman.io/podman/v6/pkg/api/types" + "go.podman.io/podman/v6/pkg/domain/entities" + "go.podman.io/podman/v6/pkg/domain/infra/abi" + "go.podman.io/podman/v6/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 cdbfb03ef2..bb41776aca 100644 --- a/pkg/api/handlers/compat/containers_top.go +++ b/pkg/api/handlers/compat/containers_top.go @@ -9,11 +9,11 @@ import ( "strings" "time" - "github.com/containers/podman/v6/libpod" - "github.com/containers/podman/v6/pkg/api/handlers" - "github.com/containers/podman/v6/pkg/api/handlers/utils" - api "github.com/containers/podman/v6/pkg/api/types" "github.com/sirupsen/logrus" + "go.podman.io/podman/v6/libpod" + "go.podman.io/podman/v6/pkg/api/handlers" + "go.podman.io/podman/v6/pkg/api/handlers/utils" + api "go.podman.io/podman/v6/pkg/api/types" ) func TopContainer(w http.ResponseWriter, r *http.Request) { diff --git a/pkg/api/handlers/compat/containers_unpause.go b/pkg/api/handlers/compat/containers_unpause.go index 0a1b069a81..55570cb320 100644 --- a/pkg/api/handlers/compat/containers_unpause.go +++ b/pkg/api/handlers/compat/containers_unpause.go @@ -5,9 +5,9 @@ package compat import ( "net/http" - "github.com/containers/podman/v6/libpod" - "github.com/containers/podman/v6/pkg/api/handlers/utils" - api "github.com/containers/podman/v6/pkg/api/types" + "go.podman.io/podman/v6/libpod" + "go.podman.io/podman/v6/pkg/api/handlers/utils" + api "go.podman.io/podman/v6/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 b62aa9d86a..6bb506bd2b 100644 --- a/pkg/api/handlers/compat/events.go +++ b/pkg/api/handlers/compat/events.go @@ -6,15 +6,15 @@ import ( "fmt" "net/http" - "github.com/containers/podman/v6/libpod" - "github.com/containers/podman/v6/libpod/events" - "github.com/containers/podman/v6/pkg/api/handlers/utils" - "github.com/containers/podman/v6/pkg/api/handlers/utils/apiutil" - api "github.com/containers/podman/v6/pkg/api/types" - "github.com/containers/podman/v6/pkg/domain/entities" - "github.com/containers/podman/v6/pkg/util" jsoniter "github.com/json-iterator/go" "github.com/sirupsen/logrus" + "go.podman.io/podman/v6/libpod" + "go.podman.io/podman/v6/libpod/events" + "go.podman.io/podman/v6/pkg/api/handlers/utils" + "go.podman.io/podman/v6/pkg/api/handlers/utils/apiutil" + api "go.podman.io/podman/v6/pkg/api/types" + "go.podman.io/podman/v6/pkg/domain/entities" + "go.podman.io/podman/v6/pkg/util" ) // GetEvents endpoint serves both the docker-compatible one and the new libpod one diff --git a/pkg/api/handlers/compat/exec.go b/pkg/api/handlers/compat/exec.go index 7fd116a4ea..61241e2fe7 100644 --- a/pkg/api/handlers/compat/exec.go +++ b/pkg/api/handlers/compat/exec.go @@ -9,18 +9,18 @@ import ( "net/http" "strings" - "github.com/containers/podman/v6/libpod" - "github.com/containers/podman/v6/libpod/define" - "github.com/containers/podman/v6/pkg/api/handlers" - "github.com/containers/podman/v6/pkg/api/handlers/utils" - "github.com/containers/podman/v6/pkg/api/server/idle" - api "github.com/containers/podman/v6/pkg/api/types" - "github.com/containers/podman/v6/pkg/domain/entities" - "github.com/containers/podman/v6/pkg/specgenutil" - "github.com/containers/podman/v6/pkg/util" "github.com/gorilla/mux" "github.com/sirupsen/logrus" "go.podman.io/common/pkg/resize" + "go.podman.io/podman/v6/libpod" + "go.podman.io/podman/v6/libpod/define" + "go.podman.io/podman/v6/pkg/api/handlers" + "go.podman.io/podman/v6/pkg/api/handlers/utils" + "go.podman.io/podman/v6/pkg/api/server/idle" + api "go.podman.io/podman/v6/pkg/api/types" + "go.podman.io/podman/v6/pkg/domain/entities" + "go.podman.io/podman/v6/pkg/specgenutil" + "go.podman.io/podman/v6/pkg/util" ) // ExecCreateHandler creates an exec session for a given container. diff --git a/pkg/api/handlers/compat/images.go b/pkg/api/handlers/compat/images.go index f98ca2b3c9..eb879a522a 100644 --- a/pkg/api/handlers/compat/images.go +++ b/pkg/api/handlers/compat/images.go @@ -11,15 +11,6 @@ import ( "strings" "time" - "github.com/containers/podman/v6/libpod" - "github.com/containers/podman/v6/pkg/api/handlers" - "github.com/containers/podman/v6/pkg/api/handlers/utils" - "github.com/containers/podman/v6/pkg/api/handlers/utils/apiutil" - api "github.com/containers/podman/v6/pkg/api/types" - "github.com/containers/podman/v6/pkg/auth" - "github.com/containers/podman/v6/pkg/domain/entities" - "github.com/containers/podman/v6/pkg/domain/infra/abi" - "github.com/containers/podman/v6/pkg/util" dockerSpec "github.com/moby/docker-image-spec/specs-go/v1" dockerContainer "github.com/moby/moby/api/types/container" dockerImage "github.com/moby/moby/api/types/image" @@ -32,6 +23,15 @@ import ( "go.podman.io/common/pkg/config" "go.podman.io/common/pkg/filters" "go.podman.io/image/v5/manifest" + "go.podman.io/podman/v6/libpod" + "go.podman.io/podman/v6/pkg/api/handlers" + "go.podman.io/podman/v6/pkg/api/handlers/utils" + "go.podman.io/podman/v6/pkg/api/handlers/utils/apiutil" + api "go.podman.io/podman/v6/pkg/api/types" + "go.podman.io/podman/v6/pkg/auth" + "go.podman.io/podman/v6/pkg/domain/entities" + "go.podman.io/podman/v6/pkg/domain/infra/abi" + "go.podman.io/podman/v6/pkg/util" "go.podman.io/storage" ) diff --git a/pkg/api/handlers/compat/images_build.go b/pkg/api/handlers/compat/images_build.go index 7c498ab84c..2724200bf0 100644 --- a/pkg/api/handlers/compat/images_build.go +++ b/pkg/api/handlers/compat/images_build.go @@ -18,14 +18,6 @@ import ( "syscall" "time" - "github.com/containers/podman/v6/internal/localapi" - "github.com/containers/podman/v6/libpod" - "github.com/containers/podman/v6/pkg/api/handlers/utils" - api "github.com/containers/podman/v6/pkg/api/types" - "github.com/containers/podman/v6/pkg/auth" - "github.com/containers/podman/v6/pkg/channel" - "github.com/containers/podman/v6/pkg/rootless" - "github.com/containers/podman/v6/pkg/util" "github.com/opencontainers/runtime-spec/specs-go" "github.com/sirupsen/logrus" "go.podman.io/buildah" @@ -34,6 +26,14 @@ import ( "go.podman.io/common/pkg/config" "go.podman.io/image/v5/docker/reference" "go.podman.io/image/v5/types" + "go.podman.io/podman/v6/internal/localapi" + "go.podman.io/podman/v6/libpod" + "go.podman.io/podman/v6/pkg/api/handlers/utils" + api "go.podman.io/podman/v6/pkg/api/types" + "go.podman.io/podman/v6/pkg/auth" + "go.podman.io/podman/v6/pkg/channel" + "go.podman.io/podman/v6/pkg/rootless" + "go.podman.io/podman/v6/pkg/util" "go.podman.io/storage/pkg/archive" "go.podman.io/storage/pkg/chrootarchive" "go.podman.io/storage/pkg/fileutils" diff --git a/pkg/api/handlers/compat/images_history.go b/pkg/api/handlers/compat/images_history.go index 88d293c186..db89a7feb3 100644 --- a/pkg/api/handlers/compat/images_history.go +++ b/pkg/api/handlers/compat/images_history.go @@ -6,10 +6,10 @@ import ( "fmt" "net/http" - "github.com/containers/podman/v6/libpod" - "github.com/containers/podman/v6/pkg/api/handlers" - "github.com/containers/podman/v6/pkg/api/handlers/utils" - api "github.com/containers/podman/v6/pkg/api/types" + "go.podman.io/podman/v6/libpod" + "go.podman.io/podman/v6/pkg/api/handlers" + "go.podman.io/podman/v6/pkg/api/handlers/utils" + api "go.podman.io/podman/v6/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 d9ed1a7c17..459125c018 100644 --- a/pkg/api/handlers/compat/images_prune.go +++ b/pkg/api/handlers/compat/images_prune.go @@ -8,14 +8,14 @@ import ( "fmt" "net/http" - "github.com/containers/podman/v6/libpod" - "github.com/containers/podman/v6/pkg/api/handlers" - "github.com/containers/podman/v6/pkg/api/handlers/utils" - api "github.com/containers/podman/v6/pkg/api/types" - "github.com/containers/podman/v6/pkg/domain/entities" - "github.com/containers/podman/v6/pkg/domain/infra/abi" - "github.com/containers/podman/v6/pkg/util" dockerImage "github.com/moby/moby/api/types/image" + "go.podman.io/podman/v6/libpod" + "go.podman.io/podman/v6/pkg/api/handlers" + "go.podman.io/podman/v6/pkg/api/handlers/utils" + api "go.podman.io/podman/v6/pkg/api/types" + "go.podman.io/podman/v6/pkg/domain/entities" + "go.podman.io/podman/v6/pkg/domain/infra/abi" + "go.podman.io/podman/v6/pkg/util" ) func PruneImages(w http.ResponseWriter, r *http.Request) { diff --git a/pkg/api/handlers/compat/images_push.go b/pkg/api/handlers/compat/images_push.go index a5e63383f7..8031f2ab6f 100644 --- a/pkg/api/handlers/compat/images_push.go +++ b/pkg/api/handlers/compat/images_push.go @@ -9,17 +9,17 @@ import ( "net/http" "strings" - "github.com/containers/podman/v6/libpod" - handlers "github.com/containers/podman/v6/pkg/api/handlers" - "github.com/containers/podman/v6/pkg/api/handlers/utils" - "github.com/containers/podman/v6/pkg/api/handlers/utils/apiutil" - api "github.com/containers/podman/v6/pkg/api/types" - "github.com/containers/podman/v6/pkg/auth" - "github.com/containers/podman/v6/pkg/domain/entities" - "github.com/containers/podman/v6/pkg/domain/infra/abi" "github.com/moby/moby/api/types/jsonstream" "github.com/sirupsen/logrus" "go.podman.io/image/v5/types" + "go.podman.io/podman/v6/libpod" + handlers "go.podman.io/podman/v6/pkg/api/handlers" + "go.podman.io/podman/v6/pkg/api/handlers/utils" + "go.podman.io/podman/v6/pkg/api/handlers/utils/apiutil" + api "go.podman.io/podman/v6/pkg/api/types" + "go.podman.io/podman/v6/pkg/auth" + "go.podman.io/podman/v6/pkg/domain/entities" + "go.podman.io/podman/v6/pkg/domain/infra/abi" "go.podman.io/storage" ) diff --git a/pkg/api/handlers/compat/images_remove.go b/pkg/api/handlers/compat/images_remove.go index dc36c2aaf1..671da2bb2c 100644 --- a/pkg/api/handlers/compat/images_remove.go +++ b/pkg/api/handlers/compat/images_remove.go @@ -7,12 +7,12 @@ import ( "fmt" "net/http" - "github.com/containers/podman/v6/libpod" - "github.com/containers/podman/v6/libpod/define" - "github.com/containers/podman/v6/pkg/api/handlers/utils" - api "github.com/containers/podman/v6/pkg/api/types" - "github.com/containers/podman/v6/pkg/domain/entities" - "github.com/containers/podman/v6/pkg/domain/infra/abi" + "go.podman.io/podman/v6/libpod" + "go.podman.io/podman/v6/libpod/define" + "go.podman.io/podman/v6/pkg/api/handlers/utils" + api "go.podman.io/podman/v6/pkg/api/types" + "go.podman.io/podman/v6/pkg/domain/entities" + "go.podman.io/podman/v6/pkg/domain/infra/abi" "go.podman.io/storage" ) diff --git a/pkg/api/handlers/compat/images_search.go b/pkg/api/handlers/compat/images_search.go index dd0c1bb551..d7453f7358 100644 --- a/pkg/api/handlers/compat/images_search.go +++ b/pkg/api/handlers/compat/images_search.go @@ -6,13 +6,13 @@ import ( "fmt" "net/http" - "github.com/containers/podman/v6/libpod" - "github.com/containers/podman/v6/pkg/api/handlers/utils" - api "github.com/containers/podman/v6/pkg/api/types" - "github.com/containers/podman/v6/pkg/auth" - "github.com/containers/podman/v6/pkg/domain/entities" - "github.com/containers/podman/v6/pkg/domain/infra/abi" "go.podman.io/image/v5/types" + "go.podman.io/podman/v6/libpod" + "go.podman.io/podman/v6/pkg/api/handlers/utils" + api "go.podman.io/podman/v6/pkg/api/types" + "go.podman.io/podman/v6/pkg/auth" + "go.podman.io/podman/v6/pkg/domain/entities" + "go.podman.io/podman/v6/pkg/domain/infra/abi" "go.podman.io/storage" ) diff --git a/pkg/api/handlers/compat/images_tag.go b/pkg/api/handlers/compat/images_tag.go index 10953f34fd..de25fe699c 100644 --- a/pkg/api/handlers/compat/images_tag.go +++ b/pkg/api/handlers/compat/images_tag.go @@ -7,10 +7,10 @@ import ( "fmt" "net/http" - "github.com/containers/podman/v6/libpod" - "github.com/containers/podman/v6/pkg/api/handlers/utils" - api "github.com/containers/podman/v6/pkg/api/types" "go.podman.io/common/libimage" + "go.podman.io/podman/v6/libpod" + "go.podman.io/podman/v6/pkg/api/handlers/utils" + api "go.podman.io/podman/v6/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 57e6097923..5ef43badd5 100644 --- a/pkg/api/handlers/compat/info.go +++ b/pkg/api/handlers/compat/info.go @@ -11,12 +11,6 @@ import ( "strings" "time" - "github.com/containers/podman/v6/libpod" - "github.com/containers/podman/v6/libpod/define" - "github.com/containers/podman/v6/pkg/api/handlers" - "github.com/containers/podman/v6/pkg/api/handlers/utils" - api "github.com/containers/podman/v6/pkg/api/types" - "github.com/containers/podman/v6/pkg/rootless" "github.com/google/uuid" "github.com/moby/moby/api/types/registry" "github.com/moby/moby/api/types/swarm" @@ -26,6 +20,12 @@ import ( "go.podman.io/common/pkg/config" "go.podman.io/common/pkg/sysinfo" "go.podman.io/image/v5/pkg/sysregistriesv2" + "go.podman.io/podman/v6/libpod" + "go.podman.io/podman/v6/libpod/define" + "go.podman.io/podman/v6/pkg/api/handlers" + "go.podman.io/podman/v6/pkg/api/handlers/utils" + api "go.podman.io/podman/v6/pkg/api/types" + "go.podman.io/podman/v6/pkg/rootless" ) func GetInfo(w http.ResponseWriter, r *http.Request) { diff --git a/pkg/api/handlers/compat/networks.go b/pkg/api/handlers/compat/networks.go index 71f88ca07f..a072426a06 100644 --- a/pkg/api/handlers/compat/networks.go +++ b/pkg/api/handlers/compat/networks.go @@ -10,15 +10,15 @@ import ( "net/http" "net/netip" - "github.com/containers/podman/v6/libpod" - "github.com/containers/podman/v6/libpod/define" - "github.com/containers/podman/v6/pkg/api/handlers/utils" - api "github.com/containers/podman/v6/pkg/api/types" - "github.com/containers/podman/v6/pkg/domain/entities" - "github.com/containers/podman/v6/pkg/domain/infra/abi" - "github.com/containers/podman/v6/pkg/util" nettypes "go.podman.io/common/libnetwork/types" netutil "go.podman.io/common/libnetwork/util" + "go.podman.io/podman/v6/libpod" + "go.podman.io/podman/v6/libpod/define" + "go.podman.io/podman/v6/pkg/api/handlers/utils" + api "go.podman.io/podman/v6/pkg/api/types" + "go.podman.io/podman/v6/pkg/domain/entities" + "go.podman.io/podman/v6/pkg/domain/infra/abi" + "go.podman.io/podman/v6/pkg/util" dockerNetwork "github.com/moby/moby/api/types/network" "github.com/sirupsen/logrus" diff --git a/pkg/api/handlers/compat/resize.go b/pkg/api/handlers/compat/resize.go index 729c71b75f..0147e2c1f9 100644 --- a/pkg/api/handlers/compat/resize.go +++ b/pkg/api/handlers/compat/resize.go @@ -8,12 +8,12 @@ import ( "net/http" "strings" - "github.com/containers/podman/v6/libpod" - "github.com/containers/podman/v6/libpod/define" - "github.com/containers/podman/v6/pkg/api/handlers/utils" - api "github.com/containers/podman/v6/pkg/api/types" "github.com/gorilla/mux" "go.podman.io/common/pkg/resize" + "go.podman.io/podman/v6/libpod" + "go.podman.io/podman/v6/libpod/define" + "go.podman.io/podman/v6/pkg/api/handlers/utils" + api "go.podman.io/podman/v6/pkg/api/types" ) func ResizeTTY(w http.ResponseWriter, r *http.Request) { diff --git a/pkg/api/handlers/compat/secrets.go b/pkg/api/handlers/compat/secrets.go index 5aade50278..3bec29079e 100644 --- a/pkg/api/handlers/compat/secrets.go +++ b/pkg/api/handlers/compat/secrets.go @@ -11,12 +11,12 @@ import ( "net/http" "strings" - "github.com/containers/podman/v6/libpod" - "github.com/containers/podman/v6/pkg/api/handlers/utils" - api "github.com/containers/podman/v6/pkg/api/types" - "github.com/containers/podman/v6/pkg/domain/entities" - "github.com/containers/podman/v6/pkg/domain/infra/abi" - "github.com/containers/podman/v6/pkg/util" + "go.podman.io/podman/v6/libpod" + "go.podman.io/podman/v6/pkg/api/handlers/utils" + api "go.podman.io/podman/v6/pkg/api/types" + "go.podman.io/podman/v6/pkg/domain/entities" + "go.podman.io/podman/v6/pkg/domain/infra/abi" + "go.podman.io/podman/v6/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 da55eaf524..35b8a7e1ac 100644 --- a/pkg/api/handlers/compat/system.go +++ b/pkg/api/handlers/compat/system.go @@ -6,18 +6,18 @@ import ( "net/http" "strings" - "github.com/containers/podman/v6/libpod" - "github.com/containers/podman/v6/pkg/api/handlers" - "github.com/containers/podman/v6/pkg/api/handlers/utils" - "github.com/containers/podman/v6/pkg/api/handlers/utils/apiutil" - api "github.com/containers/podman/v6/pkg/api/types" - "github.com/containers/podman/v6/pkg/domain/entities" - "github.com/containers/podman/v6/pkg/domain/infra/abi" "github.com/moby/moby/api/types/build" dockerContainer "github.com/moby/moby/api/types/container" "github.com/moby/moby/api/types/image" dockerSystem "github.com/moby/moby/api/types/system" "github.com/moby/moby/api/types/volume" + "go.podman.io/podman/v6/libpod" + "go.podman.io/podman/v6/pkg/api/handlers" + "go.podman.io/podman/v6/pkg/api/handlers/utils" + "go.podman.io/podman/v6/pkg/api/handlers/utils/apiutil" + api "go.podman.io/podman/v6/pkg/api/types" + "go.podman.io/podman/v6/pkg/domain/entities" + "go.podman.io/podman/v6/pkg/domain/infra/abi" ) func GetDiskUsage(w http.ResponseWriter, r *http.Request) { diff --git a/pkg/api/handlers/compat/unsupported.go b/pkg/api/handlers/compat/unsupported.go index bed7ba6004..f36dcd9af6 100644 --- a/pkg/api/handlers/compat/unsupported.go +++ b/pkg/api/handlers/compat/unsupported.go @@ -6,9 +6,9 @@ import ( "fmt" "net/http" - "github.com/containers/podman/v6/pkg/api/handlers/utils" - "github.com/containers/podman/v6/pkg/errorhandling" log "github.com/sirupsen/logrus" + "go.podman.io/podman/v6/pkg/api/handlers/utils" + "go.podman.io/podman/v6/pkg/errorhandling" ) func UnsupportedHandler(w http.ResponseWriter, r *http.Request) { diff --git a/pkg/api/handlers/compat/version.go b/pkg/api/handlers/compat/version.go index c58dc6fa15..b71a88f97c 100644 --- a/pkg/api/handlers/compat/version.go +++ b/pkg/api/handlers/compat/version.go @@ -8,13 +8,13 @@ import ( goRuntime "runtime" "time" - "github.com/containers/podman/v6/libpod" - "github.com/containers/podman/v6/libpod/define" - "github.com/containers/podman/v6/pkg/api/handlers/utils" - api "github.com/containers/podman/v6/pkg/api/types" - "github.com/containers/podman/v6/pkg/domain/entities" - "github.com/containers/podman/v6/pkg/domain/entities/types" - "github.com/containers/podman/v6/version" + "go.podman.io/podman/v6/libpod" + "go.podman.io/podman/v6/libpod/define" + "go.podman.io/podman/v6/pkg/api/handlers/utils" + api "go.podman.io/podman/v6/pkg/api/types" + "go.podman.io/podman/v6/pkg/domain/entities" + "go.podman.io/podman/v6/pkg/domain/entities/types" + "go.podman.io/podman/v6/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 a3f2134877..9f65afdbf3 100644 --- a/pkg/api/handlers/compat/volumes.go +++ b/pkg/api/handlers/compat/volumes.go @@ -11,16 +11,16 @@ import ( "net/url" "time" - "github.com/containers/podman/v6/libpod" - "github.com/containers/podman/v6/libpod/define" - "github.com/containers/podman/v6/pkg/api/handlers" - "github.com/containers/podman/v6/pkg/api/handlers/utils" - api "github.com/containers/podman/v6/pkg/api/types" - "github.com/containers/podman/v6/pkg/domain/filters" - "github.com/containers/podman/v6/pkg/domain/infra/abi/parse" - "github.com/containers/podman/v6/pkg/util" "github.com/moby/moby/api/types/volume" "github.com/moby/moby/client" + "go.podman.io/podman/v6/libpod" + "go.podman.io/podman/v6/libpod/define" + "go.podman.io/podman/v6/pkg/api/handlers" + "go.podman.io/podman/v6/pkg/api/handlers/utils" + api "go.podman.io/podman/v6/pkg/api/types" + "go.podman.io/podman/v6/pkg/domain/filters" + "go.podman.io/podman/v6/pkg/domain/infra/abi/parse" + "go.podman.io/podman/v6/pkg/util" ) func ListVolumes(w http.ResponseWriter, r *http.Request) { diff --git a/pkg/api/handlers/decoder.go b/pkg/api/handlers/decoder.go index 385fb48724..3f46498f0b 100644 --- a/pkg/api/handlers/decoder.go +++ b/pkg/api/handlers/decoder.go @@ -10,11 +10,11 @@ import ( "syscall" "time" - "github.com/containers/podman/v6/libpod/define" - "github.com/containers/podman/v6/pkg/util" "github.com/gorilla/schema" "github.com/sirupsen/logrus" "go.podman.io/image/v5/types" + "go.podman.io/podman/v6/libpod/define" + "go.podman.io/podman/v6/pkg/util" ) // NewAPIDecoder returns a configured schema.Decoder diff --git a/pkg/api/handlers/grpc/noop.go b/pkg/api/handlers/grpc/noop.go index dbc561c79c..c7e4514a06 100644 --- a/pkg/api/handlers/grpc/noop.go +++ b/pkg/api/handlers/grpc/noop.go @@ -5,8 +5,8 @@ package grpc import ( "context" - "github.com/containers/podman/v6/libpod" - "github.com/containers/podman/v6/pkg/api/grpcpb" + "go.podman.io/podman/v6/libpod" + "go.podman.io/podman/v6/pkg/api/grpcpb" ) type noopServer struct { diff --git a/pkg/api/handlers/libpod/artifacts.go b/pkg/api/handlers/libpod/artifacts.go index 17e3669133..df8d89e464 100644 --- a/pkg/api/handlers/libpod/artifacts.go +++ b/pkg/api/handlers/libpod/artifacts.go @@ -9,19 +9,19 @@ import ( "net/http" "path/filepath" - "github.com/containers/podman/v6/internal/localapi" - "github.com/containers/podman/v6/libpod" - "github.com/containers/podman/v6/pkg/api/handlers/utils" - api "github.com/containers/podman/v6/pkg/api/types" - "github.com/containers/podman/v6/pkg/auth" - "github.com/containers/podman/v6/pkg/domain/entities" - "github.com/containers/podman/v6/pkg/domain/infra/abi" - domain_utils "github.com/containers/podman/v6/pkg/domain/utils" "github.com/docker/distribution/registry/api/errcode" "github.com/gorilla/schema" libartifact_types "go.podman.io/common/pkg/libartifact/types" "go.podman.io/image/v5/oci/layout" "go.podman.io/image/v5/types" + "go.podman.io/podman/v6/internal/localapi" + "go.podman.io/podman/v6/libpod" + "go.podman.io/podman/v6/pkg/api/handlers/utils" + api "go.podman.io/podman/v6/pkg/api/types" + "go.podman.io/podman/v6/pkg/auth" + "go.podman.io/podman/v6/pkg/domain/entities" + "go.podman.io/podman/v6/pkg/domain/infra/abi" + domain_utils "go.podman.io/podman/v6/pkg/domain/utils" ) func InspectArtifact(w http.ResponseWriter, r *http.Request) { diff --git a/pkg/api/handlers/libpod/containers.go b/pkg/api/handlers/libpod/containers.go index e47daf03f2..70def7b205 100644 --- a/pkg/api/handlers/libpod/containers.go +++ b/pkg/api/handlers/libpod/containers.go @@ -11,19 +11,19 @@ import ( "strconv" "strings" - "github.com/containers/podman/v6/libpod" - "github.com/containers/podman/v6/libpod/define" - "github.com/containers/podman/v6/pkg/api/handlers" - "github.com/containers/podman/v6/pkg/api/handlers/compat" - "github.com/containers/podman/v6/pkg/api/handlers/utils" - api "github.com/containers/podman/v6/pkg/api/types" - "github.com/containers/podman/v6/pkg/domain/entities" - "github.com/containers/podman/v6/pkg/domain/infra/abi" - "github.com/containers/podman/v6/pkg/specgenutil" - "github.com/containers/podman/v6/pkg/util" "github.com/gorilla/schema" "github.com/opencontainers/runtime-spec/specs-go" "github.com/sirupsen/logrus" + "go.podman.io/podman/v6/libpod" + "go.podman.io/podman/v6/libpod/define" + "go.podman.io/podman/v6/pkg/api/handlers" + "go.podman.io/podman/v6/pkg/api/handlers/compat" + "go.podman.io/podman/v6/pkg/api/handlers/utils" + api "go.podman.io/podman/v6/pkg/api/types" + "go.podman.io/podman/v6/pkg/domain/entities" + "go.podman.io/podman/v6/pkg/domain/infra/abi" + "go.podman.io/podman/v6/pkg/specgenutil" + "go.podman.io/podman/v6/pkg/util" ) func ContainerExists(w http.ResponseWriter, r *http.Request) { diff --git a/pkg/api/handlers/libpod/containers_create.go b/pkg/api/handlers/libpod/containers_create.go index 5588734551..a657644424 100644 --- a/pkg/api/handlers/libpod/containers_create.go +++ b/pkg/api/handlers/libpod/containers_create.go @@ -9,14 +9,14 @@ import ( "net/http" "strconv" - "github.com/containers/podman/v6/libpod" - "github.com/containers/podman/v6/libpod/define" - "github.com/containers/podman/v6/pkg/api/handlers/utils" - api "github.com/containers/podman/v6/pkg/api/types" - "github.com/containers/podman/v6/pkg/domain/entities" - "github.com/containers/podman/v6/pkg/specgen" - "github.com/containers/podman/v6/pkg/specgen/generate" - "github.com/containers/podman/v6/pkg/specgenutil" + "go.podman.io/podman/v6/libpod" + "go.podman.io/podman/v6/libpod/define" + "go.podman.io/podman/v6/pkg/api/handlers/utils" + api "go.podman.io/podman/v6/pkg/api/types" + "go.podman.io/podman/v6/pkg/domain/entities" + "go.podman.io/podman/v6/pkg/specgen" + "go.podman.io/podman/v6/pkg/specgen/generate" + "go.podman.io/podman/v6/pkg/specgenutil" "go.podman.io/storage" ) diff --git a/pkg/api/handlers/libpod/containers_stats.go b/pkg/api/handlers/libpod/containers_stats.go index f05258c51a..4ffed9b546 100644 --- a/pkg/api/handlers/libpod/containers_stats.go +++ b/pkg/api/handlers/libpod/containers_stats.go @@ -7,13 +7,13 @@ import ( "fmt" "net/http" - "github.com/containers/podman/v6/libpod" - "github.com/containers/podman/v6/pkg/api/handlers/utils" - api "github.com/containers/podman/v6/pkg/api/types" - "github.com/containers/podman/v6/pkg/domain/entities" - "github.com/containers/podman/v6/pkg/domain/infra/abi" "github.com/gorilla/schema" "github.com/sirupsen/logrus" + "go.podman.io/podman/v6/libpod" + "go.podman.io/podman/v6/pkg/api/handlers/utils" + api "go.podman.io/podman/v6/pkg/api/types" + "go.podman.io/podman/v6/pkg/domain/entities" + "go.podman.io/podman/v6/pkg/domain/infra/abi" ) func StatsContainer(w http.ResponseWriter, r *http.Request) { diff --git a/pkg/api/handlers/libpod/generate.go b/pkg/api/handlers/libpod/generate.go index 6aa7a278ba..f780e72023 100644 --- a/pkg/api/handlers/libpod/generate.go +++ b/pkg/api/handlers/libpod/generate.go @@ -6,13 +6,13 @@ import ( "fmt" "net/http" - "github.com/containers/podman/v6/libpod" - "github.com/containers/podman/v6/pkg/api/handlers/utils" - api "github.com/containers/podman/v6/pkg/api/types" - "github.com/containers/podman/v6/pkg/domain/entities" - "github.com/containers/podman/v6/pkg/domain/infra/abi" "github.com/gorilla/schema" "go.podman.io/common/pkg/config" + "go.podman.io/podman/v6/libpod" + "go.podman.io/podman/v6/pkg/api/handlers/utils" + api "go.podman.io/podman/v6/pkg/api/types" + "go.podman.io/podman/v6/pkg/domain/entities" + "go.podman.io/podman/v6/pkg/domain/infra/abi" ) func GenerateSystemd(w http.ResponseWriter, r *http.Request) { diff --git a/pkg/api/handlers/libpod/healthcheck.go b/pkg/api/handlers/libpod/healthcheck.go index 15cae70e05..659688837b 100644 --- a/pkg/api/handlers/libpod/healthcheck.go +++ b/pkg/api/handlers/libpod/healthcheck.go @@ -5,10 +5,10 @@ package libpod import ( "net/http" - "github.com/containers/podman/v6/libpod" - "github.com/containers/podman/v6/libpod/define" - "github.com/containers/podman/v6/pkg/api/handlers/utils" - api "github.com/containers/podman/v6/pkg/api/types" + "go.podman.io/podman/v6/libpod" + "go.podman.io/podman/v6/libpod/define" + "go.podman.io/podman/v6/pkg/api/handlers/utils" + api "go.podman.io/podman/v6/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 35801e62a0..c6e677132a 100644 --- a/pkg/api/handlers/libpod/images.go +++ b/pkg/api/handlers/libpod/images.go @@ -15,21 +15,6 @@ import ( "strconv" "strings" - "github.com/containers/podman/v6/internal/localapi" - "github.com/containers/podman/v6/libpod" - "github.com/containers/podman/v6/libpod/define" - "github.com/containers/podman/v6/pkg/api/handlers" - "github.com/containers/podman/v6/pkg/api/handlers/utils" - api "github.com/containers/podman/v6/pkg/api/types" - "github.com/containers/podman/v6/pkg/bindings/images" - "github.com/containers/podman/v6/pkg/channel" - "github.com/containers/podman/v6/pkg/domain/entities" - "github.com/containers/podman/v6/pkg/domain/entities/reports" - "github.com/containers/podman/v6/pkg/domain/infra/abi" - domainUtils "github.com/containers/podman/v6/pkg/domain/utils" - "github.com/containers/podman/v6/pkg/errorhandling" - "github.com/containers/podman/v6/pkg/util" - utils2 "github.com/containers/podman/v6/utils" "github.com/gorilla/schema" "github.com/moby/moby/api/types/jsonstream" "github.com/sirupsen/logrus" @@ -39,6 +24,21 @@ import ( "go.podman.io/image/v5/manifest" "go.podman.io/image/v5/pkg/shortnames" "go.podman.io/image/v5/types" + "go.podman.io/podman/v6/internal/localapi" + "go.podman.io/podman/v6/libpod" + "go.podman.io/podman/v6/libpod/define" + "go.podman.io/podman/v6/pkg/api/handlers" + "go.podman.io/podman/v6/pkg/api/handlers/utils" + api "go.podman.io/podman/v6/pkg/api/types" + "go.podman.io/podman/v6/pkg/bindings/images" + "go.podman.io/podman/v6/pkg/channel" + "go.podman.io/podman/v6/pkg/domain/entities" + "go.podman.io/podman/v6/pkg/domain/entities/reports" + "go.podman.io/podman/v6/pkg/domain/infra/abi" + domainUtils "go.podman.io/podman/v6/pkg/domain/utils" + "go.podman.io/podman/v6/pkg/errorhandling" + "go.podman.io/podman/v6/pkg/util" + utils2 "go.podman.io/podman/v6/utils" "go.podman.io/storage" "go.podman.io/storage/pkg/archive" "go.podman.io/storage/pkg/chrootarchive" diff --git a/pkg/api/handlers/libpod/images_pull.go b/pkg/api/handlers/libpod/images_pull.go index c18339a282..2a04ed12b1 100644 --- a/pkg/api/handlers/libpod/images_pull.go +++ b/pkg/api/handlers/libpod/images_pull.go @@ -10,17 +10,17 @@ import ( "net/http" "time" - "github.com/containers/podman/v6/libpod" - "github.com/containers/podman/v6/pkg/api/handlers/utils" - api "github.com/containers/podman/v6/pkg/api/types" - "github.com/containers/podman/v6/pkg/auth" - "github.com/containers/podman/v6/pkg/channel" - "github.com/containers/podman/v6/pkg/domain/entities" "github.com/gorilla/schema" "github.com/sirupsen/logrus" "go.podman.io/common/libimage" "go.podman.io/common/pkg/config" "go.podman.io/image/v5/types" + "go.podman.io/podman/v6/libpod" + "go.podman.io/podman/v6/pkg/api/handlers/utils" + api "go.podman.io/podman/v6/pkg/api/types" + "go.podman.io/podman/v6/pkg/auth" + "go.podman.io/podman/v6/pkg/channel" + "go.podman.io/podman/v6/pkg/domain/entities" ) // The duration for which we are willing to wait before starting the stream, to be able to decide the HTTP status code more accurately. diff --git a/pkg/api/handlers/libpod/images_push.go b/pkg/api/handlers/libpod/images_push.go index 744137a8b9..3b3fa8fa94 100644 --- a/pkg/api/handlers/libpod/images_push.go +++ b/pkg/api/handlers/libpod/images_push.go @@ -9,16 +9,16 @@ import ( "net/http" "strings" - "github.com/containers/podman/v6/libpod" - "github.com/containers/podman/v6/pkg/api/handlers/utils" - api "github.com/containers/podman/v6/pkg/api/types" - "github.com/containers/podman/v6/pkg/auth" - "github.com/containers/podman/v6/pkg/channel" - "github.com/containers/podman/v6/pkg/domain/entities" - "github.com/containers/podman/v6/pkg/domain/infra/abi" "github.com/gorilla/schema" "github.com/sirupsen/logrus" "go.podman.io/image/v5/types" + "go.podman.io/podman/v6/libpod" + "go.podman.io/podman/v6/pkg/api/handlers/utils" + api "go.podman.io/podman/v6/pkg/api/types" + "go.podman.io/podman/v6/pkg/auth" + "go.podman.io/podman/v6/pkg/channel" + "go.podman.io/podman/v6/pkg/domain/entities" + "go.podman.io/podman/v6/pkg/domain/infra/abi" ) // PushImage is the handler for the compat http endpoint for pushing images. diff --git a/pkg/api/handlers/libpod/info.go b/pkg/api/handlers/libpod/info.go index f3e8533d8d..77db47e4fc 100644 --- a/pkg/api/handlers/libpod/info.go +++ b/pkg/api/handlers/libpod/info.go @@ -5,10 +5,10 @@ package libpod import ( "net/http" - "github.com/containers/podman/v6/libpod" - "github.com/containers/podman/v6/pkg/api/handlers/utils" - api "github.com/containers/podman/v6/pkg/api/types" - "github.com/containers/podman/v6/pkg/domain/infra/abi" + "go.podman.io/podman/v6/libpod" + "go.podman.io/podman/v6/pkg/api/handlers/utils" + api "go.podman.io/podman/v6/pkg/api/types" + "go.podman.io/podman/v6/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 c750112a53..e2e99854e7 100644 --- a/pkg/api/handlers/libpod/kube.go +++ b/pkg/api/handlers/libpod/kube.go @@ -12,15 +12,15 @@ import ( "os" "path/filepath" - "github.com/containers/podman/v6/libpod" - "github.com/containers/podman/v6/pkg/api/handlers/utils" - api "github.com/containers/podman/v6/pkg/api/types" - "github.com/containers/podman/v6/pkg/auth" - "github.com/containers/podman/v6/pkg/domain/entities" - "github.com/containers/podman/v6/pkg/domain/infra/abi" "github.com/gorilla/schema" "github.com/sirupsen/logrus" "go.podman.io/image/v5/types" + "go.podman.io/podman/v6/libpod" + "go.podman.io/podman/v6/pkg/api/handlers/utils" + api "go.podman.io/podman/v6/pkg/api/types" + "go.podman.io/podman/v6/pkg/auth" + "go.podman.io/podman/v6/pkg/domain/entities" + "go.podman.io/podman/v6/pkg/domain/infra/abi" "go.podman.io/storage/pkg/chrootarchive" ) diff --git a/pkg/api/handlers/libpod/manifests.go b/pkg/api/handlers/libpod/manifests.go index 002b0521e8..f2cbc3da9d 100644 --- a/pkg/api/handlers/libpod/manifests.go +++ b/pkg/api/handlers/libpod/manifests.go @@ -18,23 +18,23 @@ import ( "strings" "sync" - "github.com/containers/podman/v6/libpod" - "github.com/containers/podman/v6/pkg/api/handlers" - "github.com/containers/podman/v6/pkg/api/handlers/utils" - "github.com/containers/podman/v6/pkg/api/handlers/utils/apiutil" - api "github.com/containers/podman/v6/pkg/api/types" - "github.com/containers/podman/v6/pkg/auth" - "github.com/containers/podman/v6/pkg/channel" - "github.com/containers/podman/v6/pkg/domain/entities" - "github.com/containers/podman/v6/pkg/domain/infra/abi" - domainUtils "github.com/containers/podman/v6/pkg/domain/utils" - "github.com/containers/podman/v6/pkg/errorhandling" "github.com/gorilla/mux" "github.com/gorilla/schema" "github.com/opencontainers/go-digest" "github.com/sirupsen/logrus" "go.podman.io/image/v5/docker/reference" "go.podman.io/image/v5/types" + "go.podman.io/podman/v6/libpod" + "go.podman.io/podman/v6/pkg/api/handlers" + "go.podman.io/podman/v6/pkg/api/handlers/utils" + "go.podman.io/podman/v6/pkg/api/handlers/utils/apiutil" + api "go.podman.io/podman/v6/pkg/api/types" + "go.podman.io/podman/v6/pkg/auth" + "go.podman.io/podman/v6/pkg/channel" + "go.podman.io/podman/v6/pkg/domain/entities" + "go.podman.io/podman/v6/pkg/domain/infra/abi" + domainUtils "go.podman.io/podman/v6/pkg/domain/utils" + "go.podman.io/podman/v6/pkg/errorhandling" ) func ManifestCreate(w http.ResponseWriter, r *http.Request) { diff --git a/pkg/api/handlers/libpod/networks.go b/pkg/api/handlers/libpod/networks.go index b72e9f26f1..4ce841c774 100644 --- a/pkg/api/handlers/libpod/networks.go +++ b/pkg/api/handlers/libpod/networks.go @@ -8,15 +8,15 @@ import ( "fmt" "net/http" - "github.com/containers/podman/v6/libpod" - "github.com/containers/podman/v6/libpod/define" - "github.com/containers/podman/v6/pkg/api/handlers/utils" - api "github.com/containers/podman/v6/pkg/api/types" - "github.com/containers/podman/v6/pkg/domain/entities" - "github.com/containers/podman/v6/pkg/domain/infra/abi" - "github.com/containers/podman/v6/pkg/util" "github.com/gorilla/schema" "go.podman.io/common/libnetwork/types" + "go.podman.io/podman/v6/libpod" + "go.podman.io/podman/v6/libpod/define" + "go.podman.io/podman/v6/pkg/api/handlers/utils" + api "go.podman.io/podman/v6/pkg/api/types" + "go.podman.io/podman/v6/pkg/domain/entities" + "go.podman.io/podman/v6/pkg/domain/infra/abi" + "go.podman.io/podman/v6/pkg/util" ) func CreateNetwork(w http.ResponseWriter, r *http.Request) { diff --git a/pkg/api/handlers/libpod/pods.go b/pkg/api/handlers/libpod/pods.go index e45cb57075..997e998353 100644 --- a/pkg/api/handlers/libpod/pods.go +++ b/pkg/api/handlers/libpod/pods.go @@ -10,20 +10,20 @@ import ( "strings" "time" - "github.com/containers/podman/v6/libpod" - "github.com/containers/podman/v6/libpod/define" - "github.com/containers/podman/v6/pkg/api/handlers" - "github.com/containers/podman/v6/pkg/api/handlers/utils" - api "github.com/containers/podman/v6/pkg/api/types" - "github.com/containers/podman/v6/pkg/domain/entities" - "github.com/containers/podman/v6/pkg/domain/infra/abi" - "github.com/containers/podman/v6/pkg/specgen" - "github.com/containers/podman/v6/pkg/specgen/generate" - "github.com/containers/podman/v6/pkg/specgenutil" - "github.com/containers/podman/v6/pkg/util" "github.com/gorilla/schema" "github.com/hashicorp/go-multierror" "github.com/sirupsen/logrus" + "go.podman.io/podman/v6/libpod" + "go.podman.io/podman/v6/libpod/define" + "go.podman.io/podman/v6/pkg/api/handlers" + "go.podman.io/podman/v6/pkg/api/handlers/utils" + api "go.podman.io/podman/v6/pkg/api/types" + "go.podman.io/podman/v6/pkg/domain/entities" + "go.podman.io/podman/v6/pkg/domain/infra/abi" + "go.podman.io/podman/v6/pkg/specgen" + "go.podman.io/podman/v6/pkg/specgen/generate" + "go.podman.io/podman/v6/pkg/specgenutil" + "go.podman.io/podman/v6/pkg/util" ) func PodCreate(w http.ResponseWriter, r *http.Request) { diff --git a/pkg/api/handlers/libpod/quadlets.go b/pkg/api/handlers/libpod/quadlets.go index f9087fa807..a54054ea15 100644 --- a/pkg/api/handlers/libpod/quadlets.go +++ b/pkg/api/handlers/libpod/quadlets.go @@ -11,16 +11,16 @@ import ( "path/filepath" "strings" - "github.com/containers/podman/v6/libpod" - "github.com/containers/podman/v6/libpod/define" - "github.com/containers/podman/v6/pkg/api/handlers/utils" - api "github.com/containers/podman/v6/pkg/api/types" - "github.com/containers/podman/v6/pkg/domain/entities" - "github.com/containers/podman/v6/pkg/domain/infra/abi" - "github.com/containers/podman/v6/pkg/systemd/quadlet" - "github.com/containers/podman/v6/pkg/util" "github.com/gorilla/schema" "github.com/sirupsen/logrus" + "go.podman.io/podman/v6/libpod" + "go.podman.io/podman/v6/libpod/define" + "go.podman.io/podman/v6/pkg/api/handlers/utils" + api "go.podman.io/podman/v6/pkg/api/types" + "go.podman.io/podman/v6/pkg/domain/entities" + "go.podman.io/podman/v6/pkg/domain/infra/abi" + "go.podman.io/podman/v6/pkg/systemd/quadlet" + "go.podman.io/podman/v6/pkg/util" "go.podman.io/storage/pkg/chrootarchive" ) diff --git a/pkg/api/handlers/libpod/secrets.go b/pkg/api/handlers/libpod/secrets.go index 046d6480db..12b343ab49 100644 --- a/pkg/api/handlers/libpod/secrets.go +++ b/pkg/api/handlers/libpod/secrets.go @@ -6,13 +6,13 @@ import ( "fmt" "net/http" - "github.com/containers/podman/v6/libpod" - "github.com/containers/podman/v6/pkg/api/handlers/utils" - api "github.com/containers/podman/v6/pkg/api/types" - "github.com/containers/podman/v6/pkg/domain/entities" - "github.com/containers/podman/v6/pkg/domain/infra/abi" "github.com/gorilla/schema" "go.podman.io/common/pkg/secrets" + "go.podman.io/podman/v6/libpod" + "go.podman.io/podman/v6/pkg/api/handlers/utils" + api "go.podman.io/podman/v6/pkg/api/types" + "go.podman.io/podman/v6/pkg/domain/entities" + "go.podman.io/podman/v6/pkg/domain/infra/abi" ) func CreateSecret(w http.ResponseWriter, r *http.Request) { diff --git a/pkg/api/handlers/libpod/swagger_spec.go b/pkg/api/handlers/libpod/swagger_spec.go index fec64ae96d..636c8e309c 100644 --- a/pkg/api/handlers/libpod/swagger_spec.go +++ b/pkg/api/handlers/libpod/swagger_spec.go @@ -8,7 +8,7 @@ import ( "net/http" "os" - "github.com/containers/podman/v6/pkg/api/handlers/utils" + "go.podman.io/podman/v6/pkg/api/handlers/utils" "go.podman.io/storage/pkg/fileutils" ) diff --git a/pkg/api/handlers/libpod/system.go b/pkg/api/handlers/libpod/system.go index ea7f7cb8f9..371e79487f 100644 --- a/pkg/api/handlers/libpod/system.go +++ b/pkg/api/handlers/libpod/system.go @@ -7,13 +7,13 @@ import ( "net/http" "time" - "github.com/containers/podman/v6/libpod" - "github.com/containers/podman/v6/pkg/api/handlers/utils" - api "github.com/containers/podman/v6/pkg/api/types" - "github.com/containers/podman/v6/pkg/domain/entities" - "github.com/containers/podman/v6/pkg/domain/infra/abi" - "github.com/containers/podman/v6/pkg/util" "github.com/gorilla/schema" + "go.podman.io/podman/v6/libpod" + "go.podman.io/podman/v6/pkg/api/handlers/utils" + api "go.podman.io/podman/v6/pkg/api/types" + "go.podman.io/podman/v6/pkg/domain/entities" + "go.podman.io/podman/v6/pkg/domain/infra/abi" + "go.podman.io/podman/v6/pkg/util" ) // SystemPrune removes unused data diff --git a/pkg/api/handlers/libpod/volumes.go b/pkg/api/handlers/libpod/volumes.go index f808278f31..b8b122a77b 100644 --- a/pkg/api/handlers/libpod/volumes.go +++ b/pkg/api/handlers/libpod/volumes.go @@ -10,17 +10,17 @@ import ( "net/http" "net/url" - "github.com/containers/podman/v6/libpod" - "github.com/containers/podman/v6/libpod/define" - "github.com/containers/podman/v6/pkg/api/handlers/utils" - api "github.com/containers/podman/v6/pkg/api/types" - "github.com/containers/podman/v6/pkg/domain/entities" - "github.com/containers/podman/v6/pkg/domain/entities/reports" - "github.com/containers/podman/v6/pkg/domain/filters" - "github.com/containers/podman/v6/pkg/domain/infra/abi" - "github.com/containers/podman/v6/pkg/domain/infra/abi/parse" - "github.com/containers/podman/v6/pkg/util" "github.com/gorilla/schema" + "go.podman.io/podman/v6/libpod" + "go.podman.io/podman/v6/libpod/define" + "go.podman.io/podman/v6/pkg/api/handlers/utils" + api "go.podman.io/podman/v6/pkg/api/types" + "go.podman.io/podman/v6/pkg/domain/entities" + "go.podman.io/podman/v6/pkg/domain/entities/reports" + "go.podman.io/podman/v6/pkg/domain/filters" + "go.podman.io/podman/v6/pkg/domain/infra/abi" + "go.podman.io/podman/v6/pkg/domain/infra/abi/parse" + "go.podman.io/podman/v6/pkg/util" ) func CreateVolume(w http.ResponseWriter, r *http.Request) { diff --git a/pkg/api/handlers/swagger/errors.go b/pkg/api/handlers/swagger/errors.go index 9956d666fb..f16d0fcdbb 100644 --- a/pkg/api/handlers/swagger/errors.go +++ b/pkg/api/handlers/swagger/errors.go @@ -4,7 +4,7 @@ package swagger import ( - "github.com/containers/podman/v6/pkg/errorhandling" + "go.podman.io/podman/v6/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 e5b8c7f982..aee89bd85b 100644 --- a/pkg/api/handlers/swagger/models.go +++ b/pkg/api/handlers/swagger/models.go @@ -4,9 +4,9 @@ package swagger import ( - "github.com/containers/podman/v6/pkg/domain/entities" "github.com/moby/moby/api/types/container" "github.com/moby/moby/api/types/network" + "go.podman.io/podman/v6/pkg/domain/entities" ) // Details for creating a volume diff --git a/pkg/api/handlers/swagger/responses.go b/pkg/api/handlers/swagger/responses.go index 525dc6a2c4..65c11dbb48 100644 --- a/pkg/api/handlers/swagger/responses.go +++ b/pkg/api/handlers/swagger/responses.go @@ -4,17 +4,17 @@ package swagger import ( - "github.com/containers/podman/v6/libpod/define" - "github.com/containers/podman/v6/pkg/api/handlers" - "github.com/containers/podman/v6/pkg/domain/entities" - "github.com/containers/podman/v6/pkg/domain/entities/reports" - "github.com/containers/podman/v6/pkg/inspect" "github.com/moby/moby/api/types/container" dockerImage "github.com/moby/moby/api/types/image" "github.com/moby/moby/api/types/network" "github.com/moby/moby/api/types/volume" "go.podman.io/common/libnetwork/types" "go.podman.io/image/v5/manifest" + "go.podman.io/podman/v6/libpod/define" + "go.podman.io/podman/v6/pkg/api/handlers" + "go.podman.io/podman/v6/pkg/domain/entities" + "go.podman.io/podman/v6/pkg/domain/entities/reports" + "go.podman.io/podman/v6/pkg/inspect" ) // Image Tree diff --git a/pkg/api/handlers/types.go b/pkg/api/handlers/types.go index 4f3b8ee4e1..7d646e8f4f 100644 --- a/pkg/api/handlers/types.go +++ b/pkg/api/handlers/types.go @@ -1,8 +1,6 @@ package handlers import ( - "github.com/containers/podman/v6/libpod/define" - "github.com/containers/podman/v6/pkg/domain/entities" build "github.com/moby/moby/api/types/build" dockerContainer "github.com/moby/moby/api/types/container" dockerImage "github.com/moby/moby/api/types/image" @@ -14,6 +12,8 @@ import ( "github.com/moby/moby/api/types/volume" ocispec "github.com/opencontainers/image-spec/specs-go/v1" "github.com/opencontainers/runtime-spec/specs-go" + "go.podman.io/podman/v6/libpod/define" + "go.podman.io/podman/v6/pkg/domain/entities" ) type AuthConfig struct { diff --git a/pkg/api/handlers/types/types.go b/pkg/api/handlers/types/types.go index 4e39851a87..e1d514874e 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/v6/pkg/domain/entities" +import "go.podman.io/podman/v6/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 03dec97e42..eeda0623da 100644 --- a/pkg/api/handlers/utils/apiutil/apiutil.go +++ b/pkg/api/handlers/utils/apiutil/apiutil.go @@ -10,8 +10,8 @@ import ( "strings" "github.com/blang/semver/v4" - "github.com/containers/podman/v6/version" "github.com/gorilla/mux" + "go.podman.io/podman/v6/version" ) var ( diff --git a/pkg/api/handlers/utils/apiutil/apiutil_test.go b/pkg/api/handlers/utils/apiutil/apiutil_test.go index a6fed9cd2d..344f41576f 100644 --- a/pkg/api/handlers/utils/apiutil/apiutil_test.go +++ b/pkg/api/handlers/utils/apiutil/apiutil_test.go @@ -9,8 +9,8 @@ import ( "net/http/httptest" "testing" - "github.com/containers/podman/v6/version" "github.com/gorilla/mux" + "go.podman.io/podman/v6/version" ) func TestSupportedVersion(t *testing.T) { diff --git a/pkg/api/handlers/utils/containers.go b/pkg/api/handlers/utils/containers.go index 10b048327c..24d20eae31 100644 --- a/pkg/api/handlers/utils/containers.go +++ b/pkg/api/handlers/utils/containers.go @@ -11,18 +11,18 @@ import ( "strings" "time" - "github.com/containers/podman/v6/libpod/events" - api "github.com/containers/podman/v6/pkg/api/types" - "github.com/containers/podman/v6/pkg/domain/entities" - "github.com/containers/podman/v6/pkg/domain/infra/abi" + "go.podman.io/podman/v6/libpod/events" + api "go.podman.io/podman/v6/pkg/api/types" + "go.podman.io/podman/v6/pkg/domain/entities" + "go.podman.io/podman/v6/pkg/domain/infra/abi" - "github.com/containers/podman/v6/pkg/api/handlers" "github.com/sirupsen/logrus" + "go.podman.io/podman/v6/pkg/api/handlers" - "github.com/containers/podman/v6/libpod/define" + "go.podman.io/podman/v6/libpod/define" - "github.com/containers/podman/v6/libpod" "github.com/gorilla/schema" + "go.podman.io/podman/v6/libpod" ) type waitQueryDocker struct { diff --git a/pkg/api/handlers/utils/errors.go b/pkg/api/handlers/utils/errors.go index 52d5fcf71c..3f9d3a5700 100644 --- a/pkg/api/handlers/utils/errors.go +++ b/pkg/api/handlers/utils/errors.go @@ -7,9 +7,9 @@ import ( "fmt" "net/http" - "github.com/containers/podman/v6/libpod/define" - "github.com/containers/podman/v6/pkg/errorhandling" log "github.com/sirupsen/logrus" + "go.podman.io/podman/v6/libpod/define" + "go.podman.io/podman/v6/pkg/errorhandling" "go.podman.io/storage" ) diff --git a/pkg/api/handlers/utils/handler.go b/pkg/api/handlers/utils/handler.go index c06da1bb9d..a9fa011a99 100644 --- a/pkg/api/handlers/utils/handler.go +++ b/pkg/api/handlers/utils/handler.go @@ -20,9 +20,9 @@ import ( "github.com/sirupsen/logrus" "go.podman.io/image/v5/types" - "github.com/containers/podman/v6/pkg/api/handlers/utils/apiutil" - api "github.com/containers/podman/v6/pkg/api/types" - "github.com/containers/podman/v6/pkg/bindings/images" + "go.podman.io/podman/v6/pkg/api/handlers/utils/apiutil" + api "go.podman.io/podman/v6/pkg/api/types" + "go.podman.io/podman/v6/pkg/bindings/images" ) // 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 462eaca43b..60fb863a80 100644 --- a/pkg/api/handlers/utils/images.go +++ b/pkg/api/handlers/utils/images.go @@ -9,11 +9,6 @@ import ( "strings" "time" - "github.com/containers/podman/v6/libpod" - "github.com/containers/podman/v6/pkg/api/handlers" - "github.com/containers/podman/v6/pkg/api/handlers/utils/apiutil" - api "github.com/containers/podman/v6/pkg/api/types" - "github.com/containers/podman/v6/pkg/errorhandling" "github.com/docker/distribution/registry/api/errcode" "github.com/docker/go-units" "github.com/moby/moby/api/types/jsonstream" @@ -25,6 +20,11 @@ import ( storageTransport "go.podman.io/image/v5/storage" "go.podman.io/image/v5/transports/alltransports" "go.podman.io/image/v5/types" + "go.podman.io/podman/v6/libpod" + "go.podman.io/podman/v6/pkg/api/handlers" + "go.podman.io/podman/v6/pkg/api/handlers/utils/apiutil" + api "go.podman.io/podman/v6/pkg/api/types" + "go.podman.io/podman/v6/pkg/errorhandling" "go.podman.io/storage" ) diff --git a/pkg/api/server/handler_api.go b/pkg/api/server/handler_api.go index 5122c8b076..805f3b9a95 100644 --- a/pkg/api/server/handler_api.go +++ b/pkg/api/server/handler_api.go @@ -10,8 +10,8 @@ import ( "net/http" "runtime" - "github.com/containers/podman/v6/version" "github.com/sirupsen/logrus" + "go.podman.io/podman/v6/version" ) type BufferedResponseWriter struct { diff --git a/pkg/api/server/handler_panic.go b/pkg/api/server/handler_panic.go index a3ead23745..92bdbfb5d2 100644 --- a/pkg/api/server/handler_panic.go +++ b/pkg/api/server/handler_panic.go @@ -7,9 +7,9 @@ import ( "net/http" "runtime" - "github.com/containers/podman/v6/pkg/api/handlers/utils" "github.com/gorilla/mux" "github.com/sirupsen/logrus" + "go.podman.io/podman/v6/pkg/api/handlers/utils" ) // panicHandler captures panics from endpoint handlers and logs stack trace diff --git a/pkg/api/server/handler_rid.go b/pkg/api/server/handler_rid.go index c35197b264..120cef297c 100644 --- a/pkg/api/server/handler_rid.go +++ b/pkg/api/server/handler_rid.go @@ -7,11 +7,11 @@ import ( "io" "net/http" - "github.com/containers/podman/v6/pkg/api/types" "github.com/google/uuid" "github.com/gorilla/handlers" "github.com/gorilla/mux" "github.com/sirupsen/logrus" + "go.podman.io/podman/v6/pkg/api/types" ) // referenceIDHandler adds X-Reference-Id Header allowing event correlation diff --git a/pkg/api/server/register_archive.go b/pkg/api/server/register_archive.go index 8acedf926b..20de25944f 100644 --- a/pkg/api/server/register_archive.go +++ b/pkg/api/server/register_archive.go @@ -5,8 +5,8 @@ package server import ( "net/http" - "github.com/containers/podman/v6/pkg/api/handlers/compat" "github.com/gorilla/mux" + "go.podman.io/podman/v6/pkg/api/handlers/compat" ) func (s *APIServer) registerArchiveHandlers(r *mux.Router) error { diff --git a/pkg/api/server/register_artifacts.go b/pkg/api/server/register_artifacts.go index 6a5b0783eb..dcd7c25190 100644 --- a/pkg/api/server/register_artifacts.go +++ b/pkg/api/server/register_artifacts.go @@ -5,8 +5,8 @@ package server import ( "net/http" - "github.com/containers/podman/v6/pkg/api/handlers/libpod" "github.com/gorilla/mux" + "go.podman.io/podman/v6/pkg/api/handlers/libpod" ) func (s *APIServer) registerArtifactHandlers(r *mux.Router) error { diff --git a/pkg/api/server/register_auth.go b/pkg/api/server/register_auth.go index 2074bf3df5..83fe70c7df 100644 --- a/pkg/api/server/register_auth.go +++ b/pkg/api/server/register_auth.go @@ -5,8 +5,8 @@ package server import ( "net/http" - "github.com/containers/podman/v6/pkg/api/handlers/compat" "github.com/gorilla/mux" + "go.podman.io/podman/v6/pkg/api/handlers/compat" ) func (s *APIServer) registerAuthHandlers(r *mux.Router) error { diff --git a/pkg/api/server/register_containers.go b/pkg/api/server/register_containers.go index 39be12a242..4f4d4e3860 100644 --- a/pkg/api/server/register_containers.go +++ b/pkg/api/server/register_containers.go @@ -5,9 +5,9 @@ package server import ( "net/http" - "github.com/containers/podman/v6/pkg/api/handlers/compat" - "github.com/containers/podman/v6/pkg/api/handlers/libpod" "github.com/gorilla/mux" + "go.podman.io/podman/v6/pkg/api/handlers/compat" + "go.podman.io/podman/v6/pkg/api/handlers/libpod" ) func (s *APIServer) registerContainersHandlers(r *mux.Router) error { diff --git a/pkg/api/server/register_distribution.go b/pkg/api/server/register_distribution.go index 19e0866168..915f74725e 100644 --- a/pkg/api/server/register_distribution.go +++ b/pkg/api/server/register_distribution.go @@ -3,8 +3,8 @@ package server import ( - "github.com/containers/podman/v6/pkg/api/handlers/compat" "github.com/gorilla/mux" + "go.podman.io/podman/v6/pkg/api/handlers/compat" ) func (s *APIServer) registerDistributionHandlers(r *mux.Router) error { diff --git a/pkg/api/server/register_events.go b/pkg/api/server/register_events.go index 0a8d6b085e..46a801c4e0 100644 --- a/pkg/api/server/register_events.go +++ b/pkg/api/server/register_events.go @@ -5,8 +5,8 @@ package server import ( "net/http" - "github.com/containers/podman/v6/pkg/api/handlers/compat" "github.com/gorilla/mux" + "go.podman.io/podman/v6/pkg/api/handlers/compat" ) func (s *APIServer) registerEventsHandlers(r *mux.Router) error { diff --git a/pkg/api/server/register_exec.go b/pkg/api/server/register_exec.go index 360981cbf7..2941dc9e8c 100644 --- a/pkg/api/server/register_exec.go +++ b/pkg/api/server/register_exec.go @@ -5,8 +5,8 @@ package server import ( "net/http" - "github.com/containers/podman/v6/pkg/api/handlers/compat" "github.com/gorilla/mux" + "go.podman.io/podman/v6/pkg/api/handlers/compat" ) func (s *APIServer) registerExecHandlers(r *mux.Router) error { diff --git a/pkg/api/server/register_generate.go b/pkg/api/server/register_generate.go index 6bfe8e8bcf..625d8bac43 100644 --- a/pkg/api/server/register_generate.go +++ b/pkg/api/server/register_generate.go @@ -5,8 +5,8 @@ package server import ( "net/http" - "github.com/containers/podman/v6/pkg/api/handlers/libpod" "github.com/gorilla/mux" + "go.podman.io/podman/v6/pkg/api/handlers/libpod" ) func (s *APIServer) registerGenerateHandlers(r *mux.Router) error { diff --git a/pkg/api/server/register_healthcheck.go b/pkg/api/server/register_healthcheck.go index fcb0ef88ab..2985f4e297 100644 --- a/pkg/api/server/register_healthcheck.go +++ b/pkg/api/server/register_healthcheck.go @@ -5,8 +5,8 @@ package server import ( "net/http" - "github.com/containers/podman/v6/pkg/api/handlers/libpod" "github.com/gorilla/mux" + "go.podman.io/podman/v6/pkg/api/handlers/libpod" ) func (s *APIServer) registerHealthCheckHandlers(r *mux.Router) error { diff --git a/pkg/api/server/register_images.go b/pkg/api/server/register_images.go index 7b9df9bbd8..148ec70382 100644 --- a/pkg/api/server/register_images.go +++ b/pkg/api/server/register_images.go @@ -5,9 +5,9 @@ package server import ( "net/http" - "github.com/containers/podman/v6/pkg/api/handlers/compat" - "github.com/containers/podman/v6/pkg/api/handlers/libpod" "github.com/gorilla/mux" + "go.podman.io/podman/v6/pkg/api/handlers/compat" + "go.podman.io/podman/v6/pkg/api/handlers/libpod" ) // TODO diff --git a/pkg/api/server/register_info.go b/pkg/api/server/register_info.go index 1b68a11642..a12ee116a6 100644 --- a/pkg/api/server/register_info.go +++ b/pkg/api/server/register_info.go @@ -5,9 +5,9 @@ package server import ( "net/http" - "github.com/containers/podman/v6/pkg/api/handlers/compat" - "github.com/containers/podman/v6/pkg/api/handlers/libpod" "github.com/gorilla/mux" + "go.podman.io/podman/v6/pkg/api/handlers/compat" + "go.podman.io/podman/v6/pkg/api/handlers/libpod" ) func (s *APIServer) registerInfoHandlers(r *mux.Router) error { diff --git a/pkg/api/server/register_kube.go b/pkg/api/server/register_kube.go index f24ecb5d16..37738f2dd2 100644 --- a/pkg/api/server/register_kube.go +++ b/pkg/api/server/register_kube.go @@ -5,8 +5,8 @@ package server import ( "net/http" - "github.com/containers/podman/v6/pkg/api/handlers/libpod" "github.com/gorilla/mux" + "go.podman.io/podman/v6/pkg/api/handlers/libpod" ) func (s *APIServer) registerKubeHandlers(r *mux.Router) error { diff --git a/pkg/api/server/register_manifest.go b/pkg/api/server/register_manifest.go index ca327b3ae7..b907ae88fa 100644 --- a/pkg/api/server/register_manifest.go +++ b/pkg/api/server/register_manifest.go @@ -5,8 +5,8 @@ package server import ( "net/http" - "github.com/containers/podman/v6/pkg/api/handlers/libpod" "github.com/gorilla/mux" + "go.podman.io/podman/v6/pkg/api/handlers/libpod" ) func (s *APIServer) registerManifestHandlers(r *mux.Router) error { diff --git a/pkg/api/server/register_monitor.go b/pkg/api/server/register_monitor.go index 7dc46786d6..7a44fca0be 100644 --- a/pkg/api/server/register_monitor.go +++ b/pkg/api/server/register_monitor.go @@ -3,8 +3,8 @@ package server import ( - "github.com/containers/podman/v6/pkg/api/handlers/compat" "github.com/gorilla/mux" + "go.podman.io/podman/v6/pkg/api/handlers/compat" ) func (s *APIServer) registerMonitorHandlers(r *mux.Router) error { diff --git a/pkg/api/server/register_networks.go b/pkg/api/server/register_networks.go index 8a27591354..ecd888a03d 100644 --- a/pkg/api/server/register_networks.go +++ b/pkg/api/server/register_networks.go @@ -5,9 +5,9 @@ package server import ( "net/http" - "github.com/containers/podman/v6/pkg/api/handlers/compat" - "github.com/containers/podman/v6/pkg/api/handlers/libpod" "github.com/gorilla/mux" + "go.podman.io/podman/v6/pkg/api/handlers/compat" + "go.podman.io/podman/v6/pkg/api/handlers/libpod" ) func (s *APIServer) registerNetworkHandlers(r *mux.Router) error { diff --git a/pkg/api/server/register_ping.go b/pkg/api/server/register_ping.go index 78c417b70b..601413a7b0 100644 --- a/pkg/api/server/register_ping.go +++ b/pkg/api/server/register_ping.go @@ -5,8 +5,8 @@ package server import ( "net/http" - "github.com/containers/podman/v6/pkg/api/handlers/compat" "github.com/gorilla/mux" + "go.podman.io/podman/v6/pkg/api/handlers/compat" ) func (s *APIServer) registerPingHandlers(r *mux.Router) error { diff --git a/pkg/api/server/register_plugins.go b/pkg/api/server/register_plugins.go index 1e08d54502..50de3e0257 100644 --- a/pkg/api/server/register_plugins.go +++ b/pkg/api/server/register_plugins.go @@ -3,8 +3,8 @@ package server import ( - "github.com/containers/podman/v6/pkg/api/handlers/compat" "github.com/gorilla/mux" + "go.podman.io/podman/v6/pkg/api/handlers/compat" ) func (s *APIServer) registerPluginsHandlers(r *mux.Router) error { diff --git a/pkg/api/server/register_pods.go b/pkg/api/server/register_pods.go index af6d3a5b8d..ed0cd53221 100644 --- a/pkg/api/server/register_pods.go +++ b/pkg/api/server/register_pods.go @@ -5,8 +5,8 @@ package server import ( "net/http" - "github.com/containers/podman/v6/pkg/api/handlers/libpod" "github.com/gorilla/mux" + "go.podman.io/podman/v6/pkg/api/handlers/libpod" ) func (s *APIServer) registerPodsHandlers(r *mux.Router) error { diff --git a/pkg/api/server/register_quadlets.go b/pkg/api/server/register_quadlets.go index cd45581a3b..d417771ef9 100644 --- a/pkg/api/server/register_quadlets.go +++ b/pkg/api/server/register_quadlets.go @@ -5,8 +5,8 @@ package server import ( "net/http" - "github.com/containers/podman/v6/pkg/api/handlers/libpod" "github.com/gorilla/mux" + "go.podman.io/podman/v6/pkg/api/handlers/libpod" ) func (s *APIServer) registerQuadletHandlers(r *mux.Router) error { diff --git a/pkg/api/server/register_secrets.go b/pkg/api/server/register_secrets.go index df2a5a17b2..4c8a291a97 100644 --- a/pkg/api/server/register_secrets.go +++ b/pkg/api/server/register_secrets.go @@ -5,9 +5,9 @@ package server import ( "net/http" - "github.com/containers/podman/v6/pkg/api/handlers/compat" - "github.com/containers/podman/v6/pkg/api/handlers/libpod" "github.com/gorilla/mux" + "go.podman.io/podman/v6/pkg/api/handlers/compat" + "go.podman.io/podman/v6/pkg/api/handlers/libpod" ) func (s *APIServer) registerSecretHandlers(r *mux.Router) error { diff --git a/pkg/api/server/register_swagger.go b/pkg/api/server/register_swagger.go index 17629ba827..725066f667 100644 --- a/pkg/api/server/register_swagger.go +++ b/pkg/api/server/register_swagger.go @@ -5,8 +5,8 @@ package server import ( "net/http" - "github.com/containers/podman/v6/pkg/api/handlers/libpod" "github.com/gorilla/mux" + "go.podman.io/podman/v6/pkg/api/handlers/libpod" ) // registerSwaggerHandlers maps the swagger endpoint for the server diff --git a/pkg/api/server/register_swarm.go b/pkg/api/server/register_swarm.go index 7bd3c70b30..6091194037 100644 --- a/pkg/api/server/register_swarm.go +++ b/pkg/api/server/register_swarm.go @@ -6,9 +6,9 @@ import ( "errors" "net/http" - "github.com/containers/podman/v6/pkg/api/handlers/utils" "github.com/gorilla/mux" "github.com/sirupsen/logrus" + "go.podman.io/podman/v6/pkg/api/handlers/utils" ) func (s *APIServer) registerSwarmHandlers(r *mux.Router) error { diff --git a/pkg/api/server/register_system.go b/pkg/api/server/register_system.go index c0ba1577c7..5abebf16b1 100644 --- a/pkg/api/server/register_system.go +++ b/pkg/api/server/register_system.go @@ -5,9 +5,9 @@ package server import ( "net/http" - "github.com/containers/podman/v6/pkg/api/handlers/compat" - "github.com/containers/podman/v6/pkg/api/handlers/libpod" "github.com/gorilla/mux" + "go.podman.io/podman/v6/pkg/api/handlers/compat" + "go.podman.io/podman/v6/pkg/api/handlers/libpod" ) func (s *APIServer) registerSystemHandlers(r *mux.Router) error { diff --git a/pkg/api/server/register_version.go b/pkg/api/server/register_version.go index fe0149638f..d3b38dcb38 100644 --- a/pkg/api/server/register_version.go +++ b/pkg/api/server/register_version.go @@ -5,8 +5,8 @@ package server import ( "net/http" - "github.com/containers/podman/v6/pkg/api/handlers/compat" "github.com/gorilla/mux" + "go.podman.io/podman/v6/pkg/api/handlers/compat" ) func (s *APIServer) registerVersionHandlers(r *mux.Router) error { diff --git a/pkg/api/server/register_volumes.go b/pkg/api/server/register_volumes.go index 4c92c1cd59..f2fd5c2e4b 100644 --- a/pkg/api/server/register_volumes.go +++ b/pkg/api/server/register_volumes.go @@ -5,9 +5,9 @@ package server import ( "net/http" - "github.com/containers/podman/v6/pkg/api/handlers/compat" - "github.com/containers/podman/v6/pkg/api/handlers/libpod" "github.com/gorilla/mux" + "go.podman.io/podman/v6/pkg/api/handlers/compat" + "go.podman.io/podman/v6/pkg/api/handlers/libpod" ) func (s *APIServer) registerVolumeHandlers(r *mux.Router) error { diff --git a/pkg/api/server/server.go b/pkg/api/server/server.go index 1697c8ca46..ea206a1430 100644 --- a/pkg/api/server/server.go +++ b/pkg/api/server/server.go @@ -17,19 +17,19 @@ import ( "syscall" "time" - "github.com/containers/podman/v6/libpod" - "github.com/containers/podman/v6/libpod/shutdown" - "github.com/containers/podman/v6/pkg/api/grpcpb" - "github.com/containers/podman/v6/pkg/api/handlers" - grpchandlers "github.com/containers/podman/v6/pkg/api/handlers/grpc" - "github.com/containers/podman/v6/pkg/api/server/idle" - "github.com/containers/podman/v6/pkg/api/types" - "github.com/containers/podman/v6/pkg/domain/entities" - "github.com/containers/podman/v6/pkg/util/tlsutil" "github.com/coreos/go-systemd/v22/daemon" "github.com/gorilla/mux" "github.com/gorilla/schema" "github.com/sirupsen/logrus" + "go.podman.io/podman/v6/libpod" + "go.podman.io/podman/v6/libpod/shutdown" + "go.podman.io/podman/v6/pkg/api/grpcpb" + "go.podman.io/podman/v6/pkg/api/handlers" + grpchandlers "go.podman.io/podman/v6/pkg/api/handlers/grpc" + "go.podman.io/podman/v6/pkg/api/server/idle" + "go.podman.io/podman/v6/pkg/api/types" + "go.podman.io/podman/v6/pkg/domain/entities" + "go.podman.io/podman/v6/pkg/util/tlsutil" "google.golang.org/grpc" "google.golang.org/grpc/reflection" ) diff --git a/pkg/autoupdate/autoupdate.go b/pkg/autoupdate/autoupdate.go index cc52a16923..85f0396ecd 100644 --- a/pkg/autoupdate/autoupdate.go +++ b/pkg/autoupdate/autoupdate.go @@ -9,17 +9,17 @@ import ( "os" "sort" - "github.com/containers/podman/v6/libpod" - "github.com/containers/podman/v6/libpod/define" - "github.com/containers/podman/v6/libpod/events" - "github.com/containers/podman/v6/pkg/domain/entities" - "github.com/containers/podman/v6/pkg/systemd" - systemdDefine "github.com/containers/podman/v6/pkg/systemd/define" "github.com/coreos/go-systemd/v22/dbus" "github.com/sirupsen/logrus" "go.podman.io/common/libimage" "go.podman.io/common/pkg/config" "go.podman.io/image/v5/docker" + "go.podman.io/podman/v6/libpod" + "go.podman.io/podman/v6/libpod/define" + "go.podman.io/podman/v6/libpod/events" + "go.podman.io/podman/v6/pkg/domain/entities" + "go.podman.io/podman/v6/pkg/systemd" + systemdDefine "go.podman.io/podman/v6/pkg/systemd/define" ) // Policy represents an auto-update policy. diff --git a/pkg/bindings/README.md b/pkg/bindings/README.md index 5bcc534e5b..098fffef9d 100644 --- a/pkg/bindings/README.md +++ b/pkg/bindings/README.md @@ -43,7 +43,7 @@ import ( "fmt" "os" - "github.com/containers/podman/v6/pkg/bindings" + "go.podman.io/podman/v6/pkg/bindings" ) func main() { @@ -74,8 +74,8 @@ import ( "fmt" "os" - "github.com/containers/podman/v6/pkg/bindings" - "github.com/containers/podman/v6/pkg/bindings/containers" + "go.podman.io/podman/v6/pkg/bindings" + "go.podman.io/podman/v6/pkg/bindings/containers" ) func main() { @@ -102,8 +102,8 @@ import ( "fmt" "os" - "github.com/containers/podman/v6/pkg/bindings" - "github.com/containers/podman/v6/pkg/bindings/images" + "go.podman.io/podman/v6/pkg/bindings" + "go.podman.io/podman/v6/pkg/bindings/images" ) func main() { @@ -130,10 +130,10 @@ import ( "fmt" "os" - "github.com/containers/podman/v6/pkg/bindings" - "github.com/containers/podman/v6/pkg/bindings/containers" - "github.com/containers/podman/v6/pkg/bindings/images" - "github.com/containers/podman/v6/pkg/specgen" + "go.podman.io/podman/v6/pkg/bindings" + "go.podman.io/podman/v6/pkg/bindings/containers" + "go.podman.io/podman/v6/pkg/bindings/images" + "go.podman.io/podman/v6/pkg/specgen" ) func main() { diff --git a/pkg/bindings/artifacts/add.go b/pkg/bindings/artifacts/add.go index 0d7328c6e6..61d5e3ef7a 100644 --- a/pkg/bindings/artifacts/add.go +++ b/pkg/bindings/artifacts/add.go @@ -6,9 +6,9 @@ import ( "net/http" "net/url" - "github.com/containers/podman/v6/pkg/bindings" - "github.com/containers/podman/v6/pkg/domain/entities" - entitiesTypes "github.com/containers/podman/v6/pkg/domain/entities/types" + "go.podman.io/podman/v6/pkg/bindings" + "go.podman.io/podman/v6/pkg/domain/entities" + entitiesTypes "go.podman.io/podman/v6/pkg/domain/entities/types" ) func Add(ctx context.Context, artifactName string, blobName string, artifactBlob io.Reader, options *AddOptions) (*entitiesTypes.ArtifactAddReport, error) { diff --git a/pkg/bindings/artifacts/extract.go b/pkg/bindings/artifacts/extract.go index e470dd4dbc..81a7c7d84f 100644 --- a/pkg/bindings/artifacts/extract.go +++ b/pkg/bindings/artifacts/extract.go @@ -11,7 +11,7 @@ import ( "os" "path/filepath" - "github.com/containers/podman/v6/pkg/bindings" + "go.podman.io/podman/v6/pkg/bindings" ) func Extract(ctx context.Context, artifactName string, target string, options *ExtractOptions) error { diff --git a/pkg/bindings/artifacts/inspect.go b/pkg/bindings/artifacts/inspect.go index b55c1f1d00..8fd253aee2 100644 --- a/pkg/bindings/artifacts/inspect.go +++ b/pkg/bindings/artifacts/inspect.go @@ -4,8 +4,8 @@ import ( "context" "net/http" - "github.com/containers/podman/v6/pkg/bindings" - "github.com/containers/podman/v6/pkg/domain/entities/types" + "go.podman.io/podman/v6/pkg/bindings" + "go.podman.io/podman/v6/pkg/domain/entities/types" ) func Inspect(ctx context.Context, nameOrID string, _ *InspectOptions) (*types.ArtifactInspectReport, error) { diff --git a/pkg/bindings/artifacts/list.go b/pkg/bindings/artifacts/list.go index 9c7925e10b..b9ae8c2735 100644 --- a/pkg/bindings/artifacts/list.go +++ b/pkg/bindings/artifacts/list.go @@ -4,8 +4,8 @@ import ( "context" "net/http" - "github.com/containers/podman/v6/pkg/bindings" - "github.com/containers/podman/v6/pkg/domain/entities" + "go.podman.io/podman/v6/pkg/bindings" + "go.podman.io/podman/v6/pkg/domain/entities" ) // List returns a list of artifacts in local storage. diff --git a/pkg/bindings/artifacts/pull.go b/pkg/bindings/artifacts/pull.go index ac185d07ef..c95832dd6c 100644 --- a/pkg/bindings/artifacts/pull.go +++ b/pkg/bindings/artifacts/pull.go @@ -4,10 +4,10 @@ import ( "context" "net/http" - "github.com/containers/podman/v6/pkg/auth" - "github.com/containers/podman/v6/pkg/bindings" - "github.com/containers/podman/v6/pkg/domain/entities" imageTypes "go.podman.io/image/v5/types" + "go.podman.io/podman/v6/pkg/auth" + "go.podman.io/podman/v6/pkg/bindings" + "go.podman.io/podman/v6/pkg/domain/entities" ) func Pull(ctx context.Context, name string, options *PullOptions) (*entities.ArtifactPullReport, error) { diff --git a/pkg/bindings/artifacts/push.go b/pkg/bindings/artifacts/push.go index 1490ce2a34..4214b11126 100644 --- a/pkg/bindings/artifacts/push.go +++ b/pkg/bindings/artifacts/push.go @@ -4,10 +4,10 @@ import ( "context" "net/http" - "github.com/containers/podman/v6/pkg/auth" - "github.com/containers/podman/v6/pkg/bindings" - "github.com/containers/podman/v6/pkg/domain/entities" imageTypes "go.podman.io/image/v5/types" + "go.podman.io/podman/v6/pkg/auth" + "go.podman.io/podman/v6/pkg/bindings" + "go.podman.io/podman/v6/pkg/domain/entities" ) func Push(ctx context.Context, name string, options *PushOptions) (*entities.ArtifactPushReport, error) { diff --git a/pkg/bindings/artifacts/remove.go b/pkg/bindings/artifacts/remove.go index dd5150c21a..2e9962f114 100644 --- a/pkg/bindings/artifacts/remove.go +++ b/pkg/bindings/artifacts/remove.go @@ -4,8 +4,8 @@ import ( "context" "net/http" - "github.com/containers/podman/v6/pkg/bindings" - "github.com/containers/podman/v6/pkg/domain/entities" + "go.podman.io/podman/v6/pkg/bindings" + "go.podman.io/podman/v6/pkg/domain/entities" ) // Remove removes an artifact from local storage. diff --git a/pkg/bindings/artifacts/types_add_options.go b/pkg/bindings/artifacts/types_add_options.go index 9e696bb4e2..a6ec7f514e 100644 --- a/pkg/bindings/artifacts/types_add_options.go +++ b/pkg/bindings/artifacts/types_add_options.go @@ -4,7 +4,7 @@ package artifacts import ( "net/url" - "github.com/containers/podman/v6/pkg/bindings/internal/util" + "go.podman.io/podman/v6/pkg/bindings/internal/util" ) // Changed returns true if named field has been set diff --git a/pkg/bindings/artifacts/types_extract_options.go b/pkg/bindings/artifacts/types_extract_options.go index 0cc7ab9e98..8c3489f2ed 100644 --- a/pkg/bindings/artifacts/types_extract_options.go +++ b/pkg/bindings/artifacts/types_extract_options.go @@ -4,7 +4,7 @@ package artifacts import ( "net/url" - "github.com/containers/podman/v6/pkg/bindings/internal/util" + "go.podman.io/podman/v6/pkg/bindings/internal/util" ) // Changed returns true if named field has been set diff --git a/pkg/bindings/artifacts/types_inspect_options.go b/pkg/bindings/artifacts/types_inspect_options.go index f2edc83c98..ca94150cb4 100644 --- a/pkg/bindings/artifacts/types_inspect_options.go +++ b/pkg/bindings/artifacts/types_inspect_options.go @@ -4,7 +4,7 @@ package artifacts import ( "net/url" - "github.com/containers/podman/v6/pkg/bindings/internal/util" + "go.podman.io/podman/v6/pkg/bindings/internal/util" ) // Changed returns true if named field has been set diff --git a/pkg/bindings/artifacts/types_list_options.go b/pkg/bindings/artifacts/types_list_options.go index a167e35830..68323b7bb4 100644 --- a/pkg/bindings/artifacts/types_list_options.go +++ b/pkg/bindings/artifacts/types_list_options.go @@ -4,7 +4,7 @@ package artifacts import ( "net/url" - "github.com/containers/podman/v6/pkg/bindings/internal/util" + "go.podman.io/podman/v6/pkg/bindings/internal/util" ) // Changed returns true if named field has been set diff --git a/pkg/bindings/artifacts/types_pull_options.go b/pkg/bindings/artifacts/types_pull_options.go index ad2e5bce80..1c05f60356 100644 --- a/pkg/bindings/artifacts/types_pull_options.go +++ b/pkg/bindings/artifacts/types_pull_options.go @@ -5,7 +5,7 @@ import ( "io" "net/url" - "github.com/containers/podman/v6/pkg/bindings/internal/util" + "go.podman.io/podman/v6/pkg/bindings/internal/util" ) // Changed returns true if named field has been set diff --git a/pkg/bindings/artifacts/types_push_options.go b/pkg/bindings/artifacts/types_push_options.go index 295d118a17..6386800c9d 100644 --- a/pkg/bindings/artifacts/types_push_options.go +++ b/pkg/bindings/artifacts/types_push_options.go @@ -4,7 +4,7 @@ package artifacts import ( "net/url" - "github.com/containers/podman/v6/pkg/bindings/internal/util" + "go.podman.io/podman/v6/pkg/bindings/internal/util" ) // Changed returns true if named field has been set diff --git a/pkg/bindings/artifacts/types_remove_options.go b/pkg/bindings/artifacts/types_remove_options.go index 8b75e44f2e..94bf15a31c 100644 --- a/pkg/bindings/artifacts/types_remove_options.go +++ b/pkg/bindings/artifacts/types_remove_options.go @@ -4,7 +4,7 @@ package artifacts import ( "net/url" - "github.com/containers/podman/v6/pkg/bindings/internal/util" + "go.podman.io/podman/v6/pkg/bindings/internal/util" ) // Changed returns true if named field has been set diff --git a/pkg/bindings/connection.go b/pkg/bindings/connection.go index 814934094f..178896974e 100644 --- a/pkg/bindings/connection.go +++ b/pkg/bindings/connection.go @@ -18,11 +18,11 @@ import ( "time" "github.com/blang/semver/v4" - "github.com/containers/podman/v6/pkg/util/tlsutil" - "github.com/containers/podman/v6/version" "github.com/kevinburke/ssh_config" "github.com/sirupsen/logrus" "go.podman.io/common/pkg/ssh" + "go.podman.io/podman/v6/pkg/util/tlsutil" + "go.podman.io/podman/v6/version" "go.podman.io/storage/pkg/fileutils" "golang.org/x/net/proxy" ) diff --git a/pkg/bindings/containers/archive.go b/pkg/bindings/containers/archive.go index 574fa9bff4..7662efc013 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/v6/pkg/bindings" - "github.com/containers/podman/v6/pkg/copy" - "github.com/containers/podman/v6/pkg/domain/entities/types" + "go.podman.io/podman/v6/pkg/bindings" + "go.podman.io/podman/v6/pkg/copy" + "go.podman.io/podman/v6/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 ef23d081a5..7962541694 100644 --- a/pkg/bindings/containers/attach.go +++ b/pkg/bindings/containers/attach.go @@ -16,11 +16,11 @@ import ( "strconv" "time" - "github.com/containers/podman/v6/libpod/define" - "github.com/containers/podman/v6/pkg/bindings" "github.com/moby/term" "github.com/sirupsen/logrus" "go.podman.io/common/pkg/detach" + "go.podman.io/podman/v6/libpod/define" + "go.podman.io/podman/v6/pkg/bindings" terminal "golang.org/x/term" ) diff --git a/pkg/bindings/containers/checkpoint.go b/pkg/bindings/containers/checkpoint.go index 4271123a4b..e4c4820dba 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/v6/pkg/bindings" - "github.com/containers/podman/v6/pkg/domain/entities/types" + "go.podman.io/podman/v6/pkg/bindings" + "go.podman.io/podman/v6/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 39d691a273..d03a7d46e6 100644 --- a/pkg/bindings/containers/commit.go +++ b/pkg/bindings/containers/commit.go @@ -9,9 +9,9 @@ import ( "os" "strings" - "github.com/containers/podman/v6/pkg/bindings" - "github.com/containers/podman/v6/pkg/bindings/images" - "github.com/containers/podman/v6/pkg/domain/entities/types" + "go.podman.io/podman/v6/pkg/bindings" + "go.podman.io/podman/v6/pkg/bindings/images" + "go.podman.io/podman/v6/pkg/domain/entities/types" "go.podman.io/storage/pkg/regexp" ) diff --git a/pkg/bindings/containers/containers.go b/pkg/bindings/containers/containers.go index 577eface59..f5d479ca56 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/v6/libpod/define" - "github.com/containers/podman/v6/pkg/api/handlers" - "github.com/containers/podman/v6/pkg/bindings" - "github.com/containers/podman/v6/pkg/domain/entities/reports" - "github.com/containers/podman/v6/pkg/domain/entities/types" + "go.podman.io/podman/v6/libpod/define" + "go.podman.io/podman/v6/pkg/api/handlers" + "go.podman.io/podman/v6/pkg/bindings" + "go.podman.io/podman/v6/pkg/domain/entities/reports" + "go.podman.io/podman/v6/pkg/domain/entities/types" ) var ErrLostSync = errors.New("lost synchronization with multiplexed stream") diff --git a/pkg/bindings/containers/create.go b/pkg/bindings/containers/create.go index 1f4e88fde9..8a9fce61cc 100644 --- a/pkg/bindings/containers/create.go +++ b/pkg/bindings/containers/create.go @@ -5,10 +5,10 @@ import ( "net/http" "strings" - "github.com/containers/podman/v6/pkg/bindings" - "github.com/containers/podman/v6/pkg/domain/entities/types" - "github.com/containers/podman/v6/pkg/specgen" jsoniter "github.com/json-iterator/go" + "go.podman.io/podman/v6/pkg/bindings" + "go.podman.io/podman/v6/pkg/domain/entities/types" + "go.podman.io/podman/v6/pkg/specgen" ) func CreateWithSpec(ctx context.Context, s *specgen.SpecGenerator, options *CreateOptions) (types.ContainerCreateResponse, error) { diff --git a/pkg/bindings/containers/diff.go b/pkg/bindings/containers/diff.go index 1b06da23c8..0f1fc57245 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/v6/pkg/bindings" + "go.podman.io/podman/v6/pkg/bindings" "go.podman.io/storage/pkg/archive" ) diff --git a/pkg/bindings/containers/exec.go b/pkg/bindings/containers/exec.go index a2c7613b01..7ff4000d42 100644 --- a/pkg/bindings/containers/exec.go +++ b/pkg/bindings/containers/exec.go @@ -8,12 +8,12 @@ import ( "net/http" "strings" - "github.com/containers/podman/v6/libpod/define" - "github.com/containers/podman/v6/pkg/api/handlers" - "github.com/containers/podman/v6/pkg/bindings" - "github.com/containers/podman/v6/pkg/domain/entities/types" jsoniter "github.com/json-iterator/go" "github.com/sirupsen/logrus" + "go.podman.io/podman/v6/libpod/define" + "go.podman.io/podman/v6/pkg/api/handlers" + "go.podman.io/podman/v6/pkg/bindings" + "go.podman.io/podman/v6/pkg/domain/entities/types" ) var json = jsoniter.ConfigCompatibleWithStandardLibrary diff --git a/pkg/bindings/containers/healthcheck.go b/pkg/bindings/containers/healthcheck.go index 793bee605f..87fae7bff0 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/v6/libpod/define" - "github.com/containers/podman/v6/pkg/bindings" + "go.podman.io/podman/v6/libpod/define" + "go.podman.io/podman/v6/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 c8d01af05c..cdf6a67f03 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/v6/pkg/bindings" + "go.podman.io/podman/v6/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 ca51780416..9861a9ef63 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/v6/pkg/bindings" + "go.podman.io/podman/v6/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 3d35dcfda8..07d63254a7 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/v6/pkg/bindings" + "go.podman.io/podman/v6/pkg/bindings" ) // Rename an existing container. diff --git a/pkg/bindings/containers/term_unix.go b/pkg/bindings/containers/term_unix.go index 4bf2f5a2d7..ebbca0e5b9 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/v6/pkg/signal" + sig "go.podman.io/podman/v6/pkg/signal" "golang.org/x/term" ) diff --git a/pkg/bindings/containers/term_windows.go b/pkg/bindings/containers/term_windows.go index 6d1e071a3a..aa4f60995a 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/v6/pkg/signal" + sig "go.podman.io/podman/v6/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 10a6fe860f..59c322bae3 100644 --- a/pkg/bindings/containers/types.go +++ b/pkg/bindings/containers/types.go @@ -4,7 +4,7 @@ import ( "bufio" "io" - "github.com/containers/podman/v6/libpod/define" + "go.podman.io/podman/v6/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 ad4f118a54..98aa9defa2 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/v6/pkg/bindings/internal/util" + "go.podman.io/podman/v6/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 d728265706..fd062901c4 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/v6/pkg/bindings/internal/util" + "go.podman.io/podman/v6/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 02acdb5034..b29a2197bb 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/v6/pkg/bindings/internal/util" + "go.podman.io/podman/v6/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 1834067956..25a7c4e1cb 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/v6/pkg/bindings/internal/util" + "go.podman.io/podman/v6/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 d69f292534..7638108890 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/v6/pkg/bindings/internal/util" + "go.podman.io/podman/v6/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 933e74968a..764ba0b2db 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/v6/pkg/bindings/internal/util" + "go.podman.io/podman/v6/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 14f98121e3..ef3149dbfb 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/v6/pkg/bindings/internal/util" + "go.podman.io/podman/v6/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 dc8d2c9781..4baa4c1a12 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/v6/pkg/bindings/internal/util" + "go.podman.io/podman/v6/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 e72dde1606..1117f391e7 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/v6/pkg/bindings/internal/util" + "go.podman.io/podman/v6/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 df7c6745e0..7e8335c739 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/v6/pkg/bindings/internal/util" + "go.podman.io/podman/v6/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 8358bfa897..4ac38c9d8f 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/v6/pkg/bindings/internal/util" + "go.podman.io/podman/v6/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 35e61c8e54..dd73c70512 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/v6/pkg/bindings/internal/util" + "go.podman.io/podman/v6/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 55d55e5298..67bb8ea994 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/v6/pkg/bindings/internal/util" + "go.podman.io/podman/v6/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 7d204ccf71..d04fdf1022 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/v6/pkg/bindings/internal/util" + "go.podman.io/podman/v6/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 4ccdcebc7f..d48e6aa891 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/v6/pkg/bindings/internal/util" + "go.podman.io/podman/v6/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 fe8efeb2bd..fee6599f96 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/v6/pkg/bindings/internal/util" + "go.podman.io/podman/v6/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 57104db5c0..ac8820cd8e 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/v6/pkg/bindings/internal/util" + "go.podman.io/podman/v6/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 4ce0860022..feb7c34eba 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/v6/pkg/bindings/internal/util" + "go.podman.io/podman/v6/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 373f50e768..20e3911808 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/v6/pkg/bindings/internal/util" + "go.podman.io/podman/v6/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 152bba0c5a..c682e3ea92 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/v6/pkg/bindings/internal/util" + "go.podman.io/podman/v6/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 b2265132a9..ec5c3846b4 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/v6/pkg/bindings/internal/util" + "go.podman.io/podman/v6/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 7504e95c3d..870db2b160 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/v6/pkg/bindings/internal/util" + "go.podman.io/podman/v6/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 154cb8c1d4..e3a4151942 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/v6/pkg/bindings/internal/util" + "go.podman.io/podman/v6/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 789765e698..2b26dd1a28 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/v6/pkg/bindings/internal/util" + "go.podman.io/podman/v6/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 c6fa5aae81..e5ef447dac 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/v6/pkg/bindings/internal/util" + "go.podman.io/podman/v6/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 ab2fdc3f4d..ac01b55112 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/v6/pkg/bindings/internal/util" + "go.podman.io/podman/v6/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 b2ea9e13e1..867fb76732 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/v6/pkg/bindings/internal/util" + "go.podman.io/podman/v6/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 f5212db7d0..cb157dde28 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/v6/pkg/bindings/internal/util" + "go.podman.io/podman/v6/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 b363ac12e3..aa917f919c 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/v6/pkg/bindings/internal/util" + "go.podman.io/podman/v6/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 f5c722805a..d64310793b 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/v6/pkg/bindings/internal/util" + "go.podman.io/podman/v6/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 ae9a8d6a76..9ef1a2a491 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/v6/pkg/bindings/internal/util" + "go.podman.io/podman/v6/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 1c75c08cc4..1023a284f1 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/v6/pkg/bindings/internal/util" + "go.podman.io/podman/v6/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 57015b5c74..96ace15095 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/v6/pkg/bindings/internal/util" + "go.podman.io/podman/v6/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 a31d7fe1c2..3362e07e92 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/v6/pkg/bindings/internal/util" + "go.podman.io/podman/v6/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 0ab0a0ee07..5af1e5d14f 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/v6/pkg/bindings/internal/util" + "go.podman.io/podman/v6/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 2097012fc9..85855262ff 100644 --- a/pkg/bindings/containers/types_wait_options.go +++ b/pkg/bindings/containers/types_wait_options.go @@ -4,9 +4,9 @@ package containers import ( "net/url" - "github.com/containers/podman/v6/pkg/bindings/internal/util" + "go.podman.io/podman/v6/pkg/bindings/internal/util" - "github.com/containers/podman/v6/libpod/define" + "go.podman.io/podman/v6/libpod/define" ) // Changed returns true if named field has been set diff --git a/pkg/bindings/containers/update.go b/pkg/bindings/containers/update.go index 78a217c144..53b2029c2a 100644 --- a/pkg/bindings/containers/update.go +++ b/pkg/bindings/containers/update.go @@ -7,10 +7,10 @@ import ( "strconv" "strings" - "github.com/containers/podman/v6/pkg/api/handlers" - "github.com/containers/podman/v6/pkg/bindings" - "github.com/containers/podman/v6/pkg/domain/entities/types" jsoniter "github.com/json-iterator/go" + "go.podman.io/podman/v6/pkg/api/handlers" + "go.podman.io/podman/v6/pkg/bindings" + "go.podman.io/podman/v6/pkg/domain/entities/types" ) func Update(ctx context.Context, options *types.ContainerUpdateOptions) (string, error) { diff --git a/pkg/bindings/errors.go b/pkg/bindings/errors.go index 2dc55392fa..bce1ef75eb 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/v6/pkg/errorhandling" + "go.podman.io/podman/v6/pkg/errorhandling" ) var ErrNotImplemented = errors.New("function not implemented") diff --git a/pkg/bindings/generate/generate.go b/pkg/bindings/generate/generate.go index ba71f20ac2..f70cabf18d 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/v6/pkg/bindings" - "github.com/containers/podman/v6/pkg/domain/entities/types" + "go.podman.io/podman/v6/pkg/bindings" + "go.podman.io/podman/v6/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 43ba4a8149..e3ab431c72 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/v6/pkg/bindings/internal/util" + "go.podman.io/podman/v6/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 6eed03a883..d58fd157cf 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/v6/pkg/bindings/internal/util" + "go.podman.io/podman/v6/pkg/bindings/internal/util" ) // Changed returns true if named field has been set diff --git a/pkg/bindings/generator/generator.go b/pkg/bindings/generator/generator.go index 6c962d1a74..bb731aa648 100644 --- a/pkg/bindings/generator/generator.go +++ b/pkg/bindings/generator/generator.go @@ -81,7 +81,7 @@ func main() { } // always add reflect - imports := []string{"\"reflect\"", "\"github.com/containers/podman/v6/pkg/bindings/internal/util\""} + imports := []string{"\"reflect\"", "\"go.podman.io/podman/v6/pkg/bindings/internal/util\""} for _, imp := range f.Imports { imports = append(imports, imp.Path.Value) } diff --git a/pkg/bindings/images/build.go b/pkg/bindings/images/build.go index f2faf0b662..cbb3ca830f 100644 --- a/pkg/bindings/images/build.go +++ b/pkg/bindings/images/build.go @@ -19,13 +19,6 @@ import ( "strings" "github.com/blang/semver/v4" - "github.com/containers/podman/v6/internal/remote_build_helpers" - ldefine "github.com/containers/podman/v6/libpod/define" - "github.com/containers/podman/v6/pkg/auth" - "github.com/containers/podman/v6/pkg/bindings" - "github.com/containers/podman/v6/pkg/domain/entities/types" - "github.com/containers/podman/v6/pkg/specgen" - "github.com/containers/podman/v6/pkg/util" "github.com/docker/go-units" "github.com/hashicorp/go-multierror" jsoniter "github.com/json-iterator/go" @@ -35,6 +28,13 @@ import ( "go.podman.io/buildah/define" "go.podman.io/buildah/pkg/parse" imageTypes "go.podman.io/image/v5/types" + "go.podman.io/podman/v6/internal/remote_build_helpers" + ldefine "go.podman.io/podman/v6/libpod/define" + "go.podman.io/podman/v6/pkg/auth" + "go.podman.io/podman/v6/pkg/bindings" + "go.podman.io/podman/v6/pkg/domain/entities/types" + "go.podman.io/podman/v6/pkg/specgen" + "go.podman.io/podman/v6/pkg/util" "go.podman.io/storage/pkg/archive" "go.podman.io/storage/pkg/fileutils" "go.podman.io/storage/pkg/ioutils" diff --git a/pkg/bindings/images/diff.go b/pkg/bindings/images/diff.go index 77a1425e3b..f752dde46d 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/v6/pkg/bindings" + "go.podman.io/podman/v6/pkg/bindings" "go.podman.io/storage/pkg/archive" ) diff --git a/pkg/bindings/images/images.go b/pkg/bindings/images/images.go index 59ba632261..1dfb36f6dc 100644 --- a/pkg/bindings/images/images.go +++ b/pkg/bindings/images/images.go @@ -9,12 +9,12 @@ import ( "net/url" "strconv" - handlersTypes "github.com/containers/podman/v6/pkg/api/handlers/types" - "github.com/containers/podman/v6/pkg/auth" - "github.com/containers/podman/v6/pkg/bindings" - "github.com/containers/podman/v6/pkg/domain/entities/reports" - "github.com/containers/podman/v6/pkg/domain/entities/types" imageTypes "go.podman.io/image/v5/types" + handlersTypes "go.podman.io/podman/v6/pkg/api/handlers/types" + "go.podman.io/podman/v6/pkg/auth" + "go.podman.io/podman/v6/pkg/bindings" + "go.podman.io/podman/v6/pkg/domain/entities/reports" + "go.podman.io/podman/v6/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 5f3694d4f8..ab84f87d43 100644 --- a/pkg/bindings/images/pull.go +++ b/pkg/bindings/images/pull.go @@ -10,11 +10,11 @@ import ( "os" "strconv" - "github.com/containers/podman/v6/pkg/auth" - "github.com/containers/podman/v6/pkg/bindings" - "github.com/containers/podman/v6/pkg/domain/entities/types" - "github.com/containers/podman/v6/pkg/errorhandling" imgTypes "go.podman.io/image/v5/types" + "go.podman.io/podman/v6/pkg/auth" + "go.podman.io/podman/v6/pkg/bindings" + "go.podman.io/podman/v6/pkg/domain/entities/types" + "go.podman.io/podman/v6/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 46dd2973a5..483853cfe9 100644 --- a/pkg/bindings/images/push.go +++ b/pkg/bindings/images/push.go @@ -10,10 +10,10 @@ import ( "os" "strconv" - "github.com/containers/podman/v6/pkg/auth" - "github.com/containers/podman/v6/pkg/bindings" - "github.com/containers/podman/v6/pkg/domain/entities/types" imageTypes "go.podman.io/image/v5/types" + "go.podman.io/podman/v6/pkg/auth" + "go.podman.io/podman/v6/pkg/bindings" + "go.podman.io/podman/v6/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 24e809427a..07819d0779 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/v6/pkg/api/handlers/types" - "github.com/containers/podman/v6/pkg/bindings" - "github.com/containers/podman/v6/pkg/domain/entities/types" - "github.com/containers/podman/v6/pkg/errorhandling" + handlersTypes "go.podman.io/podman/v6/pkg/api/handlers/types" + "go.podman.io/podman/v6/pkg/bindings" + "go.podman.io/podman/v6/pkg/domain/entities/types" + "go.podman.io/podman/v6/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 32bcb37892..b8c118ae2a 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/v6/pkg/domain/entities/types" + "go.podman.io/podman/v6/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 e0640c7e1e..ade1d822ef 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/v6/pkg/bindings/internal/util" + "go.podman.io/podman/v6/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 f3a962a052..863b1c8df3 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/v6/pkg/bindings/internal/util" + "go.podman.io/podman/v6/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 59fabbb2d6..92432845ef 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/v6/pkg/bindings/internal/util" + "go.podman.io/podman/v6/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 f8da136b5b..d73ab001a4 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/v6/pkg/bindings/internal/util" + "go.podman.io/podman/v6/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 488e7e0e25..f9f16204d1 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/v6/pkg/bindings/internal/util" + "go.podman.io/podman/v6/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 9b9812d3c7..a20300e88c 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/v6/pkg/bindings/internal/util" + "go.podman.io/podman/v6/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 787fd96ad7..e07a84288f 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/v6/pkg/bindings/internal/util" + "go.podman.io/podman/v6/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 facfc82c72..c759dd0fe1 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/v6/pkg/bindings/internal/util" + "go.podman.io/podman/v6/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 842ac1d478..efa9688871 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/v6/pkg/bindings/internal/util" + "go.podman.io/podman/v6/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 33336af4b4..d9211b7643 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/v6/pkg/bindings/internal/util" + "go.podman.io/podman/v6/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 750422763c..725647ed4f 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/v6/pkg/bindings/internal/util" + "go.podman.io/podman/v6/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 f41b729800..450ab73e62 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/v6/pkg/bindings/internal/util" + "go.podman.io/podman/v6/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 0b0c78a95d..d48f01b5b6 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/v6/pkg/bindings/internal/util" + "go.podman.io/podman/v6/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 7b681241c0..6d25934bdc 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/v6/pkg/bindings/internal/util" + "go.podman.io/podman/v6/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 f53a12ca7d..3c0e426cf4 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/v6/pkg/bindings/internal/util" + "go.podman.io/podman/v6/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 90b0037fe1..5f35ef4332 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/v6/pkg/bindings/internal/util" + "go.podman.io/podman/v6/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 dcfd8bc85b..092980093c 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/v6/pkg/bindings/internal/util" + "go.podman.io/podman/v6/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 215f656efc..944aa64b94 100644 --- a/pkg/bindings/kube/kube.go +++ b/pkg/bindings/kube/kube.go @@ -8,12 +8,12 @@ import ( "os" "strconv" - "github.com/containers/podman/v6/pkg/auth" - "github.com/containers/podman/v6/pkg/bindings" - "github.com/containers/podman/v6/pkg/bindings/generate" - entitiesTypes "github.com/containers/podman/v6/pkg/domain/entities/types" "github.com/sirupsen/logrus" "go.podman.io/image/v5/types" + "go.podman.io/podman/v6/pkg/auth" + "go.podman.io/podman/v6/pkg/bindings" + "go.podman.io/podman/v6/pkg/bindings/generate" + entitiesTypes "go.podman.io/podman/v6/pkg/domain/entities/types" ) func Play(ctx context.Context, path string, options *PlayOptions) (*entitiesTypes.KubePlayReport, error) { diff --git a/pkg/bindings/kube/types_apply_options.go b/pkg/bindings/kube/types_apply_options.go index 936b1f2aa4..5080f76ac6 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/v6/pkg/bindings/internal/util" + "go.podman.io/podman/v6/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 7daa1c5aa2..acf00b5baa 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/v6/pkg/bindings/internal/util" + "go.podman.io/podman/v6/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 0afe322033..7a04650968 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/v6/pkg/bindings/internal/util" + "go.podman.io/podman/v6/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 abd3c792b3..34d995a5cb 100644 --- a/pkg/bindings/manifests/manifests.go +++ b/pkg/bindings/manifests/manifests.go @@ -16,15 +16,15 @@ import ( "strings" "sync" - "github.com/containers/podman/v6/pkg/auth" - "github.com/containers/podman/v6/pkg/bindings" - "github.com/containers/podman/v6/pkg/bindings/images" - entitiesTypes "github.com/containers/podman/v6/pkg/domain/entities/types" - "github.com/containers/podman/v6/pkg/errorhandling" jsoniter "github.com/json-iterator/go" "go.podman.io/common/libimage/define" "go.podman.io/image/v5/manifest" imageTypes "go.podman.io/image/v5/types" + "go.podman.io/podman/v6/pkg/auth" + "go.podman.io/podman/v6/pkg/bindings" + "go.podman.io/podman/v6/pkg/bindings/images" + entitiesTypes "go.podman.io/podman/v6/pkg/domain/entities/types" + "go.podman.io/podman/v6/pkg/errorhandling" ) // Create creates a manifest for the given name. Optional images to be associated with diff --git a/pkg/bindings/manifests/types_add_options.go b/pkg/bindings/manifests/types_add_options.go index a7f602890c..088a76daca 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/v6/pkg/bindings/internal/util" + "go.podman.io/podman/v6/pkg/bindings/internal/util" ) // Changed returns true if named field has been set diff --git a/pkg/bindings/manifests/types_addartifact_options.go b/pkg/bindings/manifests/types_addartifact_options.go index c1b354e892..6da3bb2add 100644 --- a/pkg/bindings/manifests/types_addartifact_options.go +++ b/pkg/bindings/manifests/types_addartifact_options.go @@ -4,7 +4,7 @@ package manifests import ( "net/url" - "github.com/containers/podman/v6/pkg/bindings/internal/util" + "go.podman.io/podman/v6/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 6c610f66e6..91115c6cfc 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/v6/pkg/bindings/internal/util" + "go.podman.io/podman/v6/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 a4f9fb2ec0..09bb84fd00 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/v6/pkg/bindings/internal/util" + "go.podman.io/podman/v6/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 a994854288..5c59bce262 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/v6/pkg/bindings/internal/util" + "go.podman.io/podman/v6/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 024666a64e..c12f4e27e2 100644 --- a/pkg/bindings/manifests/types_modify_options.go +++ b/pkg/bindings/manifests/types_modify_options.go @@ -5,7 +5,7 @@ import ( "io" "net/url" - "github.com/containers/podman/v6/pkg/bindings/internal/util" + "go.podman.io/podman/v6/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 f224aaf995..287a7a04fb 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/v6/pkg/bindings/internal/util" + "go.podman.io/podman/v6/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 5bc684980b..071d895abd 100644 --- a/pkg/bindings/network/network.go +++ b/pkg/bindings/network/network.go @@ -6,10 +6,10 @@ import ( "net/url" "strings" - "github.com/containers/podman/v6/pkg/bindings" - entitiesTypes "github.com/containers/podman/v6/pkg/domain/entities/types" jsoniter "github.com/json-iterator/go" "go.podman.io/common/libnetwork/types" + "go.podman.io/podman/v6/pkg/bindings" + entitiesTypes "go.podman.io/podman/v6/pkg/domain/entities/types" ) // Create makes a new network configuration diff --git a/pkg/bindings/network/types_create_options.go b/pkg/bindings/network/types_create_options.go index be6443d2a9..2cf1740dfe 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/v6/pkg/bindings/internal/util" + "go.podman.io/podman/v6/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 8971186544..4a6f2b747b 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/v6/pkg/bindings/internal/util" + "go.podman.io/podman/v6/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 378e7b6f6e..2ffe210a83 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/v6/pkg/bindings/internal/util" + "go.podman.io/podman/v6/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 68e769812d..bfe2749004 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/v6/pkg/bindings/internal/util" + "go.podman.io/podman/v6/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 3243241629..3e7285149c 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/v6/pkg/bindings/internal/util" + "go.podman.io/podman/v6/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 6aa4272de6..afb663681d 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/v6/pkg/bindings/internal/util" + "go.podman.io/podman/v6/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 2ae3a58c55..180141072f 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/v6/pkg/bindings/internal/util" + "go.podman.io/podman/v6/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 efbd19942f..1f3f45e775 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/v6/pkg/bindings/internal/util" + "go.podman.io/podman/v6/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 4bafe08fff..735d78e953 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/v6/pkg/bindings/internal/util" + "go.podman.io/podman/v6/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 bf3699774d..10a5b65cc6 100644 --- a/pkg/bindings/play/play.go +++ b/pkg/bindings/play/play.go @@ -4,8 +4,8 @@ import ( "context" "io" - "github.com/containers/podman/v6/pkg/bindings/kube" - "github.com/containers/podman/v6/pkg/domain/entities/types" + "go.podman.io/podman/v6/pkg/bindings/kube" + "go.podman.io/podman/v6/pkg/domain/entities/types" ) type KubeOptions = kube.PlayOptions diff --git a/pkg/bindings/pods/pods.go b/pkg/bindings/pods/pods.go index c85033d5db..c6d4ae2765 100644 --- a/pkg/bindings/pods/pods.go +++ b/pkg/bindings/pods/pods.go @@ -6,11 +6,11 @@ import ( "net/url" "strings" - "github.com/containers/podman/v6/pkg/api/handlers" - "github.com/containers/podman/v6/pkg/bindings" - entitiesTypes "github.com/containers/podman/v6/pkg/domain/entities/types" - "github.com/containers/podman/v6/pkg/errorhandling" jsoniter "github.com/json-iterator/go" + "go.podman.io/podman/v6/pkg/api/handlers" + "go.podman.io/podman/v6/pkg/bindings" + entitiesTypes "go.podman.io/podman/v6/pkg/domain/entities/types" + "go.podman.io/podman/v6/pkg/errorhandling" ) func CreatePodFromSpec(ctx context.Context, spec *entitiesTypes.PodSpec) (*entitiesTypes.PodCreateReport, error) { diff --git a/pkg/bindings/pods/types_create_options.go b/pkg/bindings/pods/types_create_options.go index aafe90acff..5595970e9e 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/v6/pkg/bindings/internal/util" + "go.podman.io/podman/v6/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 0088929e58..45b52cca82 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/v6/pkg/bindings/internal/util" + "go.podman.io/podman/v6/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 cec82559da..d90b944776 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/v6/pkg/bindings/internal/util" + "go.podman.io/podman/v6/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 fefec07799..cf968f2995 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/v6/pkg/bindings/internal/util" + "go.podman.io/podman/v6/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 fea09c373d..329b1e0d72 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/v6/pkg/bindings/internal/util" + "go.podman.io/podman/v6/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 05b813155c..856e400694 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/v6/pkg/bindings/internal/util" + "go.podman.io/podman/v6/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 426a6c4c78..75126e580e 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/v6/pkg/bindings/internal/util" + "go.podman.io/podman/v6/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 43b7541923..0c7d944bbe 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/v6/pkg/bindings/internal/util" + "go.podman.io/podman/v6/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 5803038df7..661ec096e6 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/v6/pkg/bindings/internal/util" + "go.podman.io/podman/v6/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 d8fd011d45..943474c46d 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/v6/pkg/bindings/internal/util" + "go.podman.io/podman/v6/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 7a78a0692e..1ba09f10df 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/v6/pkg/bindings/internal/util" + "go.podman.io/podman/v6/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 0cb64ce17f..49d8a3dfff 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/v6/pkg/bindings/internal/util" + "go.podman.io/podman/v6/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 1850a4248d..8428b6561b 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/v6/pkg/bindings/internal/util" + "go.podman.io/podman/v6/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 840ef6270c..bc5a45c66b 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/v6/pkg/bindings/internal/util" + "go.podman.io/podman/v6/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 b489d0bd37..cc6e6ed729 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/v6/pkg/bindings" - entitiesTypes "github.com/containers/podman/v6/pkg/domain/entities/types" + "go.podman.io/podman/v6/pkg/bindings" + entitiesTypes "go.podman.io/podman/v6/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 cd180b4f77..188e1e9cb7 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/v6/pkg/bindings/internal/util" + "go.podman.io/podman/v6/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 e89e6d085c..4a30aef1c4 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/v6/pkg/bindings/internal/util" + "go.podman.io/podman/v6/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 20874e3c8a..d38ad49e8f 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/v6/pkg/bindings/internal/util" + "go.podman.io/podman/v6/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 75c8b48229..5d620b1304 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/v6/pkg/bindings/internal/util" + "go.podman.io/podman/v6/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 bd197c5f9d..140a215a34 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/v6/libpod/define" - "github.com/containers/podman/v6/pkg/bindings" + "go.podman.io/podman/v6/libpod/define" + "go.podman.io/podman/v6/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 0e0d6fb96a..ade08f070b 100644 --- a/pkg/bindings/system/system.go +++ b/pkg/bindings/system/system.go @@ -7,10 +7,10 @@ import ( "net/http" "time" - "github.com/containers/podman/v6/libpod/define" - "github.com/containers/podman/v6/pkg/bindings" - "github.com/containers/podman/v6/pkg/domain/entities/types" "github.com/sirupsen/logrus" + "go.podman.io/podman/v6/libpod/define" + "go.podman.io/podman/v6/pkg/bindings" + "go.podman.io/podman/v6/pkg/domain/entities/types" ) // Events allows you to monitor libdpod related events like container creation and diff --git a/pkg/bindings/system/types_check_options.go b/pkg/bindings/system/types_check_options.go index 7aafb315aa..7f79479a85 100644 --- a/pkg/bindings/system/types_check_options.go +++ b/pkg/bindings/system/types_check_options.go @@ -4,7 +4,7 @@ package system import ( "net/url" - "github.com/containers/podman/v6/pkg/bindings/internal/util" + "go.podman.io/podman/v6/pkg/bindings/internal/util" ) // Changed returns true if named field has been set diff --git a/pkg/bindings/system/types_disk_options.go b/pkg/bindings/system/types_disk_options.go index 46be0d2a98..9dea8b1168 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/v6/pkg/bindings/internal/util" + "go.podman.io/podman/v6/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 502b656c77..4203b8ec5c 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/v6/pkg/bindings/internal/util" + "go.podman.io/podman/v6/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 f254d18703..14b8ab2cd2 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/v6/pkg/bindings/internal/util" + "go.podman.io/podman/v6/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 8bedc5b681..20dd232f80 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/v6/pkg/bindings/internal/util" + "go.podman.io/podman/v6/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 312e7ed04e..74b9e40576 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/v6/pkg/bindings/internal/util" + "go.podman.io/podman/v6/pkg/bindings/internal/util" ) // Changed returns true if named field has been set diff --git a/pkg/bindings/test/api_response_test.go b/pkg/bindings/test/api_response_test.go index 15de7e5839..6f8789e73d 100644 --- a/pkg/bindings/test/api_response_test.go +++ b/pkg/bindings/test/api_response_test.go @@ -7,11 +7,11 @@ import ( "io" "net/http" - "github.com/containers/podman/v6/pkg/bindings" - "github.com/containers/podman/v6/pkg/domain/entities/reports" - "github.com/containers/podman/v6/pkg/domain/entities/types" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + "go.podman.io/podman/v6/pkg/bindings" + "go.podman.io/podman/v6/pkg/domain/entities/reports" + "go.podman.io/podman/v6/pkg/domain/entities/types" ) var _ = Describe("APIResponse Process method", func() { diff --git a/pkg/bindings/test/attach_test.go b/pkg/bindings/test/attach_test.go index 55fb245940..015f8f6b7e 100644 --- a/pkg/bindings/test/attach_test.go +++ b/pkg/bindings/test/attach_test.go @@ -5,12 +5,12 @@ import ( "fmt" "time" - "github.com/containers/podman/v6/libpod/define" - "github.com/containers/podman/v6/pkg/bindings/containers" - "github.com/containers/podman/v6/pkg/specgen" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "github.com/onsi/gomega/gexec" + "go.podman.io/podman/v6/libpod/define" + "go.podman.io/podman/v6/pkg/bindings/containers" + "go.podman.io/podman/v6/pkg/specgen" ) var _ = Describe("Podman containers attach", func() { diff --git a/pkg/bindings/test/auth_test.go b/pkg/bindings/test/auth_test.go index 526f699992..ce540ae7b2 100644 --- a/pkg/bindings/test/auth_test.go +++ b/pkg/bindings/test/auth_test.go @@ -4,13 +4,13 @@ import ( "os" "time" - podmanRegistry "github.com/containers/podman/v6/hack/podman-registry-go" - "github.com/containers/podman/v6/pkg/bindings/images" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "github.com/onsi/gomega/gexec" "go.podman.io/common/pkg/auth" "go.podman.io/image/v5/types" + podmanRegistry "go.podman.io/podman/v6/hack/podman-registry-go" + "go.podman.io/podman/v6/pkg/bindings/images" ) var _ = Describe("Podman images", func() { diff --git a/pkg/bindings/test/common_test.go b/pkg/bindings/test/common_test.go index 7a8a1cbfa6..9918dae13d 100644 --- a/pkg/bindings/test/common_test.go +++ b/pkg/bindings/test/common_test.go @@ -9,13 +9,13 @@ import ( "strings" "time" - "github.com/containers/podman/v6/libpod/define" - . "github.com/containers/podman/v6/pkg/bindings" - "github.com/containers/podman/v6/pkg/bindings/containers" - "github.com/containers/podman/v6/pkg/specgen" "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" + "go.podman.io/podman/v6/libpod/define" + . "go.podman.io/podman/v6/pkg/bindings" + "go.podman.io/podman/v6/pkg/bindings/containers" + "go.podman.io/podman/v6/pkg/specgen" ) type testImage struct { diff --git a/pkg/bindings/test/connection_test.go b/pkg/bindings/test/connection_test.go index 67a53df4a0..8800ccd3d1 100644 --- a/pkg/bindings/test/connection_test.go +++ b/pkg/bindings/test/connection_test.go @@ -4,11 +4,11 @@ import ( "context" "time" - "github.com/containers/podman/v6/pkg/bindings/containers" - "github.com/containers/podman/v6/pkg/bindings/system" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "github.com/onsi/gomega/gexec" + "go.podman.io/podman/v6/pkg/bindings/containers" + "go.podman.io/podman/v6/pkg/bindings/system" ) var _ = Describe("Podman connection", func() { diff --git a/pkg/bindings/test/containers_test.go b/pkg/bindings/test/containers_test.go index 2feb58f963..50a3682986 100644 --- a/pkg/bindings/test/containers_test.go +++ b/pkg/bindings/test/containers_test.go @@ -5,15 +5,15 @@ import ( "strings" "time" - "github.com/containers/podman/v6/libpod/define" - "github.com/containers/podman/v6/pkg/bindings" - "github.com/containers/podman/v6/pkg/bindings/containers" - "github.com/containers/podman/v6/pkg/domain/entities/reports" - "github.com/containers/podman/v6/pkg/domain/entities/types" - "github.com/containers/podman/v6/pkg/specgen" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "github.com/onsi/gomega/gexec" + "go.podman.io/podman/v6/libpod/define" + "go.podman.io/podman/v6/pkg/bindings" + "go.podman.io/podman/v6/pkg/bindings/containers" + "go.podman.io/podman/v6/pkg/domain/entities/reports" + "go.podman.io/podman/v6/pkg/domain/entities/types" + "go.podman.io/podman/v6/pkg/specgen" ) var _ = Describe("Podman containers ", func() { diff --git a/pkg/bindings/test/create_test.go b/pkg/bindings/test/create_test.go index ad536669b1..194880e7f4 100644 --- a/pkg/bindings/test/create_test.go +++ b/pkg/bindings/test/create_test.go @@ -3,11 +3,11 @@ package bindings_test import ( "time" - "github.com/containers/podman/v6/pkg/bindings/containers" - "github.com/containers/podman/v6/pkg/specgen" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "github.com/onsi/gomega/gexec" + "go.podman.io/podman/v6/pkg/bindings/containers" + "go.podman.io/podman/v6/pkg/specgen" ) var _ = Describe("Create containers ", func() { diff --git a/pkg/bindings/test/exec_test.go b/pkg/bindings/test/exec_test.go index ca354b3cad..3bdd13c6db 100644 --- a/pkg/bindings/test/exec_test.go +++ b/pkg/bindings/test/exec_test.go @@ -3,11 +3,11 @@ package bindings_test import ( "time" - "github.com/containers/podman/v6/pkg/api/handlers" - "github.com/containers/podman/v6/pkg/bindings/containers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "github.com/onsi/gomega/gexec" + "go.podman.io/podman/v6/pkg/api/handlers" + "go.podman.io/podman/v6/pkg/bindings/containers" ) var _ = Describe("Podman containers exec", func() { diff --git a/pkg/bindings/test/generator_test.go b/pkg/bindings/test/generator_test.go index b8f0c15170..b2b6d2276a 100644 --- a/pkg/bindings/test/generator_test.go +++ b/pkg/bindings/test/generator_test.go @@ -1,10 +1,10 @@ package bindings_test import ( - "github.com/containers/podman/v6/pkg/bindings/containers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gstruct" + "go.podman.io/podman/v6/pkg/bindings/containers" ) var _ = Describe("Podman API Bindings", func() { diff --git a/pkg/bindings/test/images_test.go b/pkg/bindings/test/images_test.go index d87820002a..03e135d05d 100644 --- a/pkg/bindings/test/images_test.go +++ b/pkg/bindings/test/images_test.go @@ -8,16 +8,16 @@ import ( "path/filepath" "time" - podmanRegistry "github.com/containers/podman/v6/hack/podman-registry-go" - "github.com/containers/podman/v6/libpod/define" - "github.com/containers/podman/v6/pkg/bindings" - "github.com/containers/podman/v6/pkg/bindings/containers" - "github.com/containers/podman/v6/pkg/bindings/images" - "github.com/containers/podman/v6/pkg/domain/entities" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" . "github.com/onsi/gomega/gstruct" + podmanRegistry "go.podman.io/podman/v6/hack/podman-registry-go" + "go.podman.io/podman/v6/libpod/define" + "go.podman.io/podman/v6/pkg/bindings" + "go.podman.io/podman/v6/pkg/bindings/containers" + "go.podman.io/podman/v6/pkg/bindings/images" + "go.podman.io/podman/v6/pkg/domain/entities" ) var _ = Describe("Podman images", func() { diff --git a/pkg/bindings/test/info_test.go b/pkg/bindings/test/info_test.go index a0ee5710f0..1b8d123914 100644 --- a/pkg/bindings/test/info_test.go +++ b/pkg/bindings/test/info_test.go @@ -4,13 +4,13 @@ import ( "runtime" "time" - "github.com/containers/podman/v6/pkg/bindings/containers" - "github.com/containers/podman/v6/pkg/bindings/images" - "github.com/containers/podman/v6/pkg/bindings/system" - "github.com/containers/podman/v6/pkg/specgen" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "github.com/onsi/gomega/gexec" + "go.podman.io/podman/v6/pkg/bindings/containers" + "go.podman.io/podman/v6/pkg/bindings/images" + "go.podman.io/podman/v6/pkg/bindings/system" + "go.podman.io/podman/v6/pkg/specgen" ) var _ = Describe("Podman info", func() { diff --git a/pkg/bindings/test/manifests_test.go b/pkg/bindings/test/manifests_test.go index 4b3bd54afe..433567ea9f 100644 --- a/pkg/bindings/test/manifests_test.go +++ b/pkg/bindings/test/manifests_test.go @@ -6,13 +6,13 @@ import ( "net/http" "time" - podmanRegistry "github.com/containers/podman/v6/hack/podman-registry-go" - "github.com/containers/podman/v6/pkg/bindings" - "github.com/containers/podman/v6/pkg/bindings/images" - "github.com/containers/podman/v6/pkg/bindings/manifests" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "github.com/onsi/gomega/gexec" + podmanRegistry "go.podman.io/podman/v6/hack/podman-registry-go" + "go.podman.io/podman/v6/pkg/bindings" + "go.podman.io/podman/v6/pkg/bindings/images" + "go.podman.io/podman/v6/pkg/bindings/manifests" ) var _ = Describe("Podman manifests", func() { diff --git a/pkg/bindings/test/networks_test.go b/pkg/bindings/test/networks_test.go index c309e09f0b..f858383412 100644 --- a/pkg/bindings/test/networks_test.go +++ b/pkg/bindings/test/networks_test.go @@ -7,13 +7,13 @@ import ( "slices" "time" - "github.com/containers/podman/v6/pkg/bindings" - "github.com/containers/podman/v6/pkg/bindings/containers" - "github.com/containers/podman/v6/pkg/bindings/network" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "github.com/onsi/gomega/gexec" "go.podman.io/common/libnetwork/types" + "go.podman.io/podman/v6/pkg/bindings" + "go.podman.io/podman/v6/pkg/bindings/containers" + "go.podman.io/podman/v6/pkg/bindings/network" ) var _ = Describe("Podman networks", func() { diff --git a/pkg/bindings/test/pods_test.go b/pkg/bindings/test/pods_test.go index 32e3b604ed..3b865aa626 100644 --- a/pkg/bindings/test/pods_test.go +++ b/pkg/bindings/test/pods_test.go @@ -7,16 +7,16 @@ import ( "strings" "time" - "github.com/containers/podman/v6/libpod/define" - "github.com/containers/podman/v6/pkg/bindings" - "github.com/containers/podman/v6/pkg/bindings/pods" - "github.com/containers/podman/v6/pkg/domain/entities" - "github.com/containers/podman/v6/pkg/errorhandling" - "github.com/containers/podman/v6/pkg/specgen" - "github.com/containers/podman/v6/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "github.com/onsi/gomega/gexec" + "go.podman.io/podman/v6/libpod/define" + "go.podman.io/podman/v6/pkg/bindings" + "go.podman.io/podman/v6/pkg/bindings/pods" + "go.podman.io/podman/v6/pkg/domain/entities" + "go.podman.io/podman/v6/pkg/errorhandling" + "go.podman.io/podman/v6/pkg/specgen" + "go.podman.io/podman/v6/utils" ) var _ = Describe("Podman pods", func() { diff --git a/pkg/bindings/test/resource_test.go b/pkg/bindings/test/resource_test.go index 959822dfb1..10775ee4eb 100644 --- a/pkg/bindings/test/resource_test.go +++ b/pkg/bindings/test/resource_test.go @@ -13,14 +13,14 @@ import ( "strconv" "syscall" - "github.com/containers/podman/v6/pkg/bindings" - "github.com/containers/podman/v6/pkg/bindings/containers" - "github.com/containers/podman/v6/pkg/bindings/images" - "github.com/containers/podman/v6/pkg/bindings/pods" - "github.com/containers/podman/v6/pkg/bindings/system" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" + "go.podman.io/podman/v6/pkg/bindings" + "go.podman.io/podman/v6/pkg/bindings/containers" + "go.podman.io/podman/v6/pkg/bindings/images" + "go.podman.io/podman/v6/pkg/bindings/pods" + "go.podman.io/podman/v6/pkg/bindings/system" ) var _ = Describe("Verify Podman resources", func() { diff --git a/pkg/bindings/test/secrets_test.go b/pkg/bindings/test/secrets_test.go index 8811d0f141..28d2c76376 100644 --- a/pkg/bindings/test/secrets_test.go +++ b/pkg/bindings/test/secrets_test.go @@ -6,11 +6,11 @@ import ( "strings" "time" - "github.com/containers/podman/v6/pkg/bindings" - "github.com/containers/podman/v6/pkg/bindings/secrets" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "github.com/onsi/gomega/gexec" + "go.podman.io/podman/v6/pkg/bindings" + "go.podman.io/podman/v6/pkg/bindings/secrets" ) var _ = Describe("Podman secrets", func() { diff --git a/pkg/bindings/test/system_test.go b/pkg/bindings/test/system_test.go index 2a950c4957..d98d7f7578 100644 --- a/pkg/bindings/test/system_test.go +++ b/pkg/bindings/test/system_test.go @@ -4,15 +4,15 @@ import ( "sync" "time" - "github.com/containers/podman/v6/pkg/bindings/containers" - "github.com/containers/podman/v6/pkg/bindings/pods" - "github.com/containers/podman/v6/pkg/bindings/system" - "github.com/containers/podman/v6/pkg/bindings/volumes" - "github.com/containers/podman/v6/pkg/domain/entities" - "github.com/containers/podman/v6/pkg/domain/entities/reports" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "github.com/onsi/gomega/gexec" + "go.podman.io/podman/v6/pkg/bindings/containers" + "go.podman.io/podman/v6/pkg/bindings/pods" + "go.podman.io/podman/v6/pkg/bindings/system" + "go.podman.io/podman/v6/pkg/bindings/volumes" + "go.podman.io/podman/v6/pkg/domain/entities" + "go.podman.io/podman/v6/pkg/domain/entities/reports" ) var _ = Describe("Podman system", func() { diff --git a/pkg/bindings/test/types_test.go b/pkg/bindings/test/types_test.go index 3cdd0eb14c..9e89bf4f65 100644 --- a/pkg/bindings/test/types_test.go +++ b/pkg/bindings/test/types_test.go @@ -3,11 +3,11 @@ package bindings_test import ( "bytes" - "github.com/containers/podman/v6/pkg/bindings/images" - "github.com/containers/podman/v6/pkg/bindings/kube" - "github.com/containers/podman/v6/pkg/bindings/manifests" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + "go.podman.io/podman/v6/pkg/bindings/images" + "go.podman.io/podman/v6/pkg/bindings/kube" + "go.podman.io/podman/v6/pkg/bindings/manifests" ) var _ = Describe("Binding types", func() { diff --git a/pkg/bindings/test/volumes_test.go b/pkg/bindings/test/volumes_test.go index 0a0618b1b2..c215b7c546 100644 --- a/pkg/bindings/test/volumes_test.go +++ b/pkg/bindings/test/volumes_test.go @@ -7,14 +7,14 @@ import ( "slices" "time" - "github.com/containers/podman/v6/pkg/bindings" - "github.com/containers/podman/v6/pkg/bindings/containers" - "github.com/containers/podman/v6/pkg/bindings/volumes" - "github.com/containers/podman/v6/pkg/domain/entities" - "github.com/containers/podman/v6/pkg/domain/entities/reports" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "github.com/onsi/gomega/gexec" + "go.podman.io/podman/v6/pkg/bindings" + "go.podman.io/podman/v6/pkg/bindings/containers" + "go.podman.io/podman/v6/pkg/bindings/volumes" + "go.podman.io/podman/v6/pkg/domain/entities" + "go.podman.io/podman/v6/pkg/domain/entities/reports" ) var _ = Describe("Podman volumes", func() { diff --git a/pkg/bindings/volumes/types_create_options.go b/pkg/bindings/volumes/types_create_options.go index 34784dc214..87c89e5b95 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/v6/pkg/bindings/internal/util" + "go.podman.io/podman/v6/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 21b970dd94..a0e256a4ca 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/v6/pkg/bindings/internal/util" + "go.podman.io/podman/v6/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 ba8951ae0c..925b15616e 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/v6/pkg/bindings/internal/util" + "go.podman.io/podman/v6/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 b59205c9c8..3658003ad8 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/v6/pkg/bindings/internal/util" + "go.podman.io/podman/v6/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 c89bb6ff08..42ccec2477 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/v6/pkg/bindings/internal/util" + "go.podman.io/podman/v6/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 292da60a42..084be66608 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/v6/pkg/bindings/internal/util" + "go.podman.io/podman/v6/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 37f4ee44e4..75abf2ab59 100644 --- a/pkg/bindings/volumes/volumes.go +++ b/pkg/bindings/volumes/volumes.go @@ -7,10 +7,10 @@ import ( "net/http" "strings" - "github.com/containers/podman/v6/pkg/bindings" - "github.com/containers/podman/v6/pkg/domain/entities/reports" - entitiesTypes "github.com/containers/podman/v6/pkg/domain/entities/types" jsoniter "github.com/json-iterator/go" + "go.podman.io/podman/v6/pkg/bindings" + "go.podman.io/podman/v6/pkg/domain/entities/reports" + entitiesTypes "go.podman.io/podman/v6/pkg/domain/entities/types" ) // Create creates a volume given its configuration. diff --git a/pkg/checkpoint/checkpoint_restore.go b/pkg/checkpoint/checkpoint_restore.go index 48ec713db0..7b4d6d0d3f 100644 --- a/pkg/checkpoint/checkpoint_restore.go +++ b/pkg/checkpoint/checkpoint_restore.go @@ -9,17 +9,17 @@ import ( "os" metadata "github.com/checkpoint-restore/checkpointctl/lib" - "github.com/containers/podman/v6/libpod" - ann "github.com/containers/podman/v6/pkg/annotations" - "github.com/containers/podman/v6/pkg/checkpoint/crutils" - "github.com/containers/podman/v6/pkg/criu" - "github.com/containers/podman/v6/pkg/domain/entities" - "github.com/containers/podman/v6/pkg/specgen/generate" - "github.com/containers/podman/v6/pkg/specgenutil" spec "github.com/opencontainers/runtime-spec/specs-go" "github.com/sirupsen/logrus" "go.podman.io/common/libimage" "go.podman.io/common/pkg/config" + "go.podman.io/podman/v6/libpod" + ann "go.podman.io/podman/v6/pkg/annotations" + "go.podman.io/podman/v6/pkg/checkpoint/crutils" + "go.podman.io/podman/v6/pkg/criu" + "go.podman.io/podman/v6/pkg/domain/entities" + "go.podman.io/podman/v6/pkg/specgen/generate" + "go.podman.io/podman/v6/pkg/specgenutil" ) // Prefixing the checkpoint/restore related functions with 'cr' diff --git a/pkg/copy/fileinfo.go b/pkg/copy/fileinfo.go index 5dc3e287e0..574492c513 100644 --- a/pkg/copy/fileinfo.go +++ b/pkg/copy/fileinfo.go @@ -10,7 +10,7 @@ import ( "path/filepath" "strings" - "github.com/containers/podman/v6/libpod/define" + "go.podman.io/podman/v6/libpod/define" ) // XDockerContainerPathStatHeader is the *key* in http headers pointing to the diff --git a/pkg/domain/entities/artifact.go b/pkg/domain/entities/artifact.go index 55917fa82b..1d6d46ac05 100644 --- a/pkg/domain/entities/artifact.go +++ b/pkg/domain/entities/artifact.go @@ -4,9 +4,9 @@ import ( "io" encconfig "github.com/containers/ocicrypt/config" - entitiesTypes "github.com/containers/podman/v6/pkg/domain/entities/types" libartifactTypes "go.podman.io/common/pkg/libartifact/types" "go.podman.io/image/v5/types" + entitiesTypes "go.podman.io/podman/v6/pkg/domain/entities/types" ) type ArtifactAddOptions struct { diff --git a/pkg/domain/entities/container_ps.go b/pkg/domain/entities/container_ps.go index 81f166ea9a..0c397af9e1 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/v6/pkg/domain/entities/types" + "go.podman.io/podman/v6/pkg/domain/entities/types" ) // ExternalContainerFilter is a function to determine whether a container list is included diff --git a/pkg/domain/entities/containers.go b/pkg/domain/entities/containers.go index b0219ce87b..6e9e200077 100644 --- a/pkg/domain/entities/containers.go +++ b/pkg/domain/entities/containers.go @@ -6,11 +6,11 @@ import ( "os" "time" - "github.com/containers/podman/v6/libpod/define" - "github.com/containers/podman/v6/pkg/domain/entities/types" - "github.com/containers/podman/v6/pkg/specgen" nettypes "go.podman.io/common/libnetwork/types" imageTypes "go.podman.io/image/v5/types" + "go.podman.io/podman/v6/libpod/define" + "go.podman.io/podman/v6/pkg/domain/entities/types" + "go.podman.io/podman/v6/pkg/specgen" "go.podman.io/storage/pkg/archive" ) diff --git a/pkg/domain/entities/engine_container.go b/pkg/domain/entities/engine_container.go index 140211dd65..10e1c32cfd 100644 --- a/pkg/domain/entities/engine_container.go +++ b/pkg/domain/entities/engine_container.go @@ -4,12 +4,12 @@ import ( "context" "io" - "github.com/containers/podman/v6/libpod/define" - "github.com/containers/podman/v6/pkg/domain/entities/reports" - "github.com/containers/podman/v6/pkg/domain/entities/types" - "github.com/containers/podman/v6/pkg/specgen" netTypes "go.podman.io/common/libnetwork/types" "go.podman.io/common/pkg/config" + "go.podman.io/podman/v6/libpod/define" + "go.podman.io/podman/v6/pkg/domain/entities/reports" + "go.podman.io/podman/v6/pkg/domain/entities/types" + "go.podman.io/podman/v6/pkg/specgen" ) type ContainerCopyFunc = types.ContainerCopyFunc diff --git a/pkg/domain/entities/engine_image.go b/pkg/domain/entities/engine_image.go index bb69a87aad..d7f645317e 100644 --- a/pkg/domain/entities/engine_image.go +++ b/pkg/domain/entities/engine_image.go @@ -4,9 +4,9 @@ import ( "context" "io" - "github.com/containers/podman/v6/pkg/domain/entities/reports" "go.podman.io/common/libimage/define" "go.podman.io/common/pkg/config" + "go.podman.io/podman/v6/pkg/domain/entities/reports" ) type ImageEngine interface { //nolint:interfacebloat diff --git a/pkg/domain/entities/events.go b/pkg/domain/entities/events.go index 4ec362eedc..3cba2490e2 100644 --- a/pkg/domain/entities/events.go +++ b/pkg/domain/entities/events.go @@ -4,9 +4,9 @@ import ( "strconv" "time" - libpodEvents "github.com/containers/podman/v6/libpod/events" - types "github.com/containers/podman/v6/pkg/domain/entities/types" dockerEvents "github.com/moby/moby/api/types/events" + libpodEvents "go.podman.io/podman/v6/libpod/events" + types "go.podman.io/podman/v6/pkg/domain/entities/types" ) type Event = types.Event diff --git a/pkg/domain/entities/generate.go b/pkg/domain/entities/generate.go index 6596b9a4fc..826c8ebc96 100644 --- a/pkg/domain/entities/generate.go +++ b/pkg/domain/entities/generate.go @@ -1,7 +1,7 @@ package entities import ( - "github.com/containers/podman/v6/pkg/domain/entities/types" + "go.podman.io/podman/v6/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 b59197ac47..f3e1c96472 100644 --- a/pkg/domain/entities/images.go +++ b/pkg/domain/entities/images.go @@ -5,10 +5,10 @@ import ( "net/url" encconfig "github.com/containers/ocicrypt/config" - entitiesTypes "github.com/containers/podman/v6/pkg/domain/entities/types" "go.podman.io/common/pkg/config" "go.podman.io/image/v5/signature/signer" "go.podman.io/image/v5/types" + entitiesTypes "go.podman.io/podman/v6/pkg/domain/entities/types" ) type ImageSummary = entitiesTypes.ImageSummary diff --git a/pkg/domain/entities/machine.go b/pkg/domain/entities/machine.go index 1390437db8..16bf317739 100644 --- a/pkg/domain/entities/machine.go +++ b/pkg/domain/entities/machine.go @@ -1,6 +1,6 @@ package entities -import "github.com/containers/podman/v6/libpod/define" +import "go.podman.io/podman/v6/libpod/define" type ListReporter struct { Name string diff --git a/pkg/domain/entities/manifest.go b/pkg/domain/entities/manifest.go index c58fc99e05..79ee4776ba 100644 --- a/pkg/domain/entities/manifest.go +++ b/pkg/domain/entities/manifest.go @@ -1,8 +1,8 @@ package entities import ( - entitiesTypes "github.com/containers/podman/v6/pkg/domain/entities/types" "go.podman.io/image/v5/types" + entitiesTypes "go.podman.io/podman/v6/pkg/domain/entities/types" ) // ManifestCreateOptions provides model for creating manifest list or image index diff --git a/pkg/domain/entities/network.go b/pkg/domain/entities/network.go index 1d7cc4f417..e94dd910fe 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/v6/pkg/domain/entities/types" + entitiesTypes "go.podman.io/podman/v6/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 0131bf4283..687712569e 100644 --- a/pkg/domain/entities/play.go +++ b/pkg/domain/entities/play.go @@ -3,8 +3,8 @@ package entities import ( "net" - entitiesTypes "github.com/containers/podman/v6/pkg/domain/entities/types" "go.podman.io/image/v5/types" + entitiesTypes "go.podman.io/podman/v6/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 46b65764e2..c5738322c4 100644 --- a/pkg/domain/entities/pods.go +++ b/pkg/domain/entities/pods.go @@ -4,12 +4,12 @@ import ( "errors" "strings" - "github.com/containers/podman/v6/libpod/define" - "github.com/containers/podman/v6/pkg/domain/entities/types" - "github.com/containers/podman/v6/pkg/specgen" - "github.com/containers/podman/v6/pkg/util" "github.com/opencontainers/runtime-spec/specs-go" commonFlag "go.podman.io/common/pkg/flag" + "go.podman.io/podman/v6/libpod/define" + "go.podman.io/podman/v6/pkg/domain/entities/types" + "go.podman.io/podman/v6/pkg/specgen" + "go.podman.io/podman/v6/pkg/util" ) type PodKillOptions struct { diff --git a/pkg/domain/entities/secrets.go b/pkg/domain/entities/secrets.go index 47ac80121a..740df0e4c0 100644 --- a/pkg/domain/entities/secrets.go +++ b/pkg/domain/entities/secrets.go @@ -1,8 +1,8 @@ package entities import ( - "github.com/containers/podman/v6/pkg/domain/entities/types" - "github.com/containers/podman/v6/pkg/errorhandling" + "go.podman.io/podman/v6/pkg/domain/entities/types" + "go.podman.io/podman/v6/pkg/errorhandling" ) type SecretCreateReport = types.SecretCreateReport diff --git a/pkg/domain/entities/system.go b/pkg/domain/entities/system.go index 1b3703a7d1..2e3a6a1896 100644 --- a/pkg/domain/entities/system.go +++ b/pkg/domain/entities/system.go @@ -1,7 +1,7 @@ package entities import ( - "github.com/containers/podman/v6/pkg/domain/entities/types" + "go.podman.io/podman/v6/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 622df3096a..8785a42849 100644 --- a/pkg/domain/entities/types.go +++ b/pkg/domain/entities/types.go @@ -3,11 +3,11 @@ package entities import ( "net" - "github.com/containers/podman/v6/libpod/define" - "github.com/containers/podman/v6/libpod/events" - entitiesTypes "github.com/containers/podman/v6/pkg/domain/entities/types" - "github.com/containers/podman/v6/pkg/specgen" "go.podman.io/common/libnetwork/types" + "go.podman.io/podman/v6/libpod/define" + "go.podman.io/podman/v6/libpod/events" + entitiesTypes "go.podman.io/podman/v6/pkg/domain/entities/types" + "go.podman.io/podman/v6/pkg/specgen" "go.podman.io/storage/pkg/archive" ) diff --git a/pkg/domain/entities/types/container_ps.go b/pkg/domain/entities/types/container_ps.go index 1d6fb60de6..3c15c4a984 100644 --- a/pkg/domain/entities/types/container_ps.go +++ b/pkg/domain/entities/types/container_ps.go @@ -3,8 +3,8 @@ package types import ( "time" - define "github.com/containers/podman/v6/pkg/ps/define" netTypes "go.podman.io/common/libnetwork/types" + define "go.podman.io/podman/v6/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 7d94bf4daf..43dafc9ea8 100644 --- a/pkg/domain/entities/types/containers.go +++ b/pkg/domain/entities/types/containers.go @@ -1,9 +1,9 @@ package types import ( - "github.com/containers/podman/v6/libpod/define" - "github.com/containers/podman/v6/pkg/specgen" "github.com/opencontainers/runtime-spec/specs-go" + "go.podman.io/podman/v6/libpod/define" + "go.podman.io/podman/v6/pkg/specgen" ) type ContainerCopyFunc func() error diff --git a/pkg/domain/entities/types/images.go b/pkg/domain/entities/types/images.go index fce60b278b..e59b495bfe 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/v6/pkg/inspect" - "github.com/containers/podman/v6/pkg/trust" + "go.podman.io/podman/v6/pkg/inspect" + "go.podman.io/podman/v6/pkg/trust" ) // swagger:model LibpodImageSummary diff --git a/pkg/domain/entities/types/pods.go b/pkg/domain/entities/types/pods.go index 38c083b196..524e757789 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/v6/libpod/define" - "github.com/containers/podman/v6/pkg/specgen" + "go.podman.io/podman/v6/libpod/define" + "go.podman.io/podman/v6/pkg/specgen" ) type PodPruneReport struct { diff --git a/pkg/domain/entities/types/system.go b/pkg/domain/entities/types/system.go index 538b0d6eb9..711332205b 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/v6/libpod/define" - "github.com/containers/podman/v6/pkg/domain/entities/reports" + "go.podman.io/podman/v6/libpod/define" + "go.podman.io/podman/v6/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 12384a8815..33ccd38e92 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/v6/libpod/define" + "go.podman.io/podman/v6/libpod/define" ) // swagger:model diff --git a/pkg/domain/entities/volumes.go b/pkg/domain/entities/volumes.go index 0058b7004d..4150b88214 100644 --- a/pkg/domain/entities/volumes.go +++ b/pkg/domain/entities/volumes.go @@ -4,7 +4,7 @@ import ( "io" "net/url" - "github.com/containers/podman/v6/pkg/domain/entities/types" + "go.podman.io/podman/v6/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 b313e47283..300a06f39a 100644 --- a/pkg/domain/filters/containers.go +++ b/pkg/domain/filters/containers.go @@ -10,11 +10,11 @@ import ( "strings" "time" - "github.com/containers/podman/v6/libpod" - "github.com/containers/podman/v6/libpod/define" - "github.com/containers/podman/v6/pkg/domain/entities/types" "go.podman.io/common/pkg/filters" "go.podman.io/common/pkg/util" + "go.podman.io/podman/v6/libpod" + "go.podman.io/podman/v6/libpod/define" + "go.podman.io/podman/v6/pkg/domain/entities/types" "go.podman.io/storage" ) diff --git a/pkg/domain/filters/pods.go b/pkg/domain/filters/pods.go index 50169b5cb1..8eafd5c196 100644 --- a/pkg/domain/filters/pods.go +++ b/pkg/domain/filters/pods.go @@ -9,10 +9,10 @@ import ( "strconv" "strings" - "github.com/containers/podman/v6/libpod" - "github.com/containers/podman/v6/libpod/define" "go.podman.io/common/pkg/filters" "go.podman.io/common/pkg/util" + "go.podman.io/podman/v6/libpod" + "go.podman.io/podman/v6/libpod/define" ) // GeneratePodFilterFunc takes a filter and filtervalue (key, value) diff --git a/pkg/domain/filters/volumes.go b/pkg/domain/filters/volumes.go index 6e2668711c..c8893e7a4c 100644 --- a/pkg/domain/filters/volumes.go +++ b/pkg/domain/filters/volumes.go @@ -8,9 +8,9 @@ import ( "strings" "time" - "github.com/containers/podman/v6/libpod" - "github.com/containers/podman/v6/pkg/util" "go.podman.io/common/pkg/filters" + "go.podman.io/podman/v6/libpod" + "go.podman.io/podman/v6/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 6176707dfa..067201a6a4 100644 --- a/pkg/domain/infra/abi/apply.go +++ b/pkg/domain/infra/abi/apply.go @@ -14,8 +14,8 @@ import ( "os" "strings" - "github.com/containers/podman/v6/pkg/domain/entities" - k8sAPI "github.com/containers/podman/v6/pkg/k8s.io/api/core/v1" + "go.podman.io/podman/v6/pkg/domain/entities" + k8sAPI "go.podman.io/podman/v6/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 e5fd3b8b5e..e8b820da16 100644 --- a/pkg/domain/infra/abi/archive.go +++ b/pkg/domain/infra/abi/archive.go @@ -6,7 +6,7 @@ import ( "context" "io" - "github.com/containers/podman/v6/pkg/domain/entities" + "go.podman.io/podman/v6/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/artifact.go b/pkg/domain/infra/abi/artifact.go index 317296cb30..d90c865969 100644 --- a/pkg/domain/infra/abi/artifact.go +++ b/pkg/domain/infra/abi/artifact.go @@ -10,12 +10,12 @@ import ( "os" "time" - "github.com/containers/podman/v6/pkg/domain/entities" "github.com/opencontainers/go-digest" "github.com/sirupsen/logrus" "go.podman.io/common/libimage" "go.podman.io/common/pkg/libartifact" "go.podman.io/common/pkg/libartifact/types" + "go.podman.io/podman/v6/pkg/domain/entities" ) func (ir *ImageEngine) ArtifactInspect(ctx context.Context, name string, _ entities.ArtifactInspectOptions) (*entities.ArtifactInspectReport, error) { diff --git a/pkg/domain/infra/abi/auto-update.go b/pkg/domain/infra/abi/auto-update.go index 21e529441c..cc7f3fe1f0 100644 --- a/pkg/domain/infra/abi/auto-update.go +++ b/pkg/domain/infra/abi/auto-update.go @@ -5,8 +5,8 @@ package abi import ( "context" - "github.com/containers/podman/v6/pkg/autoupdate" - "github.com/containers/podman/v6/pkg/domain/entities" + "go.podman.io/podman/v6/pkg/autoupdate" + "go.podman.io/podman/v6/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 eb57420ed8..4f4b3940fa 100644 --- a/pkg/domain/infra/abi/containers.go +++ b/pkg/domain/infra/abi/containers.go @@ -14,28 +14,28 @@ import ( "sync" "time" - "github.com/containers/podman/v6/libpod" - "github.com/containers/podman/v6/libpod/define" - "github.com/containers/podman/v6/libpod/logs" - "github.com/containers/podman/v6/pkg/checkpoint" - "github.com/containers/podman/v6/pkg/domain/entities" - "github.com/containers/podman/v6/pkg/domain/entities/reports" - dfilters "github.com/containers/podman/v6/pkg/domain/filters" - "github.com/containers/podman/v6/pkg/domain/infra/abi/terminal" - "github.com/containers/podman/v6/pkg/errorhandling" - parallelctr "github.com/containers/podman/v6/pkg/parallel/ctr" - "github.com/containers/podman/v6/pkg/ps" - "github.com/containers/podman/v6/pkg/rootless" - "github.com/containers/podman/v6/pkg/signal" - "github.com/containers/podman/v6/pkg/specgen" - "github.com/containers/podman/v6/pkg/specgen/generate" - "github.com/containers/podman/v6/pkg/specgenutil" - "github.com/containers/podman/v6/pkg/util" "github.com/hashicorp/go-multierror" "github.com/sirupsen/logrus" "go.podman.io/buildah" "go.podman.io/common/pkg/config" "go.podman.io/image/v5/manifest" + "go.podman.io/podman/v6/libpod" + "go.podman.io/podman/v6/libpod/define" + "go.podman.io/podman/v6/libpod/logs" + "go.podman.io/podman/v6/pkg/checkpoint" + "go.podman.io/podman/v6/pkg/domain/entities" + "go.podman.io/podman/v6/pkg/domain/entities/reports" + dfilters "go.podman.io/podman/v6/pkg/domain/filters" + "go.podman.io/podman/v6/pkg/domain/infra/abi/terminal" + "go.podman.io/podman/v6/pkg/errorhandling" + parallelctr "go.podman.io/podman/v6/pkg/parallel/ctr" + "go.podman.io/podman/v6/pkg/ps" + "go.podman.io/podman/v6/pkg/rootless" + "go.podman.io/podman/v6/pkg/signal" + "go.podman.io/podman/v6/pkg/specgen" + "go.podman.io/podman/v6/pkg/specgen/generate" + "go.podman.io/podman/v6/pkg/specgenutil" + "go.podman.io/podman/v6/pkg/util" "go.podman.io/storage" "go.podman.io/storage/pkg/unshare" "go.podman.io/storage/types" diff --git a/pkg/domain/infra/abi/containers_runlabel.go b/pkg/domain/infra/abi/containers_runlabel.go index 52f5acafa0..658c2c88ef 100644 --- a/pkg/domain/infra/abi/containers_runlabel.go +++ b/pkg/domain/infra/abi/containers_runlabel.go @@ -11,14 +11,14 @@ import ( "path/filepath" "strings" - "github.com/containers/podman/v6/libpod/define" - "github.com/containers/podman/v6/pkg/domain/entities" - envLib "github.com/containers/podman/v6/pkg/env" - "github.com/containers/podman/v6/utils" "github.com/google/shlex" "github.com/sirupsen/logrus" "go.podman.io/common/libimage" "go.podman.io/common/pkg/config" + "go.podman.io/podman/v6/libpod/define" + "go.podman.io/podman/v6/pkg/domain/entities" + envLib "go.podman.io/podman/v6/pkg/env" + "go.podman.io/podman/v6/utils" "go.podman.io/storage/pkg/fileutils" ) diff --git a/pkg/domain/infra/abi/containers_stat.go b/pkg/domain/infra/abi/containers_stat.go index 8debb8ad43..1bb3dba93b 100644 --- a/pkg/domain/infra/abi/containers_stat.go +++ b/pkg/domain/infra/abi/containers_stat.go @@ -5,7 +5,7 @@ package abi import ( "context" - "github.com/containers/podman/v6/pkg/domain/entities" + "go.podman.io/podman/v6/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 6681455261..a7f342c6d8 100644 --- a/pkg/domain/infra/abi/events.go +++ b/pkg/domain/infra/abi/events.go @@ -5,8 +5,8 @@ package abi import ( "context" - "github.com/containers/podman/v6/libpod/events" - "github.com/containers/podman/v6/pkg/domain/entities" + "go.podman.io/podman/v6/libpod/events" + "go.podman.io/podman/v6/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 f19a889b5c..40c7b416e6 100644 --- a/pkg/domain/infra/abi/farm.go +++ b/pkg/domain/infra/abi/farm.go @@ -7,10 +7,10 @@ import ( "fmt" "strings" - "github.com/containers/podman/v6/pkg/domain/entities" - "github.com/containers/podman/v6/pkg/emulation" "go.podman.io/buildah/pkg/parse" lplatform "go.podman.io/common/libimage/platform" + "go.podman.io/podman/v6/pkg/domain/entities" + "go.podman.io/podman/v6/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 ee91f7e3aa..3e1de33097 100644 --- a/pkg/domain/infra/abi/generate.go +++ b/pkg/domain/infra/abi/generate.go @@ -9,13 +9,13 @@ import ( "fmt" "strings" - "github.com/containers/podman/v6/libpod" - "github.com/containers/podman/v6/libpod/define" - "github.com/containers/podman/v6/pkg/domain/entities" - k8sAPI "github.com/containers/podman/v6/pkg/k8s.io/api/core/v1" - "github.com/containers/podman/v6/pkg/specgen" - generateUtils "github.com/containers/podman/v6/pkg/specgen/generate" - "github.com/containers/podman/v6/pkg/systemd/generate" + "go.podman.io/podman/v6/libpod" + "go.podman.io/podman/v6/libpod/define" + "go.podman.io/podman/v6/pkg/domain/entities" + k8sAPI "go.podman.io/podman/v6/pkg/k8s.io/api/core/v1" + "go.podman.io/podman/v6/pkg/specgen" + generateUtils "go.podman.io/podman/v6/pkg/specgen/generate" + "go.podman.io/podman/v6/pkg/systemd/generate" "sigs.k8s.io/yaml" ) diff --git a/pkg/domain/infra/abi/healthcheck.go b/pkg/domain/infra/abi/healthcheck.go index 8bb19a2f7c..8d5e1603f3 100644 --- a/pkg/domain/infra/abi/healthcheck.go +++ b/pkg/domain/infra/abi/healthcheck.go @@ -5,8 +5,8 @@ package abi import ( "context" - "github.com/containers/podman/v6/libpod/define" - "github.com/containers/podman/v6/pkg/domain/entities" + "go.podman.io/podman/v6/libpod/define" + "go.podman.io/podman/v6/pkg/domain/entities" ) func (ic *ContainerEngine) HealthCheckRun(ctx context.Context, nameOrID string, _ entities.HealthCheckOptions) (*define.HealthCheckResults, error) { diff --git a/pkg/domain/infra/abi/images.go b/pkg/domain/infra/abi/images.go index 0b0d4978cd..2cfdf442ba 100644 --- a/pkg/domain/infra/abi/images.go +++ b/pkg/domain/infra/abi/images.go @@ -19,12 +19,6 @@ import ( "syscall" "time" - "github.com/containers/podman/v6/libpod/define" - "github.com/containers/podman/v6/pkg/domain/entities" - "github.com/containers/podman/v6/pkg/domain/entities/reports" - domainUtils "github.com/containers/podman/v6/pkg/domain/utils" - "github.com/containers/podman/v6/pkg/errorhandling" - "github.com/containers/podman/v6/pkg/rootless" "github.com/opencontainers/go-digest" imgspecv1 "github.com/opencontainers/image-spec/specs-go/v1" "github.com/sirupsen/logrus" @@ -41,6 +35,12 @@ import ( "go.podman.io/image/v5/signature" "go.podman.io/image/v5/transports" "go.podman.io/image/v5/transports/alltransports" + "go.podman.io/podman/v6/libpod/define" + "go.podman.io/podman/v6/pkg/domain/entities" + "go.podman.io/podman/v6/pkg/domain/entities/reports" + domainUtils "go.podman.io/podman/v6/pkg/domain/utils" + "go.podman.io/podman/v6/pkg/errorhandling" + "go.podman.io/podman/v6/pkg/rootless" "go.podman.io/storage" "go.podman.io/storage/pkg/unshare" "go.podman.io/storage/types" diff --git a/pkg/domain/infra/abi/images_list.go b/pkg/domain/infra/abi/images_list.go index 31efe701cd..fe4a51c80b 100644 --- a/pkg/domain/infra/abi/images_list.go +++ b/pkg/domain/infra/abi/images_list.go @@ -7,9 +7,9 @@ import ( "fmt" "slices" - "github.com/containers/podman/v6/libpod/define" - "github.com/containers/podman/v6/pkg/domain/entities" "go.podman.io/common/libimage" + "go.podman.io/podman/v6/libpod/define" + "go.podman.io/podman/v6/pkg/domain/entities" ) func (ir *ImageEngine) List(ctx context.Context, opts entities.ImageListOptions) ([]*entities.ImageSummary, error) { diff --git a/pkg/domain/infra/abi/manifest.go b/pkg/domain/infra/abi/manifest.go index f9c0985c48..21ef9d2a97 100644 --- a/pkg/domain/infra/abi/manifest.go +++ b/pkg/domain/infra/abi/manifest.go @@ -12,8 +12,6 @@ import ( "slices" "strings" - "github.com/containers/podman/v6/pkg/domain/entities" - envLib "github.com/containers/podman/v6/pkg/env" "github.com/opencontainers/go-digest" imgspecv1 "github.com/opencontainers/image-spec/specs-go/v1" "github.com/sirupsen/logrus" @@ -28,6 +26,8 @@ import ( "go.podman.io/image/v5/transports" "go.podman.io/image/v5/transports/alltransports" "go.podman.io/image/v5/types" + "go.podman.io/podman/v6/pkg/domain/entities" + envLib "go.podman.io/podman/v6/pkg/env" "go.podman.io/storage" ) diff --git a/pkg/domain/infra/abi/network.go b/pkg/domain/infra/abi/network.go index ae74b3efb7..2703687586 100644 --- a/pkg/domain/infra/abi/network.go +++ b/pkg/domain/infra/abi/network.go @@ -9,12 +9,12 @@ import ( "slices" "strconv" - "github.com/containers/podman/v6/libpod/define" - "github.com/containers/podman/v6/libpod/events" - "github.com/containers/podman/v6/pkg/domain/entities" "go.podman.io/common/libnetwork/pasta" "go.podman.io/common/libnetwork/types" netutil "go.podman.io/common/libnetwork/util" + "go.podman.io/podman/v6/libpod/define" + "go.podman.io/podman/v6/libpod/events" + "go.podman.io/podman/v6/pkg/domain/entities" ) func (ic *ContainerEngine) NetworkUpdate(_ context.Context, netName string, options entities.NetworkUpdateOptions) error { diff --git a/pkg/domain/infra/abi/parse/parse.go b/pkg/domain/infra/abi/parse/parse.go index d4c47bab30..62c71c58e8 100644 --- a/pkg/domain/infra/abi/parse/parse.go +++ b/pkg/domain/infra/abi/parse/parse.go @@ -7,10 +7,10 @@ import ( "strconv" "strings" - "github.com/containers/podman/v6/libpod" - "github.com/containers/podman/v6/libpod/define" "github.com/docker/go-units" "github.com/sirupsen/logrus" + "go.podman.io/podman/v6/libpod" + "go.podman.io/podman/v6/libpod/define" ) // Handle volume options from CLI. diff --git a/pkg/domain/infra/abi/play.go b/pkg/domain/infra/abi/play.go index 88f400e6e6..3a4d1bd90f 100644 --- a/pkg/domain/infra/abi/play.go +++ b/pkg/domain/infra/abi/play.go @@ -15,22 +15,6 @@ import ( "strings" "sync" - "github.com/containers/podman/v6/cmd/podman/parse" - "github.com/containers/podman/v6/libpod" - "github.com/containers/podman/v6/libpod/define" - "github.com/containers/podman/v6/pkg/annotations" - "github.com/containers/podman/v6/pkg/domain/entities" - entitiesTypes "github.com/containers/podman/v6/pkg/domain/entities/types" - "github.com/containers/podman/v6/pkg/domain/infra/abi/internal/expansion" - v1apps "github.com/containers/podman/v6/pkg/k8s.io/api/apps/v1" - v1 "github.com/containers/podman/v6/pkg/k8s.io/api/core/v1" - metav1 "github.com/containers/podman/v6/pkg/k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/containers/podman/v6/pkg/specgen" - "github.com/containers/podman/v6/pkg/specgen/generate" - "github.com/containers/podman/v6/pkg/specgen/generate/kube" - "github.com/containers/podman/v6/pkg/specgenutil" - "github.com/containers/podman/v6/pkg/systemd/notifyproxy" - "github.com/containers/podman/v6/pkg/util" "github.com/coreos/go-systemd/v22/daemon" "github.com/opencontainers/go-digest" "github.com/opencontainers/selinux/go-selinux" @@ -43,6 +27,22 @@ import ( "go.podman.io/common/pkg/secrets" "go.podman.io/image/v5/docker/reference" "go.podman.io/image/v5/types" + "go.podman.io/podman/v6/cmd/podman/parse" + "go.podman.io/podman/v6/libpod" + "go.podman.io/podman/v6/libpod/define" + "go.podman.io/podman/v6/pkg/annotations" + "go.podman.io/podman/v6/pkg/domain/entities" + entitiesTypes "go.podman.io/podman/v6/pkg/domain/entities/types" + "go.podman.io/podman/v6/pkg/domain/infra/abi/internal/expansion" + v1apps "go.podman.io/podman/v6/pkg/k8s.io/api/apps/v1" + v1 "go.podman.io/podman/v6/pkg/k8s.io/api/core/v1" + metav1 "go.podman.io/podman/v6/pkg/k8s.io/apimachinery/pkg/apis/meta/v1" + "go.podman.io/podman/v6/pkg/specgen" + "go.podman.io/podman/v6/pkg/specgen/generate" + "go.podman.io/podman/v6/pkg/specgen/generate/kube" + "go.podman.io/podman/v6/pkg/specgenutil" + "go.podman.io/podman/v6/pkg/systemd/notifyproxy" + "go.podman.io/podman/v6/pkg/util" "go.podman.io/storage/pkg/chrootarchive" "go.podman.io/storage/pkg/fileutils" yamlv3 "gopkg.in/yaml.v3" diff --git a/pkg/domain/infra/abi/play_test.go b/pkg/domain/infra/abi/play_test.go index 91648d294b..8a06f69c9b 100644 --- a/pkg/domain/infra/abi/play_test.go +++ b/pkg/domain/infra/abi/play_test.go @@ -6,9 +6,9 @@ import ( "bytes" "testing" - v1 "github.com/containers/podman/v6/pkg/k8s.io/api/core/v1" - v12 "github.com/containers/podman/v6/pkg/k8s.io/apimachinery/pkg/apis/meta/v1" "github.com/stretchr/testify/assert" + v1 "go.podman.io/podman/v6/pkg/k8s.io/api/core/v1" + v12 "go.podman.io/podman/v6/pkg/k8s.io/apimachinery/pkg/apis/meta/v1" ) func TestReadConfigMapFromFile(t *testing.T) { diff --git a/pkg/domain/infra/abi/play_utils.go b/pkg/domain/infra/abi/play_utils.go index 61514b9de8..e4e4fd107f 100644 --- a/pkg/domain/infra/abi/play_utils.go +++ b/pkg/domain/infra/abi/play_utils.go @@ -7,7 +7,7 @@ import ( "os" "strings" - "github.com/containers/podman/v6/libpod/define" + "go.podman.io/podman/v6/libpod/define" "golang.org/x/sys/unix" ) diff --git a/pkg/domain/infra/abi/play_utils_test.go b/pkg/domain/infra/abi/play_utils_test.go index 1023f05518..bfd03486d6 100644 --- a/pkg/domain/infra/abi/play_utils_test.go +++ b/pkg/domain/infra/abi/play_utils_test.go @@ -5,8 +5,8 @@ package abi import ( "testing" - "github.com/containers/podman/v6/libpod/define" "github.com/stretchr/testify/require" + "go.podman.io/podman/v6/libpod/define" ) func TestGetSdNotifyMode(t *testing.T) { diff --git a/pkg/domain/infra/abi/pods.go b/pkg/domain/infra/abi/pods.go index bcd03c6517..2eb17dc5a5 100644 --- a/pkg/domain/infra/abi/pods.go +++ b/pkg/domain/infra/abi/pods.go @@ -9,14 +9,14 @@ import ( "strconv" "strings" - "github.com/containers/podman/v6/libpod" - "github.com/containers/podman/v6/libpod/define" - "github.com/containers/podman/v6/pkg/domain/entities" - dfilters "github.com/containers/podman/v6/pkg/domain/filters" - "github.com/containers/podman/v6/pkg/signal" - "github.com/containers/podman/v6/pkg/specgen" - "github.com/containers/podman/v6/pkg/specgen/generate" "github.com/sirupsen/logrus" + "go.podman.io/podman/v6/libpod" + "go.podman.io/podman/v6/libpod/define" + "go.podman.io/podman/v6/pkg/domain/entities" + dfilters "go.podman.io/podman/v6/pkg/domain/filters" + "go.podman.io/podman/v6/pkg/signal" + "go.podman.io/podman/v6/pkg/specgen" + "go.podman.io/podman/v6/pkg/specgen/generate" ) // getPodsByContext returns a slice of pods. Note that all, latest and pods are diff --git a/pkg/domain/infra/abi/pods_stats.go b/pkg/domain/infra/abi/pods_stats.go index 5295688adf..24704de3b4 100644 --- a/pkg/domain/infra/abi/pods_stats.go +++ b/pkg/domain/infra/abi/pods_stats.go @@ -8,10 +8,10 @@ import ( "fmt" "strconv" - "github.com/containers/podman/v6/libpod" - "github.com/containers/podman/v6/libpod/define" - "github.com/containers/podman/v6/pkg/domain/entities" "github.com/docker/go-units" + "go.podman.io/podman/v6/libpod" + "go.podman.io/podman/v6/libpod/define" + "go.podman.io/podman/v6/pkg/domain/entities" ) // PodStats implements printing stats about pods. diff --git a/pkg/domain/infra/abi/quadlet.go b/pkg/domain/infra/abi/quadlet.go index fc7aa77e47..4446ebaa09 100644 --- a/pkg/domain/infra/abi/quadlet.go +++ b/pkg/domain/infra/abi/quadlet.go @@ -17,15 +17,15 @@ import ( "slices" "strings" - "github.com/containers/podman/v6/libpod/define" - "github.com/containers/podman/v6/pkg/domain/entities" - "github.com/containers/podman/v6/pkg/rootless" - "github.com/containers/podman/v6/pkg/systemd" - "github.com/containers/podman/v6/pkg/systemd/parser" - systemdquadlet "github.com/containers/podman/v6/pkg/systemd/quadlet" - "github.com/containers/podman/v6/pkg/util" "github.com/sirupsen/logrus" "go.podman.io/common/pkg/config" + "go.podman.io/podman/v6/libpod/define" + "go.podman.io/podman/v6/pkg/domain/entities" + "go.podman.io/podman/v6/pkg/rootless" + "go.podman.io/podman/v6/pkg/systemd" + "go.podman.io/podman/v6/pkg/systemd/parser" + systemdquadlet "go.podman.io/podman/v6/pkg/systemd/quadlet" + "go.podman.io/podman/v6/pkg/util" "go.podman.io/storage/pkg/fileutils" ) diff --git a/pkg/domain/infra/abi/runtime.go b/pkg/domain/infra/abi/runtime.go index 17788f7a32..78b416b0be 100644 --- a/pkg/domain/infra/abi/runtime.go +++ b/pkg/domain/infra/abi/runtime.go @@ -5,7 +5,7 @@ package abi import ( "sync" - "github.com/containers/podman/v6/libpod" + "go.podman.io/podman/v6/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 25952927dd..329a5febe7 100644 --- a/pkg/domain/infra/abi/secrets.go +++ b/pkg/domain/infra/abi/secrets.go @@ -10,10 +10,10 @@ import ( "path/filepath" "strings" - "github.com/containers/podman/v6/libpod/events" - "github.com/containers/podman/v6/pkg/domain/entities" - "github.com/containers/podman/v6/pkg/domain/utils" "go.podman.io/common/pkg/secrets" + "go.podman.io/podman/v6/libpod/events" + "go.podman.io/podman/v6/pkg/domain/entities" + "go.podman.io/podman/v6/pkg/domain/utils" ) func (ic *ContainerEngine) SecretCreate(_ 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 5568340369..77e2269774 100644 --- a/pkg/domain/infra/abi/secrets_test.go +++ b/pkg/domain/infra/abi/secrets_test.go @@ -6,9 +6,9 @@ import ( "testing" "time" - "github.com/containers/podman/v6/pkg/domain/entities" "github.com/stretchr/testify/assert" "go.podman.io/common/pkg/secrets" + "go.podman.io/podman/v6/pkg/domain/entities" ) func Test_secretToReport(t *testing.T) { diff --git a/pkg/domain/infra/abi/system.go b/pkg/domain/infra/abi/system.go index 564788d71e..fb5868b2ee 100644 --- a/pkg/domain/infra/abi/system.go +++ b/pkg/domain/infra/abi/system.go @@ -12,11 +12,11 @@ import ( "path/filepath" "strings" - "github.com/containers/podman/v6/libpod/define" - "github.com/containers/podman/v6/pkg/domain/entities" - "github.com/containers/podman/v6/pkg/domain/entities/reports" - "github.com/containers/podman/v6/pkg/emulation" - "github.com/containers/podman/v6/pkg/util" + "go.podman.io/podman/v6/libpod/define" + "go.podman.io/podman/v6/pkg/domain/entities" + "go.podman.io/podman/v6/pkg/domain/entities/reports" + "go.podman.io/podman/v6/pkg/emulation" + "go.podman.io/podman/v6/pkg/util" "go.podman.io/storage" "go.podman.io/storage/pkg/directory" "go.podman.io/storage/pkg/fileutils" diff --git a/pkg/domain/infra/abi/system_linux.go b/pkg/domain/infra/abi/system_linux.go index 6976dca63e..02ed8e1c95 100644 --- a/pkg/domain/infra/abi/system_linux.go +++ b/pkg/domain/infra/abi/system_linux.go @@ -8,12 +8,12 @@ import ( "fmt" "os" - "github.com/containers/podman/v6/pkg/rootless" - "github.com/containers/podman/v6/pkg/util" "github.com/sirupsen/logrus" "go.podman.io/common/pkg/cgroups" "go.podman.io/common/pkg/config" "go.podman.io/common/pkg/systemd" + "go.podman.io/podman/v6/pkg/rootless" + "go.podman.io/podman/v6/pkg/util" "go.podman.io/storage/pkg/unshare" "golang.org/x/sys/unix" ) diff --git a/pkg/domain/infra/abi/terminal/sigproxy_commn.go b/pkg/domain/infra/abi/terminal/sigproxy_commn.go index cdb6356255..0c8a38ec2b 100644 --- a/pkg/domain/infra/abi/terminal/sigproxy_commn.go +++ b/pkg/domain/infra/abi/terminal/sigproxy_commn.go @@ -7,11 +7,11 @@ import ( "os" "syscall" - "github.com/containers/podman/v6/libpod" - "github.com/containers/podman/v6/libpod/define" - "github.com/containers/podman/v6/libpod/shutdown" - "github.com/containers/podman/v6/pkg/signal" "github.com/sirupsen/logrus" + "go.podman.io/podman/v6/libpod" + "go.podman.io/podman/v6/libpod/define" + "go.podman.io/podman/v6/libpod/shutdown" + "go.podman.io/podman/v6/pkg/signal" ) // ProxySignals ... diff --git a/pkg/domain/infra/abi/terminal/terminal.go b/pkg/domain/infra/abi/terminal/terminal.go index d48417c0c9..f23382ca65 100644 --- a/pkg/domain/infra/abi/terminal/terminal.go +++ b/pkg/domain/infra/abi/terminal/terminal.go @@ -8,10 +8,10 @@ import ( "os" "os/signal" - lsignal "github.com/containers/podman/v6/pkg/signal" "github.com/moby/term" "github.com/sirupsen/logrus" "go.podman.io/common/pkg/resize" + lsignal "go.podman.io/podman/v6/pkg/signal" ) // RawTtyFormatter ... diff --git a/pkg/domain/infra/abi/terminal/terminal_common.go b/pkg/domain/infra/abi/terminal/terminal_common.go index f7f802498c..eec615fdd6 100644 --- a/pkg/domain/infra/abi/terminal/terminal_common.go +++ b/pkg/domain/infra/abi/terminal/terminal_common.go @@ -8,10 +8,10 @@ import ( "fmt" "os" - "github.com/containers/podman/v6/libpod" - "github.com/containers/podman/v6/libpod/define" "github.com/sirupsen/logrus" "go.podman.io/common/pkg/resize" + "go.podman.io/podman/v6/libpod" + "go.podman.io/podman/v6/libpod/define" "golang.org/x/term" ) diff --git a/pkg/domain/infra/abi/trust.go b/pkg/domain/infra/abi/trust.go index bda3c10cb8..04ed1ee6c2 100644 --- a/pkg/domain/infra/abi/trust.go +++ b/pkg/domain/infra/abi/trust.go @@ -7,9 +7,9 @@ import ( "fmt" "os" - "github.com/containers/podman/v6/pkg/domain/entities" - "github.com/containers/podman/v6/pkg/trust" "go.podman.io/image/v5/types" + "go.podman.io/podman/v6/pkg/domain/entities" + "go.podman.io/podman/v6/pkg/trust" "go.podman.io/storage/pkg/configfile" ) diff --git a/pkg/domain/infra/abi/volumes.go b/pkg/domain/infra/abi/volumes.go index e327c19c9b..7973b5e326 100644 --- a/pkg/domain/infra/abi/volumes.go +++ b/pkg/domain/infra/abi/volumes.go @@ -8,13 +8,13 @@ import ( "fmt" "io" - "github.com/containers/podman/v6/libpod" - "github.com/containers/podman/v6/libpod/define" - "github.com/containers/podman/v6/pkg/domain/entities" - "github.com/containers/podman/v6/pkg/domain/entities/reports" - "github.com/containers/podman/v6/pkg/domain/filters" - "github.com/containers/podman/v6/pkg/domain/infra/abi/parse" - "github.com/containers/podman/v6/pkg/util" + "go.podman.io/podman/v6/libpod" + "go.podman.io/podman/v6/libpod/define" + "go.podman.io/podman/v6/pkg/domain/entities" + "go.podman.io/podman/v6/pkg/domain/entities/reports" + "go.podman.io/podman/v6/pkg/domain/filters" + "go.podman.io/podman/v6/pkg/domain/infra/abi/parse" + "go.podman.io/podman/v6/pkg/util" ) func (ic *ContainerEngine) VolumeCreate(ctx context.Context, opts entities.VolumeCreateOptions) (*entities.IDOrNameResponse, error) { diff --git a/pkg/domain/infra/runtime.go b/pkg/domain/infra/runtime.go index 44290ceb30..cf91f209bc 100644 --- a/pkg/domain/infra/runtime.go +++ b/pkg/domain/infra/runtime.go @@ -3,8 +3,8 @@ package infra import ( "context" - "github.com/containers/podman/v6/pkg/bindings" - "github.com/containers/podman/v6/pkg/domain/entities" + "go.podman.io/podman/v6/pkg/bindings" + "go.podman.io/podman/v6/pkg/domain/entities" ) // For the meaning of "WithoutLock", compare runtime_tunnel.go:newConnection() diff --git a/pkg/domain/infra/runtime_abi.go b/pkg/domain/infra/runtime_abi.go index 70f89cee24..da0c75ab61 100644 --- a/pkg/domain/infra/runtime_abi.go +++ b/pkg/domain/infra/runtime_abi.go @@ -6,8 +6,8 @@ import ( "context" "fmt" - "github.com/containers/podman/v6/pkg/domain/entities" - "github.com/containers/podman/v6/pkg/domain/infra/tunnel" + "go.podman.io/podman/v6/pkg/domain/entities" + "go.podman.io/podman/v6/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 f2f349a1e3..71cf1c05f8 100644 --- a/pkg/domain/infra/runtime_libpod.go +++ b/pkg/domain/infra/runtime_libpod.go @@ -11,14 +11,14 @@ import ( "strings" "sync" - "github.com/containers/podman/v6/libpod" - "github.com/containers/podman/v6/pkg/domain/entities" - "github.com/containers/podman/v6/pkg/namespaces" - "github.com/containers/podman/v6/pkg/rootless" - "github.com/containers/podman/v6/pkg/util" "github.com/sirupsen/logrus" flag "github.com/spf13/pflag" "go.podman.io/image/v5/pkg/cli/basetls/tlsdetails" + "go.podman.io/podman/v6/libpod" + "go.podman.io/podman/v6/pkg/domain/entities" + "go.podman.io/podman/v6/pkg/namespaces" + "go.podman.io/podman/v6/pkg/rootless" + "go.podman.io/podman/v6/pkg/util" "go.podman.io/storage/pkg/idtools" "go.podman.io/storage/types" ) diff --git a/pkg/domain/infra/runtime_proxy.go b/pkg/domain/infra/runtime_proxy.go index 13668a44b1..0a2fd5299d 100644 --- a/pkg/domain/infra/runtime_proxy.go +++ b/pkg/domain/infra/runtime_proxy.go @@ -5,9 +5,9 @@ package infra import ( "context" - "github.com/containers/podman/v6/pkg/domain/entities" - "github.com/containers/podman/v6/pkg/domain/infra/abi" flag "github.com/spf13/pflag" + "go.podman.io/podman/v6/pkg/domain/entities" + "go.podman.io/podman/v6/pkg/domain/infra/abi" ) // ContainerEngine Proxy will be EOL'ed after podman is separated from libpod repo diff --git a/pkg/domain/infra/runtime_tunnel.go b/pkg/domain/infra/runtime_tunnel.go index 92092ef7fd..4630851ecf 100644 --- a/pkg/domain/infra/runtime_tunnel.go +++ b/pkg/domain/infra/runtime_tunnel.go @@ -7,8 +7,8 @@ import ( "fmt" "sync" - "github.com/containers/podman/v6/pkg/domain/entities" - "github.com/containers/podman/v6/pkg/domain/infra/tunnel" + "go.podman.io/podman/v6/pkg/domain/entities" + "go.podman.io/podman/v6/pkg/domain/infra/tunnel" ) var ( diff --git a/pkg/domain/infra/tunnel/artifact.go b/pkg/domain/infra/tunnel/artifact.go index 51d571de67..7de730e7f1 100644 --- a/pkg/domain/infra/tunnel/artifact.go +++ b/pkg/domain/infra/tunnel/artifact.go @@ -8,12 +8,12 @@ import ( "net/http" "os" - "github.com/containers/podman/v6/internal/localapi" - "github.com/containers/podman/v6/pkg/bindings/artifacts" - "github.com/containers/podman/v6/pkg/domain/entities" - "github.com/containers/podman/v6/pkg/errorhandling" "github.com/sirupsen/logrus" "go.podman.io/image/v5/types" + "go.podman.io/podman/v6/internal/localapi" + "go.podman.io/podman/v6/pkg/bindings/artifacts" + "go.podman.io/podman/v6/pkg/domain/entities" + "go.podman.io/podman/v6/pkg/errorhandling" ) func (ir *ImageEngine) ArtifactExtract(_ context.Context, name string, target string, opts entities.ArtifactExtractOptions) error { diff --git a/pkg/domain/infra/tunnel/auto-update.go b/pkg/domain/infra/tunnel/auto-update.go index 31d46a6a90..64721bdb29 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/v6/pkg/domain/entities" + "go.podman.io/podman/v6/pkg/domain/entities" ) func (ic *ContainerEngine) AutoUpdate(_ context.Context, _ entities.AutoUpdateOptions) ([]*entities.AutoUpdateReport, []error) { diff --git a/pkg/domain/infra/tunnel/containers.go b/pkg/domain/infra/tunnel/containers.go index 69e89c36f3..66df7420ec 100644 --- a/pkg/domain/infra/tunnel/containers.go +++ b/pkg/domain/infra/tunnel/containers.go @@ -12,19 +12,19 @@ import ( "strings" "time" - "github.com/containers/podman/v6/libpod/define" - "github.com/containers/podman/v6/pkg/api/handlers" - "github.com/containers/podman/v6/pkg/bindings" - "github.com/containers/podman/v6/pkg/bindings/containers" - "github.com/containers/podman/v6/pkg/bindings/images" - "github.com/containers/podman/v6/pkg/domain/entities" - "github.com/containers/podman/v6/pkg/domain/entities/reports" - "github.com/containers/podman/v6/pkg/errorhandling" - "github.com/containers/podman/v6/pkg/specgen" - "github.com/containers/podman/v6/pkg/util" "github.com/sirupsen/logrus" "go.podman.io/common/pkg/config" "go.podman.io/image/v5/docker/reference" + "go.podman.io/podman/v6/libpod/define" + "go.podman.io/podman/v6/pkg/api/handlers" + "go.podman.io/podman/v6/pkg/bindings" + "go.podman.io/podman/v6/pkg/bindings/containers" + "go.podman.io/podman/v6/pkg/bindings/images" + "go.podman.io/podman/v6/pkg/domain/entities" + "go.podman.io/podman/v6/pkg/domain/entities/reports" + "go.podman.io/podman/v6/pkg/errorhandling" + "go.podman.io/podman/v6/pkg/specgen" + "go.podman.io/podman/v6/pkg/util" "go.podman.io/storage/types" ) diff --git a/pkg/domain/infra/tunnel/events.go b/pkg/domain/infra/tunnel/events.go index 0e7d87a7bc..c04388be74 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/v6/libpod/events" - "github.com/containers/podman/v6/pkg/bindings/system" - "github.com/containers/podman/v6/pkg/domain/entities" + "go.podman.io/podman/v6/libpod/events" + "go.podman.io/podman/v6/pkg/bindings/system" + "go.podman.io/podman/v6/pkg/domain/entities" ) func (ic *ContainerEngine) Events(_ context.Context, opts entities.EventsOptions) error { diff --git a/pkg/domain/infra/tunnel/farm.go b/pkg/domain/infra/tunnel/farm.go index 694a26b8c1..438bc90673 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/v6/pkg/bindings/system" - "github.com/containers/podman/v6/pkg/domain/entities" + "go.podman.io/podman/v6/pkg/bindings/system" + "go.podman.io/podman/v6/pkg/domain/entities" ) const ( diff --git a/pkg/domain/infra/tunnel/healthcheck.go b/pkg/domain/infra/tunnel/healthcheck.go index 4d2bece929..e2bbed28ef 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/v6/libpod/define" - "github.com/containers/podman/v6/pkg/bindings/containers" - "github.com/containers/podman/v6/pkg/domain/entities" + "go.podman.io/podman/v6/libpod/define" + "go.podman.io/podman/v6/pkg/bindings/containers" + "go.podman.io/podman/v6/pkg/domain/entities" ) func (ic *ContainerEngine) HealthCheckRun(_ context.Context, nameOrID string, _ entities.HealthCheckOptions) (*define.HealthCheckResults, error) { diff --git a/pkg/domain/infra/tunnel/helpers.go b/pkg/domain/infra/tunnel/helpers.go index 447218900f..a961fe36cd 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/v6/libpod/define" - "github.com/containers/podman/v6/pkg/bindings/containers" - "github.com/containers/podman/v6/pkg/bindings/pods" - "github.com/containers/podman/v6/pkg/domain/entities" - "github.com/containers/podman/v6/pkg/errorhandling" + "go.podman.io/podman/v6/libpod/define" + "go.podman.io/podman/v6/pkg/bindings/containers" + "go.podman.io/podman/v6/pkg/bindings/pods" + "go.podman.io/podman/v6/pkg/domain/entities" + "go.podman.io/podman/v6/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 477d3ab32e..0e3bd9631e 100644 --- a/pkg/domain/infra/tunnel/images.go +++ b/pkg/domain/infra/tunnel/images.go @@ -10,19 +10,19 @@ import ( "strings" "time" - "github.com/containers/podman/v6/internal/localapi" - "github.com/containers/podman/v6/libpod/define" - "github.com/containers/podman/v6/pkg/bindings/images" - "github.com/containers/podman/v6/pkg/domain/entities" - "github.com/containers/podman/v6/pkg/domain/entities/reports" - "github.com/containers/podman/v6/pkg/domain/utils" - "github.com/containers/podman/v6/pkg/errorhandling" "github.com/sirupsen/logrus" bdefine "go.podman.io/buildah/define" "go.podman.io/common/libimage/filter" "go.podman.io/common/pkg/config" "go.podman.io/image/v5/docker/reference" "go.podman.io/image/v5/types" + "go.podman.io/podman/v6/internal/localapi" + "go.podman.io/podman/v6/libpod/define" + "go.podman.io/podman/v6/pkg/bindings/images" + "go.podman.io/podman/v6/pkg/domain/entities" + "go.podman.io/podman/v6/pkg/domain/entities/reports" + "go.podman.io/podman/v6/pkg/domain/utils" + "go.podman.io/podman/v6/pkg/errorhandling" "go.podman.io/storage/pkg/archive" "go.podman.io/storage/pkg/chrootarchive" ) diff --git a/pkg/domain/infra/tunnel/kube.go b/pkg/domain/infra/tunnel/kube.go index 216c7c530e..5f0adf4f5b 100644 --- a/pkg/domain/infra/tunnel/kube.go +++ b/pkg/domain/infra/tunnel/kube.go @@ -5,11 +5,11 @@ import ( "fmt" "io" - "github.com/containers/podman/v6/pkg/bindings/generate" - "github.com/containers/podman/v6/pkg/bindings/kube" - "github.com/containers/podman/v6/pkg/bindings/play" - "github.com/containers/podman/v6/pkg/domain/entities" "go.podman.io/image/v5/types" + "go.podman.io/podman/v6/pkg/bindings/generate" + "go.podman.io/podman/v6/pkg/bindings/kube" + "go.podman.io/podman/v6/pkg/bindings/play" + "go.podman.io/podman/v6/pkg/domain/entities" ) func (ic *ContainerEngine) GenerateSystemd(_ 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 eb5caf1b32..58546cd7d7 100644 --- a/pkg/domain/infra/tunnel/manifest.go +++ b/pkg/domain/infra/tunnel/manifest.go @@ -6,12 +6,12 @@ import ( "slices" "strings" - "github.com/containers/podman/v6/pkg/bindings/images" - "github.com/containers/podman/v6/pkg/bindings/manifests" - "github.com/containers/podman/v6/pkg/domain/entities" - envLib "github.com/containers/podman/v6/pkg/env" "go.podman.io/common/libimage/define" "go.podman.io/image/v5/types" + "go.podman.io/podman/v6/pkg/bindings/images" + "go.podman.io/podman/v6/pkg/bindings/manifests" + "go.podman.io/podman/v6/pkg/domain/entities" + envLib "go.podman.io/podman/v6/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 f6bb4b8a74..575cc8729f 100644 --- a/pkg/domain/infra/tunnel/network.go +++ b/pkg/domain/infra/tunnel/network.go @@ -5,11 +5,11 @@ import ( "errors" "fmt" - "github.com/containers/podman/v6/libpod/define" - "github.com/containers/podman/v6/pkg/bindings/network" - "github.com/containers/podman/v6/pkg/domain/entities" - "github.com/containers/podman/v6/pkg/errorhandling" "go.podman.io/common/libnetwork/types" + "go.podman.io/podman/v6/libpod/define" + "go.podman.io/podman/v6/pkg/bindings/network" + "go.podman.io/podman/v6/pkg/domain/entities" + "go.podman.io/podman/v6/pkg/errorhandling" ) func (ic *ContainerEngine) NetworkUpdate(_ 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 6538d5d725..f29374ec45 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/v6/libpod/define" - "github.com/containers/podman/v6/pkg/bindings/pods" - "github.com/containers/podman/v6/pkg/domain/entities" - "github.com/containers/podman/v6/pkg/errorhandling" - "github.com/containers/podman/v6/pkg/util" + "go.podman.io/podman/v6/libpod/define" + "go.podman.io/podman/v6/pkg/bindings/pods" + "go.podman.io/podman/v6/pkg/domain/entities" + "go.podman.io/podman/v6/pkg/errorhandling" + "go.podman.io/podman/v6/pkg/util" ) func (ic *ContainerEngine) PodExists(_ context.Context, nameOrID string) (*entities.BoolReport, error) { diff --git a/pkg/domain/infra/tunnel/quadlet.go b/pkg/domain/infra/tunnel/quadlet.go index 7c0a29ac04..2a12162a8a 100644 --- a/pkg/domain/infra/tunnel/quadlet.go +++ b/pkg/domain/infra/tunnel/quadlet.go @@ -4,7 +4,7 @@ import ( "context" "errors" - "github.com/containers/podman/v6/pkg/domain/entities" + "go.podman.io/podman/v6/pkg/domain/entities" ) var errNotImplemented = errors.New("not implemented for the remote Podman client") diff --git a/pkg/domain/infra/tunnel/runtime.go b/pkg/domain/infra/tunnel/runtime.go index c8a1632899..ea83c2d449 100644 --- a/pkg/domain/infra/tunnel/runtime.go +++ b/pkg/domain/infra/tunnel/runtime.go @@ -6,9 +6,9 @@ import ( "sync" "syscall" - "github.com/containers/podman/v6/libpod/define" - "github.com/containers/podman/v6/pkg/signal" "github.com/sirupsen/logrus" + "go.podman.io/podman/v6/libpod/define" + "go.podman.io/podman/v6/pkg/signal" ) // Image-related runtime using an ssh-tunnel to utilize Podman service diff --git a/pkg/domain/infra/tunnel/secrets.go b/pkg/domain/infra/tunnel/secrets.go index 8d2a857d32..72638ace08 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/v6/pkg/bindings/secrets" - "github.com/containers/podman/v6/pkg/domain/entities" - "github.com/containers/podman/v6/pkg/errorhandling" + "go.podman.io/podman/v6/pkg/bindings/secrets" + "go.podman.io/podman/v6/pkg/domain/entities" + "go.podman.io/podman/v6/pkg/errorhandling" ) func (ic *ContainerEngine) SecretCreate(_ 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 e7aefe90dc..1c72324cd1 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/v6/libpod/define" - "github.com/containers/podman/v6/pkg/bindings/system" - "github.com/containers/podman/v6/pkg/domain/entities" + "go.podman.io/podman/v6/libpod/define" + "go.podman.io/podman/v6/pkg/bindings/system" + "go.podman.io/podman/v6/pkg/domain/entities" ) func (ic *ContainerEngine) Info(_ context.Context) (*define.Info, error) { diff --git a/pkg/domain/infra/tunnel/trust.go b/pkg/domain/infra/tunnel/trust.go index 8d0a670363..1b43c31561 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/v6/pkg/domain/entities" + "go.podman.io/podman/v6/pkg/domain/entities" ) func (ir *ImageEngine) ShowTrust(_ context.Context, _ []string, _ entities.ShowTrustOptions) (*entities.ShowTrustReport, error) { diff --git a/pkg/domain/infra/tunnel/volumes.go b/pkg/domain/infra/tunnel/volumes.go index d78a42143f..60b7ad7338 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/v6/pkg/bindings/volumes" - "github.com/containers/podman/v6/pkg/domain/entities" - "github.com/containers/podman/v6/pkg/domain/entities/reports" - "github.com/containers/podman/v6/pkg/errorhandling" + "go.podman.io/podman/v6/pkg/bindings/volumes" + "go.podman.io/podman/v6/pkg/domain/entities" + "go.podman.io/podman/v6/pkg/domain/entities/reports" + "go.podman.io/podman/v6/pkg/errorhandling" ) func (ic *ContainerEngine) VolumeCreate(_ context.Context, opts entities.VolumeCreateOptions) (*entities.IDOrNameResponse, error) { diff --git a/pkg/domain/utils/scp.go b/pkg/domain/utils/scp.go index 4dd3725ca1..2f806e6329 100644 --- a/pkg/domain/utils/scp.go +++ b/pkg/domain/utils/scp.go @@ -9,12 +9,12 @@ import ( "strconv" "strings" - "github.com/containers/podman/v6/libpod/define" - "github.com/containers/podman/v6/pkg/domain/entities" "github.com/sirupsen/logrus" "go.podman.io/common/pkg/config" "go.podman.io/common/pkg/ssh" "go.podman.io/image/v5/transports/alltransports" + "go.podman.io/podman/v6/libpod/define" + "go.podman.io/podman/v6/pkg/domain/entities" ) func ExecuteTransfer(src, dst string, opts entities.ScpExecuteTransferOptions) (*entities.ScpExecuteTransferReport, error) { diff --git a/pkg/domain/utils/scp_test.go b/pkg/domain/utils/scp_test.go index 269f04c16f..c9e863393a 100644 --- a/pkg/domain/utils/scp_test.go +++ b/pkg/domain/utils/scp_test.go @@ -4,8 +4,8 @@ import ( "fmt" "testing" - "github.com/containers/podman/v6/pkg/domain/entities" "github.com/stretchr/testify/assert" + "go.podman.io/podman/v6/pkg/domain/entities" ) func TestValidateSCPArgs(t *testing.T) { diff --git a/pkg/domain/utils/secrets_filters.go b/pkg/domain/utils/secrets_filters.go index 5adf184aea..bfbe335dbc 100644 --- a/pkg/domain/utils/secrets_filters.go +++ b/pkg/domain/utils/secrets_filters.go @@ -4,8 +4,8 @@ import ( "fmt" "strings" - "github.com/containers/podman/v6/pkg/util" "go.podman.io/common/pkg/secrets" + "go.podman.io/podman/v6/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 cd1e553b00..4e236a7e30 100644 --- a/pkg/domain/utils/utils_test.go +++ b/pkg/domain/utils/utils_test.go @@ -5,8 +5,8 @@ import ( "sort" "testing" - "github.com/containers/podman/v6/pkg/domain/entities" "github.com/stretchr/testify/assert" + "go.podman.io/podman/v6/pkg/domain/entities" ) func TestToLibpodFilters(t *testing.T) { diff --git a/pkg/farm/farm.go b/pkg/farm/farm.go index 51a695e45a..157ecd0255 100644 --- a/pkg/farm/farm.go +++ b/pkg/farm/farm.go @@ -11,13 +11,13 @@ import ( "strings" "sync" - "github.com/containers/podman/v6/pkg/domain/entities" - "github.com/containers/podman/v6/pkg/domain/infra" "github.com/hashicorp/go-multierror" "github.com/sirupsen/logrus" "go.podman.io/buildah/define" lplatform "go.podman.io/common/libimage/platform" "go.podman.io/common/pkg/config" + "go.podman.io/podman/v6/pkg/domain/entities" + "go.podman.io/podman/v6/pkg/domain/infra" ) // Farm represents a group of connections to builders. diff --git a/pkg/farm/list_builder.go b/pkg/farm/list_builder.go index 09379c97ad..a1e78ca132 100644 --- a/pkg/farm/list_builder.go +++ b/pkg/farm/list_builder.go @@ -6,11 +6,11 @@ import ( "os" "sync" - "github.com/containers/podman/v6/pkg/domain/entities" "github.com/hashicorp/go-multierror" "github.com/sirupsen/logrus" "go.podman.io/image/v5/docker" "go.podman.io/image/v5/types" + "go.podman.io/podman/v6/pkg/domain/entities" ) type listBuilderOptions struct { diff --git a/pkg/fileserver/server_windows.go b/pkg/fileserver/server_windows.go index c4532a20a6..648e8cae09 100644 --- a/pkg/fileserver/server_windows.go +++ b/pkg/fileserver/server_windows.go @@ -3,9 +3,9 @@ package fileserver import ( "fmt" - "github.com/containers/podman/v6/pkg/fileserver/plan9" "github.com/linuxkit/virtsock/pkg/hvsock" "github.com/sirupsen/logrus" + "go.podman.io/podman/v6/pkg/fileserver/plan9" ) // Start serving the given shares on Windows HVSocks for use by a Hyper-V VM. diff --git a/pkg/inspect/inspect.go b/pkg/inspect/inspect.go index 167d91f12c..4142325c71 100644 --- a/pkg/inspect/inspect.go +++ b/pkg/inspect/inspect.go @@ -3,10 +3,10 @@ package inspect import ( "time" - "github.com/containers/podman/v6/libpod/define" "github.com/opencontainers/go-digest" v1 "github.com/opencontainers/image-spec/specs-go/v1" "go.podman.io/image/v5/manifest" + "go.podman.io/podman/v6/libpod/define" ) // ImageData holds the inspect information of an image. diff --git a/pkg/k8s.io/api/apps/v1/types.go b/pkg/k8s.io/api/apps/v1/types.go index 7e90ad1883..204d9c652f 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/v6/pkg/k8s.io/api/core/v1" - metav1 "github.com/containers/podman/v6/pkg/k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/containers/podman/v6/pkg/k8s.io/apimachinery/pkg/util/intstr" + v1 "go.podman.io/podman/v6/pkg/k8s.io/api/core/v1" + metav1 "go.podman.io/podman/v6/pkg/k8s.io/apimachinery/pkg/apis/meta/v1" + "go.podman.io/podman/v6/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 5a89084fbe..ea0e2611bc 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/v6/pkg/k8s.io/apimachinery/pkg/api/resource" + "go.podman.io/podman/v6/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 12a685607e..af59252c98 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/v6/pkg/k8s.io/apimachinery/pkg/api/resource" - metav1 "github.com/containers/podman/v6/pkg/k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/containers/podman/v6/pkg/k8s.io/apimachinery/pkg/types" - "github.com/containers/podman/v6/pkg/k8s.io/apimachinery/pkg/util/intstr" + "go.podman.io/podman/v6/pkg/k8s.io/apimachinery/pkg/api/resource" + metav1 "go.podman.io/podman/v6/pkg/k8s.io/apimachinery/pkg/apis/meta/v1" + "go.podman.io/podman/v6/pkg/k8s.io/apimachinery/pkg/types" + "go.podman.io/podman/v6/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 3c953b499b..128a620db8 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/v6/pkg/k8s.io/apimachinery/pkg/types" + "go.podman.io/podman/v6/pkg/k8s.io/apimachinery/pkg/types" ) // TypeMeta describes an individual object in an API response or request diff --git a/pkg/machine/apple/apple.go b/pkg/machine/apple/apple.go index 3ca329c8e5..7f8b1b8c86 100644 --- a/pkg/machine/apple/apple.go +++ b/pkg/machine/apple/apple.go @@ -13,16 +13,16 @@ import ( "time" gvproxy "github.com/containers/gvisor-tap-vsock/pkg/types" - "github.com/containers/podman/v6/pkg/machine" - "github.com/containers/podman/v6/pkg/machine/define" - "github.com/containers/podman/v6/pkg/machine/ignition" - "github.com/containers/podman/v6/pkg/machine/sockets" - "github.com/containers/podman/v6/pkg/machine/vmconfigs" - "github.com/containers/podman/v6/pkg/systemd/parser" vfConfig "github.com/crc-org/vfkit/pkg/config" "github.com/sirupsen/logrus" "go.podman.io/common/pkg/config" "go.podman.io/common/pkg/strongunits" + "go.podman.io/podman/v6/pkg/machine" + "go.podman.io/podman/v6/pkg/machine/define" + "go.podman.io/podman/v6/pkg/machine/ignition" + "go.podman.io/podman/v6/pkg/machine/sockets" + "go.podman.io/podman/v6/pkg/machine/vmconfigs" + "go.podman.io/podman/v6/pkg/systemd/parser" ) const applehvMACAddress = "5a:94:ef:e4:0c:ee" diff --git a/pkg/machine/apple/ignition.go b/pkg/machine/apple/ignition.go index 6d6910193f..36ff6834e1 100644 --- a/pkg/machine/apple/ignition.go +++ b/pkg/machine/apple/ignition.go @@ -6,9 +6,9 @@ import ( "net" "net/http" - "github.com/containers/podman/v6/pkg/machine/define" - "github.com/containers/podman/v6/pkg/machine/vmconfigs" "github.com/sirupsen/logrus" + "go.podman.io/podman/v6/pkg/machine/define" + "go.podman.io/podman/v6/pkg/machine/vmconfigs" ) // ServeIgnitionOverSock allows podman to open a small httpd instance on the vsock between the host diff --git a/pkg/machine/apple/vfkit.go b/pkg/machine/apple/vfkit.go index c875fd1399..fa0ac87306 100644 --- a/pkg/machine/apple/vfkit.go +++ b/pkg/machine/apple/vfkit.go @@ -5,10 +5,10 @@ package apple import ( "errors" - "github.com/containers/podman/v6/pkg/machine/define" - "github.com/containers/podman/v6/pkg/machine/vmconfigs" vfConfig "github.com/crc-org/vfkit/pkg/config" "github.com/sirupsen/logrus" + "go.podman.io/podman/v6/pkg/machine/define" + "go.podman.io/podman/v6/pkg/machine/vmconfigs" ) func GetDefaultDevices(mc *vmconfigs.MachineConfig) ([]vfConfig.VirtioDevice, *define.VMFile, error) { diff --git a/pkg/machine/apple/vfkit/helper.go b/pkg/machine/apple/vfkit/helper.go index 11d54a8c8e..7cce114f50 100644 --- a/pkg/machine/apple/vfkit/helper.go +++ b/pkg/machine/apple/vfkit/helper.go @@ -10,10 +10,10 @@ import ( "net/http" "time" - "github.com/containers/podman/v6/pkg/machine/define" "github.com/crc-org/vfkit/pkg/config" rest "github.com/crc-org/vfkit/pkg/rest/define" "github.com/sirupsen/logrus" + "go.podman.io/podman/v6/pkg/machine/define" "golang.org/x/sys/unix" ) diff --git a/pkg/machine/apple/vfkit/rest.go b/pkg/machine/apple/vfkit/rest.go index 60f717a652..70c13c047c 100644 --- a/pkg/machine/apple/vfkit/rest.go +++ b/pkg/machine/apple/vfkit/rest.go @@ -6,7 +6,7 @@ import ( "errors" "fmt" - "github.com/containers/podman/v6/pkg/machine/define" + "go.podman.io/podman/v6/pkg/machine/define" ) type Endpoint string diff --git a/pkg/machine/applehv/machine.go b/pkg/machine/applehv/machine.go index bb5fbb1e49..0f96673d0c 100644 --- a/pkg/machine/applehv/machine.go +++ b/pkg/machine/applehv/machine.go @@ -3,8 +3,8 @@ package applehv import ( - "github.com/containers/podman/v6/pkg/machine/define" - "github.com/containers/podman/v6/pkg/machine/vmconfigs" + "go.podman.io/podman/v6/pkg/machine/define" + "go.podman.io/podman/v6/pkg/machine/vmconfigs" ) func (a *AppleHVStubber) Remove(_ *vmconfigs.MachineConfig) ([]string, func() error, error) { diff --git a/pkg/machine/applehv/stubber.go b/pkg/machine/applehv/stubber.go index ef50d9f761..117975d4d7 100644 --- a/pkg/machine/applehv/stubber.go +++ b/pkg/machine/applehv/stubber.go @@ -8,15 +8,15 @@ import ( "strconv" gvproxy "github.com/containers/gvisor-tap-vsock/pkg/types" - "github.com/containers/podman/v6/pkg/machine" - "github.com/containers/podman/v6/pkg/machine/apple" - "github.com/containers/podman/v6/pkg/machine/apple/vfkit" - "github.com/containers/podman/v6/pkg/machine/define" - "github.com/containers/podman/v6/pkg/machine/ignition" - "github.com/containers/podman/v6/pkg/machine/vmconfigs" - "github.com/containers/podman/v6/utils" vfConfig "github.com/crc-org/vfkit/pkg/config" "go.podman.io/common/pkg/config" + "go.podman.io/podman/v6/pkg/machine" + "go.podman.io/podman/v6/pkg/machine/apple" + "go.podman.io/podman/v6/pkg/machine/apple/vfkit" + "go.podman.io/podman/v6/pkg/machine/define" + "go.podman.io/podman/v6/pkg/machine/ignition" + "go.podman.io/podman/v6/pkg/machine/vmconfigs" + "go.podman.io/podman/v6/utils" ) // applehcMACAddress is a pre-defined mac address that vfkit recognizes diff --git a/pkg/machine/certificates/certificates.go b/pkg/machine/certificates/certificates.go index f5d02825ed..ae928b77f5 100644 --- a/pkg/machine/certificates/certificates.go +++ b/pkg/machine/certificates/certificates.go @@ -7,11 +7,11 @@ import ( "os" "path/filepath" - "github.com/containers/podman/v6/internal/localapi" - "github.com/containers/podman/v6/pkg/machine" - "github.com/containers/podman/v6/pkg/machine/define" - "github.com/containers/podman/v6/pkg/machine/vmconfigs" "github.com/sirupsen/logrus" + "go.podman.io/podman/v6/internal/localapi" + "go.podman.io/podman/v6/pkg/machine" + "go.podman.io/podman/v6/pkg/machine/define" + "go.podman.io/podman/v6/pkg/machine/vmconfigs" ) const ( diff --git a/pkg/machine/compression/compression_test.go b/pkg/machine/compression/compression_test.go index 0cbd43354a..d6ffadb1bd 100644 --- a/pkg/machine/compression/compression_test.go +++ b/pkg/machine/compression/compression_test.go @@ -4,9 +4,9 @@ import ( "os" "testing" - "github.com/containers/podman/v6/pkg/machine/define" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "go.podman.io/podman/v6/pkg/machine/define" ) func Test_compressionFromFile(t *testing.T) { diff --git a/pkg/machine/compression/decompress.go b/pkg/machine/compression/decompress.go index 2f7b17c79c..6d297ff64a 100644 --- a/pkg/machine/compression/decompress.go +++ b/pkg/machine/compression/decompress.go @@ -6,9 +6,9 @@ import ( "path/filepath" "strings" - "github.com/containers/podman/v6/pkg/machine/define" - "github.com/containers/podman/v6/utils" "github.com/sirupsen/logrus" + "go.podman.io/podman/v6/pkg/machine/define" + "go.podman.io/podman/v6/utils" "go.podman.io/storage/pkg/archive" ) diff --git a/pkg/machine/config.go b/pkg/machine/config.go index a4c0b87c74..e0e32cda72 100644 --- a/pkg/machine/config.go +++ b/pkg/machine/config.go @@ -12,11 +12,11 @@ import ( "strings" "time" - "github.com/containers/podman/v6/pkg/machine/compression" - "github.com/containers/podman/v6/pkg/machine/define" - "github.com/containers/podman/v6/pkg/machine/vmconfigs" "github.com/sirupsen/logrus" "go.podman.io/common/pkg/strongunits" + "go.podman.io/podman/v6/pkg/machine/compression" + "go.podman.io/podman/v6/pkg/machine/define" + "go.podman.io/podman/v6/pkg/machine/vmconfigs" ) const apiUpTimeout = 20 * time.Second diff --git a/pkg/machine/config_test.go b/pkg/machine/config_test.go index 02031bb4da..2b8d3a123f 100644 --- a/pkg/machine/config_test.go +++ b/pkg/machine/config_test.go @@ -6,8 +6,8 @@ import ( "path/filepath" "testing" - "github.com/containers/podman/v6/pkg/machine/env" "github.com/stretchr/testify/assert" + "go.podman.io/podman/v6/pkg/machine/env" ) func TestGetSSHIdentityPath(t *testing.T) { diff --git a/pkg/machine/connection/add.go b/pkg/machine/connection/add.go index 41c8cc0681..3e7ba18a36 100644 --- a/pkg/machine/connection/add.go +++ b/pkg/machine/connection/add.go @@ -6,7 +6,7 @@ import ( "fmt" "strconv" - "github.com/containers/podman/v6/pkg/machine/define" + "go.podman.io/podman/v6/pkg/machine/define" ) // AddSSHConnectionsToPodmanSocket adds SSH connections to the podman socket if diff --git a/pkg/machine/connection/connection.go b/pkg/machine/connection/connection.go index f10b266ba7..cfdac02e2f 100644 --- a/pkg/machine/connection/connection.go +++ b/pkg/machine/connection/connection.go @@ -8,8 +8,8 @@ import ( "net" "net/url" - "github.com/containers/podman/v6/pkg/machine/define" "go.podman.io/common/pkg/config" + "go.podman.io/podman/v6/pkg/machine/define" ) const LocalhostIP = "127.0.0.1" diff --git a/pkg/machine/define/vmfile_test.go b/pkg/machine/define/vmfile_test.go index 00e01d63e0..fa47292be3 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/v6/test/utils" + "go.podman.io/podman/v6/test/utils" ) func TestMachineFile_GetPath(t *testing.T) { diff --git a/pkg/machine/e2e/api_test.go b/pkg/machine/e2e/api_test.go index 4ea2873f53..1e3237dd93 100644 --- a/pkg/machine/e2e/api_test.go +++ b/pkg/machine/e2e/api_test.go @@ -6,12 +6,12 @@ import ( "path/filepath" "runtime" - "github.com/containers/podman/v6/pkg/machine" jsoniter "github.com/json-iterator/go" "github.com/moby/moby/client" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" + "go.podman.io/podman/v6/pkg/machine" ) const ( diff --git a/pkg/machine/e2e/basic_test.go b/pkg/machine/e2e/basic_test.go index 42f97d99d0..c1ae5c845d 100644 --- a/pkg/machine/e2e/basic_test.go +++ b/pkg/machine/e2e/basic_test.go @@ -14,11 +14,11 @@ import ( "strings" "time" - "github.com/containers/podman/v6/pkg/machine/define" - "github.com/containers/podman/v6/version/rawversion" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" + "go.podman.io/podman/v6/pkg/machine/define" + "go.podman.io/podman/v6/version/rawversion" ) const TESTIMAGE = "quay.io/libpod/testimage:20241011" diff --git a/pkg/machine/e2e/compose_test.go b/pkg/machine/e2e/compose_test.go index 853bc85c51..b185b50156 100644 --- a/pkg/machine/e2e/compose_test.go +++ b/pkg/machine/e2e/compose_test.go @@ -5,8 +5,8 @@ import ( "runtime" "strings" - "github.com/containers/podman/v6/pkg/machine" jsoniter "github.com/json-iterator/go" + "go.podman.io/podman/v6/pkg/machine" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/pkg/machine/e2e/config_test.go b/pkg/machine/e2e/config_test.go index de3f38a512..6a67114beb 100644 --- a/pkg/machine/e2e/config_test.go +++ b/pkg/machine/e2e/config_test.go @@ -13,13 +13,13 @@ import ( "syscall" "time" - "github.com/containers/podman/v6/pkg/machine" - "github.com/containers/podman/v6/pkg/machine/define" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "github.com/onsi/gomega/format" . "github.com/onsi/gomega/gexec" "github.com/onsi/gomega/types" + "go.podman.io/podman/v6/pkg/machine" + "go.podman.io/podman/v6/pkg/machine/define" "go.podman.io/storage/pkg/stringid" ) diff --git a/pkg/machine/e2e/config_windows_test.go b/pkg/machine/e2e/config_windows_test.go index a5b406770f..9e7df744b0 100644 --- a/pkg/machine/e2e/config_windows_test.go +++ b/pkg/machine/e2e/config_windows_test.go @@ -8,9 +8,9 @@ import ( "strings" "github.com/containers/libhvee/pkg/hypervctl" - "github.com/containers/podman/v6/pkg/machine/define" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega/gexec" + "go.podman.io/podman/v6/pkg/machine/define" ) const podmanBinary = "../../../bin/windows/podman.exe" diff --git a/pkg/machine/e2e/info_test.go b/pkg/machine/e2e/info_test.go index a83433ca53..e44b1650d5 100644 --- a/pkg/machine/e2e/info_test.go +++ b/pkg/machine/e2e/info_test.go @@ -3,11 +3,11 @@ package e2e_test import ( "strconv" - "github.com/containers/podman/v6/pkg/domain/entities" jsoniter "github.com/json-iterator/go" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" + "go.podman.io/podman/v6/pkg/domain/entities" ) var _ = Describe("podman machine info", func() { diff --git a/pkg/machine/e2e/init_test.go b/pkg/machine/e2e/init_test.go index 2bfc4db3ad..030013a477 100644 --- a/pkg/machine/e2e/init_test.go +++ b/pkg/machine/e2e/init_test.go @@ -9,10 +9,6 @@ import ( "strings" "time" - "github.com/containers/podman/v6/pkg/domain/entities" - "github.com/containers/podman/v6/pkg/machine/define" - "github.com/containers/podman/v6/pkg/machine/provider" - "github.com/containers/podman/v6/utils" jsoniter "github.com/json-iterator/go" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" @@ -20,6 +16,10 @@ import ( "github.com/shirou/gopsutil/v4/mem" "github.com/sirupsen/logrus" "go.podman.io/common/pkg/strongunits" + "go.podman.io/podman/v6/pkg/domain/entities" + "go.podman.io/podman/v6/pkg/machine/define" + "go.podman.io/podman/v6/pkg/machine/provider" + "go.podman.io/podman/v6/utils" ) var _ = Describe("podman machine init", func() { diff --git a/pkg/machine/e2e/init_windows_test.go b/pkg/machine/e2e/init_windows_test.go index 4f591196b7..74befafd6e 100644 --- a/pkg/machine/e2e/init_windows_test.go +++ b/pkg/machine/e2e/init_windows_test.go @@ -8,11 +8,11 @@ import ( "github.com/Microsoft/go-winio/vhd" "github.com/containers/libhvee/pkg/hypervctl" - "github.com/containers/podman/v6/pkg/machine/define" - "github.com/containers/podman/v6/pkg/machine/hyperv/vsock" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" + "go.podman.io/podman/v6/pkg/machine/define" + "go.podman.io/podman/v6/pkg/machine/hyperv/vsock" ) var _ = Describe("podman machine init - windows only", func() { diff --git a/pkg/machine/e2e/inspect_test.go b/pkg/machine/e2e/inspect_test.go index 85a678eb96..dc74bd9d26 100644 --- a/pkg/machine/e2e/inspect_test.go +++ b/pkg/machine/e2e/inspect_test.go @@ -3,8 +3,8 @@ package e2e_test import ( "runtime" - "github.com/containers/podman/v6/pkg/machine" jsoniter "github.com/json-iterator/go" + "go.podman.io/podman/v6/pkg/machine" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/pkg/machine/e2e/list_test.go b/pkg/machine/e2e/list_test.go index 98fe22dd62..724249b15c 100644 --- a/pkg/machine/e2e/list_test.go +++ b/pkg/machine/e2e/list_test.go @@ -6,11 +6,11 @@ import ( "strings" "time" - "github.com/containers/podman/v6/pkg/domain/entities" jsoniter "github.com/json-iterator/go" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" + "go.podman.io/podman/v6/pkg/domain/entities" ) var _ = Describe("podman machine list", func() { diff --git a/pkg/machine/e2e/machine_pull_test.go b/pkg/machine/e2e/machine_pull_test.go index 9528784c1b..2ea346a794 100644 --- a/pkg/machine/e2e/machine_pull_test.go +++ b/pkg/machine/e2e/machine_pull_test.go @@ -7,10 +7,10 @@ import ( "runtime" "strings" - "github.com/containers/podman/v6/pkg/machine/compression" - "github.com/containers/podman/v6/pkg/machine/define" - "github.com/containers/podman/v6/pkg/machine/ocipull" "go.podman.io/image/v5/types" + "go.podman.io/podman/v6/pkg/machine/compression" + "go.podman.io/podman/v6/pkg/machine/define" + "go.podman.io/podman/v6/pkg/machine/ocipull" ) func pullOCITestDisk(finalDir string, vmType define.VMType) error { diff --git a/pkg/machine/e2e/machine_test.go b/pkg/machine/e2e/machine_test.go index 9bce22bfe9..0ae27a5263 100644 --- a/pkg/machine/e2e/machine_test.go +++ b/pkg/machine/e2e/machine_test.go @@ -12,13 +12,13 @@ import ( "testing" "time" - "github.com/containers/podman/v6/pkg/machine/define" - "github.com/containers/podman/v6/pkg/machine/provider" - "github.com/containers/podman/v6/pkg/machine/vmconfigs" - "github.com/containers/podman/v6/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "go.podman.io/common/pkg/config" + "go.podman.io/podman/v6/pkg/machine/define" + "go.podman.io/podman/v6/pkg/machine/provider" + "go.podman.io/podman/v6/pkg/machine/vmconfigs" + "go.podman.io/podman/v6/utils" ) func TestMain(m *testing.M) { diff --git a/pkg/machine/e2e/os_test.go b/pkg/machine/e2e/os_test.go index d817889b58..3ef23929ba 100644 --- a/pkg/machine/e2e/os_test.go +++ b/pkg/machine/e2e/os_test.go @@ -3,10 +3,10 @@ package e2e_test import ( "fmt" - "github.com/containers/podman/v6/pkg/machine/define" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" + "go.podman.io/podman/v6/pkg/machine/define" ) var _ = Describe("podman machine os apply", func() { diff --git a/pkg/machine/e2e/proxy_test.go b/pkg/machine/e2e/proxy_test.go index b6c23ebc7f..a6b77ad170 100644 --- a/pkg/machine/e2e/proxy_test.go +++ b/pkg/machine/e2e/proxy_test.go @@ -4,10 +4,10 @@ import ( "os" "path/filepath" - "github.com/containers/podman/v6/pkg/machine/define" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" + "go.podman.io/podman/v6/pkg/machine/define" ) var _ = Describe("podman machine proxy settings propagation", func() { diff --git a/pkg/machine/e2e/rm_test.go b/pkg/machine/e2e/rm_test.go index bb1303fdcd..a282dc4d9e 100644 --- a/pkg/machine/e2e/rm_test.go +++ b/pkg/machine/e2e/rm_test.go @@ -5,10 +5,10 @@ import ( "os" "path/filepath" - "github.com/containers/podman/v6/pkg/machine/define" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" + "go.podman.io/podman/v6/pkg/machine/define" ) var _ = Describe("podman machine rm", func() { diff --git a/pkg/machine/e2e/set_test.go b/pkg/machine/e2e/set_test.go index c09f5eca9e..afae3617f5 100644 --- a/pkg/machine/e2e/set_test.go +++ b/pkg/machine/e2e/set_test.go @@ -6,10 +6,10 @@ import ( "strconv" "strings" - "github.com/containers/podman/v6/pkg/machine/define" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" + "go.podman.io/podman/v6/pkg/machine/define" ) var _ = Describe("podman machine set", func() { diff --git a/pkg/machine/e2e/ssh_test.go b/pkg/machine/e2e/ssh_test.go index cec00cf6fa..3c40e927c9 100644 --- a/pkg/machine/e2e/ssh_test.go +++ b/pkg/machine/e2e/ssh_test.go @@ -1,10 +1,10 @@ package e2e_test import ( - "github.com/containers/podman/v6/pkg/machine/define" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" + "go.podman.io/podman/v6/pkg/machine/define" ) var _ = Describe("podman machine ssh", func() { diff --git a/pkg/machine/e2e/start_test.go b/pkg/machine/e2e/start_test.go index d13f9904b8..4250be73d9 100644 --- a/pkg/machine/e2e/start_test.go +++ b/pkg/machine/e2e/start_test.go @@ -9,11 +9,11 @@ import ( "sync" "time" - "github.com/containers/podman/v6/pkg/machine/define" jsoniter "github.com/json-iterator/go" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" + "go.podman.io/podman/v6/pkg/machine/define" ) var _ = Describe("podman machine start", func() { diff --git a/pkg/machine/env/dir.go b/pkg/machine/env/dir.go index f9364d1afe..0077b36d7b 100644 --- a/pkg/machine/env/dir.go +++ b/pkg/machine/env/dir.go @@ -6,7 +6,7 @@ import ( "path/filepath" "strings" - "github.com/containers/podman/v6/pkg/machine/define" + "go.podman.io/podman/v6/pkg/machine/define" "go.podman.io/storage/pkg/fileutils" "go.podman.io/storage/pkg/homedir" ) diff --git a/pkg/machine/env/dir_linux.go b/pkg/machine/env/dir_linux.go index 66248a244d..16364d5b96 100644 --- a/pkg/machine/env/dir_linux.go +++ b/pkg/machine/env/dir_linux.go @@ -1,8 +1,8 @@ package env import ( - "github.com/containers/podman/v6/pkg/rootless" - "github.com/containers/podman/v6/pkg/util" + "go.podman.io/podman/v6/pkg/rootless" + "go.podman.io/podman/v6/pkg/util" ) func getRuntimeDir() (string, error) { diff --git a/pkg/machine/gvproxy.go b/pkg/machine/gvproxy.go index 5f75c11557..c7a948e866 100644 --- a/pkg/machine/gvproxy.go +++ b/pkg/machine/gvproxy.go @@ -7,7 +7,7 @@ import ( "strconv" "time" - "github.com/containers/podman/v6/pkg/machine/define" + "go.podman.io/podman/v6/pkg/machine/define" ) const ( diff --git a/pkg/machine/gvproxy_unix.go b/pkg/machine/gvproxy_unix.go index a4d8ae13f0..413867b828 100644 --- a/pkg/machine/gvproxy_unix.go +++ b/pkg/machine/gvproxy_unix.go @@ -8,9 +8,9 @@ import ( "syscall" "time" - "github.com/containers/podman/v6/pkg/machine/define" psutil "github.com/shirou/gopsutil/v4/process" "github.com/sirupsen/logrus" + "go.podman.io/podman/v6/pkg/machine/define" "golang.org/x/sys/unix" ) diff --git a/pkg/machine/gvproxy_windows.go b/pkg/machine/gvproxy_windows.go index bc22decac1..a46fcd10e5 100644 --- a/pkg/machine/gvproxy_windows.go +++ b/pkg/machine/gvproxy_windows.go @@ -5,9 +5,9 @@ import ( "os" "time" - "github.com/containers/podman/v6/pkg/machine/define" "github.com/containers/winquit/pkg/winquit" "github.com/sirupsen/logrus" + "go.podman.io/podman/v6/pkg/machine/define" "golang.org/x/sys/windows" ) diff --git a/pkg/machine/hyperv/hutil.go b/pkg/machine/hyperv/hutil.go index e6ca8fec15..16b4c9dbee 100644 --- a/pkg/machine/hyperv/hutil.go +++ b/pkg/machine/hyperv/hutil.go @@ -8,8 +8,8 @@ import ( "os/user" "unsafe" - "github.com/containers/podman/v6/pkg/machine/windows" "github.com/sirupsen/logrus" + "go.podman.io/podman/v6/pkg/machine/windows" syswindows "golang.org/x/sys/windows" ) diff --git a/pkg/machine/hyperv/stubber.go b/pkg/machine/hyperv/stubber.go index 4c7daf8794..15aed69ffd 100644 --- a/pkg/machine/hyperv/stubber.go +++ b/pkg/machine/hyperv/stubber.go @@ -15,16 +15,16 @@ import ( gvproxy "github.com/containers/gvisor-tap-vsock/pkg/types" "github.com/containers/libhvee/pkg/hypervctl" "github.com/containers/libhvee/pkg/kvp/ginsu" - "github.com/containers/podman/v6/pkg/machine" - "github.com/containers/podman/v6/pkg/machine/define" - "github.com/containers/podman/v6/pkg/machine/env" - "github.com/containers/podman/v6/pkg/machine/hyperv/vsock" - "github.com/containers/podman/v6/pkg/machine/ignition" - "github.com/containers/podman/v6/pkg/machine/vmconfigs" - "github.com/containers/podman/v6/pkg/machine/windows" - "github.com/containers/podman/v6/pkg/systemd/parser" "github.com/sirupsen/logrus" "go.podman.io/common/pkg/strongunits" + "go.podman.io/podman/v6/pkg/machine" + "go.podman.io/podman/v6/pkg/machine/define" + "go.podman.io/podman/v6/pkg/machine/env" + "go.podman.io/podman/v6/pkg/machine/hyperv/vsock" + "go.podman.io/podman/v6/pkg/machine/ignition" + "go.podman.io/podman/v6/pkg/machine/vmconfigs" + "go.podman.io/podman/v6/pkg/machine/windows" + "go.podman.io/podman/v6/pkg/systemd/parser" ) type HyperVStubber struct { diff --git a/pkg/machine/hyperv/volumes.go b/pkg/machine/hyperv/volumes.go index 93987fd5aa..a353e1cb39 100644 --- a/pkg/machine/hyperv/volumes.go +++ b/pkg/machine/hyperv/volumes.go @@ -9,11 +9,11 @@ import ( "strconv" "strings" - "github.com/containers/podman/v6/pkg/machine" - "github.com/containers/podman/v6/pkg/machine/hyperv/vsock" - "github.com/containers/podman/v6/pkg/machine/vmconfigs" - "github.com/containers/podman/v6/pkg/machine/windows" "github.com/sirupsen/logrus" + "go.podman.io/podman/v6/pkg/machine" + "go.podman.io/podman/v6/pkg/machine/hyperv/vsock" + "go.podman.io/podman/v6/pkg/machine/vmconfigs" + "go.podman.io/podman/v6/pkg/machine/windows" ) func startShares(mc *vmconfigs.MachineConfig) error { diff --git a/pkg/machine/hyperv/vsock/vsock.go b/pkg/machine/hyperv/vsock/vsock.go index b69f992ca8..818ed63607 100644 --- a/pkg/machine/hyperv/vsock/vsock.go +++ b/pkg/machine/hyperv/vsock/vsock.go @@ -11,9 +11,9 @@ import ( "strings" "github.com/Microsoft/go-winio" - "github.com/containers/podman/v6/pkg/machine/sockets" - "github.com/containers/podman/v6/utils" "github.com/sirupsen/logrus" + "go.podman.io/podman/v6/pkg/machine/sockets" + "go.podman.io/podman/v6/utils" "golang.org/x/sys/windows/registry" ) diff --git a/pkg/machine/ignition/ignition.go b/pkg/machine/ignition/ignition.go index 7d848f9f8f..f2b9f56b68 100644 --- a/pkg/machine/ignition/ignition.go +++ b/pkg/machine/ignition/ignition.go @@ -12,9 +12,9 @@ import ( "path/filepath" "runtime" - "github.com/containers/podman/v6/pkg/machine/define" - "github.com/containers/podman/v6/pkg/systemd/parser" "github.com/sirupsen/logrus" + "go.podman.io/podman/v6/pkg/machine/define" + "go.podman.io/podman/v6/pkg/systemd/parser" "go.podman.io/storage/pkg/fileutils" ) diff --git a/pkg/machine/ignition/ready.go b/pkg/machine/ignition/ready.go index 5fc38c42aa..2181719fd7 100644 --- a/pkg/machine/ignition/ready.go +++ b/pkg/machine/ignition/ready.go @@ -6,7 +6,7 @@ import ( "errors" "fmt" - "github.com/containers/podman/v6/pkg/machine/define" + "go.podman.io/podman/v6/pkg/machine/define" ) // ReadyUnitOpts are options for creating the ready unit that reports back to podman diff --git a/pkg/machine/libkrun/stubber.go b/pkg/machine/libkrun/stubber.go index 1144080961..4ace7021b1 100644 --- a/pkg/machine/libkrun/stubber.go +++ b/pkg/machine/libkrun/stubber.go @@ -7,14 +7,14 @@ import ( "strconv" gvproxy "github.com/containers/gvisor-tap-vsock/pkg/types" - "github.com/containers/podman/v6/pkg/machine" - "github.com/containers/podman/v6/pkg/machine/apple" - "github.com/containers/podman/v6/pkg/machine/apple/vfkit" - "github.com/containers/podman/v6/pkg/machine/define" - "github.com/containers/podman/v6/pkg/machine/ignition" - "github.com/containers/podman/v6/pkg/machine/vmconfigs" - "github.com/containers/podman/v6/utils" vfConfig "github.com/crc-org/vfkit/pkg/config" + "go.podman.io/podman/v6/pkg/machine" + "go.podman.io/podman/v6/pkg/machine/apple" + "go.podman.io/podman/v6/pkg/machine/apple/vfkit" + "go.podman.io/podman/v6/pkg/machine/define" + "go.podman.io/podman/v6/pkg/machine/ignition" + "go.podman.io/podman/v6/pkg/machine/vmconfigs" + "go.podman.io/podman/v6/utils" ) const ( diff --git a/pkg/machine/lock/lock.go b/pkg/machine/lock/lock.go index e7ec1b382e..d6d874dfcd 100644 --- a/pkg/machine/lock/lock.go +++ b/pkg/machine/lock/lock.go @@ -4,7 +4,7 @@ import ( "fmt" "path/filepath" - "github.com/containers/podman/v6/pkg/machine/env" + "go.podman.io/podman/v6/pkg/machine/env" "go.podman.io/storage/pkg/lockfile" ) diff --git a/pkg/machine/machine_common.go b/pkg/machine/machine_common.go index 72858732a2..995da823bb 100644 --- a/pkg/machine/machine_common.go +++ b/pkg/machine/machine_common.go @@ -7,7 +7,7 @@ import ( "os" "strings" - "github.com/containers/podman/v6/pkg/machine/define" + "go.podman.io/podman/v6/pkg/machine/define" ) // GetDevNullFiles returns pointers to Read-only and Write-only DevNull files diff --git a/pkg/machine/machine_windows.go b/pkg/machine/machine_windows.go index 5b5dc2af42..670834f361 100644 --- a/pkg/machine/machine_windows.go +++ b/pkg/machine/machine_windows.go @@ -16,11 +16,11 @@ import ( "time" winio "github.com/Microsoft/go-winio" - "github.com/containers/podman/v6/pkg/machine/define" - "github.com/containers/podman/v6/pkg/machine/env" - "github.com/containers/podman/v6/pkg/machine/sockets" "github.com/sirupsen/logrus" "go.podman.io/common/pkg/config" + "go.podman.io/podman/v6/pkg/machine/define" + "go.podman.io/podman/v6/pkg/machine/env" + "go.podman.io/podman/v6/pkg/machine/sockets" "go.podman.io/storage/pkg/fileutils" ) diff --git a/pkg/machine/ocipull/oci.go b/pkg/machine/ocipull/oci.go index 0233eb14fb..8fb519bd7e 100644 --- a/pkg/machine/ocipull/oci.go +++ b/pkg/machine/ocipull/oci.go @@ -4,7 +4,7 @@ import ( "fmt" "github.com/blang/semver/v4" - "github.com/containers/podman/v6/version" + "go.podman.io/podman/v6/version" ) type OSVersion struct { diff --git a/pkg/machine/ocipull/ociartifact.go b/pkg/machine/ocipull/ociartifact.go index d7fd2c57ec..8f5612c34b 100644 --- a/pkg/machine/ocipull/ociartifact.go +++ b/pkg/machine/ocipull/ociartifact.go @@ -10,9 +10,6 @@ import ( "runtime" "strings" - "github.com/containers/podman/v6/pkg/machine/compression" - "github.com/containers/podman/v6/pkg/machine/define" - "github.com/containers/podman/v6/utils" "github.com/opencontainers/go-digest" specV1 "github.com/opencontainers/image-spec/specs-go/v1" "github.com/sirupsen/logrus" @@ -21,6 +18,9 @@ import ( "go.podman.io/image/v5/image" "go.podman.io/image/v5/transports/alltransports" "go.podman.io/image/v5/types" + "go.podman.io/podman/v6/pkg/machine/compression" + "go.podman.io/podman/v6/pkg/machine/define" + "go.podman.io/podman/v6/utils" ) const ( diff --git a/pkg/machine/ocipull/pull.go b/pkg/machine/ocipull/pull.go index a92f62059d..25145255e6 100644 --- a/pkg/machine/ocipull/pull.go +++ b/pkg/machine/ocipull/pull.go @@ -6,13 +6,13 @@ import ( "fmt" "os" - "github.com/containers/podman/v6/pkg/machine/define" "github.com/sirupsen/logrus" "go.podman.io/buildah/pkg/parse" "go.podman.io/image/v5/copy" "go.podman.io/image/v5/oci/layout" "go.podman.io/image/v5/signature" "go.podman.io/image/v5/types" + "go.podman.io/podman/v6/pkg/machine/define" "go.podman.io/storage/pkg/configfile" ) diff --git a/pkg/machine/os/machine_os.go b/pkg/machine/os/machine_os.go index 0ee9aae92c..b579befcb7 100644 --- a/pkg/machine/os/machine_os.go +++ b/pkg/machine/os/machine_os.go @@ -6,9 +6,9 @@ import ( "context" "fmt" - "github.com/containers/podman/v6/pkg/machine" - "github.com/containers/podman/v6/pkg/machine/shim" - "github.com/containers/podman/v6/pkg/machine/vmconfigs" + "go.podman.io/podman/v6/pkg/machine" + "go.podman.io/podman/v6/pkg/machine/shim" + "go.podman.io/podman/v6/pkg/machine/vmconfigs" ) // MachineOS manages machine OS's from outside the machine. diff --git a/pkg/machine/ports/ports.go b/pkg/machine/ports/ports.go index d44a436aa7..916b03d94c 100644 --- a/pkg/machine/ports/ports.go +++ b/pkg/machine/ports/ports.go @@ -11,8 +11,8 @@ import ( "path/filepath" "strconv" - "github.com/containers/podman/v6/pkg/machine/env" "github.com/sirupsen/logrus" + "go.podman.io/podman/v6/pkg/machine/env" "go.podman.io/storage/pkg/ioutils" "go.podman.io/storage/pkg/lockfile" ) diff --git a/pkg/machine/provider/platform.go b/pkg/machine/provider/platform.go index 43052610df..63b33ca26d 100644 --- a/pkg/machine/provider/platform.go +++ b/pkg/machine/provider/platform.go @@ -1,9 +1,9 @@ package provider import ( - "github.com/containers/podman/v6/pkg/machine/define" - "github.com/containers/podman/v6/pkg/machine/env" - "github.com/containers/podman/v6/pkg/machine/vmconfigs" + "go.podman.io/podman/v6/pkg/machine/define" + "go.podman.io/podman/v6/pkg/machine/env" + "go.podman.io/podman/v6/pkg/machine/vmconfigs" ) func InstalledProviders() ([]define.VMType, error) { diff --git a/pkg/machine/provider/platform_darwin.go b/pkg/machine/provider/platform_darwin.go index 208e4758f0..88ee2d057a 100644 --- a/pkg/machine/provider/platform_darwin.go +++ b/pkg/machine/provider/platform_darwin.go @@ -8,12 +8,12 @@ import ( "strings" "github.com/blang/semver/v4" - "github.com/containers/podman/v6/pkg/machine/applehv" - "github.com/containers/podman/v6/pkg/machine/define" - "github.com/containers/podman/v6/pkg/machine/libkrun" - "github.com/containers/podman/v6/pkg/machine/vmconfigs" "github.com/sirupsen/logrus" "go.podman.io/common/pkg/config" + "go.podman.io/podman/v6/pkg/machine/applehv" + "go.podman.io/podman/v6/pkg/machine/define" + "go.podman.io/podman/v6/pkg/machine/libkrun" + "go.podman.io/podman/v6/pkg/machine/vmconfigs" ) func Get() (vmconfigs.VMProvider, error) { diff --git a/pkg/machine/provider/platform_test.go b/pkg/machine/provider/platform_test.go index bbdb5a59d1..135527f912 100644 --- a/pkg/machine/provider/platform_test.go +++ b/pkg/machine/provider/platform_test.go @@ -4,8 +4,8 @@ import ( "runtime" "testing" - "github.com/containers/podman/v6/pkg/machine/define" "github.com/stretchr/testify/assert" + "go.podman.io/podman/v6/pkg/machine/define" ) func TestSupportedProviders(t *testing.T) { diff --git a/pkg/machine/provider/platform_unix.go b/pkg/machine/provider/platform_unix.go index 6beda870ed..9a5ff5dfeb 100644 --- a/pkg/machine/provider/platform_unix.go +++ b/pkg/machine/provider/platform_unix.go @@ -8,11 +8,11 @@ import ( "io/fs" "os" - "github.com/containers/podman/v6/pkg/machine/define" - "github.com/containers/podman/v6/pkg/machine/qemu" - "github.com/containers/podman/v6/pkg/machine/vmconfigs" "github.com/sirupsen/logrus" "go.podman.io/common/pkg/config" + "go.podman.io/podman/v6/pkg/machine/define" + "go.podman.io/podman/v6/pkg/machine/qemu" + "go.podman.io/podman/v6/pkg/machine/vmconfigs" ) func Get() (vmconfigs.VMProvider, error) { diff --git a/pkg/machine/provider/platform_windows.go b/pkg/machine/provider/platform_windows.go index 51dfff3acc..436bc6c5b1 100644 --- a/pkg/machine/provider/platform_windows.go +++ b/pkg/machine/provider/platform_windows.go @@ -5,13 +5,13 @@ import ( "os" "github.com/containers/libhvee/pkg/hypervctl" - "github.com/containers/podman/v6/pkg/machine/define" - "github.com/containers/podman/v6/pkg/machine/hyperv" - "github.com/containers/podman/v6/pkg/machine/vmconfigs" - "github.com/containers/podman/v6/pkg/machine/wsl" - "github.com/containers/podman/v6/pkg/machine/wsl/wutil" "github.com/sirupsen/logrus" "go.podman.io/common/pkg/config" + "go.podman.io/podman/v6/pkg/machine/define" + "go.podman.io/podman/v6/pkg/machine/hyperv" + "go.podman.io/podman/v6/pkg/machine/vmconfigs" + "go.podman.io/podman/v6/pkg/machine/wsl" + "go.podman.io/podman/v6/pkg/machine/wsl/wutil" ) func Get() (vmconfigs.VMProvider, error) { diff --git a/pkg/machine/provider/platform_windows_test.go b/pkg/machine/provider/platform_windows_test.go index ebba6f6529..3b8e6da45a 100644 --- a/pkg/machine/provider/platform_windows_test.go +++ b/pkg/machine/provider/platform_windows_test.go @@ -5,9 +5,9 @@ package provider import ( "testing" - "github.com/containers/podman/v6/pkg/machine/define" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "go.podman.io/podman/v6/pkg/machine/define" ) func TestGetByVMType_Supported(t *testing.T) { diff --git a/pkg/machine/proxyenv/env.go b/pkg/machine/proxyenv/env.go index 527c10373a..0e988a9581 100644 --- a/pkg/machine/proxyenv/env.go +++ b/pkg/machine/proxyenv/env.go @@ -6,11 +6,11 @@ import ( "os" "strings" - "github.com/containers/podman/v6/pkg/machine" - "github.com/containers/podman/v6/pkg/machine/vmconfigs" "github.com/sirupsen/logrus" "go.podman.io/common/libnetwork/etchosts" "go.podman.io/common/pkg/config" + "go.podman.io/podman/v6/pkg/machine" + "go.podman.io/podman/v6/pkg/machine/vmconfigs" ) const proxySetupScriptTemplate = `#!/bin/bash diff --git a/pkg/machine/qemu/command/command.go b/pkg/machine/qemu/command/command.go index 1e5d96a609..bd235e9451 100644 --- a/pkg/machine/qemu/command/command.go +++ b/pkg/machine/qemu/command/command.go @@ -10,7 +10,7 @@ import ( "strconv" "time" - "github.com/containers/podman/v6/pkg/machine/define" + "go.podman.io/podman/v6/pkg/machine/define" "go.podman.io/storage/pkg/fileutils" ) diff --git a/pkg/machine/qemu/command/qemu_command_test.go b/pkg/machine/qemu/command/qemu_command_test.go index 7d431e856b..33b4ef91fd 100644 --- a/pkg/machine/qemu/command/qemu_command_test.go +++ b/pkg/machine/qemu/command/qemu_command_test.go @@ -6,9 +6,9 @@ import ( "fmt" "testing" - "github.com/containers/podman/v6/pkg/machine/define" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "go.podman.io/podman/v6/pkg/machine/define" ) func TestQemuCmd(t *testing.T) { diff --git a/pkg/machine/qemu/config_test.go b/pkg/machine/qemu/config_test.go index 0cb75cc05e..e0160c07b9 100644 --- a/pkg/machine/qemu/config_test.go +++ b/pkg/machine/qemu/config_test.go @@ -6,7 +6,7 @@ import ( "reflect" "testing" - "github.com/containers/podman/v6/pkg/machine/define" + "go.podman.io/podman/v6/pkg/machine/define" ) func TestUSBParsing(t *testing.T) { diff --git a/pkg/machine/qemu/machine.go b/pkg/machine/qemu/machine.go index 141452bc01..7908a157dc 100644 --- a/pkg/machine/qemu/machine.go +++ b/pkg/machine/qemu/machine.go @@ -14,11 +14,11 @@ import ( "syscall" "time" - "github.com/containers/podman/v6/pkg/errorhandling" - "github.com/containers/podman/v6/pkg/machine/define" - "github.com/containers/podman/v6/pkg/machine/vmconfigs" "github.com/digitalocean/go-qemu/qmp" "github.com/sirupsen/logrus" + "go.podman.io/podman/v6/pkg/errorhandling" + "go.podman.io/podman/v6/pkg/machine/define" + "go.podman.io/podman/v6/pkg/machine/vmconfigs" "go.podman.io/storage/pkg/fileutils" ) diff --git a/pkg/machine/qemu/machine_windows.go b/pkg/machine/qemu/machine_windows.go index 7375f8d34f..9139c7eb4a 100644 --- a/pkg/machine/qemu/machine_windows.go +++ b/pkg/machine/qemu/machine_windows.go @@ -6,7 +6,7 @@ import ( "bytes" "fmt" - "github.com/containers/podman/v6/pkg/machine" + "go.podman.io/podman/v6/pkg/machine" ) func isProcessAlive(pid int) bool { diff --git a/pkg/machine/qemu/stubber.go b/pkg/machine/qemu/stubber.go index f4b63d039f..3ef60aadbc 100644 --- a/pkg/machine/qemu/stubber.go +++ b/pkg/machine/qemu/stubber.go @@ -14,15 +14,15 @@ import ( "time" gvproxy "github.com/containers/gvisor-tap-vsock/pkg/types" - "github.com/containers/podman/v6/pkg/machine" - "github.com/containers/podman/v6/pkg/machine/define" - "github.com/containers/podman/v6/pkg/machine/ignition" - "github.com/containers/podman/v6/pkg/machine/qemu/command" - "github.com/containers/podman/v6/pkg/machine/sockets" - "github.com/containers/podman/v6/pkg/machine/vmconfigs" "github.com/sirupsen/logrus" "go.podman.io/common/pkg/config" "go.podman.io/common/pkg/strongunits" + "go.podman.io/podman/v6/pkg/machine" + "go.podman.io/podman/v6/pkg/machine/define" + "go.podman.io/podman/v6/pkg/machine/ignition" + "go.podman.io/podman/v6/pkg/machine/qemu/command" + "go.podman.io/podman/v6/pkg/machine/sockets" + "go.podman.io/podman/v6/pkg/machine/vmconfigs" ) type QEMUStubber struct { diff --git a/pkg/machine/qemu/virtiofsd.go b/pkg/machine/qemu/virtiofsd.go index a1049ac698..eda5413f24 100644 --- a/pkg/machine/qemu/virtiofsd.go +++ b/pkg/machine/qemu/virtiofsd.go @@ -8,10 +8,10 @@ import ( "os/exec" "time" - "github.com/containers/podman/v6/pkg/machine/define" - "github.com/containers/podman/v6/pkg/machine/vmconfigs" "github.com/sirupsen/logrus" "go.podman.io/common/pkg/config" + "go.podman.io/podman/v6/pkg/machine/define" + "go.podman.io/podman/v6/pkg/machine/vmconfigs" "go.podman.io/storage/pkg/fileutils" ) diff --git a/pkg/machine/shim/diskpull/diskpull.go b/pkg/machine/shim/diskpull/diskpull.go index cb61aed67f..add7d2d109 100644 --- a/pkg/machine/shim/diskpull/diskpull.go +++ b/pkg/machine/shim/diskpull/diskpull.go @@ -4,10 +4,10 @@ import ( "context" "strings" - "github.com/containers/podman/v6/pkg/machine/define" - "github.com/containers/podman/v6/pkg/machine/ocipull" - "github.com/containers/podman/v6/pkg/machine/stdpull" "go.podman.io/image/v5/types" + "go.podman.io/podman/v6/pkg/machine/define" + "go.podman.io/podman/v6/pkg/machine/ocipull" + "go.podman.io/podman/v6/pkg/machine/stdpull" ) func GetDisk(userInputPath string, dirs *define.MachineDirs, imagePath *define.VMFile, vmType define.VMType, name string, skipTlsVerify types.OptionalBool) error { diff --git a/pkg/machine/shim/host.go b/pkg/machine/shim/host.go index fceb58960b..76e02b0151 100644 --- a/pkg/machine/shim/host.go +++ b/pkg/machine/shim/host.go @@ -14,22 +14,22 @@ import ( "syscall" "time" - "github.com/containers/podman/v6/cmd/podman/registry" - "github.com/containers/podman/v6/pkg/machine" - "github.com/containers/podman/v6/pkg/machine/certificates" - "github.com/containers/podman/v6/pkg/machine/connection" - machineDefine "github.com/containers/podman/v6/pkg/machine/define" - "github.com/containers/podman/v6/pkg/machine/env" - "github.com/containers/podman/v6/pkg/machine/ignition" - "github.com/containers/podman/v6/pkg/machine/lock" - "github.com/containers/podman/v6/pkg/machine/provider" - "github.com/containers/podman/v6/pkg/machine/proxyenv" - "github.com/containers/podman/v6/pkg/machine/shim/diskpull" - "github.com/containers/podman/v6/pkg/machine/vmconfigs" - "github.com/containers/podman/v6/utils" "github.com/hashicorp/go-multierror" "github.com/sirupsen/logrus" "go.podman.io/common/pkg/config" + "go.podman.io/podman/v6/cmd/podman/registry" + "go.podman.io/podman/v6/pkg/machine" + "go.podman.io/podman/v6/pkg/machine/certificates" + "go.podman.io/podman/v6/pkg/machine/connection" + machineDefine "go.podman.io/podman/v6/pkg/machine/define" + "go.podman.io/podman/v6/pkg/machine/env" + "go.podman.io/podman/v6/pkg/machine/ignition" + "go.podman.io/podman/v6/pkg/machine/lock" + "go.podman.io/podman/v6/pkg/machine/provider" + "go.podman.io/podman/v6/pkg/machine/proxyenv" + "go.podman.io/podman/v6/pkg/machine/shim/diskpull" + "go.podman.io/podman/v6/pkg/machine/vmconfigs" + "go.podman.io/podman/v6/utils" "golang.org/x/term" ) diff --git a/pkg/machine/shim/networking.go b/pkg/machine/shim/networking.go index 616ea1659a..7281f8fc94 100644 --- a/pkg/machine/shim/networking.go +++ b/pkg/machine/shim/networking.go @@ -9,14 +9,14 @@ import ( "time" gvproxy "github.com/containers/gvisor-tap-vsock/pkg/types" - "github.com/containers/podman/v6/pkg/machine" - "github.com/containers/podman/v6/pkg/machine/connection" - "github.com/containers/podman/v6/pkg/machine/define" - "github.com/containers/podman/v6/pkg/machine/env" - "github.com/containers/podman/v6/pkg/machine/ports" - "github.com/containers/podman/v6/pkg/machine/vmconfigs" "github.com/sirupsen/logrus" "go.podman.io/common/pkg/config" + "go.podman.io/podman/v6/pkg/machine" + "go.podman.io/podman/v6/pkg/machine/connection" + "go.podman.io/podman/v6/pkg/machine/define" + "go.podman.io/podman/v6/pkg/machine/env" + "go.podman.io/podman/v6/pkg/machine/ports" + "go.podman.io/podman/v6/pkg/machine/vmconfigs" ) const ( diff --git a/pkg/machine/shim/networking_unix.go b/pkg/machine/shim/networking_unix.go index df7ae4db8e..020da8ac02 100644 --- a/pkg/machine/shim/networking_unix.go +++ b/pkg/machine/shim/networking_unix.go @@ -8,10 +8,10 @@ import ( "os" "path/filepath" - "github.com/containers/podman/v6/pkg/machine" - "github.com/containers/podman/v6/pkg/machine/define" - "github.com/containers/podman/v6/pkg/machine/vmconfigs" "github.com/sirupsen/logrus" + "go.podman.io/podman/v6/pkg/machine" + "go.podman.io/podman/v6/pkg/machine/define" + "go.podman.io/podman/v6/pkg/machine/vmconfigs" ) func setupMachineSockets(mc *vmconfigs.MachineConfig, dirs *define.MachineDirs) ([]string, string, machine.APIForwardingState, error) { diff --git a/pkg/machine/shim/networking_windows.go b/pkg/machine/shim/networking_windows.go index e8ff59d0f9..0fec994c79 100644 --- a/pkg/machine/shim/networking_windows.go +++ b/pkg/machine/shim/networking_windows.go @@ -3,11 +3,11 @@ package shim import ( "fmt" - "github.com/containers/podman/v6/pkg/machine" - "github.com/containers/podman/v6/pkg/machine/define" - "github.com/containers/podman/v6/pkg/machine/env" - sc "github.com/containers/podman/v6/pkg/machine/sockets" - "github.com/containers/podman/v6/pkg/machine/vmconfigs" + "go.podman.io/podman/v6/pkg/machine" + "go.podman.io/podman/v6/pkg/machine/define" + "go.podman.io/podman/v6/pkg/machine/env" + sc "go.podman.io/podman/v6/pkg/machine/sockets" + "go.podman.io/podman/v6/pkg/machine/vmconfigs" ) func setupMachineSockets(mc *vmconfigs.MachineConfig, _ *define.MachineDirs) ([]string, string, machine.APIForwardingState, error) { diff --git a/pkg/machine/shim/volume.go b/pkg/machine/shim/volume.go index c3f8f0b749..90a2945324 100644 --- a/pkg/machine/shim/volume.go +++ b/pkg/machine/shim/volume.go @@ -1,8 +1,8 @@ package shim import ( - "github.com/containers/podman/v6/pkg/machine" - "github.com/containers/podman/v6/pkg/machine/vmconfigs" + "go.podman.io/podman/v6/pkg/machine" + "go.podman.io/podman/v6/pkg/machine/vmconfigs" ) func CmdLineVolumesToMounts(volumes []string, volumeType vmconfigs.VolumeMountType) []*vmconfigs.Mount { diff --git a/pkg/machine/sockets/sockets.go b/pkg/machine/sockets/sockets.go index 97483dc691..7c04225d09 100644 --- a/pkg/machine/sockets/sockets.go +++ b/pkg/machine/sockets/sockets.go @@ -9,8 +9,8 @@ import ( "path/filepath" "time" - "github.com/containers/podman/v6/pkg/machine/define" "github.com/sirupsen/logrus" + "go.podman.io/podman/v6/pkg/machine/define" "go.podman.io/storage/pkg/fileutils" ) diff --git a/pkg/machine/stdpull/local.go b/pkg/machine/stdpull/local.go index d258679c35..d2f71b46b0 100644 --- a/pkg/machine/stdpull/local.go +++ b/pkg/machine/stdpull/local.go @@ -1,9 +1,9 @@ package stdpull import ( - "github.com/containers/podman/v6/pkg/machine/compression" - "github.com/containers/podman/v6/pkg/machine/define" "github.com/sirupsen/logrus" + "go.podman.io/podman/v6/pkg/machine/compression" + "go.podman.io/podman/v6/pkg/machine/define" "go.podman.io/storage/pkg/fileutils" ) diff --git a/pkg/machine/stdpull/url.go b/pkg/machine/stdpull/url.go index d676ef278d..d8d8bf856f 100644 --- a/pkg/machine/stdpull/url.go +++ b/pkg/machine/stdpull/url.go @@ -11,10 +11,10 @@ import ( "path" "path/filepath" - "github.com/containers/podman/v6/pkg/machine/compression" - "github.com/containers/podman/v6/pkg/machine/define" - "github.com/containers/podman/v6/utils" "github.com/sirupsen/logrus" + "go.podman.io/podman/v6/pkg/machine/compression" + "go.podman.io/podman/v6/pkg/machine/define" + "go.podman.io/podman/v6/utils" "go.podman.io/storage/pkg/fileutils" ) diff --git a/pkg/machine/update.go b/pkg/machine/update.go index e14cdc97ae..bfb52086c2 100644 --- a/pkg/machine/update.go +++ b/pkg/machine/update.go @@ -5,9 +5,9 @@ package machine import ( "fmt" - "github.com/containers/podman/v6/pkg/machine/ignition" - "github.com/containers/podman/v6/pkg/machine/vmconfigs" "github.com/sirupsen/logrus" + "go.podman.io/podman/v6/pkg/machine/ignition" + "go.podman.io/podman/v6/pkg/machine/vmconfigs" ) func UpdatePodmanDockerSockService(mc *vmconfigs.MachineConfig) error { diff --git a/pkg/machine/vmconfigs/config.go b/pkg/machine/vmconfigs/config.go index 89c7ba5c4b..af27c224ba 100644 --- a/pkg/machine/vmconfigs/config.go +++ b/pkg/machine/vmconfigs/config.go @@ -4,9 +4,9 @@ import ( "time" gvproxy "github.com/containers/gvisor-tap-vsock/pkg/types" - "github.com/containers/podman/v6/pkg/machine/define" - "github.com/containers/podman/v6/pkg/machine/ignition" "go.podman.io/common/pkg/strongunits" + "go.podman.io/podman/v6/pkg/machine/define" + "go.podman.io/podman/v6/pkg/machine/ignition" "go.podman.io/storage/pkg/lockfile" ) diff --git a/pkg/machine/vmconfigs/config_common.go b/pkg/machine/vmconfigs/config_common.go index 7939611c08..89c17b5579 100644 --- a/pkg/machine/vmconfigs/config_common.go +++ b/pkg/machine/vmconfigs/config_common.go @@ -5,8 +5,8 @@ package vmconfigs import ( "os" - "github.com/containers/podman/v6/pkg/machine/define" - "github.com/containers/podman/v6/pkg/machine/qemu/command" + "go.podman.io/podman/v6/pkg/machine/define" + "go.podman.io/podman/v6/pkg/machine/qemu/command" ) type QEMUConfig struct { diff --git a/pkg/machine/vmconfigs/config_darwin.go b/pkg/machine/vmconfigs/config_darwin.go index dc3e923e36..0d0cdca536 100644 --- a/pkg/machine/vmconfigs/config_darwin.go +++ b/pkg/machine/vmconfigs/config_darwin.go @@ -3,7 +3,7 @@ package vmconfigs import ( "os" - "github.com/containers/podman/v6/pkg/machine/apple/vfkit" + "go.podman.io/podman/v6/pkg/machine/apple/vfkit" ) type AppleHVConfig struct { diff --git a/pkg/machine/vmconfigs/config_windows.go b/pkg/machine/vmconfigs/config_windows.go index f0ab9194bb..163d4bcb97 100644 --- a/pkg/machine/vmconfigs/config_windows.go +++ b/pkg/machine/vmconfigs/config_windows.go @@ -1,9 +1,9 @@ package vmconfigs import ( - "github.com/containers/podman/v6/pkg/machine/define" - "github.com/containers/podman/v6/pkg/machine/hyperv/vsock" - "github.com/containers/podman/v6/pkg/machine/qemu/command" + "go.podman.io/podman/v6/pkg/machine/define" + "go.podman.io/podman/v6/pkg/machine/hyperv/vsock" + "go.podman.io/podman/v6/pkg/machine/qemu/command" ) type HyperVConfig struct { diff --git a/pkg/machine/vmconfigs/machine.go b/pkg/machine/vmconfigs/machine.go index d80291d1c9..b231d4b40c 100644 --- a/pkg/machine/vmconfigs/machine.go +++ b/pkg/machine/vmconfigs/machine.go @@ -10,13 +10,13 @@ import ( "strings" "time" - "github.com/containers/podman/v6/pkg/errorhandling" - "github.com/containers/podman/v6/pkg/machine/connection" - "github.com/containers/podman/v6/pkg/machine/define" - "github.com/containers/podman/v6/pkg/machine/lock" - "github.com/containers/podman/v6/pkg/machine/ports" "github.com/sirupsen/logrus" "go.podman.io/common/pkg/strongunits" + "go.podman.io/podman/v6/pkg/errorhandling" + "go.podman.io/podman/v6/pkg/machine/connection" + "go.podman.io/podman/v6/pkg/machine/define" + "go.podman.io/podman/v6/pkg/machine/lock" + "go.podman.io/podman/v6/pkg/machine/ports" "go.podman.io/storage/pkg/fileutils" "go.podman.io/storage/pkg/ioutils" "go.podman.io/storage/pkg/lockfile" diff --git a/pkg/machine/vmconfigs/machine_unix.go b/pkg/machine/vmconfigs/machine_unix.go index a0ba853dd8..df9b318ad9 100644 --- a/pkg/machine/vmconfigs/machine_unix.go +++ b/pkg/machine/vmconfigs/machine_unix.go @@ -3,7 +3,7 @@ package vmconfigs import ( - "github.com/containers/podman/v6/pkg/machine/define" + "go.podman.io/podman/v6/pkg/machine/define" ) func getPipe(_ string) *define.VMFile { diff --git a/pkg/machine/vmconfigs/machine_windows.go b/pkg/machine/vmconfigs/machine_windows.go index e8c4c3c047..fa5d323e74 100644 --- a/pkg/machine/vmconfigs/machine_windows.go +++ b/pkg/machine/vmconfigs/machine_windows.go @@ -1,8 +1,8 @@ package vmconfigs import ( - "github.com/containers/podman/v6/pkg/machine/define" - "github.com/containers/podman/v6/pkg/machine/env" + "go.podman.io/podman/v6/pkg/machine/define" + "go.podman.io/podman/v6/pkg/machine/env" ) func getPipe(name string) *define.VMFile { diff --git a/pkg/machine/vmconfigs/sockets.go b/pkg/machine/vmconfigs/sockets.go index 20021c2529..094dae22f2 100644 --- a/pkg/machine/vmconfigs/sockets.go +++ b/pkg/machine/vmconfigs/sockets.go @@ -5,7 +5,7 @@ package vmconfigs import ( "fmt" - "github.com/containers/podman/v6/pkg/machine/define" + "go.podman.io/podman/v6/pkg/machine/define" ) func gvProxySocket(name string, machineRuntimeDir *define.VMFile) (*define.VMFile, error) { diff --git a/pkg/machine/vmconfigs/sockets_darwin.go b/pkg/machine/vmconfigs/sockets_darwin.go index 61998aabbe..7d2eb99355 100644 --- a/pkg/machine/vmconfigs/sockets_darwin.go +++ b/pkg/machine/vmconfigs/sockets_darwin.go @@ -3,7 +3,7 @@ package vmconfigs import ( "fmt" - "github.com/containers/podman/v6/pkg/machine/define" + "go.podman.io/podman/v6/pkg/machine/define" ) func gvProxySocket(name string, machineRuntimeDir *define.VMFile) (*define.VMFile, error) { diff --git a/pkg/machine/volumes.go b/pkg/machine/volumes.go index f75b3606eb..d4f2ba52ba 100644 --- a/pkg/machine/volumes.go +++ b/pkg/machine/volumes.go @@ -4,7 +4,7 @@ import ( "crypto/sha256" "encoding/hex" - "github.com/containers/podman/v6/pkg/machine/vmconfigs" + "go.podman.io/podman/v6/pkg/machine/vmconfigs" ) // NFSSELinuxContext is what is used by NFS mounts, which is allowed diff --git a/pkg/machine/wsl/config.go b/pkg/machine/wsl/config.go index 836bb11d72..714f24d8a1 100644 --- a/pkg/machine/wsl/config.go +++ b/pkg/machine/wsl/config.go @@ -9,10 +9,10 @@ import ( "strings" "time" - "github.com/containers/podman/v6/pkg/machine" - "github.com/containers/podman/v6/pkg/machine/define" - "github.com/containers/podman/v6/utils" "github.com/sirupsen/logrus" + "go.podman.io/podman/v6/pkg/machine" + "go.podman.io/podman/v6/pkg/machine/define" + "go.podman.io/podman/v6/utils" ) type WSLVirtualization struct{} diff --git a/pkg/machine/wsl/machine.go b/pkg/machine/wsl/machine.go index 85d0564dcb..8ee1e956ca 100644 --- a/pkg/machine/wsl/machine.go +++ b/pkg/machine/wsl/machine.go @@ -14,16 +14,16 @@ import ( "strconv" "strings" - "github.com/containers/podman/v6/pkg/machine/define" - "github.com/containers/podman/v6/pkg/machine/env" - "github.com/containers/podman/v6/pkg/machine/ignition" - "github.com/containers/podman/v6/pkg/machine/vmconfigs" - winutil "github.com/containers/podman/v6/pkg/machine/windows" - "github.com/containers/podman/v6/pkg/machine/wsl/wutil" - "github.com/containers/podman/v6/utils" "github.com/sirupsen/logrus" "go.podman.io/common/pkg/config" "go.podman.io/common/pkg/strongunits" + "go.podman.io/podman/v6/pkg/machine/define" + "go.podman.io/podman/v6/pkg/machine/env" + "go.podman.io/podman/v6/pkg/machine/ignition" + "go.podman.io/podman/v6/pkg/machine/vmconfigs" + winutil "go.podman.io/podman/v6/pkg/machine/windows" + "go.podman.io/podman/v6/pkg/machine/wsl/wutil" + "go.podman.io/podman/v6/utils" ) var ( diff --git a/pkg/machine/wsl/stubber.go b/pkg/machine/wsl/stubber.go index db3a8e4c4e..606c6fcfbe 100644 --- a/pkg/machine/wsl/stubber.go +++ b/pkg/machine/wsl/stubber.go @@ -9,16 +9,16 @@ import ( "os" "strings" - "github.com/containers/podman/v6/pkg/machine/env" - "github.com/containers/podman/v6/pkg/machine/wsl/wutil" + "go.podman.io/podman/v6/pkg/machine/env" + "go.podman.io/podman/v6/pkg/machine/wsl/wutil" gvproxy "github.com/containers/gvisor-tap-vsock/pkg/types" - "github.com/containers/podman/v6/pkg/machine" - "github.com/containers/podman/v6/pkg/machine/define" - "github.com/containers/podman/v6/pkg/machine/ignition" - "github.com/containers/podman/v6/pkg/machine/vmconfigs" - "github.com/containers/podman/v6/pkg/machine/windows" "github.com/sirupsen/logrus" + "go.podman.io/podman/v6/pkg/machine" + "go.podman.io/podman/v6/pkg/machine/define" + "go.podman.io/podman/v6/pkg/machine/ignition" + "go.podman.io/podman/v6/pkg/machine/vmconfigs" + "go.podman.io/podman/v6/pkg/machine/windows" ) type WSLStubber struct { diff --git a/pkg/machine/wsl/usermodenet.go b/pkg/machine/wsl/usermodenet.go index 7081f642a7..ca210106c9 100644 --- a/pkg/machine/wsl/usermodenet.go +++ b/pkg/machine/wsl/usermodenet.go @@ -9,12 +9,12 @@ import ( "os/exec" "path/filepath" - "github.com/containers/podman/v6/pkg/machine/env" - "github.com/containers/podman/v6/pkg/machine/vmconfigs" - "github.com/containers/podman/v6/pkg/machine/wsl/wutil" - "github.com/containers/podman/v6/pkg/specgen" "github.com/sirupsen/logrus" "go.podman.io/common/pkg/config" + "go.podman.io/podman/v6/pkg/machine/env" + "go.podman.io/podman/v6/pkg/machine/vmconfigs" + "go.podman.io/podman/v6/pkg/machine/wsl/wutil" + "go.podman.io/podman/v6/pkg/specgen" ) const gvForwarderPath = "/usr/libexec/podman/gvforwarder" diff --git a/pkg/machine/wsl/util_windows.go b/pkg/machine/wsl/util_windows.go index 70001316e5..960d5304e3 100644 --- a/pkg/machine/wsl/util_windows.go +++ b/pkg/machine/wsl/util_windows.go @@ -13,8 +13,8 @@ import ( "unicode/utf16" "github.com/Microsoft/go-winio" - "github.com/containers/podman/v6/pkg/machine/define" - winutil "github.com/containers/podman/v6/pkg/machine/windows" + "go.podman.io/podman/v6/pkg/machine/define" + winutil "go.podman.io/podman/v6/pkg/machine/windows" "go.podman.io/storage/pkg/fileutils" "go.podman.io/storage/pkg/homedir" "golang.org/x/sys/windows" diff --git a/pkg/parallel/ctr/ctr.go b/pkg/parallel/ctr/ctr.go index eb825de3b2..31ee9e1112 100644 --- a/pkg/parallel/ctr/ctr.go +++ b/pkg/parallel/ctr/ctr.go @@ -5,9 +5,9 @@ package ctr import ( "context" - "github.com/containers/podman/v6/libpod" - "github.com/containers/podman/v6/pkg/parallel" "github.com/sirupsen/logrus" + "go.podman.io/podman/v6/libpod" + "go.podman.io/podman/v6/pkg/parallel" ) // ContainerOp performs the given function on the given set of diff --git a/pkg/ps/ps.go b/pkg/ps/ps.go index f0b473dae3..3babb64895 100644 --- a/pkg/ps/ps.go +++ b/pkg/ps/ps.go @@ -13,13 +13,13 @@ import ( "strings" "time" - "github.com/containers/podman/v6/libpod" - "github.com/containers/podman/v6/libpod/define" - "github.com/containers/podman/v6/pkg/domain/entities" - "github.com/containers/podman/v6/pkg/domain/filters" - psdefine "github.com/containers/podman/v6/pkg/ps/define" "github.com/sirupsen/logrus" libnetworkTypes "go.podman.io/common/libnetwork/types" + "go.podman.io/podman/v6/libpod" + "go.podman.io/podman/v6/libpod/define" + "go.podman.io/podman/v6/pkg/domain/entities" + "go.podman.io/podman/v6/pkg/domain/filters" + psdefine "go.podman.io/podman/v6/pkg/ps/define" "go.podman.io/storage" "go.podman.io/storage/types" ) diff --git a/pkg/rootless/rootless_linux.go b/pkg/rootless/rootless_linux.go index cdbfdb5bfd..4d2af38808 100644 --- a/pkg/rootless/rootless_linux.go +++ b/pkg/rootless/rootless_linux.go @@ -16,9 +16,9 @@ import ( "sync" "unsafe" - "github.com/containers/podman/v6/pkg/errorhandling" "github.com/moby/sys/capability" "github.com/sirupsen/logrus" + "go.podman.io/podman/v6/pkg/errorhandling" "go.podman.io/storage/pkg/idtools" pmount "go.podman.io/storage/pkg/mount" "go.podman.io/storage/pkg/unshare" diff --git a/pkg/specgen/container_validate.go b/pkg/specgen/container_validate.go index c3eb5ebc6e..e42f7ab782 100644 --- a/pkg/specgen/container_validate.go +++ b/pkg/specgen/container_validate.go @@ -6,7 +6,7 @@ import ( "slices" "strings" - "github.com/containers/podman/v6/libpod/define" + "go.podman.io/podman/v6/libpod/define" ) var ( diff --git a/pkg/specgen/generate/config_linux.go b/pkg/specgen/generate/config_linux.go index 453d4357d6..277fab223a 100644 --- a/pkg/specgen/generate/config_linux.go +++ b/pkg/specgen/generate/config_linux.go @@ -10,10 +10,10 @@ import ( "path/filepath" "strings" - "github.com/containers/podman/v6/libpod/define" - "github.com/containers/podman/v6/pkg/rootless" - "github.com/containers/podman/v6/pkg/util" "go.podman.io/common/pkg/config" + "go.podman.io/podman/v6/libpod/define" + "go.podman.io/podman/v6/pkg/rootless" + "go.podman.io/podman/v6/pkg/util" "go.podman.io/storage/pkg/fileutils" spec "github.com/opencontainers/runtime-spec/specs-go" diff --git a/pkg/specgen/generate/config_linux_seccomp.go b/pkg/specgen/generate/config_linux_seccomp.go index d7b85e69e2..aa7682ecfe 100644 --- a/pkg/specgen/generate/config_linux_seccomp.go +++ b/pkg/specgen/generate/config_linux_seccomp.go @@ -8,12 +8,12 @@ import ( "fmt" "os" - "github.com/containers/podman/v6/pkg/seccomp" - "github.com/containers/podman/v6/pkg/specgen" spec "github.com/opencontainers/runtime-spec/specs-go" "github.com/sirupsen/logrus" "go.podman.io/common/libimage" goSeccomp "go.podman.io/common/pkg/seccomp" + "go.podman.io/podman/v6/pkg/seccomp" + "go.podman.io/podman/v6/pkg/specgen" ) func getSeccompConfig(s *specgen.SpecGenerator, configSpec *spec.Spec, img *libimage.Image) (*spec.LinuxSeccomp, error) { diff --git a/pkg/specgen/generate/container.go b/pkg/specgen/generate/container.go index b60e3258d5..ba249ddc76 100644 --- a/pkg/specgen/generate/container.go +++ b/pkg/specgen/generate/container.go @@ -13,17 +13,17 @@ import ( "strings" "time" - "github.com/containers/podman/v6/libpod" - "github.com/containers/podman/v6/libpod/define" - ann "github.com/containers/podman/v6/pkg/annotations" - envLib "github.com/containers/podman/v6/pkg/env" - "github.com/containers/podman/v6/pkg/signal" - "github.com/containers/podman/v6/pkg/specgen" "github.com/openshift/imagebuilder" "go.podman.io/common/libimage" "go.podman.io/common/libnetwork/types" "go.podman.io/common/pkg/config" "go.podman.io/image/v5/manifest" + "go.podman.io/podman/v6/libpod" + "go.podman.io/podman/v6/libpod/define" + ann "go.podman.io/podman/v6/pkg/annotations" + envLib "go.podman.io/podman/v6/pkg/env" + "go.podman.io/podman/v6/pkg/signal" + "go.podman.io/podman/v6/pkg/specgen" ) func getImageFromSpec(ctx context.Context, r *libpod.Runtime, s *specgen.SpecGenerator) (*libimage.Image, string, *libimage.ImageData, error) { diff --git a/pkg/specgen/generate/container_create.go b/pkg/specgen/generate/container_create.go index b98a558eba..3637b18ae0 100644 --- a/pkg/specgen/generate/container_create.go +++ b/pkg/specgen/generate/container_create.go @@ -11,19 +11,19 @@ import ( "path/filepath" "strings" - "github.com/containers/podman/v6/libpod" - "github.com/containers/podman/v6/libpod/define" - "github.com/containers/podman/v6/pkg/namespaces" - "github.com/containers/podman/v6/pkg/rootless" - "github.com/containers/podman/v6/pkg/specgen" - "github.com/containers/podman/v6/pkg/specgenutil" - "github.com/containers/podman/v6/pkg/util" "github.com/jinzhu/copier" "github.com/opencontainers/runtime-spec/specs-go" "github.com/opencontainers/selinux/go-selinux" "github.com/sirupsen/logrus" "go.podman.io/common/libimage" "go.podman.io/common/libnetwork/pasta" + "go.podman.io/podman/v6/libpod" + "go.podman.io/podman/v6/libpod/define" + "go.podman.io/podman/v6/pkg/namespaces" + "go.podman.io/podman/v6/pkg/rootless" + "go.podman.io/podman/v6/pkg/specgen" + "go.podman.io/podman/v6/pkg/specgenutil" + "go.podman.io/podman/v6/pkg/util" "tags.cncf.io/container-device-interface/pkg/parser" ) diff --git a/pkg/specgen/generate/container_create_test.go b/pkg/specgen/generate/container_create_test.go index 134e1a415c..6999ec33f2 100644 --- a/pkg/specgen/generate/container_create_test.go +++ b/pkg/specgen/generate/container_create_test.go @@ -5,11 +5,11 @@ package generate import ( "testing" - "github.com/containers/podman/v6/libpod" - "github.com/containers/podman/v6/pkg/specgen" spec "github.com/opencontainers/runtime-spec/specs-go" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "go.podman.io/podman/v6/libpod" + "go.podman.io/podman/v6/pkg/specgen" ) // TestApplyInfraInheritMountOptionsDoNotLeak verifies that mount options from diff --git a/pkg/specgen/generate/kube/kube.go b/pkg/specgen/generate/kube/kube.go index c047149d42..234d301b41 100644 --- a/pkg/specgen/generate/kube/kube.go +++ b/pkg/specgen/generate/kube/kube.go @@ -18,16 +18,6 @@ import ( "strings" "time" - "github.com/containers/podman/v6/libpod/define" - ann "github.com/containers/podman/v6/pkg/annotations" - "github.com/containers/podman/v6/pkg/domain/entities" - v1 "github.com/containers/podman/v6/pkg/k8s.io/api/core/v1" - "github.com/containers/podman/v6/pkg/k8s.io/apimachinery/pkg/api/resource" - "github.com/containers/podman/v6/pkg/k8s.io/apimachinery/pkg/util/intstr" - "github.com/containers/podman/v6/pkg/specgen" - "github.com/containers/podman/v6/pkg/specgen/generate" - systemdDefine "github.com/containers/podman/v6/pkg/systemd/define" - "github.com/containers/podman/v6/pkg/util" "github.com/docker/go-units" spec "github.com/opencontainers/runtime-spec/specs-go" "go.podman.io/common/libimage" @@ -37,6 +27,16 @@ import ( "go.podman.io/common/pkg/secrets" "go.podman.io/image/v5/manifest" itypes "go.podman.io/image/v5/types" + "go.podman.io/podman/v6/libpod/define" + ann "go.podman.io/podman/v6/pkg/annotations" + "go.podman.io/podman/v6/pkg/domain/entities" + v1 "go.podman.io/podman/v6/pkg/k8s.io/api/core/v1" + "go.podman.io/podman/v6/pkg/k8s.io/apimachinery/pkg/api/resource" + "go.podman.io/podman/v6/pkg/k8s.io/apimachinery/pkg/util/intstr" + "go.podman.io/podman/v6/pkg/specgen" + "go.podman.io/podman/v6/pkg/specgen/generate" + systemdDefine "go.podman.io/podman/v6/pkg/systemd/define" + "go.podman.io/podman/v6/pkg/util" "go.podman.io/storage/pkg/system" "sigs.k8s.io/yaml" cdiparser "tags.cncf.io/container-device-interface/pkg/parser" diff --git a/pkg/specgen/generate/kube/kube_test.go b/pkg/specgen/generate/kube/kube_test.go index 70b0099e16..d1318989ef 100644 --- a/pkg/specgen/generate/kube/kube_test.go +++ b/pkg/specgen/generate/kube/kube_test.go @@ -5,9 +5,9 @@ package kube import ( "testing" - v1 "github.com/containers/podman/v6/pkg/k8s.io/api/core/v1" - "github.com/containers/podman/v6/pkg/k8s.io/apimachinery/pkg/util/intstr" "github.com/stretchr/testify/assert" + v1 "go.podman.io/podman/v6/pkg/k8s.io/api/core/v1" + "go.podman.io/podman/v6/pkg/k8s.io/apimachinery/pkg/util/intstr" ) func testPropagation(t *testing.T, propagation v1.MountPropagationMode, expected string) { diff --git a/pkg/specgen/generate/kube/play_test.go b/pkg/specgen/generate/kube/play_test.go index 4c73b7cb92..9a708c536a 100644 --- a/pkg/specgen/generate/kube/play_test.go +++ b/pkg/specgen/generate/kube/play_test.go @@ -8,15 +8,15 @@ import ( "strconv" "testing" - "github.com/containers/podman/v6/libpod/define" - v1 "github.com/containers/podman/v6/pkg/k8s.io/api/core/v1" - "github.com/containers/podman/v6/pkg/k8s.io/apimachinery/pkg/api/resource" - v12 "github.com/containers/podman/v6/pkg/k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/containers/podman/v6/pkg/k8s.io/apimachinery/pkg/util/intstr" - "github.com/containers/podman/v6/pkg/specgen" spec "github.com/opencontainers/runtime-spec/specs-go" "github.com/stretchr/testify/assert" "go.podman.io/common/pkg/secrets" + "go.podman.io/podman/v6/libpod/define" + v1 "go.podman.io/podman/v6/pkg/k8s.io/api/core/v1" + "go.podman.io/podman/v6/pkg/k8s.io/apimachinery/pkg/api/resource" + v12 "go.podman.io/podman/v6/pkg/k8s.io/apimachinery/pkg/apis/meta/v1" + "go.podman.io/podman/v6/pkg/k8s.io/apimachinery/pkg/util/intstr" + "go.podman.io/podman/v6/pkg/specgen" "go.podman.io/storage/pkg/system" "sigs.k8s.io/yaml" ) diff --git a/pkg/specgen/generate/kube/seccomp.go b/pkg/specgen/generate/kube/seccomp.go index d0a3af5843..a2d3b5e336 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/v6/libpod" - v1 "github.com/containers/podman/v6/pkg/k8s.io/api/core/v1" + "go.podman.io/podman/v6/libpod" + v1 "go.podman.io/podman/v6/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 75976a9668..774525ca6d 100644 --- a/pkg/specgen/generate/kube/volume.go +++ b/pkg/specgen/generate/kube/volume.go @@ -9,10 +9,10 @@ import ( "maps" "os" - "github.com/containers/podman/v6/libpod" - v1 "github.com/containers/podman/v6/pkg/k8s.io/api/core/v1" "go.podman.io/common/pkg/parse" "go.podman.io/common/pkg/secrets" + "go.podman.io/podman/v6/libpod" + v1 "go.podman.io/podman/v6/pkg/k8s.io/api/core/v1" "go.podman.io/storage/pkg/fileutils" "github.com/sirupsen/logrus" diff --git a/pkg/specgen/generate/kube/volume_test.go b/pkg/specgen/generate/kube/volume_test.go index 77009869ac..1b911880f9 100644 --- a/pkg/specgen/generate/kube/volume_test.go +++ b/pkg/specgen/generate/kube/volume_test.go @@ -5,8 +5,8 @@ package kube import ( "testing" - v1 "github.com/containers/podman/v6/pkg/k8s.io/api/core/v1" "github.com/stretchr/testify/assert" + v1 "go.podman.io/podman/v6/pkg/k8s.io/api/core/v1" ) func TestVolumeFromEmptyDir(t *testing.T) { diff --git a/pkg/specgen/generate/namespaces.go b/pkg/specgen/generate/namespaces.go index f29e607f7a..cf8c33b42a 100644 --- a/pkg/specgen/generate/namespaces.go +++ b/pkg/specgen/generate/namespaces.go @@ -7,17 +7,17 @@ import ( "sort" "strings" - "github.com/containers/podman/v6/libpod" - "github.com/containers/podman/v6/libpod/define" - "github.com/containers/podman/v6/pkg/namespaces" - "github.com/containers/podman/v6/pkg/rootless" - "github.com/containers/podman/v6/pkg/specgen" - "github.com/containers/podman/v6/pkg/util" spec "github.com/opencontainers/runtime-spec/specs-go" "github.com/sirupsen/logrus" "go.podman.io/common/libimage" "go.podman.io/common/libnetwork/types" "go.podman.io/common/pkg/config" + "go.podman.io/podman/v6/libpod" + "go.podman.io/podman/v6/libpod/define" + "go.podman.io/podman/v6/pkg/namespaces" + "go.podman.io/podman/v6/pkg/rootless" + "go.podman.io/podman/v6/pkg/specgen" + "go.podman.io/podman/v6/pkg/util" ) const host = "host" diff --git a/pkg/specgen/generate/namespaces_freebsd.go b/pkg/specgen/generate/namespaces_freebsd.go index 1c1b48c801..9f29ffd0e5 100644 --- a/pkg/specgen/generate/namespaces_freebsd.go +++ b/pkg/specgen/generate/namespaces_freebsd.go @@ -6,11 +6,11 @@ import ( "fmt" "os" - "github.com/containers/podman/v6/libpod" - "github.com/containers/podman/v6/pkg/specgen" "github.com/opencontainers/runtime-tools/generate" "github.com/sirupsen/logrus" "go.podman.io/buildah/pkg/jail" + "go.podman.io/podman/v6/libpod" + "go.podman.io/podman/v6/pkg/specgen" ) func specConfigureNamespaces(s *specgen.SpecGenerator, g *generate.Generator, rt *libpod.Runtime, pod *libpod.Pod) error { diff --git a/pkg/specgen/generate/namespaces_linux.go b/pkg/specgen/generate/namespaces_linux.go index 1f65d97e61..70e0a1a1ac 100644 --- a/pkg/specgen/generate/namespaces_linux.go +++ b/pkg/specgen/generate/namespaces_linux.go @@ -6,12 +6,12 @@ import ( "fmt" "os" - "github.com/containers/podman/v6/libpod" - "github.com/containers/podman/v6/libpod/define" - "github.com/containers/podman/v6/pkg/specgen" spec "github.com/opencontainers/runtime-spec/specs-go" "github.com/opencontainers/runtime-tools/generate" "github.com/sirupsen/logrus" + "go.podman.io/podman/v6/libpod" + "go.podman.io/podman/v6/libpod/define" + "go.podman.io/podman/v6/pkg/specgen" "go.podman.io/storage/pkg/fileutils" ) diff --git a/pkg/specgen/generate/oci.go b/pkg/specgen/generate/oci.go index c2a0cd219f..ea473bfdd3 100644 --- a/pkg/specgen/generate/oci.go +++ b/pkg/specgen/generate/oci.go @@ -5,12 +5,12 @@ package generate import ( "strings" - "github.com/containers/podman/v6/libpod/define" - "github.com/containers/podman/v6/pkg/specgen" - "github.com/containers/podman/v6/pkg/util" "github.com/opencontainers/runtime-tools/generate" "github.com/sirupsen/logrus" "go.podman.io/common/libimage" + "go.podman.io/podman/v6/libpod/define" + "go.podman.io/podman/v6/pkg/specgen" + "go.podman.io/podman/v6/pkg/util" ) func addRlimits(s *specgen.SpecGenerator, g *generate.Generator) { diff --git a/pkg/specgen/generate/oci_freebsd.go b/pkg/specgen/generate/oci_freebsd.go index eaf7458533..2be81912c1 100644 --- a/pkg/specgen/generate/oci_freebsd.go +++ b/pkg/specgen/generate/oci_freebsd.go @@ -7,13 +7,13 @@ import ( "fmt" "strings" - "github.com/containers/podman/v6/libpod" - "github.com/containers/podman/v6/libpod/define" - "github.com/containers/podman/v6/pkg/specgen" spec "github.com/opencontainers/runtime-spec/specs-go" "github.com/opencontainers/runtime-tools/generate" "go.podman.io/common/libimage" "go.podman.io/common/pkg/config" + "go.podman.io/podman/v6/libpod" + "go.podman.io/podman/v6/libpod/define" + "go.podman.io/podman/v6/pkg/specgen" ) // SpecGenToOCI returns the base configuration for the container. diff --git a/pkg/specgen/generate/oci_linux.go b/pkg/specgen/generate/oci_linux.go index 83978ed562..e73f1ca01a 100644 --- a/pkg/specgen/generate/oci_linux.go +++ b/pkg/specgen/generate/oci_linux.go @@ -9,14 +9,14 @@ import ( "path" "strings" - "github.com/containers/podman/v6/libpod" - "github.com/containers/podman/v6/libpod/define" - "github.com/containers/podman/v6/pkg/rootless" - "github.com/containers/podman/v6/pkg/specgen" spec "github.com/opencontainers/runtime-spec/specs-go" "github.com/opencontainers/runtime-tools/generate" "go.podman.io/common/libimage" "go.podman.io/common/pkg/config" + "go.podman.io/podman/v6/libpod" + "go.podman.io/podman/v6/libpod/define" + "go.podman.io/podman/v6/pkg/rootless" + "go.podman.io/podman/v6/pkg/specgen" "golang.org/x/sys/unix" ) diff --git a/pkg/specgen/generate/pause_image.go b/pkg/specgen/generate/pause_image.go index 985abbca38..ffd5bc66d0 100644 --- a/pkg/specgen/generate/pause_image.go +++ b/pkg/specgen/generate/pause_image.go @@ -5,8 +5,8 @@ package generate import ( "context" - "github.com/containers/podman/v6/libpod" "go.podman.io/common/pkg/config" + "go.podman.io/podman/v6/libpod" ) // PullInfraImage 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 f562c0cd09..1f54727339 100644 --- a/pkg/specgen/generate/pod_create.go +++ b/pkg/specgen/generate/pod_create.go @@ -11,13 +11,13 @@ import ( "strconv" "strings" - "github.com/containers/podman/v6/libpod" - "github.com/containers/podman/v6/libpod/define" - "github.com/containers/podman/v6/pkg/domain/entities" - "github.com/containers/podman/v6/pkg/specgen" - "github.com/containers/podman/v6/pkg/specgenutil" "github.com/opencontainers/runtime-spec/specs-go" "github.com/sirupsen/logrus" + "go.podman.io/podman/v6/libpod" + "go.podman.io/podman/v6/libpod/define" + "go.podman.io/podman/v6/pkg/domain/entities" + "go.podman.io/podman/v6/pkg/specgen" + "go.podman.io/podman/v6/pkg/specgenutil" ) func MakePod(p *entities.PodSpec, rt *libpod.Runtime) (_ *libpod.Pod, finalErr error) { diff --git a/pkg/specgen/generate/pod_create_test.go b/pkg/specgen/generate/pod_create_test.go index c2af0434a1..7bdc1d6008 100644 --- a/pkg/specgen/generate/pod_create_test.go +++ b/pkg/specgen/generate/pod_create_test.go @@ -6,10 +6,10 @@ import ( "net" "testing" - "github.com/containers/podman/v6/pkg/specgen" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.podman.io/common/libnetwork/types" + "go.podman.io/podman/v6/pkg/specgen" ) var ( diff --git a/pkg/specgen/generate/ports.go b/pkg/specgen/generate/ports.go index 8201418a71..b0548bb9c2 100644 --- a/pkg/specgen/generate/ports.go +++ b/pkg/specgen/generate/ports.go @@ -9,12 +9,12 @@ import ( "sort" "strings" - "github.com/containers/podman/v6/pkg/specgen" - "github.com/containers/podman/v6/pkg/specgenutil" - "github.com/containers/podman/v6/utils" "github.com/sirupsen/logrus" "go.podman.io/common/libimage" "go.podman.io/common/libnetwork/types" + "go.podman.io/podman/v6/pkg/specgen" + "go.podman.io/podman/v6/pkg/specgenutil" + "go.podman.io/podman/v6/utils" ) const ( diff --git a/pkg/specgen/generate/security_freebsd.go b/pkg/specgen/generate/security_freebsd.go index 3ed5e99f12..a3612dca72 100644 --- a/pkg/specgen/generate/security_freebsd.go +++ b/pkg/specgen/generate/security_freebsd.go @@ -3,11 +3,11 @@ package generate import ( - "github.com/containers/podman/v6/libpod" - "github.com/containers/podman/v6/pkg/specgen" "github.com/opencontainers/runtime-tools/generate" "go.podman.io/common/libimage" "go.podman.io/common/pkg/config" + "go.podman.io/podman/v6/libpod" + "go.podman.io/podman/v6/pkg/specgen" ) // setLabelOpts sets the label options of the SecurityConfig according to the diff --git a/pkg/specgen/generate/security_linux.go b/pkg/specgen/generate/security_linux.go index ace82ec8fd..aec0948011 100644 --- a/pkg/specgen/generate/security_linux.go +++ b/pkg/specgen/generate/security_linux.go @@ -7,10 +7,6 @@ import ( "slices" "strings" - "github.com/containers/podman/v6/libpod" - "github.com/containers/podman/v6/libpod/define" - "github.com/containers/podman/v6/pkg/specgen" - "github.com/containers/podman/v6/pkg/util" "github.com/opencontainers/runtime-tools/generate" "github.com/opencontainers/selinux/go-selinux" "github.com/sirupsen/logrus" @@ -18,6 +14,10 @@ import ( "go.podman.io/common/pkg/apparmor" "go.podman.io/common/pkg/capabilities" "go.podman.io/common/pkg/config" + "go.podman.io/podman/v6/libpod" + "go.podman.io/podman/v6/libpod/define" + "go.podman.io/podman/v6/pkg/specgen" + "go.podman.io/podman/v6/pkg/util" ) // setLabelOpts sets the label options of the SecurityConfig according to the diff --git a/pkg/specgen/generate/storage.go b/pkg/specgen/generate/storage.go index 3daa8d3337..3f01f6290a 100644 --- a/pkg/specgen/generate/storage.go +++ b/pkg/specgen/generate/storage.go @@ -12,15 +12,15 @@ import ( "path/filepath" "strings" - "github.com/containers/podman/v6/libpod" - "github.com/containers/podman/v6/libpod/define" - "github.com/containers/podman/v6/pkg/specgen" - "github.com/containers/podman/v6/pkg/util" spec "github.com/opencontainers/runtime-spec/specs-go" "github.com/sirupsen/logrus" "go.podman.io/common/libimage" "go.podman.io/common/pkg/config" "go.podman.io/common/pkg/parse" + "go.podman.io/podman/v6/libpod" + "go.podman.io/podman/v6/libpod/define" + "go.podman.io/podman/v6/pkg/specgen" + "go.podman.io/podman/v6/pkg/util" "go.podman.io/storage/pkg/fileutils" ) diff --git a/pkg/specgen/generate/validate_freebsd.go b/pkg/specgen/generate/validate_freebsd.go index 5e2cf95228..b977a08564 100644 --- a/pkg/specgen/generate/validate_freebsd.go +++ b/pkg/specgen/generate/validate_freebsd.go @@ -2,7 +2,7 @@ package generate -import "github.com/containers/podman/v6/pkg/specgen" +import "go.podman.io/podman/v6/pkg/specgen" // verifyContainerResources does nothing on freebsd as it has no cgroups func verifyContainerResources(_ *specgen.SpecGenerator) ([]string, error) { diff --git a/pkg/specgen/generate/validate_linux.go b/pkg/specgen/generate/validate_linux.go index db129972c8..b831d49868 100644 --- a/pkg/specgen/generate/validate_linux.go +++ b/pkg/specgen/generate/validate_linux.go @@ -6,8 +6,8 @@ import ( "os" "path/filepath" - "github.com/containers/podman/v6/pkg/specgen" "go.podman.io/common/pkg/cgroups" + "go.podman.io/podman/v6/pkg/specgen" "go.podman.io/storage/pkg/fileutils" ) diff --git a/pkg/specgen/namespaces.go b/pkg/specgen/namespaces.go index 1bd6e4cd19..0267e3c9fd 100644 --- a/pkg/specgen/namespaces.go +++ b/pkg/specgen/namespaces.go @@ -7,14 +7,14 @@ import ( "slices" "strings" - "github.com/containers/podman/v6/libpod/define" - "github.com/containers/podman/v6/pkg/namespaces" - "github.com/containers/podman/v6/pkg/rootless" - "github.com/containers/podman/v6/pkg/util" spec "github.com/opencontainers/runtime-spec/specs-go" "github.com/opencontainers/runtime-tools/generate" "go.podman.io/common/libnetwork/types" "go.podman.io/common/pkg/config" + "go.podman.io/podman/v6/libpod/define" + "go.podman.io/podman/v6/pkg/namespaces" + "go.podman.io/podman/v6/pkg/rootless" + "go.podman.io/podman/v6/pkg/util" "go.podman.io/storage/pkg/fileutils" "go.podman.io/storage/pkg/unshare" storageTypes "go.podman.io/storage/types" diff --git a/pkg/specgen/specgen.go b/pkg/specgen/specgen.go index d5f19a9f36..5b44e0d65c 100644 --- a/pkg/specgen/specgen.go +++ b/pkg/specgen/specgen.go @@ -6,10 +6,10 @@ import ( "strings" "syscall" - "github.com/containers/podman/v6/libpod/define" spec "github.com/opencontainers/runtime-spec/specs-go" nettypes "go.podman.io/common/libnetwork/types" "go.podman.io/image/v5/manifest" + "go.podman.io/podman/v6/libpod/define" "go.podman.io/storage/types" ) diff --git a/pkg/specgen/volumes.go b/pkg/specgen/volumes.go index 114e1a4cfe..7c126c35d0 100644 --- a/pkg/specgen/volumes.go +++ b/pkg/specgen/volumes.go @@ -6,10 +6,10 @@ import ( "path/filepath" "strings" - "github.com/containers/podman/v6/libpod/define" spec "github.com/opencontainers/runtime-spec/specs-go" "github.com/sirupsen/logrus" "go.podman.io/common/pkg/parse" + "go.podman.io/podman/v6/libpod/define" ) // NamedVolume holds information about a named volume that will be mounted into diff --git a/pkg/specgenutil/createparse.go b/pkg/specgenutil/createparse.go index c4baf15f93..308f41ab8b 100644 --- a/pkg/specgenutil/createparse.go +++ b/pkg/specgenutil/createparse.go @@ -3,8 +3,8 @@ package specgenutil import ( "errors" - "github.com/containers/podman/v6/pkg/domain/entities" "go.podman.io/common/pkg/config" + "go.podman.io/podman/v6/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 a5cfbbb027..7cc2fe41f4 100644 --- a/pkg/specgenutil/specgen.go +++ b/pkg/specgenutil/specgen.go @@ -9,19 +9,19 @@ import ( "strings" "time" - "github.com/containers/podman/v6/cmd/podman/parse" - "github.com/containers/podman/v6/libpod/define" - "github.com/containers/podman/v6/pkg/domain/entities" - envLib "github.com/containers/podman/v6/pkg/env" - "github.com/containers/podman/v6/pkg/namespaces" - "github.com/containers/podman/v6/pkg/specgen" - systemdDefine "github.com/containers/podman/v6/pkg/systemd/define" - "github.com/containers/podman/v6/pkg/util" "github.com/docker/go-units" "github.com/opencontainers/runtime-spec/specs-go" "github.com/opencontainers/selinux/go-selinux" "go.podman.io/common/pkg/config" "go.podman.io/image/v5/manifest" + "go.podman.io/podman/v6/cmd/podman/parse" + "go.podman.io/podman/v6/libpod/define" + "go.podman.io/podman/v6/pkg/domain/entities" + envLib "go.podman.io/podman/v6/pkg/env" + "go.podman.io/podman/v6/pkg/namespaces" + "go.podman.io/podman/v6/pkg/specgen" + systemdDefine "go.podman.io/podman/v6/pkg/systemd/define" + "go.podman.io/podman/v6/pkg/util" ) const ( diff --git a/pkg/specgenutil/specgenutil_test.go b/pkg/specgenutil/specgenutil_test.go index 5f7645b094..0cf8e1a9f2 100644 --- a/pkg/specgenutil/specgenutil_test.go +++ b/pkg/specgenutil/specgenutil_test.go @@ -7,11 +7,11 @@ import ( "strings" "testing" - "github.com/containers/podman/v6/libpod/define" - "github.com/containers/podman/v6/pkg/domain/entities" - "github.com/containers/podman/v6/pkg/specgen" "github.com/stretchr/testify/assert" "go.podman.io/common/pkg/machine" + "go.podman.io/podman/v6/libpod/define" + "go.podman.io/podman/v6/pkg/domain/entities" + "go.podman.io/podman/v6/pkg/specgen" ) func TestWinPath(t *testing.T) { diff --git a/pkg/specgenutil/specgenutil_windows_test.go b/pkg/specgenutil/specgenutil_windows_test.go index 2136867d24..7aa89f535e 100644 --- a/pkg/specgenutil/specgenutil_windows_test.go +++ b/pkg/specgenutil/specgenutil_windows_test.go @@ -6,9 +6,9 @@ import ( "os" "testing" - "github.com/containers/podman/v6/pkg/domain/entities" - "github.com/containers/podman/v6/pkg/specgen" "github.com/stretchr/testify/assert" + "go.podman.io/podman/v6/pkg/domain/entities" + "go.podman.io/podman/v6/pkg/specgen" ) func TestSeccompProfilePath(t *testing.T) { diff --git a/pkg/specgenutil/volumes.go b/pkg/specgenutil/volumes.go index f5a56b1b50..af5c6e2297 100644 --- a/pkg/specgenutil/volumes.go +++ b/pkg/specgenutil/volumes.go @@ -7,14 +7,14 @@ import ( "path/filepath" "strings" - "github.com/containers/podman/v6/libpod/define" - "github.com/containers/podman/v6/pkg/rootless" - "github.com/containers/podman/v6/pkg/specgen" - "github.com/containers/podman/v6/pkg/specgenutilexternal" - "github.com/containers/podman/v6/pkg/util" spec "github.com/opencontainers/runtime-spec/specs-go" "go.podman.io/common/pkg/config" "go.podman.io/common/pkg/parse" + "go.podman.io/podman/v6/libpod/define" + "go.podman.io/podman/v6/pkg/rootless" + "go.podman.io/podman/v6/pkg/specgen" + "go.podman.io/podman/v6/pkg/specgenutilexternal" + "go.podman.io/podman/v6/pkg/util" ) var ( diff --git a/pkg/systemd/dbus.go b/pkg/systemd/dbus.go index eea3e93390..1f380bcec0 100644 --- a/pkg/systemd/dbus.go +++ b/pkg/systemd/dbus.go @@ -7,10 +7,10 @@ import ( "path/filepath" "strconv" - "github.com/containers/podman/v6/pkg/rootless" "github.com/coreos/go-systemd/v22/dbus" godbus "github.com/godbus/dbus/v5" "github.com/sirupsen/logrus" + "go.podman.io/podman/v6/pkg/rootless" ) // IsSystemdSessionValid checks if sessions is valid for provided rootless uid. diff --git a/pkg/systemd/generate/common.go b/pkg/systemd/generate/common.go index 878744654b..f2ccb6f40e 100644 --- a/pkg/systemd/generate/common.go +++ b/pkg/systemd/generate/common.go @@ -8,7 +8,7 @@ import ( "strconv" "strings" - "github.com/containers/podman/v6/pkg/systemd/define" + "go.podman.io/podman/v6/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 7480196dba..34eaf541cc 100644 --- a/pkg/systemd/generate/containers.go +++ b/pkg/systemd/generate/containers.go @@ -12,13 +12,13 @@ import ( "text/template" "time" - "github.com/containers/podman/v6/libpod" - libpodDefine "github.com/containers/podman/v6/libpod/define" - "github.com/containers/podman/v6/pkg/domain/entities" - "github.com/containers/podman/v6/pkg/systemd/define" - "github.com/containers/podman/v6/version" "github.com/sirupsen/logrus" "github.com/spf13/pflag" + "go.podman.io/podman/v6/libpod" + libpodDefine "go.podman.io/podman/v6/libpod/define" + "go.podman.io/podman/v6/pkg/domain/entities" + "go.podman.io/podman/v6/pkg/systemd/define" + "go.podman.io/podman/v6/version" ) // containerInfo contains data required for generating a container's systemd diff --git a/pkg/systemd/generate/containers_test.go b/pkg/systemd/generate/containers_test.go index 4c0b854936..59b9212166 100644 --- a/pkg/systemd/generate/containers_test.go +++ b/pkg/systemd/generate/containers_test.go @@ -7,9 +7,9 @@ import ( "strings" "testing" - "github.com/containers/podman/v6/pkg/domain/entities" - "github.com/containers/podman/v6/pkg/systemd/define" "github.com/stretchr/testify/assert" + "go.podman.io/podman/v6/pkg/domain/entities" + "go.podman.io/podman/v6/pkg/systemd/define" ) func TestValidateRestartPolicyContainer(t *testing.T) { diff --git a/pkg/systemd/generate/pods.go b/pkg/systemd/generate/pods.go index a00b04e06d..fbdb8eadec 100644 --- a/pkg/systemd/generate/pods.go +++ b/pkg/systemd/generate/pods.go @@ -12,12 +12,12 @@ import ( "text/template" "time" - "github.com/containers/podman/v6/libpod" - "github.com/containers/podman/v6/pkg/domain/entities" - "github.com/containers/podman/v6/pkg/systemd/define" - "github.com/containers/podman/v6/version" "github.com/sirupsen/logrus" "github.com/spf13/pflag" + "go.podman.io/podman/v6/libpod" + "go.podman.io/podman/v6/pkg/domain/entities" + "go.podman.io/podman/v6/pkg/systemd/define" + "go.podman.io/podman/v6/version" ) // podInfo contains data required for generating a pod's systemd diff --git a/pkg/systemd/generate/pods_test.go b/pkg/systemd/generate/pods_test.go index 2dfcc63c30..3fb1d348b3 100644 --- a/pkg/systemd/generate/pods_test.go +++ b/pkg/systemd/generate/pods_test.go @@ -5,8 +5,8 @@ package generate import ( "testing" - "github.com/containers/podman/v6/pkg/domain/entities" "github.com/stretchr/testify/assert" + "go.podman.io/podman/v6/pkg/domain/entities" ) func TestHasPodExitPolicy(t *testing.T) { diff --git a/pkg/systemd/notifyproxy/notifyproxy.go b/pkg/systemd/notifyproxy/notifyproxy.go index 25f27adc37..bca02930e9 100644 --- a/pkg/systemd/notifyproxy/notifyproxy.go +++ b/pkg/systemd/notifyproxy/notifyproxy.go @@ -13,9 +13,9 @@ import ( "syscall" "time" - "github.com/containers/podman/v6/libpod/define" "github.com/coreos/go-systemd/v22/daemon" "github.com/sirupsen/logrus" + "go.podman.io/podman/v6/libpod/define" "golang.org/x/sys/unix" ) diff --git a/pkg/systemd/quadlet/quadlet.go b/pkg/systemd/quadlet/quadlet.go index 5f82305a02..c63e305ebd 100644 --- a/pkg/systemd/quadlet/quadlet.go +++ b/pkg/systemd/quadlet/quadlet.go @@ -9,14 +9,14 @@ import ( "path/filepath" "strings" - "github.com/containers/podman/v6/pkg/specgenutilexternal" - "github.com/containers/podman/v6/pkg/systemd/parser" + "go.podman.io/podman/v6/pkg/specgenutilexternal" + "go.podman.io/podman/v6/pkg/systemd/parser" "go.podman.io/storage/pkg/regexp" ) const ( // Fixme should use - // github.com/containers/podman/v6/libpod/define.AutoUpdateLabel + // go.podman.io/podman/v6/libpod/define.AutoUpdateLabel // but it is causing bloat autoUpdateLabel = "io.containers.autoupdate" // Directory for temporary Quadlet files (sysadmin owned) diff --git a/pkg/systemd/quadlet/unitdirs.go b/pkg/systemd/quadlet/unitdirs.go index 5409a0c818..eefd306923 100644 --- a/pkg/systemd/quadlet/unitdirs.go +++ b/pkg/systemd/quadlet/unitdirs.go @@ -10,7 +10,7 @@ import ( "regexp" "strings" - "github.com/containers/podman/v6/pkg/logiface" + "go.podman.io/podman/v6/pkg/logiface" ) // This returns whether a file has an extension recognized as a valid Quadlet unit type. diff --git a/pkg/util/mount_opts.go b/pkg/util/mount_opts.go index 308c7fceff..a4678158e8 100644 --- a/pkg/util/mount_opts.go +++ b/pkg/util/mount_opts.go @@ -5,8 +5,8 @@ import ( "fmt" "strings" - "github.com/containers/podman/v6/libpod/define" - "github.com/containers/podman/v6/pkg/rootless" + "go.podman.io/podman/v6/libpod/define" + "go.podman.io/podman/v6/pkg/rootless" ) var ( diff --git a/pkg/util/rlimit.go b/pkg/util/rlimit.go index 5bc574768c..022c1c7ac8 100644 --- a/pkg/util/rlimit.go +++ b/pkg/util/rlimit.go @@ -6,10 +6,10 @@ import ( "fmt" "strings" - "github.com/containers/podman/v6/pkg/rootless" "github.com/docker/go-units" "github.com/opencontainers/runtime-spec/specs-go" "github.com/sirupsen/logrus" + "go.podman.io/podman/v6/pkg/rootless" "golang.org/x/sys/unix" ) diff --git a/pkg/util/utils.go b/pkg/util/utils.go index 99d09ea7d3..96256dddd9 100644 --- a/pkg/util/utils.go +++ b/pkg/util/utils.go @@ -16,15 +16,15 @@ import ( "syscall" "time" - "github.com/containers/podman/v6/libpod/define" - "github.com/containers/podman/v6/pkg/namespaces" - "github.com/containers/podman/v6/pkg/rootless" - "github.com/containers/podman/v6/pkg/signal" securejoin "github.com/cyphar/filepath-securejoin" ruser "github.com/moby/sys/user" "github.com/opencontainers/runtime-spec/specs-go" "github.com/sirupsen/logrus" "go.podman.io/image/v5/types" + "go.podman.io/podman/v6/libpod/define" + "go.podman.io/podman/v6/pkg/namespaces" + "go.podman.io/podman/v6/pkg/rootless" + "go.podman.io/podman/v6/pkg/signal" "go.podman.io/storage/pkg/fileutils" "go.podman.io/storage/pkg/idtools" "go.podman.io/storage/pkg/unshare" diff --git a/pkg/util/utils_linux.go b/pkg/util/utils_linux.go index 262004ec87..6ba64ecf52 100644 --- a/pkg/util/utils_linux.go +++ b/pkg/util/utils_linux.go @@ -10,12 +10,12 @@ import ( "strings" "syscall" - "github.com/containers/podman/v6/libpod/define" - "github.com/containers/podman/v6/pkg/rootless" "github.com/containers/psgo" spec "github.com/opencontainers/runtime-spec/specs-go" "github.com/opencontainers/runtime-tools/generate" "github.com/sirupsen/logrus" + "go.podman.io/podman/v6/libpod/define" + "go.podman.io/podman/v6/pkg/rootless" "golang.org/x/sys/unix" ) diff --git a/pkg/util/utils_supported.go b/pkg/util/utils_supported.go index 8d03ebb0e7..2c1469f886 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/v6/pkg/rootless" + "go.podman.io/podman/v6/pkg/rootless" "go.podman.io/storage/pkg/homedir" ) diff --git a/rpm/podman.spec b/rpm/podman.spec index 160bcb02de..ee05a1c2af 100644 --- a/rpm/podman.spec +++ b/rpm/podman.spec @@ -32,16 +32,12 @@ %define fips_enabled 1 %endif -%global container_base_path github.com/containers -%global container_base_url https://%{container_base_path} +%global container_base_path go.podman.io # For LDFLAGS %global ld_project %{container_base_path}/%{name}/v6 %global ld_libpod %{ld_project}/libpod -# %%{name} -%global git0 %{container_base_url}/%{name} - # podman-machine subpackage will be present only on these architectures %global machine_arches x86_64 aarch64 @@ -75,7 +71,7 @@ ExclusiveArch: aarch64 ppc64le s390x x86_64 riscv64 Summary: Manage Pods, Containers and Container Images URL: https://%{name}.io/ # All SourceN files fetched from upstream -Source0: %{git0}/archive/v%{version_no_tilde}.tar.gz +Source0: https://github.com/containers/%{name}/archive/v%{version_no_tilde}.tar.gz Provides: %{name}-manpages = %{epoch}:%{version}-%{release} BuildRequires: %{_bindir}/envsubst %if %{defined build_with_btrfs} diff --git a/test/e2e/artifact_created_test.go b/test/e2e/artifact_created_test.go index 1faad02412..609321850c 100644 --- a/test/e2e/artifact_created_test.go +++ b/test/e2e/artifact_created_test.go @@ -7,9 +7,9 @@ import ( "path/filepath" "time" - . "github.com/containers/podman/v6/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + . "go.podman.io/podman/v6/test/utils" ) var _ = Describe("Podman artifact created timestamp", func() { diff --git a/test/e2e/artifact_mount_test.go b/test/e2e/artifact_mount_test.go index 066bd2cc62..afa155a891 100644 --- a/test/e2e/artifact_mount_test.go +++ b/test/e2e/artifact_mount_test.go @@ -6,9 +6,9 @@ import ( "os" "path/filepath" - . "github.com/containers/podman/v6/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + . "go.podman.io/podman/v6/test/utils" ) var _ = Describe("Podman artifact mount", func() { diff --git a/test/e2e/artifact_test.go b/test/e2e/artifact_test.go index 9a54e49744..4eb4f96abe 100644 --- a/test/e2e/artifact_test.go +++ b/test/e2e/artifact_test.go @@ -10,11 +10,11 @@ import ( "strings" "time" - . "github.com/containers/podman/v6/test/utils" - "github.com/containers/podman/v6/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" imgspec "github.com/opencontainers/image-spec/specs-go/v1" + . "go.podman.io/podman/v6/test/utils" + "go.podman.io/podman/v6/utils" ) const ( diff --git a/test/e2e/attach_test.go b/test/e2e/attach_test.go index d6be0159ac..099d00e324 100644 --- a/test/e2e/attach_test.go +++ b/test/e2e/attach_test.go @@ -6,9 +6,9 @@ import ( "syscall" "time" - . "github.com/containers/podman/v6/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + . "go.podman.io/podman/v6/test/utils" ) var _ = Describe("Podman attach", func() { diff --git a/test/e2e/build_test.go b/test/e2e/build_test.go index e18340c7f6..52e0bf205d 100644 --- a/test/e2e/build_test.go +++ b/test/e2e/build_test.go @@ -11,11 +11,11 @@ import ( "runtime" "strings" - . "github.com/containers/podman/v6/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" "go.podman.io/buildah/define" + . "go.podman.io/podman/v6/test/utils" ) var _ = Describe("Podman build", func() { diff --git a/test/e2e/checkpoint_image_test.go b/test/e2e/checkpoint_image_test.go index 4adbbc0435..da18922ea3 100644 --- a/test/e2e/checkpoint_image_test.go +++ b/test/e2e/checkpoint_image_test.go @@ -8,10 +8,10 @@ import ( "strconv" "strings" - "github.com/containers/podman/v6/pkg/criu" - . "github.com/containers/podman/v6/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + "go.podman.io/podman/v6/pkg/criu" + . "go.podman.io/podman/v6/test/utils" ) var _ = Describe("Podman checkpoint", func() { diff --git a/test/e2e/checkpoint_test.go b/test/e2e/checkpoint_test.go index e332c5f350..cd76ff003f 100644 --- a/test/e2e/checkpoint_test.go +++ b/test/e2e/checkpoint_test.go @@ -14,14 +14,14 @@ import ( "time" "github.com/checkpoint-restore/go-criu/v7/stats" - "github.com/containers/podman/v6/pkg/checkpoint/crutils" - "github.com/containers/podman/v6/pkg/criu" - "github.com/containers/podman/v6/pkg/domain/entities" - . "github.com/containers/podman/v6/test/utils" - "github.com/containers/podman/v6/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" + "go.podman.io/podman/v6/pkg/checkpoint/crutils" + "go.podman.io/podman/v6/pkg/criu" + "go.podman.io/podman/v6/pkg/domain/entities" + . "go.podman.io/podman/v6/test/utils" + "go.podman.io/podman/v6/utils" ) var netname string diff --git a/test/e2e/cleanup_test.go b/test/e2e/cleanup_test.go index cab7e90ba7..4daf0e56e1 100644 --- a/test/e2e/cleanup_test.go +++ b/test/e2e/cleanup_test.go @@ -3,9 +3,9 @@ package integration import ( - . "github.com/containers/podman/v6/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + . "go.podman.io/podman/v6/test/utils" ) var _ = Describe("Podman container cleanup", func() { diff --git a/test/e2e/commit_test.go b/test/e2e/commit_test.go index 825db0cb02..e3a23ba96f 100644 --- a/test/e2e/commit_test.go +++ b/test/e2e/commit_test.go @@ -7,10 +7,10 @@ import ( "path/filepath" "strings" - . "github.com/containers/podman/v6/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" + . "go.podman.io/podman/v6/test/utils" ) var _ = Describe("Podman commit", func() { diff --git a/test/e2e/common_test.go b/test/e2e/common_test.go index bd17ac8740..53d8c1d8e7 100644 --- a/test/e2e/common_test.go +++ b/test/e2e/common_test.go @@ -30,17 +30,17 @@ import ( "time" "github.com/blang/semver/v4" - "github.com/containers/podman/v6/libpod/define" - "github.com/containers/podman/v6/pkg/domain/entities" - "github.com/containers/podman/v6/pkg/inspect" - . "github.com/containers/podman/v6/test/utils" - "github.com/containers/podman/v6/utils" jsoniter "github.com/json-iterator/go" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" "github.com/sirupsen/logrus" "go.podman.io/common/pkg/libartifact" + "go.podman.io/podman/v6/libpod/define" + "go.podman.io/podman/v6/pkg/domain/entities" + "go.podman.io/podman/v6/pkg/inspect" + . "go.podman.io/podman/v6/test/utils" + "go.podman.io/podman/v6/utils" "go.podman.io/storage/pkg/ioutils" "go.podman.io/storage/pkg/lockfile" "go.podman.io/storage/pkg/reexec" diff --git a/test/e2e/container_clone_test.go b/test/e2e/container_clone_test.go index 5acd7347da..553c1e77d1 100644 --- a/test/e2e/container_clone_test.go +++ b/test/e2e/container_clone_test.go @@ -6,10 +6,10 @@ import ( "os" "path/filepath" - . "github.com/containers/podman/v6/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" + . "go.podman.io/podman/v6/test/utils" ) var _ = Describe("Podman container clone", func() { diff --git a/test/e2e/container_create_volume_test.go b/test/e2e/container_create_volume_test.go index a2a44b89ca..45fc033f1f 100644 --- a/test/e2e/container_create_volume_test.go +++ b/test/e2e/container_create_volume_test.go @@ -7,9 +7,9 @@ import ( "os" "path/filepath" - . "github.com/containers/podman/v6/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + . "go.podman.io/podman/v6/test/utils" ) func buildDataVolumeImage(pTest *PodmanTestIntegration, image, data, dest string) { diff --git a/test/e2e/container_iface_name_test.go b/test/e2e/container_iface_name_test.go index ba43883f53..b49f986623 100644 --- a/test/e2e/container_iface_name_test.go +++ b/test/e2e/container_iface_name_test.go @@ -6,9 +6,9 @@ import ( "os" "path/filepath" - . "github.com/containers/podman/v6/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + . "go.podman.io/podman/v6/test/utils" ) func createNetworkDevice(name string) { diff --git a/test/e2e/container_inspect_test.go b/test/e2e/container_inspect_test.go index 9583285415..f0d2af040f 100644 --- a/test/e2e/container_inspect_test.go +++ b/test/e2e/container_inspect_test.go @@ -7,11 +7,11 @@ import ( "os" "path/filepath" - "github.com/containers/podman/v6/libpod/define" - "github.com/containers/podman/v6/pkg/annotations" - . "github.com/containers/podman/v6/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + "go.podman.io/podman/v6/libpod/define" + "go.podman.io/podman/v6/pkg/annotations" + . "go.podman.io/podman/v6/test/utils" ) var _ = Describe("Podman container inspect", func() { diff --git a/test/e2e/containers_conf_test.go b/test/e2e/containers_conf_test.go index a1dea6a2be..85b1ad7de7 100644 --- a/test/e2e/containers_conf_test.go +++ b/test/e2e/containers_conf_test.go @@ -11,12 +11,12 @@ import ( "strings" "time" - "github.com/containers/podman/v6/libpod/define" - . "github.com/containers/podman/v6/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" + "go.podman.io/podman/v6/libpod/define" + . "go.podman.io/podman/v6/test/utils" ) var _ = Describe("Verify podman containers.conf usage", func() { diff --git a/test/e2e/cp_test.go b/test/e2e/cp_test.go index 584677fdda..b025127621 100644 --- a/test/e2e/cp_test.go +++ b/test/e2e/cp_test.go @@ -9,9 +9,9 @@ import ( "os/user" "path/filepath" - . "github.com/containers/podman/v6/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + . "go.podman.io/podman/v6/test/utils" ) // NOTE: Only smoke tests. The system tests (i.e., "./test/system/*") take diff --git a/test/e2e/create_staticip_test.go b/test/e2e/create_staticip_test.go index 5d414ce14d..d61a4d8744 100644 --- a/test/e2e/create_staticip_test.go +++ b/test/e2e/create_staticip_test.go @@ -6,9 +6,9 @@ import ( "fmt" "time" - . "github.com/containers/podman/v6/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + . "go.podman.io/podman/v6/test/utils" ) var _ = Describe("Podman create with --ip flag", func() { diff --git a/test/e2e/create_staticmac_test.go b/test/e2e/create_staticmac_test.go index 92291c0a41..681fe73051 100644 --- a/test/e2e/create_staticmac_test.go +++ b/test/e2e/create_staticmac_test.go @@ -3,9 +3,9 @@ package integration import ( - . "github.com/containers/podman/v6/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + . "go.podman.io/podman/v6/test/utils" "go.podman.io/storage/pkg/stringid" ) diff --git a/test/e2e/create_test.go b/test/e2e/create_test.go index fb6570a080..36eb39801d 100644 --- a/test/e2e/create_test.go +++ b/test/e2e/create_test.go @@ -10,10 +10,10 @@ import ( "strconv" "strings" - . "github.com/containers/podman/v6/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" + . "go.podman.io/podman/v6/test/utils" "go.podman.io/storage/pkg/stringid" ) diff --git a/test/e2e/diff_test.go b/test/e2e/diff_test.go index ce2904737f..3a7ba4a2c9 100644 --- a/test/e2e/diff_test.go +++ b/test/e2e/diff_test.go @@ -6,9 +6,9 @@ import ( "fmt" "sort" - . "github.com/containers/podman/v6/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + . "go.podman.io/podman/v6/test/utils" "go.podman.io/storage/pkg/stringid" ) diff --git a/test/e2e/events_test.go b/test/e2e/events_test.go index f3e9243e61..fe95867bfd 100644 --- a/test/e2e/events_test.go +++ b/test/e2e/events_test.go @@ -9,10 +9,10 @@ import ( "sync" "time" - "github.com/containers/podman/v6/cmd/podman/system" - . "github.com/containers/podman/v6/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + "go.podman.io/podman/v6/cmd/podman/system" + . "go.podman.io/podman/v6/test/utils" "go.podman.io/storage/pkg/stringid" ) diff --git a/test/e2e/exec_test.go b/test/e2e/exec_test.go index dfde953408..7f72c8c78a 100644 --- a/test/e2e/exec_test.go +++ b/test/e2e/exec_test.go @@ -9,10 +9,10 @@ import ( "strings" "time" - . "github.com/containers/podman/v6/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" + . "go.podman.io/podman/v6/test/utils" ) var _ = Describe("Podman exec", func() { diff --git a/test/e2e/exists_test.go b/test/e2e/exists_test.go index 20799413e4..ef9d395d90 100644 --- a/test/e2e/exists_test.go +++ b/test/e2e/exists_test.go @@ -3,9 +3,9 @@ package integration import ( - . "github.com/containers/podman/v6/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + . "go.podman.io/podman/v6/test/utils" ) var _ = Describe("Podman image|container exists", func() { diff --git a/test/e2e/export_test.go b/test/e2e/export_test.go index 8455341f8e..92b6a86336 100644 --- a/test/e2e/export_test.go +++ b/test/e2e/export_test.go @@ -6,9 +6,9 @@ import ( "os" "path/filepath" - . "github.com/containers/podman/v6/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + . "go.podman.io/podman/v6/test/utils" ) var _ = Describe("Podman export", func() { diff --git a/test/e2e/farm_test.go b/test/e2e/farm_test.go index a953210dc0..a4833976b2 100644 --- a/test/e2e/farm_test.go +++ b/test/e2e/farm_test.go @@ -6,10 +6,10 @@ import ( "os" "path/filepath" - . "github.com/containers/podman/v6/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" + . "go.podman.io/podman/v6/test/utils" ) func setupContainersConfWithSystemConnections() { diff --git a/test/e2e/generate_kube_test.go b/test/e2e/generate_kube_test.go index 76f0efb73f..ff413a8928 100644 --- a/test/e2e/generate_kube_test.go +++ b/test/e2e/generate_kube_test.go @@ -10,13 +10,13 @@ import ( "strconv" "strings" - "github.com/containers/podman/v6/libpod/define" + "go.podman.io/podman/v6/libpod/define" - v1 "github.com/containers/podman/v6/pkg/k8s.io/api/core/v1" - "github.com/containers/podman/v6/pkg/util" - . "github.com/containers/podman/v6/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + v1 "go.podman.io/podman/v6/pkg/k8s.io/api/core/v1" + "go.podman.io/podman/v6/pkg/util" + . "go.podman.io/podman/v6/test/utils" "sigs.k8s.io/yaml" ) diff --git a/test/e2e/generate_spec_test.go b/test/e2e/generate_spec_test.go index b68d850dc2..ce6f1839da 100644 --- a/test/e2e/generate_spec_test.go +++ b/test/e2e/generate_spec_test.go @@ -5,9 +5,9 @@ package integration import ( "path/filepath" - . "github.com/containers/podman/v6/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + . "go.podman.io/podman/v6/test/utils" ) var _ = Describe("Podman generate spec", func() { diff --git a/test/e2e/generate_systemd_test.go b/test/e2e/generate_systemd_test.go index 1d2202914a..9974597eb9 100644 --- a/test/e2e/generate_systemd_test.go +++ b/test/e2e/generate_systemd_test.go @@ -7,10 +7,10 @@ import ( "path/filepath" "strings" - . "github.com/containers/podman/v6/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" + . "go.podman.io/podman/v6/test/utils" ) var _ = Describe("Podman generate systemd", func() { diff --git a/test/e2e/healthcheck_run_test.go b/test/e2e/healthcheck_run_test.go index c75484362c..8d987cefe2 100644 --- a/test/e2e/healthcheck_run_test.go +++ b/test/e2e/healthcheck_run_test.go @@ -9,10 +9,10 @@ import ( "strconv" "time" - "github.com/containers/podman/v6/libpod/define" - . "github.com/containers/podman/v6/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + "go.podman.io/podman/v6/libpod/define" + . "go.podman.io/podman/v6/test/utils" ) var _ = Describe("Podman healthcheck run", func() { diff --git a/test/e2e/history_test.go b/test/e2e/history_test.go index d5e624f787..cd53b7ece9 100644 --- a/test/e2e/history_test.go +++ b/test/e2e/history_test.go @@ -3,9 +3,9 @@ package integration import ( - . "github.com/containers/podman/v6/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + . "go.podman.io/podman/v6/test/utils" ) var _ = Describe("Podman history", func() { diff --git a/test/e2e/image_scp_test.go b/test/e2e/image_scp_test.go index 6c96e1627d..41a71ed0f1 100644 --- a/test/e2e/image_scp_test.go +++ b/test/e2e/image_scp_test.go @@ -6,9 +6,9 @@ import ( "os" "path/filepath" - . "github.com/containers/podman/v6/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + . "go.podman.io/podman/v6/test/utils" "go.podman.io/storage/pkg/homedir" ) diff --git a/test/e2e/image_sign_test.go b/test/e2e/image_sign_test.go index 21ab46b2a4..b0965ac686 100644 --- a/test/e2e/image_sign_test.go +++ b/test/e2e/image_sign_test.go @@ -7,9 +7,9 @@ import ( "os/exec" "path/filepath" - . "github.com/containers/podman/v6/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + . "go.podman.io/podman/v6/test/utils" ) // Each of these tests runs with a different GNUPGHOME; gpg-agent blows up diff --git a/test/e2e/images_test.go b/test/e2e/images_test.go index 4fd56ef7ad..b432b29f1d 100644 --- a/test/e2e/images_test.go +++ b/test/e2e/images_test.go @@ -8,11 +8,11 @@ import ( "sort" "strings" - . "github.com/containers/podman/v6/test/utils" "github.com/docker/go-units" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" + . "go.podman.io/podman/v6/test/utils" ) var _ = Describe("Podman images", func() { diff --git a/test/e2e/import_test.go b/test/e2e/import_test.go index fdaae33a8a..bebe589c2f 100644 --- a/test/e2e/import_test.go +++ b/test/e2e/import_test.go @@ -5,10 +5,10 @@ package integration import ( "path/filepath" - . "github.com/containers/podman/v6/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" + . "go.podman.io/podman/v6/test/utils" ) var _ = Describe("Podman import", func() { diff --git a/test/e2e/info_test.go b/test/e2e/info_test.go index 713acb7c27..f0f4255508 100644 --- a/test/e2e/info_test.go +++ b/test/e2e/info_test.go @@ -11,10 +11,10 @@ import ( "runtime" "strconv" - . "github.com/containers/podman/v6/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" + . "go.podman.io/podman/v6/test/utils" ) var _ = Describe("Podman Info", func() { diff --git a/test/e2e/init_test.go b/test/e2e/init_test.go index 9f1b0a0914..61c11ee000 100644 --- a/test/e2e/init_test.go +++ b/test/e2e/init_test.go @@ -5,9 +5,9 @@ package integration import ( "fmt" - . "github.com/containers/podman/v6/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + . "go.podman.io/podman/v6/test/utils" ) var _ = Describe("Podman init", func() { diff --git a/test/e2e/inspect_test.go b/test/e2e/inspect_test.go index cbefae00a8..d1e0b776a4 100644 --- a/test/e2e/inspect_test.go +++ b/test/e2e/inspect_test.go @@ -5,10 +5,10 @@ package integration import ( "fmt" - . "github.com/containers/podman/v6/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "github.com/opencontainers/selinux/go-selinux" + . "go.podman.io/podman/v6/test/utils" ) var _ = Describe("Podman inspect", func() { diff --git a/test/e2e/kill_test.go b/test/e2e/kill_test.go index 10e72ace59..b68c559aa5 100644 --- a/test/e2e/kill_test.go +++ b/test/e2e/kill_test.go @@ -5,9 +5,9 @@ package integration import ( "path/filepath" - . "github.com/containers/podman/v6/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + . "go.podman.io/podman/v6/test/utils" ) var _ = Describe("Podman kill", func() { diff --git a/test/e2e/libpod_suite_remote_test.go b/test/e2e/libpod_suite_remote_test.go index d1d94435a3..70ce8bbc8f 100644 --- a/test/e2e/libpod_suite_remote_test.go +++ b/test/e2e/libpod_suite_remote_test.go @@ -13,9 +13,9 @@ import ( "syscall" "time" - . "github.com/containers/podman/v6/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + . "go.podman.io/podman/v6/test/utils" ) var RemoteTestingTarget = PodmanTestCreateUtilTarget(os.Getenv("REMOTEINTEGRATION_TRANSPORT")) diff --git a/test/e2e/libpod_suite_test.go b/test/e2e/libpod_suite_test.go index dc8432a46d..edab72f759 100644 --- a/test/e2e/libpod_suite_test.go +++ b/test/e2e/libpod_suite_test.go @@ -6,9 +6,9 @@ import ( "os" "path/filepath" - . "github.com/containers/podman/v6/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + . "go.podman.io/podman/v6/test/utils" ) func IsRemote() bool { diff --git a/test/e2e/load_test.go b/test/e2e/load_test.go index e1bdee3a21..efbbe5847d 100644 --- a/test/e2e/load_test.go +++ b/test/e2e/load_test.go @@ -6,10 +6,10 @@ import ( "fmt" "path/filepath" - . "github.com/containers/podman/v6/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" + . "go.podman.io/podman/v6/test/utils" ) var _ = Describe("Podman load", func() { diff --git a/test/e2e/login_logout_test.go b/test/e2e/login_logout_test.go index d4788b7568..b5d21170a8 100644 --- a/test/e2e/login_logout_test.go +++ b/test/e2e/login_logout_test.go @@ -10,9 +10,9 @@ import ( "strconv" "strings" - . "github.com/containers/podman/v6/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + . "go.podman.io/podman/v6/test/utils" ) var _ = Describe("Podman login and logout", func() { diff --git a/test/e2e/logs_test.go b/test/e2e/logs_test.go index b18a6d3b51..7ceea86f91 100644 --- a/test/e2e/logs_test.go +++ b/test/e2e/logs_test.go @@ -8,11 +8,11 @@ import ( "os/exec" "time" - . "github.com/containers/podman/v6/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "github.com/onsi/gomega/format" . "github.com/onsi/gomega/gexec" + . "go.podman.io/podman/v6/test/utils" "go.podman.io/storage/pkg/stringid" ) diff --git a/test/e2e/manifest_test.go b/test/e2e/manifest_test.go index 62e973c025..53b01af007 100644 --- a/test/e2e/manifest_test.go +++ b/test/e2e/manifest_test.go @@ -9,8 +9,6 @@ import ( "path/filepath" "strings" - podmanRegistry "github.com/containers/podman/v6/hack/podman-registry-go" - . "github.com/containers/podman/v6/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" @@ -20,6 +18,8 @@ import ( "go.podman.io/image/v5/docker/reference" manifest "go.podman.io/image/v5/manifest" "go.podman.io/image/v5/transports/alltransports" + podmanRegistry "go.podman.io/podman/v6/hack/podman-registry-go" + . "go.podman.io/podman/v6/test/utils" "go.podman.io/storage/pkg/archive" ) diff --git a/test/e2e/mount_rootless_test.go b/test/e2e/mount_rootless_test.go index 04d30ecb0b..46b096965d 100644 --- a/test/e2e/mount_rootless_test.go +++ b/test/e2e/mount_rootless_test.go @@ -5,9 +5,9 @@ package integration import ( "slices" - . "github.com/containers/podman/v6/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + . "go.podman.io/podman/v6/test/utils" ) var _ = Describe("Podman mount", func() { diff --git a/test/e2e/mount_test.go b/test/e2e/mount_test.go index 14dd5fb4c4..10f32506ba 100644 --- a/test/e2e/mount_test.go +++ b/test/e2e/mount_test.go @@ -3,9 +3,9 @@ package integration import ( - . "github.com/containers/podman/v6/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + . "go.podman.io/podman/v6/test/utils" ) var _ = Describe("Podman mount", func() { diff --git a/test/e2e/negative_test.go b/test/e2e/negative_test.go index 0b344a8704..b09280fde5 100644 --- a/test/e2e/negative_test.go +++ b/test/e2e/negative_test.go @@ -5,9 +5,9 @@ package integration import ( "fmt" - . "github.com/containers/podman/v6/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + . "go.podman.io/podman/v6/test/utils" ) var _ = Describe("Podman negative command-line", func() { diff --git a/test/e2e/network_connect_disconnect_test.go b/test/e2e/network_connect_disconnect_test.go index 99afefe323..5edfd1ea7c 100644 --- a/test/e2e/network_connect_disconnect_test.go +++ b/test/e2e/network_connect_disconnect_test.go @@ -5,10 +5,10 @@ package integration import ( "fmt" - . "github.com/containers/podman/v6/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "github.com/onsi/gomega/types" + . "go.podman.io/podman/v6/test/utils" "go.podman.io/storage/pkg/stringid" ) diff --git a/test/e2e/network_create_test.go b/test/e2e/network_create_test.go index bf5d75aa67..5714fa733d 100644 --- a/test/e2e/network_create_test.go +++ b/test/e2e/network_create_test.go @@ -7,10 +7,10 @@ import ( "net" "strings" - . "github.com/containers/podman/v6/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "go.podman.io/common/libnetwork/types" + . "go.podman.io/podman/v6/test/utils" "go.podman.io/storage/pkg/stringid" ) diff --git a/test/e2e/network_test.go b/test/e2e/network_test.go index 42c7131341..df5256a51d 100644 --- a/test/e2e/network_test.go +++ b/test/e2e/network_test.go @@ -7,10 +7,10 @@ import ( "net" "time" - . "github.com/containers/podman/v6/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" + . "go.podman.io/podman/v6/test/utils" "go.podman.io/storage/pkg/stringid" ) diff --git a/test/e2e/pause_test.go b/test/e2e/pause_test.go index 5f608fd923..43da55ffe3 100644 --- a/test/e2e/pause_test.go +++ b/test/e2e/pause_test.go @@ -8,9 +8,9 @@ import ( "path/filepath" "strings" - . "github.com/containers/podman/v6/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + . "go.podman.io/podman/v6/test/utils" ) var _ = Describe("Podman pause", func() { diff --git a/test/e2e/play_build_test.go b/test/e2e/play_build_test.go index 6065840205..dbd4caedbc 100644 --- a/test/e2e/play_build_test.go +++ b/test/e2e/play_build_test.go @@ -8,10 +8,10 @@ import ( "os" "path/filepath" - . "github.com/containers/podman/v6/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" + . "go.podman.io/podman/v6/test/utils" ) var _ = Describe("Podman play kube with build", func() { diff --git a/test/e2e/play_kube_test.go b/test/e2e/play_kube_test.go index 82da967142..92deee3174 100644 --- a/test/e2e/play_kube_test.go +++ b/test/e2e/play_kube_test.go @@ -21,19 +21,19 @@ import ( "text/template" "time" - "github.com/containers/podman/v6/libpod/define" - "github.com/containers/podman/v6/pkg/bindings" - "github.com/containers/podman/v6/pkg/bindings/play" - v1 "github.com/containers/podman/v6/pkg/k8s.io/api/core/v1" - "github.com/containers/podman/v6/pkg/util" - . "github.com/containers/podman/v6/test/utils" - "github.com/containers/podman/v6/utils" "github.com/google/uuid" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "github.com/onsi/gomega/format" . "github.com/onsi/gomega/gexec" "github.com/opencontainers/selinux/go-selinux" + "go.podman.io/podman/v6/libpod/define" + "go.podman.io/podman/v6/pkg/bindings" + "go.podman.io/podman/v6/pkg/bindings/play" + v1 "go.podman.io/podman/v6/pkg/k8s.io/api/core/v1" + "go.podman.io/podman/v6/pkg/util" + . "go.podman.io/podman/v6/test/utils" + "go.podman.io/podman/v6/utils" "go.podman.io/storage/pkg/stringid" ) diff --git a/test/e2e/pod_clone_test.go b/test/e2e/pod_clone_test.go index a7633b494c..01a2321a67 100644 --- a/test/e2e/pod_clone_test.go +++ b/test/e2e/pod_clone_test.go @@ -5,9 +5,9 @@ package integration import ( "os" - . "github.com/containers/podman/v6/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + . "go.podman.io/podman/v6/test/utils" ) var _ = Describe("Podman pod clone", func() { diff --git a/test/e2e/pod_create_test.go b/test/e2e/pod_create_test.go index 987c12be59..9f74b16735 100644 --- a/test/e2e/pod_create_test.go +++ b/test/e2e/pod_create_test.go @@ -12,14 +12,14 @@ import ( "strings" "time" - "github.com/containers/podman/v6/pkg/util" - . "github.com/containers/podman/v6/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "github.com/opencontainers/selinux/go-selinux" "go.podman.io/common/pkg/apparmor" "go.podman.io/common/pkg/seccomp" "go.podman.io/common/pkg/sysinfo" + "go.podman.io/podman/v6/pkg/util" + . "go.podman.io/podman/v6/test/utils" ) var _ = Describe("Podman pod create", func() { diff --git a/test/e2e/pod_infra_container_test.go b/test/e2e/pod_infra_container_test.go index c262f91219..df302833fd 100644 --- a/test/e2e/pod_infra_container_test.go +++ b/test/e2e/pod_infra_container_test.go @@ -6,9 +6,9 @@ import ( "fmt" "strconv" - . "github.com/containers/podman/v6/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + . "go.podman.io/podman/v6/test/utils" ) var _ = Describe("Podman pod create", func() { diff --git a/test/e2e/pod_initcontainers_test.go b/test/e2e/pod_initcontainers_test.go index 3189c8459e..b29191450e 100644 --- a/test/e2e/pod_initcontainers_test.go +++ b/test/e2e/pod_initcontainers_test.go @@ -6,10 +6,10 @@ import ( "fmt" "path/filepath" - "github.com/containers/podman/v6/libpod/define" - . "github.com/containers/podman/v6/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + "go.podman.io/podman/v6/libpod/define" + . "go.podman.io/podman/v6/test/utils" ) var _ = Describe("Podman init containers", func() { diff --git a/test/e2e/pod_inspect_test.go b/test/e2e/pod_inspect_test.go index db61f8ba6e..a2a3cffc12 100644 --- a/test/e2e/pod_inspect_test.go +++ b/test/e2e/pod_inspect_test.go @@ -3,9 +3,9 @@ package integration import ( - . "github.com/containers/podman/v6/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + . "go.podman.io/podman/v6/test/utils" ) var _ = Describe("Podman pod inspect", func() { diff --git a/test/e2e/pod_kill_test.go b/test/e2e/pod_kill_test.go index 052badae17..d6159e4d4a 100644 --- a/test/e2e/pod_kill_test.go +++ b/test/e2e/pod_kill_test.go @@ -3,9 +3,9 @@ package integration import ( - . "github.com/containers/podman/v6/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + . "go.podman.io/podman/v6/test/utils" ) var _ = Describe("Podman pod kill", func() { diff --git a/test/e2e/pod_pause_test.go b/test/e2e/pod_pause_test.go index 98d2caaf98..ab4409a938 100644 --- a/test/e2e/pod_pause_test.go +++ b/test/e2e/pod_pause_test.go @@ -3,9 +3,9 @@ package integration import ( - . "github.com/containers/podman/v6/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + . "go.podman.io/podman/v6/test/utils" ) var _ = Describe("Podman pod pause", func() { diff --git a/test/e2e/pod_pod_namespaces_test.go b/test/e2e/pod_pod_namespaces_test.go index c8e3fbb5b0..f2ca1554a9 100644 --- a/test/e2e/pod_pod_namespaces_test.go +++ b/test/e2e/pod_pod_namespaces_test.go @@ -3,9 +3,9 @@ package integration import ( - . "github.com/containers/podman/v6/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + . "go.podman.io/podman/v6/test/utils" ) var _ = Describe("Podman pod create", func() { diff --git a/test/e2e/pod_prune_test.go b/test/e2e/pod_prune_test.go index 659851a995..30e8971bbf 100644 --- a/test/e2e/pod_prune_test.go +++ b/test/e2e/pod_prune_test.go @@ -3,9 +3,9 @@ package integration import ( - . "github.com/containers/podman/v6/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + . "go.podman.io/podman/v6/test/utils" ) var _ = Describe("Podman pod prune", func() { diff --git a/test/e2e/pod_ps_test.go b/test/e2e/pod_ps_test.go index 745307a394..42c32ee270 100644 --- a/test/e2e/pod_ps_test.go +++ b/test/e2e/pod_ps_test.go @@ -6,9 +6,9 @@ import ( "fmt" "sort" - . "github.com/containers/podman/v6/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + . "go.podman.io/podman/v6/test/utils" "go.podman.io/storage/pkg/stringid" ) diff --git a/test/e2e/pod_restart_test.go b/test/e2e/pod_restart_test.go index d43aee1bbd..98b51910fd 100644 --- a/test/e2e/pod_restart_test.go +++ b/test/e2e/pod_restart_test.go @@ -5,9 +5,9 @@ package integration import ( "fmt" - . "github.com/containers/podman/v6/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + . "go.podman.io/podman/v6/test/utils" ) var _ = Describe("Podman pod restart", func() { diff --git a/test/e2e/pod_rm_test.go b/test/e2e/pod_rm_test.go index 4373a86d89..6b7e9fb5bc 100644 --- a/test/e2e/pod_rm_test.go +++ b/test/e2e/pod_rm_test.go @@ -10,9 +10,9 @@ import ( "path/filepath" "strings" - . "github.com/containers/podman/v6/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + . "go.podman.io/podman/v6/test/utils" ) var _ = Describe("Podman pod rm", func() { diff --git a/test/e2e/pod_start_test.go b/test/e2e/pod_start_test.go index 489a473c36..bace4ef1b6 100644 --- a/test/e2e/pod_start_test.go +++ b/test/e2e/pod_start_test.go @@ -9,9 +9,9 @@ import ( "strconv" "strings" - . "github.com/containers/podman/v6/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + . "go.podman.io/podman/v6/test/utils" ) var _ = Describe("Podman pod start", func() { diff --git a/test/e2e/pod_stats_test.go b/test/e2e/pod_stats_test.go index 211944d674..9c2147e49f 100644 --- a/test/e2e/pod_stats_test.go +++ b/test/e2e/pod_stats_test.go @@ -3,9 +3,9 @@ package integration import ( - . "github.com/containers/podman/v6/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + . "go.podman.io/podman/v6/test/utils" ) var _ = Describe("Podman pod stats", func() { diff --git a/test/e2e/pod_stop_test.go b/test/e2e/pod_stop_test.go index d5e2d64dd2..b0b271dbda 100644 --- a/test/e2e/pod_stop_test.go +++ b/test/e2e/pod_stop_test.go @@ -6,9 +6,9 @@ import ( "path/filepath" "time" - . "github.com/containers/podman/v6/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + . "go.podman.io/podman/v6/test/utils" ) var _ = Describe("Podman pod stop", func() { diff --git a/test/e2e/pod_top_test.go b/test/e2e/pod_top_test.go index 2ed8a0fddd..aeaee67ab8 100644 --- a/test/e2e/pod_top_test.go +++ b/test/e2e/pod_top_test.go @@ -6,9 +6,9 @@ import ( "fmt" "time" - . "github.com/containers/podman/v6/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + . "go.podman.io/podman/v6/test/utils" ) var _ = Describe("Podman top", func() { diff --git a/test/e2e/port_test.go b/test/e2e/port_test.go index 77a2c795c9..d0ce1f6b1c 100644 --- a/test/e2e/port_test.go +++ b/test/e2e/port_test.go @@ -6,9 +6,9 @@ import ( "fmt" "strings" - . "github.com/containers/podman/v6/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + . "go.podman.io/podman/v6/test/utils" ) var _ = Describe("Podman port", func() { diff --git a/test/e2e/prune_test.go b/test/e2e/prune_test.go index b2daa3e3e3..2b80bb11ef 100644 --- a/test/e2e/prune_test.go +++ b/test/e2e/prune_test.go @@ -9,10 +9,10 @@ import ( "syscall" "time" - . "github.com/containers/podman/v6/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" + . "go.podman.io/podman/v6/test/utils" ) var pruneImage = fmt.Sprintf(` diff --git a/test/e2e/ps_test.go b/test/e2e/ps_test.go index f90251161d..92ae13d202 100644 --- a/test/e2e/ps_test.go +++ b/test/e2e/ps_test.go @@ -8,11 +8,11 @@ import ( "sort" "strconv" - . "github.com/containers/podman/v6/test/utils" "github.com/docker/go-units" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" + . "go.podman.io/podman/v6/test/utils" "go.podman.io/storage/pkg/stringid" ) diff --git a/test/e2e/pull_chunked_test.go b/test/e2e/pull_chunked_test.go index a33428875c..3be2573eb0 100644 --- a/test/e2e/pull_chunked_test.go +++ b/test/e2e/pull_chunked_test.go @@ -14,12 +14,12 @@ import ( "slices" "strings" - . "github.com/containers/podman/v6/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" "github.com/opencontainers/go-digest" imgspecv1 "github.com/opencontainers/image-spec/specs-go/v1" + . "go.podman.io/podman/v6/test/utils" ) func pullChunkedTests() { // included in pull_test.go, must use a Ginkgo DSL at the top level diff --git a/test/e2e/pull_test.go b/test/e2e/pull_test.go index a96023c29b..98b8879655 100644 --- a/test/e2e/pull_test.go +++ b/test/e2e/pull_test.go @@ -8,10 +8,10 @@ import ( "path/filepath" "runtime" - . "github.com/containers/podman/v6/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" + . "go.podman.io/podman/v6/test/utils" ) var _ = Describe("Podman pull", func() { diff --git a/test/e2e/push_test.go b/test/e2e/push_test.go index b00d5fbea1..bd721b89de 100644 --- a/test/e2e/push_test.go +++ b/test/e2e/push_test.go @@ -9,11 +9,11 @@ import ( "path/filepath" "strings" - . "github.com/containers/podman/v6/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" "go.podman.io/image/v5/signature/simplesequoia" + . "go.podman.io/podman/v6/test/utils" "go.podman.io/storage/pkg/archive" ) diff --git a/test/e2e/quadlet_test.go b/test/e2e/quadlet_test.go index 7ac5c13d46..877d0f7e33 100644 --- a/test/e2e/quadlet_test.go +++ b/test/e2e/quadlet_test.go @@ -12,10 +12,10 @@ import ( "slices" "strings" - "github.com/containers/podman/v6/pkg/systemd/parser" - . "github.com/containers/podman/v6/test/utils" - "github.com/containers/podman/v6/version" "github.com/mattn/go-shellwords" + "go.podman.io/podman/v6/pkg/systemd/parser" + . "go.podman.io/podman/v6/test/utils" + "go.podman.io/podman/v6/version" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/test/e2e/rename_test.go b/test/e2e/rename_test.go index 7349ea1339..f8ea85750a 100644 --- a/test/e2e/rename_test.go +++ b/test/e2e/rename_test.go @@ -5,9 +5,9 @@ package integration import ( "fmt" - . "github.com/containers/podman/v6/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + . "go.podman.io/podman/v6/test/utils" ) var _ = Describe("podman rename", func() { diff --git a/test/e2e/restart_test.go b/test/e2e/restart_test.go index 6f3ca5fade..a89f6a956d 100644 --- a/test/e2e/restart_test.go +++ b/test/e2e/restart_test.go @@ -7,10 +7,10 @@ import ( "path/filepath" "time" - . "github.com/containers/podman/v6/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" + . "go.podman.io/podman/v6/test/utils" ) var _ = Describe("Podman restart", func() { diff --git a/test/e2e/rm_test.go b/test/e2e/rm_test.go index f6dfa1c63b..377922dd71 100644 --- a/test/e2e/rm_test.go +++ b/test/e2e/rm_test.go @@ -6,9 +6,9 @@ import ( "fmt" "path/filepath" - . "github.com/containers/podman/v6/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + . "go.podman.io/podman/v6/test/utils" ) var _ = Describe("Podman rm", func() { diff --git a/test/e2e/rmi_test.go b/test/e2e/rmi_test.go index 69f0edc2ce..e0c576e5ab 100644 --- a/test/e2e/rmi_test.go +++ b/test/e2e/rmi_test.go @@ -6,9 +6,9 @@ import ( "fmt" "sync" - . "github.com/containers/podman/v6/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + . "go.podman.io/podman/v6/test/utils" ) var _ = Describe("Podman rmi", func() { diff --git a/test/e2e/run_aardvark_test.go b/test/e2e/run_aardvark_test.go index 7ca2471a08..1950d542cb 100644 --- a/test/e2e/run_aardvark_test.go +++ b/test/e2e/run_aardvark_test.go @@ -6,9 +6,9 @@ import ( "fmt" "strings" - . "github.com/containers/podman/v6/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + . "go.podman.io/podman/v6/test/utils" ) var _ = Describe("Podman run networking", func() { diff --git a/test/e2e/run_apparmor_test.go b/test/e2e/run_apparmor_test.go index 39fcedb677..90edf2c620 100644 --- a/test/e2e/run_apparmor_test.go +++ b/test/e2e/run_apparmor_test.go @@ -7,10 +7,10 @@ import ( "os" "path/filepath" - . "github.com/containers/podman/v6/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "go.podman.io/common/pkg/apparmor" + . "go.podman.io/podman/v6/test/utils" ) // wip diff --git a/test/e2e/run_cgroup_parent_test.go b/test/e2e/run_cgroup_parent_test.go index a8e005e3bd..9d2f66b620 100644 --- a/test/e2e/run_cgroup_parent_test.go +++ b/test/e2e/run_cgroup_parent_test.go @@ -8,9 +8,9 @@ import ( "path/filepath" "strings" - . "github.com/containers/podman/v6/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + . "go.podman.io/podman/v6/test/utils" ) const cgroupRoot = "/sys/fs/cgroup" diff --git a/test/e2e/run_cleanup_test.go b/test/e2e/run_cleanup_test.go index 74fc66281f..c2686e8a62 100644 --- a/test/e2e/run_cleanup_test.go +++ b/test/e2e/run_cleanup_test.go @@ -3,9 +3,9 @@ package integration import ( - . "github.com/containers/podman/v6/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + . "go.podman.io/podman/v6/test/utils" ) var _ = Describe("Podman run exit", func() { diff --git a/test/e2e/run_cpu_test.go b/test/e2e/run_cpu_test.go index 448214df3b..6b47f4390f 100644 --- a/test/e2e/run_cpu_test.go +++ b/test/e2e/run_cpu_test.go @@ -5,10 +5,10 @@ package integration import ( "os" - . "github.com/containers/podman/v6/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" + . "go.podman.io/podman/v6/test/utils" ) var _ = Describe("Podman run cpu", func() { diff --git a/test/e2e/run_device_test.go b/test/e2e/run_device_test.go index 62d11eab77..26455c0e92 100644 --- a/test/e2e/run_device_test.go +++ b/test/e2e/run_device_test.go @@ -11,9 +11,9 @@ import ( "path/filepath" "strings" - . "github.com/containers/podman/v6/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + . "go.podman.io/podman/v6/test/utils" ) func createContainersConfFileWithDevices(pTest *PodmanTestIntegration, devices string, cdiSpecDirs []string) { diff --git a/test/e2e/run_dns_test.go b/test/e2e/run_dns_test.go index 9b50aa7fda..8233c0450d 100644 --- a/test/e2e/run_dns_test.go +++ b/test/e2e/run_dns_test.go @@ -3,9 +3,9 @@ package integration import ( - . "github.com/containers/podman/v6/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + . "go.podman.io/podman/v6/test/utils" ) var _ = Describe("Podman run dns", func() { diff --git a/test/e2e/run_entrypoint_test.go b/test/e2e/run_entrypoint_test.go index 7c51e6e8da..23c257b950 100644 --- a/test/e2e/run_entrypoint_test.go +++ b/test/e2e/run_entrypoint_test.go @@ -3,9 +3,9 @@ package integration import ( - . "github.com/containers/podman/v6/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + . "go.podman.io/podman/v6/test/utils" ) var _ = Describe("Podman run entrypoint", func() { diff --git a/test/e2e/run_env_test.go b/test/e2e/run_env_test.go index c5b56cba2f..1cf94231fc 100644 --- a/test/e2e/run_env_test.go +++ b/test/e2e/run_env_test.go @@ -5,9 +5,9 @@ package integration import ( "os" - . "github.com/containers/podman/v6/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + . "go.podman.io/podman/v6/test/utils" ) var _ = Describe("Podman run", func() { diff --git a/test/e2e/run_exit_test.go b/test/e2e/run_exit_test.go index 33dc769430..f8c605a7f2 100644 --- a/test/e2e/run_exit_test.go +++ b/test/e2e/run_exit_test.go @@ -5,10 +5,10 @@ package integration import ( "fmt" - "github.com/containers/podman/v6/libpod/define" - . "github.com/containers/podman/v6/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + "go.podman.io/podman/v6/libpod/define" + . "go.podman.io/podman/v6/test/utils" ) var _ = Describe("Podman run exit", func() { diff --git a/test/e2e/run_memory_test.go b/test/e2e/run_memory_test.go index 1723042043..c4f6b7950e 100644 --- a/test/e2e/run_memory_test.go +++ b/test/e2e/run_memory_test.go @@ -3,9 +3,9 @@ package integration import ( - . "github.com/containers/podman/v6/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + . "go.podman.io/podman/v6/test/utils" ) var _ = Describe("Podman run memory", func() { diff --git a/test/e2e/run_networking_test.go b/test/e2e/run_networking_test.go index ddaebf596d..34d44bcbb6 100644 --- a/test/e2e/run_networking_test.go +++ b/test/e2e/run_networking_test.go @@ -10,12 +10,12 @@ import ( "strings" "syscall" - . "github.com/containers/podman/v6/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" "github.com/vishvananda/netlink" "go.podman.io/common/pkg/netns" + . "go.podman.io/podman/v6/test/utils" "go.podman.io/storage/pkg/stringid" ) diff --git a/test/e2e/run_ns_test.go b/test/e2e/run_ns_test.go index d4c35d4990..e4fb2867d1 100644 --- a/test/e2e/run_ns_test.go +++ b/test/e2e/run_ns_test.go @@ -6,9 +6,9 @@ import ( "os/exec" "strings" - . "github.com/containers/podman/v6/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + . "go.podman.io/podman/v6/test/utils" ) var _ = Describe("Podman run ns", func() { diff --git a/test/e2e/run_passwd_test.go b/test/e2e/run_passwd_test.go index d19b005e77..897e5836d9 100644 --- a/test/e2e/run_passwd_test.go +++ b/test/e2e/run_passwd_test.go @@ -5,9 +5,9 @@ package integration import ( "fmt" - . "github.com/containers/podman/v6/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + . "go.podman.io/podman/v6/test/utils" ) var _ = Describe("Podman run passwd", func() { diff --git a/test/e2e/run_privileged_test.go b/test/e2e/run_privileged_test.go index f5376dc273..4b6a3b7317 100644 --- a/test/e2e/run_privileged_test.go +++ b/test/e2e/run_privileged_test.go @@ -7,10 +7,10 @@ import ( "strconv" "strings" - . "github.com/containers/podman/v6/test/utils" "github.com/moby/sys/capability" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + . "go.podman.io/podman/v6/test/utils" ) // helper function for confirming that container capabilities are equal diff --git a/test/e2e/run_restart_test.go b/test/e2e/run_restart_test.go index 9ecfa72aa6..cc909024d5 100644 --- a/test/e2e/run_restart_test.go +++ b/test/e2e/run_restart_test.go @@ -3,9 +3,9 @@ package integration import ( - . "github.com/containers/podman/v6/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + . "go.podman.io/podman/v6/test/utils" ) var _ = Describe("Podman run restart containers", func() { diff --git a/test/e2e/run_seccomp_test.go b/test/e2e/run_seccomp_test.go index a0eda85fa8..3330a178fc 100644 --- a/test/e2e/run_seccomp_test.go +++ b/test/e2e/run_seccomp_test.go @@ -5,9 +5,9 @@ package integration import ( "path" - . "github.com/containers/podman/v6/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + . "go.podman.io/podman/v6/test/utils" ) // Create an image with the given seccomp label diff --git a/test/e2e/run_security_labels_test.go b/test/e2e/run_security_labels_test.go index 6a42b973db..170f1d3edb 100644 --- a/test/e2e/run_security_labels_test.go +++ b/test/e2e/run_security_labels_test.go @@ -6,10 +6,10 @@ import ( "fmt" "strings" - . "github.com/containers/podman/v6/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" + . "go.podman.io/podman/v6/test/utils" ) var _ = Describe("Podman generate kube", func() { diff --git a/test/e2e/run_selinux_test.go b/test/e2e/run_selinux_test.go index cf91327b11..7b4fe9ec64 100644 --- a/test/e2e/run_selinux_test.go +++ b/test/e2e/run_selinux_test.go @@ -6,10 +6,10 @@ import ( "os" "path/filepath" - . "github.com/containers/podman/v6/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "github.com/opencontainers/selinux/go-selinux" + . "go.podman.io/podman/v6/test/utils" ) var _ = Describe("Podman run", func() { diff --git a/test/e2e/run_signal_test.go b/test/e2e/run_signal_test.go index c67e4052f9..2f4fcd7bfe 100644 --- a/test/e2e/run_signal_test.go +++ b/test/e2e/run_signal_test.go @@ -11,9 +11,9 @@ import ( "syscall" "time" - . "github.com/containers/podman/v6/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + . "go.podman.io/podman/v6/test/utils" "golang.org/x/sys/unix" ) diff --git a/test/e2e/run_staticip_test.go b/test/e2e/run_staticip_test.go index 8f4d0ece5c..d05c74fb2f 100644 --- a/test/e2e/run_staticip_test.go +++ b/test/e2e/run_staticip_test.go @@ -7,9 +7,9 @@ import ( "net/http" "time" - . "github.com/containers/podman/v6/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + . "go.podman.io/podman/v6/test/utils" "go.podman.io/storage/pkg/stringid" ) diff --git a/test/e2e/run_test.go b/test/e2e/run_test.go index 389db4a990..ab85888d66 100644 --- a/test/e2e/run_test.go +++ b/test/e2e/run_test.go @@ -15,13 +15,13 @@ import ( "syscall" "time" - "github.com/containers/podman/v6/libpod/define" - . "github.com/containers/podman/v6/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" "go.podman.io/common/pkg/cgroups" "go.podman.io/common/pkg/config" + "go.podman.io/podman/v6/libpod/define" + . "go.podman.io/podman/v6/test/utils" "go.podman.io/storage/pkg/fileutils" "go.podman.io/storage/pkg/stringid" ) diff --git a/test/e2e/run_transient_test.go b/test/e2e/run_transient_test.go index ba55e683fd..feb47e2e18 100644 --- a/test/e2e/run_transient_test.go +++ b/test/e2e/run_transient_test.go @@ -5,9 +5,9 @@ package integration import ( "path/filepath" - . "github.com/containers/podman/v6/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + . "go.podman.io/podman/v6/test/utils" ) var _ = Describe("Podman run with volumes", func() { diff --git a/test/e2e/run_userns_test.go b/test/e2e/run_userns_test.go index 2d207fd520..d5013b8171 100644 --- a/test/e2e/run_userns_test.go +++ b/test/e2e/run_userns_test.go @@ -10,9 +10,9 @@ import ( "strconv" "strings" - . "github.com/containers/podman/v6/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + . "go.podman.io/podman/v6/test/utils" "go.podman.io/storage" ) diff --git a/test/e2e/run_volume_test.go b/test/e2e/run_volume_test.go index e0f61e7080..2a0465e825 100644 --- a/test/e2e/run_volume_test.go +++ b/test/e2e/run_volume_test.go @@ -12,11 +12,11 @@ import ( "strconv" "strings" - . "github.com/containers/podman/v6/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" "github.com/opencontainers/runtime-spec/specs-go" + . "go.podman.io/podman/v6/test/utils" ) // in-container mount point: using a path that is definitely not present diff --git a/test/e2e/run_working_dir_test.go b/test/e2e/run_working_dir_test.go index 76ce78ab47..db205e8eec 100644 --- a/test/e2e/run_working_dir_test.go +++ b/test/e2e/run_working_dir_test.go @@ -7,10 +7,10 @@ import ( "os" "path/filepath" - . "github.com/containers/podman/v6/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "github.com/onsi/gomega/types" + . "go.podman.io/podman/v6/test/utils" ) var _ = Describe("Podman run", func() { diff --git a/test/e2e/runlabel_test.go b/test/e2e/runlabel_test.go index bbc4a584c0..961138c808 100644 --- a/test/e2e/runlabel_test.go +++ b/test/e2e/runlabel_test.go @@ -5,9 +5,9 @@ package integration import ( "fmt" - . "github.com/containers/podman/v6/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + . "go.podman.io/podman/v6/test/utils" ) var PodmanDockerfile = fmt.Sprintf(` diff --git a/test/e2e/save_test.go b/test/e2e/save_test.go index 38e0e4ac48..e56fa382dc 100644 --- a/test/e2e/save_test.go +++ b/test/e2e/save_test.go @@ -10,9 +10,9 @@ import ( "strconv" "strings" - . "github.com/containers/podman/v6/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + . "go.podman.io/podman/v6/test/utils" ) var _ = Describe("Podman save", func() { diff --git a/test/e2e/search_test.go b/test/e2e/search_test.go index ba71f79b46..0e5505c287 100644 --- a/test/e2e/search_test.go +++ b/test/e2e/search_test.go @@ -11,10 +11,10 @@ import ( "strconv" "text/template" - "github.com/containers/podman/v6/pkg/domain/entities" - . "github.com/containers/podman/v6/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + "go.podman.io/podman/v6/pkg/domain/entities" + . "go.podman.io/podman/v6/test/utils" ) type endpoint struct { diff --git a/test/e2e/secret_test.go b/test/e2e/secret_test.go index a51f62fd07..9feba5cca1 100644 --- a/test/e2e/secret_test.go +++ b/test/e2e/secret_test.go @@ -9,10 +9,10 @@ import ( "path/filepath" "strings" - . "github.com/containers/podman/v6/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" + . "go.podman.io/podman/v6/test/utils" "go.podman.io/storage/pkg/stringid" ) diff --git a/test/e2e/start_test.go b/test/e2e/start_test.go index 4ac516fe7a..29a84dd625 100644 --- a/test/e2e/start_test.go +++ b/test/e2e/start_test.go @@ -9,9 +9,9 @@ import ( "strconv" "strings" - . "github.com/containers/podman/v6/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + . "go.podman.io/podman/v6/test/utils" ) var _ = Describe("Podman start", func() { diff --git a/test/e2e/stats_test.go b/test/e2e/stats_test.go index bac561daef..9ae9d8f7f4 100644 --- a/test/e2e/stats_test.go +++ b/test/e2e/stats_test.go @@ -7,9 +7,9 @@ import ( "strconv" "time" - . "github.com/containers/podman/v6/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + . "go.podman.io/podman/v6/test/utils" ) // TODO: we need to check the output. Currently, we only check the exit codes diff --git a/test/e2e/stop_test.go b/test/e2e/stop_test.go index 1c77c3d16b..aee8913c17 100644 --- a/test/e2e/stop_test.go +++ b/test/e2e/stop_test.go @@ -7,10 +7,10 @@ import ( "path/filepath" "strings" - . "github.com/containers/podman/v6/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" + . "go.podman.io/podman/v6/test/utils" ) var _ = Describe("Podman stop", func() { diff --git a/test/e2e/system_connection_test.go b/test/e2e/system_connection_test.go index be01f45919..1526cdca8d 100644 --- a/test/e2e/system_connection_test.go +++ b/test/e2e/system_connection_test.go @@ -19,11 +19,11 @@ import ( "strings" "time" - . "github.com/containers/podman/v6/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" . "github.com/onsi/gomega/gexec" + . "go.podman.io/podman/v6/test/utils" ) func setupConnectionsConf() { diff --git a/test/e2e/system_df_test.go b/test/e2e/system_df_test.go index 7dc87ef39a..e3c982f6e3 100644 --- a/test/e2e/system_df_test.go +++ b/test/e2e/system_df_test.go @@ -6,9 +6,9 @@ import ( "strconv" "strings" - . "github.com/containers/podman/v6/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + . "go.podman.io/podman/v6/test/utils" ) var _ = Describe("podman system df", func() { diff --git a/test/e2e/system_dial_stdio_test.go b/test/e2e/system_dial_stdio_test.go index 4c5695d6fc..79aad39959 100644 --- a/test/e2e/system_dial_stdio_test.go +++ b/test/e2e/system_dial_stdio_test.go @@ -3,9 +3,9 @@ package integration import ( - . "github.com/containers/podman/v6/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + . "go.podman.io/podman/v6/test/utils" ) var _ = Describe("podman system dial-stdio", func() { diff --git a/test/e2e/system_reset_test.go b/test/e2e/system_reset_test.go index f6297d31d3..b422cac55b 100644 --- a/test/e2e/system_reset_test.go +++ b/test/e2e/system_reset_test.go @@ -5,9 +5,9 @@ package integration import ( "fmt" - . "github.com/containers/podman/v6/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + . "go.podman.io/podman/v6/test/utils" ) // system reset must run serial: https://github.com/containers/podman/issues/17903 diff --git a/test/e2e/systemd_activate_test.go b/test/e2e/systemd_activate_test.go index 016c81508b..954e92d841 100644 --- a/test/e2e/systemd_activate_test.go +++ b/test/e2e/systemd_activate_test.go @@ -14,11 +14,11 @@ import ( "syscall" "time" - testUtils "github.com/containers/podman/v6/test/utils" - podmanUtils "github.com/containers/podman/v6/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" + testUtils "go.podman.io/podman/v6/test/utils" + podmanUtils "go.podman.io/podman/v6/utils" ) var _ = Describe("Systemd activate", func() { diff --git a/test/e2e/systemd_test.go b/test/e2e/systemd_test.go index f1c40c6cb7..2515818792 100644 --- a/test/e2e/systemd_test.go +++ b/test/e2e/systemd_test.go @@ -8,10 +8,10 @@ import ( "path/filepath" "strings" - . "github.com/containers/podman/v6/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" + . "go.podman.io/podman/v6/test/utils" ) var _ = Describe("Podman systemd", func() { diff --git a/test/e2e/tag_test.go b/test/e2e/tag_test.go index 23944e060a..dced148965 100644 --- a/test/e2e/tag_test.go +++ b/test/e2e/tag_test.go @@ -3,9 +3,9 @@ package integration import ( - . "github.com/containers/podman/v6/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + . "go.podman.io/podman/v6/test/utils" ) var _ = Describe("Podman tag", func() { diff --git a/test/e2e/tls_test.go b/test/e2e/tls_test.go index a6c7b6cbc6..6a5297db02 100644 --- a/test/e2e/tls_test.go +++ b/test/e2e/tls_test.go @@ -12,9 +12,9 @@ import ( "regexp" "slices" - . "github.com/containers/podman/v6/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + . "go.podman.io/podman/v6/test/utils" ) // tlsConfigServer returns http.StatusTeapot. So if we see that, that indicates a successful TLS connection. diff --git a/test/e2e/toolbox_test.go b/test/e2e/toolbox_test.go index 1707c9db3d..b7a4b00a1e 100644 --- a/test/e2e/toolbox_test.go +++ b/test/e2e/toolbox_test.go @@ -36,10 +36,10 @@ import ( "strings" "syscall" - "github.com/containers/podman/v6/libpod/define" - . "github.com/containers/podman/v6/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + "go.podman.io/podman/v6/libpod/define" + . "go.podman.io/podman/v6/test/utils" ) var _ = Describe("Toolbox-specific testing", func() { diff --git a/test/e2e/top_test.go b/test/e2e/top_test.go index f080f48efd..434e5f7806 100644 --- a/test/e2e/top_test.go +++ b/test/e2e/top_test.go @@ -6,9 +6,9 @@ import ( "os" "os/user" - . "github.com/containers/podman/v6/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + . "go.podman.io/podman/v6/test/utils" ) var _ = Describe("Podman top", func() { diff --git a/test/e2e/tree_test.go b/test/e2e/tree_test.go index d5cbe08c86..3b8949c8db 100644 --- a/test/e2e/tree_test.go +++ b/test/e2e/tree_test.go @@ -3,9 +3,9 @@ package integration import ( - . "github.com/containers/podman/v6/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + . "go.podman.io/podman/v6/test/utils" ) var _ = Describe("Podman image tree", func() { diff --git a/test/e2e/trust_test.go b/test/e2e/trust_test.go index d58b58f326..7b31ff689f 100644 --- a/test/e2e/trust_test.go +++ b/test/e2e/trust_test.go @@ -7,9 +7,9 @@ import ( "os" "path/filepath" - . "github.com/containers/podman/v6/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + . "go.podman.io/podman/v6/test/utils" ) // Without Ordered, tests flake with "Getting key identity" (#18358) diff --git a/test/e2e/unshare_test.go b/test/e2e/unshare_test.go index aae8e66bab..1c48a9515c 100644 --- a/test/e2e/unshare_test.go +++ b/test/e2e/unshare_test.go @@ -5,9 +5,9 @@ package integration import ( "os" - . "github.com/containers/podman/v6/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + . "go.podman.io/podman/v6/test/utils" ) var _ = Describe("Podman unshare", func() { diff --git a/test/e2e/untag_test.go b/test/e2e/untag_test.go index e83f98bec2..b175f5fcff 100644 --- a/test/e2e/untag_test.go +++ b/test/e2e/untag_test.go @@ -3,9 +3,9 @@ package integration import ( - . "github.com/containers/podman/v6/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + . "go.podman.io/podman/v6/test/utils" ) var _ = Describe("Podman untag", func() { diff --git a/test/e2e/update_test.go b/test/e2e/update_test.go index 433919f473..8296e3e046 100644 --- a/test/e2e/update_test.go +++ b/test/e2e/update_test.go @@ -3,10 +3,10 @@ package integration import ( - . "github.com/containers/podman/v6/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" + . "go.podman.io/podman/v6/test/utils" "go.podman.io/storage/pkg/fileutils" ) diff --git a/test/e2e/version_test.go b/test/e2e/version_test.go index b925bc15ed..51c9872c59 100644 --- a/test/e2e/version_test.go +++ b/test/e2e/version_test.go @@ -5,11 +5,11 @@ package integration import ( "fmt" - . "github.com/containers/podman/v6/test/utils" - "github.com/containers/podman/v6/version" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" + . "go.podman.io/podman/v6/test/utils" + "go.podman.io/podman/v6/version" ) var _ = Describe("Podman version", func() { diff --git a/test/e2e/volume_create_test.go b/test/e2e/volume_create_test.go index ab08a74239..981252b3f2 100644 --- a/test/e2e/volume_create_test.go +++ b/test/e2e/volume_create_test.go @@ -6,10 +6,10 @@ import ( "fmt" "path/filepath" - . "github.com/containers/podman/v6/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" + . "go.podman.io/podman/v6/test/utils" ) var _ = Describe("Podman volume create", func() { diff --git a/test/e2e/volume_exists_test.go b/test/e2e/volume_exists_test.go index 85d4f70c6a..372c5f35f2 100644 --- a/test/e2e/volume_exists_test.go +++ b/test/e2e/volume_exists_test.go @@ -3,9 +3,9 @@ package integration import ( - . "github.com/containers/podman/v6/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + . "go.podman.io/podman/v6/test/utils" "go.podman.io/storage/pkg/stringid" ) diff --git a/test/e2e/volume_inspect_test.go b/test/e2e/volume_inspect_test.go index 4d9346368f..8615fd7dd1 100644 --- a/test/e2e/volume_inspect_test.go +++ b/test/e2e/volume_inspect_test.go @@ -3,10 +3,10 @@ package integration import ( - "github.com/containers/podman/v6/libpod/define" - . "github.com/containers/podman/v6/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + "go.podman.io/podman/v6/libpod/define" + . "go.podman.io/podman/v6/test/utils" ) var _ = Describe("Podman volume inspect", func() { diff --git a/test/e2e/volume_ls_test.go b/test/e2e/volume_ls_test.go index 7a3a1eeb7a..76924ad391 100644 --- a/test/e2e/volume_ls_test.go +++ b/test/e2e/volume_ls_test.go @@ -5,9 +5,9 @@ package integration import ( "fmt" - . "github.com/containers/podman/v6/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + . "go.podman.io/podman/v6/test/utils" ) var _ = Describe("Podman volume ls", func() { diff --git a/test/e2e/volume_plugin_test.go b/test/e2e/volume_plugin_test.go index 01dc4fbf9e..e2ab89ae87 100644 --- a/test/e2e/volume_plugin_test.go +++ b/test/e2e/volume_plugin_test.go @@ -7,9 +7,9 @@ import ( "os" "path/filepath" - . "github.com/containers/podman/v6/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + . "go.podman.io/podman/v6/test/utils" "go.podman.io/storage/pkg/stringid" ) diff --git a/test/e2e/volume_rm_test.go b/test/e2e/volume_rm_test.go index fda75ce50b..4b0aaf2495 100644 --- a/test/e2e/volume_rm_test.go +++ b/test/e2e/volume_rm_test.go @@ -5,9 +5,9 @@ package integration import ( "fmt" - . "github.com/containers/podman/v6/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + . "go.podman.io/podman/v6/test/utils" ) var _ = Describe("Podman volume rm", func() { diff --git a/test/e2e/wait_test.go b/test/e2e/wait_test.go index 76cdd0717c..3b42840f62 100644 --- a/test/e2e/wait_test.go +++ b/test/e2e/wait_test.go @@ -3,9 +3,9 @@ package integration import ( - . "github.com/containers/podman/v6/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + . "go.podman.io/podman/v6/test/utils" ) var _ = Describe("Podman wait", func() { diff --git a/test/testvol/util.go b/test/testvol/util.go index 12d54b40b3..ab4bc3eb41 100644 --- a/test/testvol/util.go +++ b/test/testvol/util.go @@ -4,7 +4,7 @@ import ( "path/filepath" "strings" - "github.com/containers/podman/v6/libpod/plugin" + "go.podman.io/podman/v6/libpod/plugin" ) const pluginSockDir = "/run/docker/plugins" diff --git a/test/tools/go.mod b/test/tools/go.mod index c0627283a3..f2203755b2 100644 --- a/test/tools/go.mod +++ b/test/tools/go.mod @@ -1,4 +1,4 @@ -module github.com/containers/podman/test/tools +module go.podman.io/podman/test/tools // Warning: if there is a "toolchain" directive anywhere in this file (and most of the // time there shouldn't be), its version must be an exact match to the "go" directive. diff --git a/test/utils/common_function_test.go b/test/utils/common_function_test.go index 45b262ae91..464b3496f6 100644 --- a/test/utils/common_function_test.go +++ b/test/utils/common_function_test.go @@ -8,9 +8,9 @@ import ( "reflect" "strings" - . "github.com/containers/podman/v6/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + . "go.podman.io/podman/v6/test/utils" ) var _ = Describe("Common functions test", func() { diff --git a/test/utils/podmansession_test.go b/test/utils/podmansession_test.go index 275cd6717c..60c93eab19 100644 --- a/test/utils/podmansession_test.go +++ b/test/utils/podmansession_test.go @@ -1,9 +1,9 @@ package utils_test import ( - . "github.com/containers/podman/v6/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + . "go.podman.io/podman/v6/test/utils" ) var _ = Describe("PodmanSession test", func() { diff --git a/test/utils/podmantest_test.go b/test/utils/podmantest_test.go index 94c297cc87..505cd5e2f9 100644 --- a/test/utils/podmantest_test.go +++ b/test/utils/podmantest_test.go @@ -1,9 +1,9 @@ package utils_test import ( - . "github.com/containers/podman/v6/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + . "go.podman.io/podman/v6/test/utils" ) var _ = Describe("PodmanTest test", func() { diff --git a/test/utils/utils_suite_test.go b/test/utils/utils_suite_test.go index 35c2d6c677..6a9a47c0bc 100644 --- a/test/utils/utils_suite_test.go +++ b/test/utils/utils_suite_test.go @@ -6,10 +6,10 @@ import ( "strings" "testing" - . "github.com/containers/podman/v6/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "github.com/onsi/gomega/gexec" + . "go.podman.io/podman/v6/test/utils" ) var ( diff --git a/test/version/main.go b/test/version/main.go index 78a4fc0710..6dad872c64 100644 --- a/test/version/main.go +++ b/test/version/main.go @@ -3,7 +3,7 @@ package main import ( "fmt" - "github.com/containers/podman/v6/version" + "go.podman.io/podman/v6/version" ) func main() { diff --git a/version/version.go b/version/version.go index 7918d0317a..5be04d6016 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/v6/version/rawversion" + "go.podman.io/podman/v6/version/rawversion" ) type ( diff --git a/winmake.ps1 b/winmake.ps1 index a033d32e5f..ae3b7467db 100644 --- a/winmake.ps1 +++ b/winmake.ps1 @@ -26,9 +26,9 @@ function Podman-Remote { New-Item -ItemType Directory -Force -Path './bin/windows' $buildInfo = Get-Date -UFormat %s -Millisecond 0 - $buildInfo = "-X github.com/containers/podman/v6/libpod/define.buildInfo=$buildInfo " + $buildInfo = "-X go.podman.io/podman/v6/libpod/define.buildInfo=$buildInfo " $commit = Git-Commit - $commit = "-X github.com/containers/podman/v6/libpod/define.gitCommit=$commit " + $commit = "-X go.podman.io/podman/v6/libpod/define.gitCommit=$commit " $ENV:GOARCH = $architecture Run-Command "go build --ldflags `"$commit $buildInfo `" --tags `"$remotetags`" --o ./bin/windows/podman.exe ./cmd/podman/."