From a98154a9782670b3398719d48565cc2510fd0152 Mon Sep 17 00:00:00 2001 From: Jan Kaluza Date: Mon, 1 Sep 2025 10:52:33 +0200 Subject: [PATCH] Switch common, storage and image to monorepo. Signed-off-by: Jan Kaluza --- cmd/podman-mac-helper/install.go | 2 +- cmd/podman-mac-helper/uninstall.go | 2 +- cmd/podman-testing/create.go | 2 +- cmd/podman-testing/data.go | 2 +- cmd/podman-testing/layer.go | 2 +- cmd/podman-testing/main.go | 8 +- cmd/podman-testing/remove.go | 2 +- cmd/podman-testing/store_supported.go | 4 +- cmd/podman/artifact/add.go | 2 +- cmd/podman/artifact/extract.go | 2 +- cmd/podman/artifact/list.go | 6 +- cmd/podman/artifact/pull.go | 6 +- cmd/podman/artifact/push.go | 6 +- cmd/podman/auto-update.go | 8 +- cmd/podman/common/build.go | 10 +- cmd/podman/common/completion.go | 12 +- cmd/podman/common/create.go | 8 +- cmd/podman/common/netflags.go | 4 +- cmd/podman/common/registries.go | 2 +- cmd/podman/common/sign.go | 10 +- cmd/podman/completion/completion.go | 2 +- cmd/podman/containers/checkpoint.go | 4 +- cmd/podman/containers/cleanup.go | 2 +- cmd/podman/containers/commit.go | 2 +- cmd/podman/containers/cp.go | 4 +- cmd/podman/containers/create.go | 8 +- cmd/podman/containers/exec.go | 2 +- cmd/podman/containers/export.go | 2 +- cmd/podman/containers/kill.go | 2 +- cmd/podman/containers/list.go | 2 +- cmd/podman/containers/logs.go | 2 +- cmd/podman/containers/mount.go | 2 +- cmd/podman/containers/pause.go | 2 +- cmd/podman/containers/prune.go | 2 +- cmd/podman/containers/ps.go | 6 +- cmd/podman/containers/ps_test.go | 2 +- cmd/podman/containers/restart.go | 2 +- cmd/podman/containers/restore.go | 2 +- cmd/podman/containers/rm.go | 2 +- cmd/podman/containers/run.go | 4 +- cmd/podman/containers/runlabel.go | 6 +- cmd/podman/containers/stats.go | 4 +- cmd/podman/containers/stop.go | 2 +- cmd/podman/containers/top.go | 2 +- cmd/podman/containers/unpause.go | 4 +- cmd/podman/containers/wait.go | 2 +- cmd/podman/diff/diff.go | 4 +- cmd/podman/farm/build.go | 2 +- cmd/podman/farm/create.go | 4 +- cmd/podman/farm/list.go | 6 +- cmd/podman/farm/remove.go | 2 +- cmd/podman/farm/update.go | 4 +- cmd/podman/generate/spec.go | 2 +- cmd/podman/generate/systemd.go | 4 +- cmd/podman/images/history.go | 2 +- cmd/podman/images/import.go | 2 +- cmd/podman/images/list.go | 4 +- cmd/podman/images/load.go | 6 +- cmd/podman/images/mount.go | 2 +- cmd/podman/images/prune.go | 2 +- cmd/podman/images/pull.go | 8 +- cmd/podman/images/push.go | 6 +- cmd/podman/images/save.go | 2 +- cmd/podman/images/scp.go | 2 +- cmd/podman/images/search.go | 8 +- cmd/podman/images/sign.go | 6 +- cmd/podman/images/trust_set.go | 2 +- cmd/podman/images/trust_show.go | 2 +- cmd/podman/images/version.go | 2 +- cmd/podman/inspect/inspect.go | 2 +- cmd/podman/kube/apply.go | 2 +- cmd/podman/kube/generate.go | 4 +- cmd/podman/kube/play.go | 6 +- cmd/podman/login.go | 6 +- cmd/podman/logout.go | 6 +- cmd/podman/machine/client9p.go | 2 +- cmd/podman/machine/info.go | 4 +- cmd/podman/machine/init.go | 6 +- cmd/podman/machine/inspect.go | 2 +- cmd/podman/machine/list.go | 6 +- cmd/podman/machine/os/manager.go | 2 +- cmd/podman/machine/reset.go | 2 +- cmd/podman/machine/server9p.go | 2 +- cmd/podman/machine/set.go | 4 +- cmd/podman/machine/ssh.go | 2 +- cmd/podman/main.go | 2 +- cmd/podman/manifest/add.go | 6 +- cmd/podman/manifest/annotate.go | 2 +- cmd/podman/manifest/create.go | 4 +- cmd/podman/manifest/inspect.go | 6 +- cmd/podman/manifest/push.go | 6 +- cmd/podman/networks/connect.go | 4 +- cmd/podman/networks/create.go | 6 +- cmd/podman/networks/list.go | 6 +- cmd/podman/networks/rm.go | 2 +- cmd/podman/networks/update.go | 2 +- cmd/podman/parse/net.go | 4 +- cmd/podman/parse/net_test.go | 2 +- cmd/podman/pods/clone.go | 2 +- cmd/podman/pods/create.go | 6 +- cmd/podman/pods/logs.go | 2 +- cmd/podman/pods/prune.go | 2 +- cmd/podman/pods/ps.go | 4 +- cmd/podman/pods/rm.go | 2 +- cmd/podman/pods/start.go | 2 +- cmd/podman/pods/stats.go | 2 +- cmd/podman/pods/stop.go | 2 +- cmd/podman/pods/top.go | 2 +- cmd/podman/quadlet/install.go | 2 +- cmd/podman/quadlet/list.go | 4 +- cmd/podman/registry/config.go | 4 +- cmd/podman/root.go | 6 +- cmd/podman/secrets/create.go | 2 +- cmd/podman/secrets/inspect.go | 2 +- cmd/podman/secrets/list.go | 4 +- cmd/podman/shell_completion_test.go | 2 +- cmd/podman/system/check.go | 2 +- cmd/podman/system/connection/add.go | 6 +- cmd/podman/system/connection/default.go | 2 +- cmd/podman/system/connection/list.go | 6 +- cmd/podman/system/connection/remove.go | 2 +- cmd/podman/system/connection/rename.go | 2 +- cmd/podman/system/df.go | 4 +- cmd/podman/system/events.go | 4 +- cmd/podman/system/info.go | 4 +- cmd/podman/system/migrate.go | 2 +- cmd/podman/system/prune.go | 2 +- cmd/podman/system/renumber.go | 2 +- cmd/podman/system/reset.go | 2 +- cmd/podman/system/service.go | 2 +- cmd/podman/system/service_abi_linux.go | 4 +- cmd/podman/system/unshare.go | 2 +- cmd/podman/system/version.go | 4 +- cmd/podman/volumes/create.go | 2 +- cmd/podman/volumes/export.go | 2 +- cmd/podman/volumes/list.go | 4 +- cmd/podman/volumes/prune.go | 2 +- cmd/podman/volumes/reload.go | 2 +- cmd/podman/volumes/rm.go | 2 +- cmd/rootlessport/main.go | 4 +- cmd/rootlessport/wsl.go | 2 +- cmd/rootlessport/wsl_test.go | 2 +- go.mod | 18 +- go.sum | 34 +- internal/domain/infra/abi/testing.go | 10 +- internal/domain/infra/runtime_proxy.go | 2 +- internal/localapi/utils.go | 2 +- libpod/boltdb_state.go | 4 +- libpod/boltdb_state_internal.go | 2 +- libpod/common_test.go | 4 +- libpod/container.go | 12 +- libpod/container_api.go | 4 +- libpod/container_commit.go | 6 +- libpod/container_config.go | 8 +- libpod/container_copy_common.go | 6 +- libpod/container_exec.go | 6 +- libpod/container_inspect_linux.go | 4 +- libpod/container_internal.go | 30 +- libpod/container_internal_common.go | 30 +- libpod/container_internal_freebsd.go | 2 +- libpod/container_internal_linux.go | 8 +- libpod/container_internal_test.go | 4 +- libpod/container_top_linux.go | 2 +- libpod/container_validate.go | 6 +- libpod/define/config.go | 2 +- libpod/define/container_inspect.go | 2 +- libpod/define/errors.go | 4 +- libpod/define/healthchecks.go | 2 +- libpod/define/info.go | 4 +- libpod/diff.go | 2 +- libpod/driver/driver.go | 2 +- libpod/events/events.go | 2 +- libpod/events/logfile.go | 2 +- libpod/healthcheck_config.go | 2 +- libpod/healthcheck_linux.go | 2 +- libpod/info.go | 8 +- libpod/info_linux.go | 14 +- libpod/kube.go | 4 +- libpod/layers/layer.go | 2 +- libpod/lock/file/file_lock.go | 4 +- libpod/networking_common.go | 10 +- libpod/networking_freebsd.go | 2 +- libpod/networking_linux.go | 4 +- libpod/networking_linux_test.go | 2 +- libpod/networking_machine.go | 4 +- libpod/networking_pasta_linux.go | 2 +- libpod/networking_slirp4netns.go | 4 +- libpod/oci.go | 2 +- libpod/oci_conmon_attach_common.go | 6 +- libpod/oci_conmon_common.go | 10 +- libpod/oci_conmon_exec_common.go | 6 +- libpod/oci_conmon_exec_linux.go | 2 +- libpod/oci_conmon_linux.go | 8 +- libpod/oci_missing.go | 2 +- libpod/oci_util.go | 2 +- libpod/options.go | 18 +- libpod/plugin/volume_api.go | 4 +- libpod/pod.go | 2 +- libpod/pod_api.go | 2 +- libpod/pod_internal.go | 2 +- libpod/pod_internal_linux.go | 2 +- libpod/reset.go | 12 +- libpod/runtime.go | 28 +- libpod/runtime_cstorage.go | 2 +- libpod/runtime_ctr.go | 10 +- libpod/runtime_img.go | 4 +- libpod/runtime_linux.go | 2 +- libpod/runtime_pod_linux.go | 4 +- libpod/runtime_volume_common.go | 10 +- libpod/sqlite_state.go | 4 +- libpod/sqlite_state_internal.go | 2 +- libpod/state.go | 2 +- libpod/state_test.go | 6 +- libpod/stats_freebsd.go | 2 +- libpod/stats_linux.go | 2 +- libpod/storage.go | 8 +- libpod/util.go | 6 +- libpod/util_linux.go | 4 +- libpod/volume.go | 4 +- pkg/api/handlers/compat/auth.go | 6 +- pkg/api/handlers/compat/containers_create.go | 12 +- .../handlers/compat/containers_stats_linux.go | 4 +- pkg/api/handlers/compat/exec.go | 2 +- pkg/api/handlers/compat/images.go | 10 +- pkg/api/handlers/compat/images_build.go | 10 +- pkg/api/handlers/compat/images_push.go | 4 +- pkg/api/handlers/compat/images_remove.go | 2 +- pkg/api/handlers/compat/images_search.go | 4 +- pkg/api/handlers/compat/images_tag.go | 2 +- pkg/api/handlers/compat/info.go | 6 +- pkg/api/handlers/compat/networks.go | 4 +- pkg/api/handlers/compat/resize.go | 2 +- pkg/api/handlers/decoder.go | 2 +- pkg/api/handlers/libpod/artifacts.go | 4 +- pkg/api/handlers/libpod/containers_create.go | 2 +- pkg/api/handlers/libpod/containers_stats.go | 2 +- pkg/api/handlers/libpod/generate.go | 2 +- pkg/api/handlers/libpod/images.go | 20 +- pkg/api/handlers/libpod/images_pull.go | 6 +- pkg/api/handlers/libpod/images_push.go | 2 +- pkg/api/handlers/libpod/kube.go | 4 +- pkg/api/handlers/libpod/manifests.go | 4 +- pkg/api/handlers/libpod/networks.go | 2 +- pkg/api/handlers/libpod/secrets.go | 2 +- pkg/api/handlers/libpod/swagger_spec.go | 2 +- pkg/api/handlers/swagger/responses.go | 4 +- pkg/api/handlers/utils/errors.go | 2 +- pkg/api/handlers/utils/images.go | 16 +- pkg/auth/auth.go | 4 +- pkg/auth/auth_test.go | 4 +- pkg/autoupdate/autoupdate.go | 6 +- pkg/bindings/artifacts/pull.go | 2 +- pkg/bindings/artifacts/push.go | 2 +- pkg/bindings/connection.go | 4 +- pkg/bindings/containers/attach.go | 2 +- pkg/bindings/containers/commit.go | 2 +- pkg/bindings/containers/diff.go | 2 +- pkg/bindings/images/build.go | 10 +- pkg/bindings/images/diff.go | 2 +- pkg/bindings/images/images.go | 2 +- pkg/bindings/images/pull.go | 2 +- pkg/bindings/images/push.go | 2 +- pkg/bindings/kube/kube.go | 2 +- pkg/bindings/manifests/manifests.go | 6 +- pkg/bindings/network/network.go | 2 +- pkg/bindings/test/auth_test.go | 4 +- pkg/bindings/test/networks_test.go | 2 +- pkg/checkpoint/checkpoint_restore.go | 4 +- .../crutils/checkpoint_restore_utils.go | 2 +- pkg/domain/entities/artifact.go | 2 +- pkg/domain/entities/auto-update.go | 2 +- pkg/domain/entities/containers.go | 6 +- pkg/domain/entities/engine.go | 2 +- pkg/domain/entities/engine_container.go | 4 +- pkg/domain/entities/engine_image.go | 4 +- pkg/domain/entities/images.go | 6 +- pkg/domain/entities/manifest.go | 2 +- pkg/domain/entities/play.go | 2 +- pkg/domain/entities/pods.go | 2 +- pkg/domain/entities/scp.go | 2 +- pkg/domain/entities/types.go | 4 +- pkg/domain/entities/types/container_ps.go | 2 +- pkg/domain/entities/types/network.go | 2 +- pkg/domain/filters/containers.go | 6 +- pkg/domain/filters/pods.go | 4 +- pkg/domain/filters/volumes.go | 2 +- pkg/domain/infra/abi/artifact.go | 2 +- pkg/domain/infra/abi/config.go | 2 +- pkg/domain/infra/abi/config_test.go | 2 +- pkg/domain/infra/abi/containers.go | 12 +- pkg/domain/infra/abi/containers_runlabel.go | 6 +- pkg/domain/infra/abi/farm.go | 2 +- pkg/domain/infra/abi/images.go | 28 +- pkg/domain/infra/abi/images_list.go | 2 +- pkg/domain/infra/abi/images_test.go | 2 +- pkg/domain/infra/abi/manifest.go | 24 +- pkg/domain/infra/abi/network.go | 8 +- pkg/domain/infra/abi/play.go | 16 +- pkg/domain/infra/abi/pods_stats.go | 2 +- pkg/domain/infra/abi/quadlet.go | 4 +- pkg/domain/infra/abi/secrets.go | 2 +- pkg/domain/infra/abi/secrets_test.go | 2 +- pkg/domain/infra/abi/system.go | 6 +- pkg/domain/infra/abi/system_linux.go | 8 +- pkg/domain/infra/abi/terminal/terminal.go | 2 +- .../infra/abi/terminal/terminal_common.go | 2 +- pkg/domain/infra/runtime_libpod.go | 6 +- pkg/domain/infra/tunnel/artifact.go | 2 +- pkg/domain/infra/tunnel/containers.go | 6 +- pkg/domain/infra/tunnel/images.go | 10 +- pkg/domain/infra/tunnel/kube.go | 2 +- pkg/domain/infra/tunnel/manifest.go | 4 +- pkg/domain/infra/tunnel/network.go | 2 +- pkg/domain/utils/scp.go | 6 +- pkg/domain/utils/secrets_filters.go | 2 +- pkg/farm/farm.go | 4 +- pkg/farm/list_builder.go | 4 +- pkg/inspect/inspect.go | 2 +- pkg/libartifact/artifact.go | 2 +- pkg/libartifact/store/config.go | 2 +- pkg/libartifact/store/store.go | 18 +- pkg/machine/apple/apple.go | 4 +- pkg/machine/applehv/stubber.go | 2 +- pkg/machine/compression/decompress.go | 2 +- pkg/machine/compression/generic.go | 2 +- pkg/machine/config.go | 2 +- pkg/machine/connection/connection.go | 2 +- pkg/machine/define/initopts.go | 2 +- pkg/machine/define/setopts.go | 2 +- pkg/machine/e2e/config_test.go | 2 +- pkg/machine/e2e/init_test.go | 2 +- pkg/machine/e2e/machine_pull_test.go | 2 +- pkg/machine/e2e/machine_test.go | 2 +- pkg/machine/env/dir.go | 4 +- pkg/machine/hyperv/stubber.go | 2 +- pkg/machine/ignition/ignition.go | 2 +- pkg/machine/keys.go | 2 +- pkg/machine/lock/lock.go | 2 +- pkg/machine/machine_windows.go | 2 +- pkg/machine/ocipull/ociartifact.go | 10 +- pkg/machine/ocipull/policy_unix.go | 4 +- pkg/machine/ocipull/pull.go | 8 +- pkg/machine/ocipull/source.go | 8 +- pkg/machine/os/ostree.go | 2 +- pkg/machine/ports/ports.go | 4 +- pkg/machine/provider/platform_darwin.go | 2 +- pkg/machine/provider/platform_unix.go | 2 +- pkg/machine/provider/platform_windows.go | 2 +- pkg/machine/proxyenv/env.go | 4 +- pkg/machine/qemu/command/command.go | 2 +- pkg/machine/qemu/command/command_unix.go | 2 +- pkg/machine/qemu/command/command_windows.go | 2 +- pkg/machine/qemu/config.go | 2 +- pkg/machine/qemu/machine.go | 2 +- pkg/machine/qemu/options_linux_arm64.go | 2 +- pkg/machine/qemu/stubber.go | 4 +- pkg/machine/qemu/virtiofsd.go | 4 +- pkg/machine/shim/diskpull/diskpull.go | 2 +- pkg/machine/shim/networking.go | 2 +- pkg/machine/sockets/sockets.go | 2 +- pkg/machine/stdpull/local.go | 2 +- pkg/machine/stdpull/url.go | 2 +- pkg/machine/vmconfigs/config.go | 4 +- pkg/machine/vmconfigs/machine.go | 8 +- pkg/machine/wsl/machine.go | 6 +- pkg/machine/wsl/util_windows.go | 4 +- pkg/ps/ps.go | 6 +- pkg/rootless/rootless.go | 4 +- pkg/rootless/rootless_freebsd.go | 2 +- pkg/rootless/rootless_linux.go | 6 +- pkg/rootless/rootless_unsupported.go | 2 +- pkg/specgen/generate/config_freebsd.go | 2 +- pkg/specgen/generate/config_linux.go | 4 +- pkg/specgen/generate/config_linux_seccomp.go | 4 +- pkg/specgen/generate/container.go | 6 +- pkg/specgen/generate/container_create.go | 6 +- pkg/specgen/generate/kube/kube.go | 14 +- pkg/specgen/generate/kube/play_test.go | 2 +- pkg/specgen/generate/kube/volume.go | 6 +- pkg/specgen/generate/namespaces.go | 6 +- pkg/specgen/generate/namespaces_linux.go | 2 +- pkg/specgen/generate/oci.go | 2 +- pkg/specgen/generate/oci_freebsd.go | 4 +- pkg/specgen/generate/oci_linux.go | 6 +- pkg/specgen/generate/pause_image.go | 2 +- pkg/specgen/generate/pod_create_test.go | 2 +- pkg/specgen/generate/ports.go | 4 +- pkg/specgen/generate/ports_bench_test.go | 2 +- pkg/specgen/generate/ports_test.go | 2 +- pkg/specgen/generate/security_freebsd.go | 4 +- pkg/specgen/generate/security_linux.go | 8 +- pkg/specgen/generate/storage.go | 8 +- pkg/specgen/generate/storage_freebsd.go | 2 +- pkg/specgen/generate/storage_linux.go | 2 +- pkg/specgen/generate/validate_linux.go | 6 +- pkg/specgen/namespaces.go | 12 +- pkg/specgen/namespaces_test.go | 2 +- pkg/specgen/podspecgen.go | 4 +- pkg/specgen/resources_freebsd.go | 2 +- pkg/specgen/resources_linux.go | 2 +- pkg/specgen/specgen.go | 6 +- pkg/specgen/specgen_local.go | 2 +- pkg/specgen/volumes.go | 2 +- pkg/specgen/winpath_linux.go | 4 +- pkg/specgen/winpath_windows.go | 2 +- pkg/specgenutil/createparse.go | 2 +- pkg/specgenutil/specgen.go | 4 +- pkg/specgenutil/specgenutil_test.go | 2 +- pkg/specgenutil/util.go | 6 +- pkg/specgenutil/volumes.go | 4 +- pkg/systemd/quadlet/quadlet.go | 2 +- pkg/trust/policy.go | 8 +- pkg/trust/policy_test.go | 2 +- pkg/trust/registries.go | 4 +- pkg/trust/trust_test.go | 2 +- pkg/util/filters_test.go | 2 +- pkg/util/utils.go | 12 +- pkg/util/utils_supported.go | 2 +- pkg/util/utils_test.go | 4 +- pkg/util/utils_windows.go | 2 +- test/e2e/common_test.go | 10 +- test/e2e/create_staticmac_test.go | 2 +- test/e2e/create_test.go | 2 +- test/e2e/diff_test.go | 2 +- test/e2e/events_test.go | 2 +- test/e2e/image_scp_test.go | 2 +- test/e2e/logs_test.go | 2 +- test/e2e/manifest_test.go | 10 +- test/e2e/network_connect_disconnect_test.go | 2 +- test/e2e/network_create_test.go | 4 +- test/e2e/network_test.go | 2 +- test/e2e/play_kube_test.go | 2 +- test/e2e/pod_create_test.go | 6 +- test/e2e/pod_ps_test.go | 2 +- test/e2e/ps_test.go | 2 +- test/e2e/push_test.go | 2 +- test/e2e/run_apparmor_test.go | 2 +- test/e2e/run_networking_test.go | 2 +- test/e2e/run_staticip_test.go | 2 +- test/e2e/run_test.go | 8 +- test/e2e/run_userns_test.go | 2 +- test/e2e/secret_test.go | 2 +- test/e2e/update_test.go | 4 +- test/e2e/volume_exists_test.go | 2 +- test/e2e/volume_plugin_test.go | 2 +- utils/utils.go | 4 +- vendor/github.com/containers/buildah/add.go | 12 +- .../containers/buildah/bind/mount.go | 4 +- .../github.com/containers/buildah/buildah.go | 8 +- .../containers/buildah/chroot/run_common.go | 6 +- .../containers/buildah/chroot/run_freebsd.go | 6 +- .../containers/buildah/chroot/run_linux.go | 4 +- .../github.com/containers/buildah/commit.go | 22 +- .../github.com/containers/buildah/common.go | 18 +- .../github.com/containers/buildah/config.go | 10 +- .../containers/buildah/convertcw.go | 8 +- .../containers/buildah/copier/copier.go | 10 +- .../containers/buildah/copier/xattrs.go | 2 +- .../containers/buildah/define/build.go | 10 +- .../containers/buildah/define/types.go | 10 +- .../containers/buildah/docker/types.go | 2 +- vendor/github.com/containers/buildah/image.go | 20 +- .../containers/buildah/imagebuildah/build.go | 48 ++- .../buildah/imagebuildah/executor.go | 22 +- .../buildah/imagebuildah/stage_executor.go | 22 +- .../github.com/containers/buildah/import.go | 12 +- vendor/github.com/containers/buildah/info.go | 8 +- .../buildah/internal/config/convert.go | 2 +- .../buildah/internal/config/override.go | 2 +- .../buildah/internal/mkcw/archive.go | 8 +- .../buildah/internal/mkcw/attest.go | 2 +- .../buildah/internal/open/open_linux.go | 2 +- .../buildah/internal/open/open_unix.go | 2 +- .../buildah/internal/parse/parse.go | 4 +- .../buildah/internal/tmpdir/tmpdir.go | 2 +- .../containers/buildah/internal/util/util.go | 14 +- .../buildah/internal/volumes/bind_linux.go | 2 +- .../buildah/internal/volumes/volumes.go | 14 +- vendor/github.com/containers/buildah/new.go | 18 +- .../containers/buildah/pkg/binfmt/binfmt.go | 2 +- .../buildah/pkg/blobcache/blobcache.go | 4 +- .../buildah/pkg/chrootuser/user_unix.go | 2 +- .../containers/buildah/pkg/cli/build.go | 6 +- .../containers/buildah/pkg/cli/common.go | 6 +- .../containers/buildah/pkg/overlay/overlay.go | 8 +- .../buildah/pkg/overlay/overlay_freebsd.go | 2 +- .../buildah/pkg/overlay/overlay_linux.go | 2 +- .../containers/buildah/pkg/parse/parse.go | 20 +- vendor/github.com/containers/buildah/pull.go | 8 +- vendor/github.com/containers/buildah/push.go | 16 +- vendor/github.com/containers/buildah/run.go | 8 +- .../containers/buildah/run_common.go | 34 +- .../containers/buildah/run_freebsd.go | 18 +- .../containers/buildah/run_linux.go | 38 +- .../github.com/containers/buildah/run_unix.go | 4 +- .../containers/buildah/run_unsupported.go | 4 +- .../github.com/containers/buildah/seccomp.go | 2 +- vendor/github.com/containers/buildah/util.go | 12 +- .../containers/buildah/util/util.go | 16 +- .../v5/signature/internal/sequoia/gosequoia.c | 200 --------- .../v5/signature/internal/sequoia/gosequoia.h | 54 --- .../internal/sequoia/gosequoiafuncs.h | 21 - .../v5/signature/internal/sequoia/sequoia.go | 223 ---------- .../v5/signature/internal/sequoia/sequoia.h | 85 ---- .../v5/signature/mechanism_gpgme_only.go | 64 --- .../image/v5/signature/mechanism_sequoia.go | 84 ---- .../containers/libhvee/pkg/hypervctl/vhd.go | 2 +- .../containers/libhvee/pkg/hypervctl/vm.go | 23 +- .../libhvee/pkg/hypervctl/vm_config.go | 3 + .../containers/libhvee/pkg/wmiext/array.go | 7 +- .../libhvee/pkg/wmiext/conversion.go | 8 +- .../psgo/internal/host/host_nocgo.go | 5 +- .../containers/psgo/internal/proc/attr.go | 8 +- .../containers/psgo/internal/proc/cmdline.go | 4 +- .../containers/psgo/internal/proc/ns.go | 2 +- .../containers/psgo/internal/proc/stat.go | 4 +- .../containers/psgo/internal/proc/status.go | 2 +- .../psgo/internal/process/process.go | 5 +- vendor/github.com/containers/psgo/psgo.go | 9 +- .../storage/drivers/register/register_vfs.go | 6 - .../libcontainer/user/lookup_deprecated.go | 81 ---- .../runc/libcontainer/user/user_deprecated.go | 146 ------- .../openshift/imagebuilder/.travis.yml | 8 +- .../openshift/imagebuilder/README.md | 9 +- .../openshift/imagebuilder/dispatchers.go | 2 +- .../imagebuilder/dockerfile/parser/parser.go | 4 +- .../openshift/imagebuilder/evaluator.go | 14 +- .../openshift/imagebuilder/imagebuilder.spec | 2 +- vendor/github.com/ulikunitz/xz/TODO.md | 11 +- vendor/github.com/ulikunitz/xz/lzma/header.go | 55 +-- vendor/github.com/ulikunitz/xz/lzma/reader.go | 123 +++++- vendor/github.com/ulikunitz/xz/lzma/writer.go | 28 +- vendor/go.podman.io/common/LICENSE | 201 +++++++++ .../common/internal/attributedstring/slice.go | 0 .../common/internal/deepcopy.go | 0 .../common/libimage/copier.go | 24 +- .../common/libimage/define/manifests.go | 2 +- .../common/libimage/define/platform.go | 0 .../common/libimage/define/search.go | 0 .../common/libimage/disk_usage.go | 2 +- .../common/libimage/events.go | 0 .../common/libimage/filter/filter.go | 4 +- .../common/libimage/filters.go | 6 +- .../common/libimage/history.go | 0 .../common/libimage/image.go | 14 +- .../common/libimage/image_config.go | 2 +- .../common/libimage/image_tree.go | 0 .../common/libimage/import.go | 6 +- .../common/libimage/inspect.go | 6 +- .../common/libimage/layer_tree.go | 4 +- .../common/libimage/load.go | 14 +- .../common/libimage/manifest_list.go | 26 +- .../common/libimage/manifests/copy.go | 2 +- .../common/libimage/manifests/manifests.go | 40 +- .../common/libimage/normalize.go | 2 +- .../common/libimage/oci.go | 0 .../common/libimage/platform.go | 4 +- .../common/libimage/platform/platform.go | 0 .../common/libimage/pull.go | 24 +- .../common/libimage/push.go | 14 +- .../common/libimage/runtime.go | 18 +- .../common/libimage/save.go | 14 +- .../common/libimage/search.go | 10 +- .../common/libimage/types.go | 2 +- .../common/libnetwork/cni/README.md | 0 .../common/libnetwork/cni/cni_conversion.go | 6 +- .../common/libnetwork/cni/cni_exec.go | 2 +- .../common/libnetwork/cni/cni_types.go | 4 +- .../common/libnetwork/cni/config.go | 4 +- .../common/libnetwork/cni/config_freebsd.go | 0 .../common/libnetwork/cni/config_linux.go | 0 .../common/libnetwork/cni/network.go | 14 +- .../common/libnetwork/cni/run.go | 4 +- .../common/libnetwork/cni/run_freebsd.go | 0 .../common/libnetwork/cni/run_linux.go | 0 .../common/libnetwork/etchosts/hosts.go | 2 +- .../common/libnetwork/etchosts/ip.go | 10 +- .../common/libnetwork/etchosts/util.go | 2 +- .../internal/rootlessnetns/netns.go | 0 .../internal/rootlessnetns/netns_freebsd.go | 6 +- .../internal/rootlessnetns/netns_linux.go | 20 +- .../common/libnetwork/internal/util/bridge.go | 6 +- .../common/libnetwork/internal/util/create.go | 2 +- .../libnetwork/internal/util/interface.go | 2 +- .../libnetwork/internal/util/interfaces.go | 0 .../common/libnetwork/internal/util/ip.go | 0 .../common/libnetwork/internal/util/parse.go | 0 .../common/libnetwork/internal/util/util.go | 4 +- .../libnetwork/internal/util/validate.go | 4 +- .../common/libnetwork/netavark/config.go | 6 +- .../common/libnetwork/netavark/const.go | 0 .../common/libnetwork/netavark/exec.go | 0 .../common/libnetwork/netavark/ipam.go | 4 +- .../common/libnetwork/netavark/network.go | 14 +- .../common/libnetwork/netavark/run.go | 4 +- .../common/libnetwork/network/interface.go | 12 +- .../libnetwork/network/interface_cni.go | 14 +- .../network/interface_cni_unsupported.go | 6 +- .../libnetwork/network/interface_freebsd.go | 0 .../libnetwork/network/interface_linux.go | 0 .../common/libnetwork/pasta/pasta_linux.go | 6 +- .../common/libnetwork/pasta/types.go | 0 .../common/libnetwork/resolvconf/resolv.go | 2 +- .../libnetwork/resolvconf/resolvconf.go | 2 +- .../common/libnetwork/slirp4netns/const.go | 0 .../libnetwork/slirp4netns/slirp4netns.go | 10 +- .../common/libnetwork/types/const.go | 0 .../common/libnetwork/types/define.go | 2 +- .../common/libnetwork/types/network.go | 0 .../common/libnetwork/util/filters.go | 6 +- .../common/libnetwork/util/ip.go | 0 .../common/libnetwork/util/ip_calc.go | 0 .../common/pkg/apparmor/apparmor.go | 2 +- .../common/pkg/apparmor/apparmor_linux.go | 6 +- .../pkg/apparmor/apparmor_linux_template.go | 0 .../pkg/apparmor/apparmor_unsupported.go | 0 .../apparmor/internal/supported/supported.go | 2 +- .../common/pkg/auth/auth.go | 16 +- .../common/pkg/auth/cli.go | 2 +- .../common/pkg/capabilities/capabilities.go | 0 .../common/pkg/cgroups/blkio_linux.go | 0 .../common/pkg/cgroups/cgroups_linux.go | 4 +- .../common/pkg/cgroups/cgroups_unsupported.go | 0 .../common/pkg/cgroups/cpu_linux.go | 0 .../common/pkg/cgroups/cpuset_linux.go | 0 .../common/pkg/cgroups/memory_linux.go | 0 .../common/pkg/cgroups/pids_linux.go | 0 .../common/pkg/cgroups/systemd_linux.go | 0 .../common/pkg/cgroups/utils_linux.go | 2 +- .../common/pkg/cgroupv2/cgroups_linux.go | 0 .../pkg/cgroupv2/cgroups_unsupported.go | 0 .../common/pkg/chown/chown.go | 2 +- .../common/pkg/chown/chown_unix.go | 0 .../common/pkg/chown/chown_windows.go | 0 .../common/pkg/completion/completion.go | 2 +- .../common/pkg/config/config.go | 10 +- .../common/pkg/config/config_bsd.go | 0 .../common/pkg/config/config_darwin.go | 0 .../common/pkg/config/config_linux.go | 2 +- .../common/pkg/config/config_local.go | 2 +- .../common/pkg/config/config_remote.go | 0 .../common/pkg/config/config_unix.go | 2 +- .../common/pkg/config/config_unsupported.go | 0 .../common/pkg/config/config_windows.go | 0 .../common/pkg/config/connections.go | 4 +- .../common/pkg/config/containers.conf | 0 .../common/pkg/config/containers.conf-freebsd | 0 .../common/pkg/config/db_backend.go | 0 .../common/pkg/config/default.go | 16 +- .../common/pkg/config/default_bsd.go | 0 .../common/pkg/config/default_common.go | 0 .../common/pkg/config/default_darwin.go | 0 .../common/pkg/config/default_linux.go | 0 .../common/pkg/config/default_unsupported.go | 0 .../common/pkg/config/default_windows.go | 2 +- .../common/pkg/config/modules.go | 2 +- .../common/pkg/config/new.go | 4 +- .../common/pkg/config/nosystemd.go | 0 .../common/pkg/config/pod_exit_policy.go | 0 .../common/pkg/config/pull_policy.go | 0 .../common/pkg/config/systemd.go | 4 +- .../common/pkg/detach/copy.go | 0 .../common/pkg/download/download.go | 0 .../common/pkg/filters/filters.go | 4 +- .../common/pkg/flag/flag.go | 0 .../common/pkg/hooks/0.1.0/hook.go | 2 +- .../common/pkg/hooks/1.0.0/hook.go | 2 +- .../common/pkg/hooks/1.0.0/when.go | 0 .../common/pkg/hooks/README.md | 0 .../common/pkg/hooks/exec/exec.go | 0 .../pkg/hooks/exec/runtimeconfigfilter.go | 0 .../common/pkg/hooks/hooks.go | 2 +- .../common/pkg/hooks/monitor.go | 2 +- .../common/pkg/hooks/read.go | 4 +- .../common/pkg/hooks/version.go | 0 .../common/pkg/machine/machine.go | 0 .../common/pkg/manifests/errors.go | 0 .../common/pkg/manifests/manifests.go | 4 +- .../common/pkg/netns/netns_linux.go | 4 +- .../common/pkg/parse/parse.go | 2 +- .../common/pkg/parse/parse_unix.go | 2 +- .../common/pkg/password/password_supported.go | 0 .../common/pkg/password/password_windows.go | 0 .../common/pkg/report/camelcase/LICENSE.md | 0 .../common/pkg/report/camelcase/README.md | 0 .../common/pkg/report/camelcase/camelcase.go | 0 .../common/pkg/report/doc.go | 0 .../common/pkg/report/formatter.go | 0 .../common/pkg/report/template.go | 4 +- .../common/pkg/report/validate.go | 2 +- .../common/pkg/report/writer.go | 0 .../common/pkg/resize/resize.go | 0 .../common/pkg/retry/retry.go | 2 +- .../common/pkg/retry/retry_linux.go | 0 .../common/pkg/retry/retry_unsupported.go | 0 .../pkg/rootlessport/rootlessport_linux.go | 2 +- .../common/pkg/seccomp/conversion.go | 0 .../common/pkg/seccomp/default_linux.go | 0 .../common/pkg/seccomp/errno_list.go | 0 .../common/pkg/seccomp/filter.go | 0 .../common/pkg/seccomp/seccomp.json | 0 .../common/pkg/seccomp/seccomp_linux.go | 0 .../common/pkg/seccomp/seccomp_unsupported.go | 0 .../common/pkg/seccomp/supported.go | 0 .../common/pkg/seccomp/types.go | 0 .../common/pkg/seccomp/validate.go | 0 .../common/pkg/secrets/define/secrets.go | 0 .../pkg/secrets/filedriver/filedriver.go | 6 +- .../pkg/secrets/passdriver/passdriver.go | 4 +- .../common/pkg/secrets/secrets.go | 12 +- .../common/pkg/secrets/secretsdb.go | 2 +- .../pkg/secrets/shelldriver/shelldriver.go | 2 +- .../common/pkg/servicereaper/service.go | 0 .../common/pkg/signal/signal_common.go | 0 .../common/pkg/signal/signal_linux.go | 0 .../common/pkg/signal/signal_linux_mipsx.go | 0 .../common/pkg/signal/signal_unsupported.go | 0 .../common/pkg/ssh/connection_golang.go | 6 +- .../common/pkg/ssh/connection_native.go | 2 +- .../common/pkg/ssh/ssh.go | 0 .../common/pkg/ssh/types.go | 2 +- .../common/pkg/ssh/utils.go | 2 +- .../common/pkg/strongunits/config.go | 65 +++ .../common/pkg/subscriptions/mounts.conf | 0 .../common/pkg/subscriptions/subscriptions.go | 6 +- .../common/pkg/supplemented/errors.go | 2 +- .../common/pkg/supplemented/supplemented.go | 10 +- .../common/pkg/sysinfo/README.md | 0 .../common/pkg/sysinfo/numcpu.go | 0 .../common/pkg/sysinfo/numcpu_linux.go | 0 .../common/pkg/sysinfo/numcpu_other.go | 0 .../common/pkg/sysinfo/numcpu_windows.go | 0 .../common/pkg/sysinfo/sysinfo.go | 2 +- .../common/pkg/sysinfo/sysinfo_linux.go | 4 +- .../common/pkg/sysinfo/sysinfo_solaris.go | 0 .../common/pkg/sysinfo/sysinfo_unix.go | 0 .../common/pkg/sysinfo/sysinfo_windows.go | 0 .../common/pkg/systemd/systemd_linux.go | 4 +- .../common/pkg/systemd/systemd_unsupported.go | 0 .../common/pkg/timetype/timestamp.go | 0 .../common/pkg/timezone/timezone.go | 2 +- .../common/pkg/timezone/timezone_linux.go | 0 .../common/pkg/timezone/timezone_unix.go | 0 .../common/pkg/timezone/timezone_windows.go | 0 .../common/pkg/umask/umask.go | 2 +- .../common/pkg/umask/umask_unix.go | 0 .../common/pkg/umask/umask_unsupported.go | 0 .../common/pkg/util/util.go | 2 +- .../common/pkg/version/version.go | 2 +- .../common/version/version.go | 0 .../image/v5/LICENSE | 0 .../image/v5/copy/blob.go | 6 +- .../image/v5/copy/compression.go | 12 +- .../image/v5/copy/copy.go | 28 +- .../image/v5/copy/digesting_reader.go | 0 .../image/v5/copy/encryption.go | 2 +- .../image/v5/copy/manifest.go | 10 +- .../image/v5/copy/multiple.go | 12 +- .../image/v5/copy/progress_bars.go | 4 +- .../image/v5/copy/progress_channel.go | 2 +- .../image/v5/copy/sign.go | 14 +- .../image/v5/copy/single.go | 22 +- .../image/v5/directory/directory_dest.go | 14 +- .../image/v5/directory/directory_src.go | 12 +- .../image/v5/directory/directory_transport.go | 10 +- .../v5/directory/explicitfilepath/path.go | 2 +- .../image/v5/docker/archive/dest.go | 6 +- .../image/v5/docker/archive/reader.go | 8 +- .../image/v5/docker/archive/src.go | 6 +- .../image/v5/docker/archive/transport.go | 10 +- .../image/v5/docker/archive/writer.go | 6 +- .../image/v5/docker/body_reader.go | 0 .../image/v5/docker/cache.go | 4 +- .../image/v5/docker/daemon/client.go | 2 +- .../image/v5/docker/daemon/daemon_dest.go | 8 +- .../image/v5/docker/daemon/daemon_src.go | 6 +- .../v5/docker/daemon/daemon_transport.go | 10 +- .../image/v5/docker/distribution_error.go | 0 .../image/v5/docker/docker_client.go | 24 +- .../image/v5/docker/docker_image.go | 8 +- .../image/v5/docker/docker_image_dest.go | 30 +- .../image/v5/docker/docker_image_src.go | 22 +- .../image/v5/docker/docker_transport.go | 8 +- .../image/v5/docker/errors.go | 0 .../image/v5/docker/internal/tarfile/dest.go | 16 +- .../v5/docker/internal/tarfile/reader.go | 10 +- .../image/v5/docker/internal/tarfile/src.go | 14 +- .../image/v5/docker/internal/tarfile/types.go | 2 +- .../v5/docker/internal/tarfile/writer.go | 10 +- .../image/v5/docker/paths_common.go | 0 .../image/v5/docker/paths_freebsd.go | 0 .../v5/docker/policyconfiguration/naming.go | 2 +- .../image/v5/docker/reference/README.md | 0 .../image/v5/docker/reference/helpers.go | 0 .../image/v5/docker/reference/normalize.go | 0 .../image/v5/docker/reference/reference.go | 0 .../v5/docker/reference/regexp-additions.go | 0 .../image/v5/docker/reference/regexp.go | 2 +- .../image/v5/docker/registries_d.go | 10 +- .../image/v5/docker/wwwauthenticate.go | 0 .../image/v5/image/docker_schema2.go | 2 +- .../image/v5/image/sourced.go | 4 +- .../image/v5/image/unparsed.go | 8 +- .../internal/blobinfocache/blobinfocache.go | 2 +- .../image/v5/internal/blobinfocache/types.go | 4 +- .../image/v5/internal/image/docker_list.go | 4 +- .../image/v5/internal/image/docker_schema1.go | 6 +- .../image/v5/internal/image/docker_schema2.go | 10 +- .../image/v5/internal/image/manifest.go | 6 +- .../image/v5/internal/image/memory.go | 2 +- .../image/v5/internal/image/oci.go | 12 +- .../image/v5/internal/image/oci_index.go | 4 +- .../image/v5/internal/image/sourced.go | 2 +- .../image/v5/internal/image/unparsed.go | 12 +- .../internal/imagedestination/impl/compat.go | 8 +- .../internal/imagedestination/impl/helpers.go | 4 +- .../imagedestination/impl/properties.go | 2 +- .../stubs/original_oci_config.go | 0 .../stubs/put_blob_partial.go | 4 +- .../imagedestination/stubs/signatures.go | 2 +- .../internal/imagedestination/stubs/stubs.go | 0 .../v5/internal/imagedestination/wrapper.go | 8 +- .../v5/internal/imagesource/impl/compat.go | 4 +- .../internal/imagesource/impl/layer_infos.go | 2 +- .../internal/imagesource/impl/properties.go | 0 .../internal/imagesource/impl/signatures.go | 2 +- .../internal/imagesource/stubs/get_blob_at.go | 4 +- .../v5/internal/imagesource/stubs/stubs.go | 0 .../image/v5/internal/imagesource/wrapper.go | 8 +- .../image/v5/internal/iolimits/iolimits.go | 0 .../image/v5/internal/manifest/common.go | 0 .../v5/internal/manifest/docker_schema2.go | 0 .../internal/manifest/docker_schema2_list.go | 6 +- .../image/v5/internal/manifest/errors.go | 0 .../image/v5/internal/manifest/list.go | 4 +- .../image/v5/internal/manifest/manifest.go | 2 +- .../image/v5/internal/manifest/oci_index.go | 6 +- .../image/v5/internal/multierr/multierr.go | 0 .../internal/pkg/platform/platform_matcher.go | 2 +- .../image/v5/internal/private/private.go | 10 +- .../internal/putblobdigest/put_blob_digest.go | 2 +- .../image/v5/internal/rootless/rootless.go | 0 .../image/v5/internal/set/set.go | 0 .../image/v5/internal/signature/signature.go | 0 .../image/v5/internal/signature/sigstore.go | 0 .../image/v5/internal/signature/simple.go | 0 .../image/v5/internal/signer/signer.go | 4 +- .../v5/internal/streamdigest/stream_digest.go | 6 +- .../image/v5/internal/tmpdir/tmpdir.go | 2 +- .../v5/internal/unparsedimage/wrapper.go | 6 +- .../v5/internal/uploadreader/upload_reader.go | 0 .../image/v5/internal/useragent/useragent.go | 2 +- .../image/v5/manifest/common.go | 4 +- .../image/v5/manifest/docker_schema1.go | 12 +- .../image/v5/manifest/docker_schema2.go | 8 +- .../image/v5/manifest/docker_schema2_list.go | 2 +- .../image/v5/manifest/list.go | 2 +- .../image/v5/manifest/manifest.go | 4 +- .../image/v5/manifest/oci.go | 6 +- .../image/v5/manifest/oci_index.go | 2 +- .../image/v5/oci/archive/oci_dest.go | 14 +- .../image/v5/oci/archive/oci_src.go | 12 +- .../image/v5/oci/archive/oci_transport.go | 18 +- .../image/v5/oci/internal/oci_util.go | 0 .../image/v5/oci/layout/oci_delete.go | 4 +- .../image/v5/oci/layout/oci_dest.go | 14 +- .../image/v5/oci/layout/oci_src.go | 14 +- .../image/v5/oci/layout/oci_transport.go | 14 +- .../image/v5/oci/layout/reader.go | 2 +- .../image/v5/openshift/openshift-copies.go | 4 +- .../image/v5/openshift/openshift.go | 6 +- .../image/v5/openshift/openshift_dest.go | 20 +- .../image/v5/openshift/openshift_src.go | 12 +- .../image/v5/openshift/openshift_transport.go | 12 +- .../image/v5/pkg/blobcache/blobcache.go | 8 +- .../image/v5/pkg/blobcache/dest.go | 18 +- .../image/v5/pkg/blobcache/src.go | 18 +- .../image/v5/pkg/blobinfocache/default.go | 8 +- .../internal/prioritize/prioritize.go | 8 +- .../v5/pkg/blobinfocache/memory/memory.go | 8 +- .../image/v5/pkg/blobinfocache/none/none.go | 4 +- .../v5/pkg/blobinfocache/sqlite/sqlite.go | 6 +- .../image/v5/pkg/cli/passphrase.go | 0 .../v5/pkg/cli/sigstore/params/sigstore.go | 0 .../image/v5/pkg/cli/sigstore/sigstore.go | 12 +- .../image/v5/pkg/compression/compression.go | 6 +- .../v5/pkg/compression/internal/types.go | 0 .../image/v5/pkg/compression/types/types.go | 2 +- .../image/v5/pkg/compression/zstd.go | 0 .../image/v5/pkg/docker/config/config.go | 16 +- .../image/v5/pkg/shortnames/shortnames.go | 8 +- .../image/v5/pkg/strslice/README.md | 0 .../image/v5/pkg/strslice/strslice.go | 0 .../v5/pkg/sysregistriesv2/paths_common.go | 0 .../v5/pkg/sysregistriesv2/paths_freebsd.go | 0 .../v5/pkg/sysregistriesv2/shortnames.go | 12 +- .../sysregistriesv2/system_registries_v2.go | 10 +- .../v5/pkg/tlsclientconfig/tlsclientconfig.go | 0 .../image/v5/sif/load.go | 0 .../image/v5/sif/src.go | 10 +- .../image/v5/sif/transport.go | 10 +- .../image/v5/signature/docker.go | 18 +- .../image/v5/signature/fulcio_cert.go | 2 +- .../image/v5/signature/internal/errors.go | 0 .../image/v5/signature/internal/json.go | 2 +- .../v5/signature/internal/rekor_api_types.go | 0 .../image/v5/signature/internal/rekor_set.go | 0 .../v5/signature/internal/sigstore_payload.go | 2 +- .../image/v5/signature/mechanism.go | 15 +- .../image/v5/signature/mechanism_gpgme.go | 101 +++-- .../image/v5/signature/mechanism_openpgp.go | 11 +- .../image/v5/signature/pki_cert.go | 2 +- .../image/v5/signature/policy_config.go | 14 +- .../v5/signature/policy_config_sigstore.go | 2 +- .../image/v5/signature/policy_eval.go | 6 +- .../v5/signature/policy_eval_baselayer.go | 2 +- .../v5/signature/policy_eval_signedby.go | 18 +- .../v5/signature/policy_eval_sigstore.go | 10 +- .../image/v5/signature/policy_eval_simple.go | 4 +- .../image/v5/signature/policy_paths_common.go | 0 .../v5/signature/policy_paths_freebsd.go | 0 .../v5/signature/policy_reference_match.go | 6 +- .../image/v5/signature/policy_types.go | 0 .../image/v5/signature/signer/signer.go | 2 +- .../image/v5/signature/sigstore/copied.go | 0 .../v5/signature/sigstore/fulcio/fulcio.go | 4 +- .../image/v5/signature/sigstore/generate.go | 0 .../v5/signature/sigstore/internal/signer.go | 8 +- .../sigstore/rekor/leveled_logger.go | 0 .../signature/sigstore/rekor/openapi_infra.go | 3 + .../v5/signature/sigstore/rekor/rekor.go | 4 +- .../v5/signature/sigstore/rekor/rekor_api.go | 0 .../sigstore/rekor/rekor_api_types.go | 0 .../image/v5/signature/sigstore/signer.go | 6 +- .../image/v5/signature/simple.go | 40 +- .../v5/signature/simplesigning/signer.go | 10 +- .../image/v5/storage/storage_dest.go | 38 +- .../image/v5/storage/storage_image.go | 6 +- .../image/v5/storage/storage_reference.go | 10 +- .../image/v5/storage/storage_src.go | 22 +- .../image/v5/storage/storage_transport.go | 10 +- .../image/v5/tarball/doc.go | 10 +- .../image/v5/tarball/tarball_reference.go | 6 +- .../image/v5/tarball/tarball_src.go | 10 +- .../image/v5/tarball/tarball_transport.go | 4 +- .../transports/alltransports/alltransports.go | 20 +- .../transports/alltransports/docker_daemon.go | 2 +- .../alltransports/docker_daemon_stub.go | 2 +- .../v5/transports/alltransports/storage.go | 2 +- .../transports/alltransports/storage_stub.go | 2 +- .../image/v5/transports/stub.go | 2 +- .../image/v5/transports/transports.go | 4 +- .../image/v5/types/types.go | 4 +- .../image/v5/version/version.go | 0 .../storage/.cirrus.yml | 6 +- .../storage/.codespellrc | 0 .../storage/.dockerignore | 0 .../storage/.gitignore | 0 .../storage/.golangci.yml | 0 .../storage/.mailmap | 0 .../storage/AUTHORS | 0 .../storage/CODE-OF-CONDUCT.md | 0 .../storage/CONTRIBUTING.md | 0 .../storage/LICENSE | 0 .../storage/Makefile | 4 +- .../storage/NOTICE | 0 .../storage/OWNERS | 0 .../storage/README.md | 0 .../storage/SECURITY.md | 0 .../storage/VERSION | 0 .../storage/check.go | 10 +- .../storage/containers.go | 10 +- .../storage/deprecated.go | 4 +- .../storage/drivers/aufs/aufs.go | 24 +- .../storage/drivers/aufs/dirs.go | 0 .../storage/drivers/aufs/mount.go | 0 .../storage/drivers/aufs/mount_linux.go | 0 .../storage/drivers/btrfs/btrfs.go | 16 +- .../drivers/btrfs/dummy_unsupported.go | 0 .../storage/drivers/btrfs/version.go | 0 .../storage/drivers/chown.go | 4 +- .../storage/drivers/chown_darwin.go | 4 +- .../storage/drivers/chown_unix.go | 4 +- .../storage/drivers/chown_windows.go | 2 +- .../storage/drivers/chroot_unix.go | 0 .../storage/drivers/chroot_windows.go | 0 .../storage/drivers/copy/copy_linux.go | 8 +- .../storage/drivers/copy/copy_unsupported.go | 2 +- .../storage/drivers/counter.go | 0 .../storage/drivers/driver.go | 12 +- .../storage/drivers/driver_darwin.go | 0 .../storage/drivers/driver_freebsd.go | 2 +- .../storage/drivers/driver_linux.go | 2 +- .../storage/drivers/driver_solaris.go | 2 +- .../storage/drivers/driver_unsupported.go | 0 .../storage/drivers/fsdiff.go | 10 +- .../storage/drivers/jsoniter.go | 0 .../storage/drivers/overlay/check.go | 14 +- .../storage/drivers/overlay/check_116.go | 4 +- .../storage/drivers/overlay/composefs.go | 6 +- .../storage/drivers/overlay/jsoniter.go | 0 .../storage/drivers/overlay/mount.go | 2 +- .../storage/drivers/overlay/overlay.go | 34 +- .../drivers/overlay/overlay_disk_quota.go | 2 +- .../overlay/overlay_disk_quota_unsupported.go | 2 +- .../drivers/overlay/overlay_unsupported.go | 0 .../storage/drivers/overlay/randomid.go | 0 .../drivers/overlayutils/overlayutils.go | 2 +- .../storage/drivers/quota/projectquota.go | 0 .../drivers/quota/projectquota_supported.go | 2 +- .../drivers/quota/projectquota_unsupported.go | 0 .../storage/drivers/register/register_aufs.go | 2 +- .../drivers/register/register_btrfs.go | 2 +- .../drivers/register/register_overlay.go | 2 +- .../storage/drivers/register/register_vfs.go | 6 + .../storage/drivers/register/register_zfs.go | 2 +- .../storage/drivers/template.go | 2 +- .../storage/drivers/vfs/copy_linux.go | 2 +- .../storage/drivers/vfs/copy_unsupported.go | 4 +- .../storage/drivers/vfs/driver.go | 18 +- .../storage/drivers/zfs/MAINTAINERS | 0 .../storage/drivers/zfs/zfs.go | 12 +- .../storage/drivers/zfs/zfs_freebsd.go | 2 +- .../storage/drivers/zfs/zfs_linux.go | 2 +- .../storage/drivers/zfs/zfs_unsupported.go | 0 .../storage/errors.go | 2 +- .../storage/idset.go | 4 +- .../storage/images.go | 10 +- .../storage/internal/dedup/dedup.go | 0 .../storage/internal/dedup/dedup_linux.go | 0 .../internal/dedup/dedup_unsupported.go | 0 .../internal/rawfilelock/rawfilelock.go | 0 .../internal/rawfilelock/rawfilelock_unix.go | 0 .../rawfilelock/rawfilelock_windows.go | 0 .../staging_lockfile/staging_lockfile.go | 2 +- .../storage/internal/tempdir/tempdir.go | 2 +- .../storage/jsoniter.go | 0 .../storage/layers.go | 22 +- .../storage/lockfile_compat.go | 2 +- .../storage/pkg/archive/README.md | 0 .../storage/pkg/archive/archive.go | 12 +- .../storage/pkg/archive/archive_110.go | 0 .../storage/pkg/archive/archive_19.go | 0 .../storage/pkg/archive/archive_bsd.go | 0 .../storage/pkg/archive/archive_linux.go | 4 +- .../storage/pkg/archive/archive_other.go | 0 .../storage/pkg/archive/archive_unix.go | 4 +- .../storage/pkg/archive/archive_windows.go | 4 +- .../storage/pkg/archive/archive_zstd.go | 0 .../storage/pkg/archive/changes.go | 8 +- .../storage/pkg/archive/changes_linux.go | 4 +- .../storage/pkg/archive/changes_other.go | 4 +- .../storage/pkg/archive/changes_unix.go | 4 +- .../storage/pkg/archive/changes_windows.go | 2 +- .../storage/pkg/archive/copy.go | 2 +- .../storage/pkg/archive/copy_unix.go | 0 .../storage/pkg/archive/copy_windows.go | 0 .../storage/pkg/archive/diff.go | 8 +- .../storage/pkg/archive/fflags_bsd.go | 2 +- .../storage/pkg/archive/fflags_unsupported.go | 0 .../storage/pkg/archive/filter.go | 0 .../storage/pkg/archive/time_linux.go | 0 .../storage/pkg/archive/time_unsupported.go | 0 .../storage/pkg/archive/whiteouts.go | 0 .../storage/pkg/archive/wrap.go | 0 .../storage/pkg/chrootarchive/archive.go | 8 +- .../pkg/chrootarchive/archive_darwin.go | 2 +- .../storage/pkg/chrootarchive/archive_unix.go | 4 +- .../pkg/chrootarchive/archive_windows.go | 4 +- .../storage/pkg/chrootarchive/chroot_linux.go | 2 +- .../storage/pkg/chrootarchive/chroot_unix.go | 0 .../storage/pkg/chrootarchive/diff.go | 2 +- .../storage/pkg/chrootarchive/diff_darwin.go | 2 +- .../storage/pkg/chrootarchive/diff_unix.go | 8 +- .../storage/pkg/chrootarchive/diff_windows.go | 4 +- .../storage/pkg/chrootarchive/init_unix.go | 2 +- .../storage/pkg/chrootarchive/jsoniter.go | 0 .../storage/pkg/chunked/bloom_filter_linux.go | 0 .../storage/pkg/chunked/cache_linux.go | 8 +- .../storage/pkg/chunked/compression.go | 4 +- .../storage/pkg/chunked/compression_linux.go | 2 +- .../pkg/chunked/compressor/compressor.go | 4 +- .../storage/pkg/chunked/compressor/rollsum.go | 0 .../storage/pkg/chunked/dump/dump.go | 4 +- .../storage/pkg/chunked/filesystem_linux.go | 8 +- .../chunked/internal/minimal/compression.go | 2 +- .../storage/pkg/chunked/internal/path/path.go | 0 .../storage/pkg/chunked/storage.go | 0 .../storage/pkg/chunked/storage_linux.go | 20 +- .../pkg/chunked/storage_unsupported.go | 4 +- .../storage/pkg/chunked/toc/toc.go | 2 +- .../storage/pkg/config/config.go | 0 .../storage/pkg/directory/directory.go | 0 .../storage/pkg/directory/directory_unix.go | 0 .../pkg/directory/directory_windows.go | 0 .../storage/pkg/fileutils/exists_freebsd.go | 0 .../storage/pkg/fileutils/exists_unix.go | 0 .../storage/pkg/fileutils/exists_windows.go | 0 .../storage/pkg/fileutils/fileutils.go | 0 .../storage/pkg/fileutils/fileutils_darwin.go | 0 .../pkg/fileutils/fileutils_solaris.go | 0 .../storage/pkg/fileutils/fileutils_unix.go | 0 .../pkg/fileutils/fileutils_windows.go | 0 .../storage/pkg/fileutils/reflink_linux.go | 0 .../pkg/fileutils/reflink_unsupported.go | 0 .../storage/pkg/fsutils/fsutils_linux.go | 0 .../storage/pkg/fsverity/fsverity_linux.go | 0 .../pkg/fsverity/fsverity_unsupported.go | 0 .../storage/pkg/homedir/homedir.go | 0 .../storage/pkg/homedir/homedir_unix.go | 2 +- .../storage/pkg/homedir/homedir_windows.go | 0 .../storage/pkg/idmap/idmapped_utils.go | 2 +- .../pkg/idmap/idmapped_utils_unsupported.go | 2 +- .../storage/pkg/idtools/idtools.go | 2 +- .../storage/pkg/idtools/idtools_supported.go | 0 .../storage/pkg/idtools/idtools_unix.go | 4 +- .../pkg/idtools/idtools_unsupported.go | 0 .../storage/pkg/idtools/idtools_windows.go | 0 .../storage/pkg/idtools/parser.go | 0 .../storage/pkg/idtools/usergroupadd_linux.go | 2 +- .../pkg/idtools/usergroupadd_unsupported.go | 0 .../storage/pkg/idtools/utils_unix.go | 0 .../storage/pkg/ioutils/buffer.go | 0 .../storage/pkg/ioutils/bytespipe.go | 0 .../storage/pkg/ioutils/fswriters.go | 0 .../storage/pkg/ioutils/fswriters_linux.go | 0 .../storage/pkg/ioutils/fswriters_other.go | 0 .../storage/pkg/ioutils/readers.go | 0 .../storage/pkg/ioutils/temp_unix.go | 0 .../storage/pkg/ioutils/temp_windows.go | 2 +- .../storage/pkg/ioutils/writeflusher.go | 0 .../storage/pkg/ioutils/writers.go | 0 .../storage/pkg/locker/README.md | 0 .../storage/pkg/locker/locker.go | 0 .../storage/pkg/lockfile/lastwrite.go | 0 .../storage/pkg/lockfile/lockfile.go | 2 +- .../storage/pkg/lockfile/lockfile_unix.go | 2 +- .../storage/pkg/lockfile/lockfile_windows.go | 0 .../storage/pkg/longpath/longpath.go | 0 .../storage/pkg/loopback/attach_loopback.go | 0 .../storage/pkg/loopback/ioctl.go | 0 .../storage/pkg/loopback/loop_wrapper.go | 0 .../storage/pkg/loopback/loopback.go | 0 .../pkg/loopback/loopback_unsupported.go | 0 .../storage/pkg/mount/flags.go | 0 .../storage/pkg/mount/flags_freebsd.go | 0 .../storage/pkg/mount/flags_linux.go | 0 .../storage/pkg/mount/flags_unsupported.go | 0 .../storage/pkg/mount/mount.go | 0 .../storage/pkg/mount/mounter_freebsd.go | 0 .../storage/pkg/mount/mounter_linux.go | 0 .../storage/pkg/mount/mounter_unsupported.go | 0 .../storage/pkg/mount/mountinfo.go | 0 .../storage/pkg/mount/mountinfo_linux.go | 0 .../storage/pkg/mount/sharedsubtree_linux.go | 0 .../storage/pkg/mount/unmount_unix.go | 0 .../storage/pkg/mount/unmount_unsupported.go | 0 .../storage/pkg/parsers/parsers.go | 0 .../storage/pkg/pools/pools.go | 2 +- .../storage/pkg/promise/promise.go | 0 .../storage/pkg/reexec/README.md | 0 .../storage/pkg/reexec/command_freebsd.go | 0 .../storage/pkg/reexec/command_linux.go | 0 .../storage/pkg/reexec/command_unix.go | 0 .../storage/pkg/reexec/command_unsupported.go | 0 .../storage/pkg/reexec/command_windows.go | 0 .../storage/pkg/reexec/reexec.go | 0 .../storage/pkg/regexp/regexp.go | 0 .../pkg/regexp/regexp_dontprecompile.go | 0 .../storage/pkg/regexp/regexp_precompile.go | 0 .../storage/pkg/stringid/README.md | 0 .../storage/pkg/stringid/stringid.go | 2 +- .../storage/pkg/stringutils/README.md | 0 .../storage/pkg/stringutils/stringutils.go | 0 .../storage/pkg/system/chmod.go | 0 .../storage/pkg/system/chtimes.go | 0 .../storage/pkg/system/chtimes_unix.go | 0 .../storage/pkg/system/chtimes_windows.go | 0 .../storage/pkg/system/errors.go | 0 .../storage/pkg/system/exitcode.go | 0 .../storage/pkg/system/extattr_freebsd.go | 0 .../storage/pkg/system/extattr_unsupported.go | 0 .../storage/pkg/system/init.go | 0 .../storage/pkg/system/init_windows.go | 0 .../storage/pkg/system/lchflags_bsd.go | 0 .../storage/pkg/system/lchown.go | 0 .../storage/pkg/system/lcow_unix.go | 0 .../storage/pkg/system/lcow_windows.go | 0 .../storage/pkg/system/lstat_unix.go | 0 .../storage/pkg/system/lstat_windows.go | 0 .../storage/pkg/system/meminfo.go | 0 .../storage/pkg/system/meminfo_freebsd.go | 0 .../storage/pkg/system/meminfo_linux.go | 0 .../storage/pkg/system/meminfo_solaris.go | 0 .../storage/pkg/system/meminfo_unsupported.go | 0 .../storage/pkg/system/meminfo_windows.go | 0 .../storage/pkg/system/mknod.go | 0 .../storage/pkg/system/mknod_freebsd.go | 0 .../storage/pkg/system/mknod_windows.go | 0 .../storage/pkg/system/path.go | 0 .../storage/pkg/system/path_unix.go | 0 .../storage/pkg/system/path_windows.go | 0 .../storage/pkg/system/process_unix.go | 0 .../storage/pkg/system/rm.go | 2 +- .../storage/pkg/system/rm_common.go | 0 .../storage/pkg/system/rm_freebsd.go | 0 .../storage/pkg/system/stat_common.go | 0 .../storage/pkg/system/stat_darwin.go | 0 .../storage/pkg/system/stat_freebsd.go | 0 .../storage/pkg/system/stat_linux.go | 0 .../storage/pkg/system/stat_netbsd.go | 0 .../storage/pkg/system/stat_openbsd.go | 0 .../storage/pkg/system/stat_solaris.go | 0 .../storage/pkg/system/stat_unix.go | 0 .../storage/pkg/system/stat_windows.go | 0 .../storage/pkg/system/syscall_unix.go | 0 .../storage/pkg/system/syscall_windows.go | 0 .../storage/pkg/system/umask.go | 0 .../storage/pkg/system/umask_windows.go | 0 .../storage/pkg/system/utimes_freebsd.go | 0 .../storage/pkg/system/utimes_linux.go | 0 .../storage/pkg/system/utimes_unsupported.go | 0 .../storage/pkg/system/xattrs_darwin.go | 0 .../storage/pkg/system/xattrs_freebsd.go | 0 .../storage/pkg/system/xattrs_linux.go | 0 .../storage/pkg/system/xattrs_unsupported.go | 0 .../storage/pkg/tarlog/tarlogger.go | 0 .../storage/pkg/truncindex/truncindex.go | 0 .../storage/pkg/unshare/getenv_linux_cgo.go | 0 .../storage/pkg/unshare/getenv_linux_nocgo.go | 0 .../storage/pkg/unshare/unshare.c | 0 .../storage/pkg/unshare/unshare.go | 0 .../storage/pkg/unshare/unshare_cgo.go | 0 .../storage/pkg/unshare/unshare_darwin.go | 2 +- .../storage/pkg/unshare/unshare_freebsd.c | 0 .../storage/pkg/unshare/unshare_freebsd.go | 2 +- .../storage/pkg/unshare/unshare_gccgo.go | 0 .../storage/pkg/unshare/unshare_linux.go | 4 +- .../pkg/unshare/unshare_unsupported.go | 2 +- .../pkg/unshare/unshare_unsupported_cgo.go | 0 .../storage/storage.conf | 0 .../storage/storage.conf-freebsd | 0 .../storage/store.go | 26 +- .../storage/types/default_override_test.conf | 0 .../storage/types/errors.go | 0 .../storage/types/idmappings.go | 2 +- .../storage/types/options.go | 10 +- .../storage/types/options_bsd.go | 0 .../storage/types/options_darwin.go | 0 .../storage/types/options_linux.go | 0 .../storage/types/options_windows.go | 0 .../storage/types/storage_broken.conf | 0 .../storage/types/storage_test.conf | 0 .../storage/types/utils.go | 4 +- .../storage/userns.go | 8 +- .../storage/userns_unsupported.go | 4 +- .../storage/utils.go | 2 +- vendor/modules.txt | 399 +++++++++--------- 1258 files changed, 3187 insertions(+), 3716 deletions(-) delete mode 100644 vendor/github.com/containers/image/v5/signature/internal/sequoia/gosequoia.c delete mode 100644 vendor/github.com/containers/image/v5/signature/internal/sequoia/gosequoia.h delete mode 100644 vendor/github.com/containers/image/v5/signature/internal/sequoia/gosequoiafuncs.h delete mode 100644 vendor/github.com/containers/image/v5/signature/internal/sequoia/sequoia.go delete mode 100644 vendor/github.com/containers/image/v5/signature/internal/sequoia/sequoia.h delete mode 100644 vendor/github.com/containers/image/v5/signature/mechanism_gpgme_only.go delete mode 100644 vendor/github.com/containers/image/v5/signature/mechanism_sequoia.go delete mode 100644 vendor/github.com/containers/storage/drivers/register/register_vfs.go delete mode 100644 vendor/github.com/opencontainers/runc/libcontainer/user/lookup_deprecated.go delete mode 100644 vendor/github.com/opencontainers/runc/libcontainer/user/user_deprecated.go create mode 100644 vendor/go.podman.io/common/LICENSE rename vendor/{github.com/containers => go.podman.io}/common/internal/attributedstring/slice.go (100%) rename vendor/{github.com/containers => go.podman.io}/common/internal/deepcopy.go (100%) rename vendor/{github.com/containers => go.podman.io}/common/libimage/copier.go (97%) rename vendor/{github.com/containers => go.podman.io}/common/libimage/define/manifests.go (97%) rename vendor/{github.com/containers => go.podman.io}/common/libimage/define/platform.go (100%) rename vendor/{github.com/containers => go.podman.io}/common/libimage/define/search.go (100%) rename vendor/{github.com/containers => go.podman.io}/common/libimage/disk_usage.go (99%) rename vendor/{github.com/containers => go.podman.io}/common/libimage/events.go (100%) rename vendor/{github.com/containers => go.podman.io}/common/libimage/filter/filter.go (94%) rename vendor/{github.com/containers => go.podman.io}/common/libimage/filters.go (99%) rename vendor/{github.com/containers => go.podman.io}/common/libimage/history.go (100%) rename vendor/{github.com/containers => go.podman.io}/common/libimage/image.go (99%) rename vendor/{github.com/containers => go.podman.io}/common/libimage/image_config.go (99%) rename vendor/{github.com/containers => go.podman.io}/common/libimage/image_tree.go (100%) rename vendor/{github.com/containers => go.podman.io}/common/libimage/import.go (94%) rename vendor/{github.com/containers => go.podman.io}/common/libimage/inspect.go (98%) rename vendor/{github.com/containers => go.podman.io}/common/libimage/layer_tree.go (99%) rename vendor/{github.com/containers => go.podman.io}/common/libimage/load.go (93%) rename vendor/{github.com/containers => go.podman.io}/common/libimage/manifest_list.go (97%) rename vendor/{github.com/containers => go.podman.io}/common/libimage/manifests/copy.go (87%) rename vendor/{github.com/containers => go.podman.io}/common/libimage/manifests/manifests.go (97%) rename vendor/{github.com/containers => go.podman.io}/common/libimage/normalize.go (98%) rename vendor/{github.com/containers => go.podman.io}/common/libimage/oci.go (100%) rename vendor/{github.com/containers => go.podman.io}/common/libimage/platform.go (91%) rename vendor/{github.com/containers => go.podman.io}/common/libimage/platform/platform.go (100%) rename vendor/{github.com/containers => go.podman.io}/common/libimage/pull.go (97%) rename vendor/{github.com/containers => go.podman.io}/common/libimage/push.go (90%) rename vendor/{github.com/containers => go.podman.io}/common/libimage/runtime.go (98%) rename vendor/{github.com/containers => go.podman.io}/common/libimage/save.go (94%) rename vendor/{github.com/containers => go.podman.io}/common/libimage/search.go (97%) rename vendor/{github.com/containers => go.podman.io}/common/libimage/types.go (85%) rename vendor/{github.com/containers => go.podman.io}/common/libnetwork/cni/README.md (100%) rename vendor/{github.com/containers => go.podman.io}/common/libnetwork/cni/cni_conversion.go (98%) rename vendor/{github.com/containers => go.podman.io}/common/libnetwork/cni/cni_exec.go (98%) rename vendor/{github.com/containers => go.podman.io}/common/libnetwork/cni/cni_types.go (98%) rename vendor/{github.com/containers => go.podman.io}/common/libnetwork/cni/config.go (98%) rename vendor/{github.com/containers => go.podman.io}/common/libnetwork/cni/config_freebsd.go (100%) rename vendor/{github.com/containers => go.podman.io}/common/libnetwork/cni/config_linux.go (100%) rename vendor/{github.com/containers => go.podman.io}/common/libnetwork/cni/network.go (96%) rename vendor/{github.com/containers => go.podman.io}/common/libnetwork/cni/run.go (98%) rename vendor/{github.com/containers => go.podman.io}/common/libnetwork/cni/run_freebsd.go (100%) rename vendor/{github.com/containers => go.podman.io}/common/libnetwork/cni/run_linux.go (100%) rename vendor/{github.com/containers => go.podman.io}/common/libnetwork/etchosts/hosts.go (99%) rename vendor/{github.com/containers => go.podman.io}/common/libnetwork/etchosts/ip.go (94%) rename vendor/{github.com/containers => go.podman.io}/common/libnetwork/etchosts/util.go (95%) rename vendor/{github.com/containers => go.podman.io}/common/libnetwork/internal/rootlessnetns/netns.go (100%) rename vendor/{github.com/containers => go.podman.io}/common/libnetwork/internal/rootlessnetns/netns_freebsd.go (81%) rename vendor/{github.com/containers => go.podman.io}/common/libnetwork/internal/rootlessnetns/netns_linux.go (97%) rename vendor/{github.com/containers => go.podman.io}/common/libnetwork/internal/util/bridge.go (93%) rename vendor/{github.com/containers => go.podman.io}/common/libnetwork/internal/util/create.go (96%) rename vendor/{github.com/containers => go.podman.io}/common/libnetwork/internal/util/interface.go (92%) rename vendor/{github.com/containers => go.podman.io}/common/libnetwork/internal/util/interfaces.go (100%) rename vendor/{github.com/containers => go.podman.io}/common/libnetwork/internal/util/ip.go (100%) rename vendor/{github.com/containers => go.podman.io}/common/libnetwork/internal/util/parse.go (100%) rename vendor/{github.com/containers => go.podman.io}/common/libnetwork/internal/util/util.go (97%) rename vendor/{github.com/containers => go.podman.io}/common/libnetwork/internal/util/validate.go (98%) rename vendor/{github.com/containers => go.podman.io}/common/libnetwork/netavark/config.go (98%) rename vendor/{github.com/containers => go.podman.io}/common/libnetwork/netavark/const.go (100%) rename vendor/{github.com/containers => go.podman.io}/common/libnetwork/netavark/exec.go (100%) rename vendor/{github.com/containers => go.podman.io}/common/libnetwork/netavark/ipam.go (99%) rename vendor/{github.com/containers => go.podman.io}/common/libnetwork/netavark/network.go (97%) rename vendor/{github.com/containers => go.podman.io}/common/libnetwork/netavark/run.go (98%) rename vendor/{github.com/containers => go.podman.io}/common/libnetwork/network/interface.go (94%) rename vendor/{github.com/containers => go.podman.io}/common/libnetwork/network/interface_cni.go (89%) rename vendor/{github.com/containers => go.podman.io}/common/libnetwork/network/interface_cni_unsupported.go (85%) rename vendor/{github.com/containers => go.podman.io}/common/libnetwork/network/interface_freebsd.go (100%) rename vendor/{github.com/containers => go.podman.io}/common/libnetwork/network/interface_linux.go (100%) rename vendor/{github.com/containers => go.podman.io}/common/libnetwork/pasta/pasta_linux.go (98%) rename vendor/{github.com/containers => go.podman.io}/common/libnetwork/pasta/types.go (100%) rename vendor/{github.com/containers => go.podman.io}/common/libnetwork/resolvconf/resolv.go (99%) rename vendor/{github.com/containers => go.podman.io}/common/libnetwork/resolvconf/resolvconf.go (99%) rename vendor/{github.com/containers => go.podman.io}/common/libnetwork/slirp4netns/const.go (100%) rename vendor/{github.com/containers => go.podman.io}/common/libnetwork/slirp4netns/slirp4netns.go (99%) rename vendor/{github.com/containers => go.podman.io}/common/libnetwork/types/const.go (100%) rename vendor/{github.com/containers => go.podman.io}/common/libnetwork/types/define.go (96%) rename vendor/{github.com/containers => go.podman.io}/common/libnetwork/types/network.go (100%) rename vendor/{github.com/containers => go.podman.io}/common/libnetwork/util/filters.go (94%) rename vendor/{github.com/containers => go.podman.io}/common/libnetwork/util/ip.go (100%) rename vendor/{github.com/containers => go.podman.io}/common/libnetwork/util/ip_calc.go (100%) rename vendor/{github.com/containers => go.podman.io}/common/pkg/apparmor/apparmor.go (93%) rename vendor/{github.com/containers => go.podman.io}/common/pkg/apparmor/apparmor_linux.go (98%) rename vendor/{github.com/containers => go.podman.io}/common/pkg/apparmor/apparmor_linux_template.go (100%) rename vendor/{github.com/containers => go.podman.io}/common/pkg/apparmor/apparmor_unsupported.go (100%) rename vendor/{github.com/containers => go.podman.io}/common/pkg/apparmor/internal/supported/supported.go (98%) rename vendor/{github.com/containers => go.podman.io}/common/pkg/auth/auth.go (97%) rename vendor/{github.com/containers => go.podman.io}/common/pkg/auth/cli.go (98%) rename vendor/{github.com/containers => go.podman.io}/common/pkg/capabilities/capabilities.go (100%) rename vendor/{github.com/containers => go.podman.io}/common/pkg/cgroups/blkio_linux.go (100%) rename vendor/{github.com/containers => go.podman.io}/common/pkg/cgroups/cgroups_linux.go (99%) rename vendor/{github.com/containers => go.podman.io}/common/pkg/cgroups/cgroups_unsupported.go (100%) rename vendor/{github.com/containers => go.podman.io}/common/pkg/cgroups/cpu_linux.go (100%) rename vendor/{github.com/containers => go.podman.io}/common/pkg/cgroups/cpuset_linux.go (100%) rename vendor/{github.com/containers => go.podman.io}/common/pkg/cgroups/memory_linux.go (100%) rename vendor/{github.com/containers => go.podman.io}/common/pkg/cgroups/pids_linux.go (100%) rename vendor/{github.com/containers => go.podman.io}/common/pkg/cgroups/systemd_linux.go (100%) rename vendor/{github.com/containers => go.podman.io}/common/pkg/cgroups/utils_linux.go (99%) rename vendor/{github.com/containers => go.podman.io}/common/pkg/cgroupv2/cgroups_linux.go (100%) rename vendor/{github.com/containers => go.podman.io}/common/pkg/cgroupv2/cgroups_unsupported.go (100%) rename vendor/{github.com/containers => go.podman.io}/common/pkg/chown/chown.go (96%) rename vendor/{github.com/containers => go.podman.io}/common/pkg/chown/chown_unix.go (100%) rename vendor/{github.com/containers => go.podman.io}/common/pkg/chown/chown_windows.go (100%) rename vendor/{github.com/containers => go.podman.io}/common/pkg/completion/completion.go (99%) rename vendor/{github.com/containers => go.podman.io}/common/pkg/config/config.go (99%) rename vendor/{github.com/containers => go.podman.io}/common/pkg/config/config_bsd.go (100%) rename vendor/{github.com/containers => go.podman.io}/common/pkg/config/config_darwin.go (100%) rename vendor/{github.com/containers => go.podman.io}/common/pkg/config/config_linux.go (96%) rename vendor/{github.com/containers => go.podman.io}/common/pkg/config/config_local.go (98%) rename vendor/{github.com/containers => go.podman.io}/common/pkg/config/config_remote.go (100%) rename vendor/{github.com/containers => go.podman.io}/common/pkg/config/config_unix.go (95%) rename vendor/{github.com/containers => go.podman.io}/common/pkg/config/config_unsupported.go (100%) rename vendor/{github.com/containers => go.podman.io}/common/pkg/config/config_windows.go (100%) rename vendor/{github.com/containers => go.podman.io}/common/pkg/config/connections.go (98%) rename vendor/{github.com/containers => go.podman.io}/common/pkg/config/containers.conf (100%) rename vendor/{github.com/containers => go.podman.io}/common/pkg/config/containers.conf-freebsd (100%) rename vendor/{github.com/containers => go.podman.io}/common/pkg/config/db_backend.go (100%) rename vendor/{github.com/containers => go.podman.io}/common/pkg/config/default.go (98%) rename vendor/{github.com/containers => go.podman.io}/common/pkg/config/default_bsd.go (100%) rename vendor/{github.com/containers => go.podman.io}/common/pkg/config/default_common.go (100%) rename vendor/{github.com/containers => go.podman.io}/common/pkg/config/default_darwin.go (100%) rename vendor/{github.com/containers => go.podman.io}/common/pkg/config/default_linux.go (100%) rename vendor/{github.com/containers => go.podman.io}/common/pkg/config/default_unsupported.go (100%) rename vendor/{github.com/containers => go.podman.io}/common/pkg/config/default_windows.go (97%) rename vendor/{github.com/containers => go.podman.io}/common/pkg/config/modules.go (97%) rename vendor/{github.com/containers => go.podman.io}/common/pkg/config/new.go (98%) rename vendor/{github.com/containers => go.podman.io}/common/pkg/config/nosystemd.go (100%) rename vendor/{github.com/containers => go.podman.io}/common/pkg/config/pod_exit_policy.go (100%) rename vendor/{github.com/containers => go.podman.io}/common/pkg/config/pull_policy.go (100%) rename vendor/{github.com/containers => go.podman.io}/common/pkg/config/systemd.go (93%) rename vendor/{github.com/containers => go.podman.io}/common/pkg/detach/copy.go (100%) rename vendor/{github.com/containers => go.podman.io}/common/pkg/download/download.go (100%) rename vendor/{github.com/containers => go.podman.io}/common/pkg/filters/filters.go (98%) rename vendor/{github.com/containers => go.podman.io}/common/pkg/flag/flag.go (100%) rename vendor/{github.com/containers => go.podman.io}/common/pkg/hooks/0.1.0/hook.go (97%) rename vendor/{github.com/containers => go.podman.io}/common/pkg/hooks/1.0.0/hook.go (97%) rename vendor/{github.com/containers => go.podman.io}/common/pkg/hooks/1.0.0/when.go (100%) rename vendor/{github.com/containers => go.podman.io}/common/pkg/hooks/README.md (100%) rename vendor/{github.com/containers => go.podman.io}/common/pkg/hooks/exec/exec.go (100%) rename vendor/{github.com/containers => go.podman.io}/common/pkg/hooks/exec/runtimeconfigfilter.go (100%) rename vendor/{github.com/containers => go.podman.io}/common/pkg/hooks/hooks.go (98%) rename vendor/{github.com/containers => go.podman.io}/common/pkg/hooks/monitor.go (96%) rename vendor/{github.com/containers => go.podman.io}/common/pkg/hooks/read.go (95%) rename vendor/{github.com/containers => go.podman.io}/common/pkg/hooks/version.go (100%) rename vendor/{github.com/containers => go.podman.io}/common/pkg/machine/machine.go (100%) rename vendor/{github.com/containers => go.podman.io}/common/pkg/manifests/errors.go (100%) rename vendor/{github.com/containers => go.podman.io}/common/pkg/manifests/manifests.go (99%) rename vendor/{github.com/containers => go.podman.io}/common/pkg/netns/netns_linux.go (98%) rename vendor/{github.com/containers => go.podman.io}/common/pkg/parse/parse.go (99%) rename vendor/{github.com/containers => go.podman.io}/common/pkg/parse/parse_unix.go (96%) rename vendor/{github.com/containers => go.podman.io}/common/pkg/password/password_supported.go (100%) rename vendor/{github.com/containers => go.podman.io}/common/pkg/password/password_windows.go (100%) rename vendor/{github.com/containers => go.podman.io}/common/pkg/report/camelcase/LICENSE.md (100%) rename vendor/{github.com/containers => go.podman.io}/common/pkg/report/camelcase/README.md (100%) rename vendor/{github.com/containers => go.podman.io}/common/pkg/report/camelcase/camelcase.go (100%) rename vendor/{github.com/containers => go.podman.io}/common/pkg/report/doc.go (100%) rename vendor/{github.com/containers => go.podman.io}/common/pkg/report/formatter.go (100%) rename vendor/{github.com/containers => go.podman.io}/common/pkg/report/template.go (98%) rename vendor/{github.com/containers => go.podman.io}/common/pkg/report/validate.go (91%) rename vendor/{github.com/containers => go.podman.io}/common/pkg/report/writer.go (100%) rename vendor/{github.com/containers => go.podman.io}/common/pkg/resize/resize.go (100%) rename vendor/{github.com/containers => go.podman.io}/common/pkg/retry/retry.go (99%) rename vendor/{github.com/containers => go.podman.io}/common/pkg/retry/retry_linux.go (100%) rename vendor/{github.com/containers => go.podman.io}/common/pkg/retry/retry_unsupported.go (100%) rename vendor/{github.com/containers => go.podman.io}/common/pkg/rootlessport/rootlessport_linux.go (91%) rename vendor/{github.com/containers => go.podman.io}/common/pkg/seccomp/conversion.go (100%) rename vendor/{github.com/containers => go.podman.io}/common/pkg/seccomp/default_linux.go (100%) rename vendor/{github.com/containers => go.podman.io}/common/pkg/seccomp/errno_list.go (100%) rename vendor/{github.com/containers => go.podman.io}/common/pkg/seccomp/filter.go (100%) rename vendor/{github.com/containers => go.podman.io}/common/pkg/seccomp/seccomp.json (100%) rename vendor/{github.com/containers => go.podman.io}/common/pkg/seccomp/seccomp_linux.go (100%) rename vendor/{github.com/containers => go.podman.io}/common/pkg/seccomp/seccomp_unsupported.go (100%) rename vendor/{github.com/containers => go.podman.io}/common/pkg/seccomp/supported.go (100%) rename vendor/{github.com/containers => go.podman.io}/common/pkg/seccomp/types.go (100%) rename vendor/{github.com/containers => go.podman.io}/common/pkg/seccomp/validate.go (100%) rename vendor/{github.com/containers => go.podman.io}/common/pkg/secrets/define/secrets.go (100%) rename vendor/{github.com/containers => go.podman.io}/common/pkg/secrets/filedriver/filedriver.go (96%) rename vendor/{github.com/containers => go.podman.io}/common/pkg/secrets/passdriver/passdriver.go (97%) rename vendor/{github.com/containers => go.podman.io}/common/pkg/secrets/secrets.go (96%) rename vendor/{github.com/containers => go.podman.io}/common/pkg/secrets/secretsdb.go (99%) rename vendor/{github.com/containers => go.podman.io}/common/pkg/secrets/shelldriver/shelldriver.go (98%) rename vendor/{github.com/containers => go.podman.io}/common/pkg/servicereaper/service.go (100%) rename vendor/{github.com/containers => go.podman.io}/common/pkg/signal/signal_common.go (100%) rename vendor/{github.com/containers => go.podman.io}/common/pkg/signal/signal_linux.go (100%) rename vendor/{github.com/containers => go.podman.io}/common/pkg/signal/signal_linux_mipsx.go (100%) rename vendor/{github.com/containers => go.podman.io}/common/pkg/signal/signal_unsupported.go (100%) rename vendor/{github.com/containers => go.podman.io}/common/pkg/ssh/connection_golang.go (98%) rename vendor/{github.com/containers => go.podman.io}/common/pkg/ssh/connection_native.go (99%) rename vendor/{github.com/containers => go.podman.io}/common/pkg/ssh/ssh.go (100%) rename vendor/{github.com/containers => go.podman.io}/common/pkg/ssh/types.go (99%) rename vendor/{github.com/containers => go.podman.io}/common/pkg/ssh/utils.go (98%) create mode 100644 vendor/go.podman.io/common/pkg/strongunits/config.go rename vendor/{github.com/containers => go.podman.io}/common/pkg/subscriptions/mounts.conf (100%) rename vendor/{github.com/containers => go.podman.io}/common/pkg/subscriptions/subscriptions.go (99%) rename vendor/{github.com/containers => go.podman.io}/common/pkg/supplemented/errors.go (92%) rename vendor/{github.com/containers => go.podman.io}/common/pkg/supplemented/supplemented.go (98%) rename vendor/{github.com/containers => go.podman.io}/common/pkg/sysinfo/README.md (100%) rename vendor/{github.com/containers => go.podman.io}/common/pkg/sysinfo/numcpu.go (100%) rename vendor/{github.com/containers => go.podman.io}/common/pkg/sysinfo/numcpu_linux.go (100%) rename vendor/{github.com/containers => go.podman.io}/common/pkg/sysinfo/numcpu_other.go (100%) rename vendor/{github.com/containers => go.podman.io}/common/pkg/sysinfo/numcpu_windows.go (100%) rename vendor/{github.com/containers => go.podman.io}/common/pkg/sysinfo/sysinfo.go (98%) rename vendor/{github.com/containers => go.podman.io}/common/pkg/sysinfo/sysinfo_linux.go (98%) rename vendor/{github.com/containers => go.podman.io}/common/pkg/sysinfo/sysinfo_solaris.go (100%) rename vendor/{github.com/containers => go.podman.io}/common/pkg/sysinfo/sysinfo_unix.go (100%) rename vendor/{github.com/containers => go.podman.io}/common/pkg/sysinfo/sysinfo_windows.go (100%) rename vendor/{github.com/containers => go.podman.io}/common/pkg/systemd/systemd_linux.go (97%) rename vendor/{github.com/containers => go.podman.io}/common/pkg/systemd/systemd_unsupported.go (100%) rename vendor/{github.com/containers => go.podman.io}/common/pkg/timetype/timestamp.go (100%) rename vendor/{github.com/containers => go.podman.io}/common/pkg/timezone/timezone.go (98%) rename vendor/{github.com/containers => go.podman.io}/common/pkg/timezone/timezone_linux.go (100%) rename vendor/{github.com/containers => go.podman.io}/common/pkg/timezone/timezone_unix.go (100%) rename vendor/{github.com/containers => go.podman.io}/common/pkg/timezone/timezone_windows.go (100%) rename vendor/{github.com/containers => go.podman.io}/common/pkg/umask/umask.go (96%) rename vendor/{github.com/containers => go.podman.io}/common/pkg/umask/umask_unix.go (100%) rename vendor/{github.com/containers => go.podman.io}/common/pkg/umask/umask_unsupported.go (100%) rename vendor/{github.com/containers => go.podman.io}/common/pkg/util/util.go (97%) rename vendor/{github.com/containers => go.podman.io}/common/pkg/version/version.go (98%) rename vendor/{github.com/containers => go.podman.io}/common/version/version.go (100%) rename vendor/{github.com/containers => go.podman.io}/image/v5/LICENSE (100%) rename vendor/{github.com/containers => go.podman.io}/image/v5/copy/blob.go (98%) rename vendor/{github.com/containers => go.podman.io}/image/v5/copy/compression.go (98%) rename vendor/{github.com/containers => go.podman.io}/image/v5/copy/copy.go (96%) rename vendor/{github.com/containers => go.podman.io}/image/v5/copy/digesting_reader.go (100%) rename vendor/{github.com/containers => go.podman.io}/image/v5/copy/encryption.go (99%) rename vendor/{github.com/containers => go.podman.io}/image/v5/copy/manifest.go (97%) rename vendor/{github.com/containers => go.podman.io}/image/v5/copy/multiple.go (97%) rename vendor/{github.com/containers => go.podman.io}/image/v5/copy/progress_bars.go (98%) rename vendor/{github.com/containers => go.podman.io}/image/v5/copy/progress_channel.go (98%) rename vendor/{github.com/containers => go.podman.io}/image/v5/copy/sign.go (90%) rename vendor/{github.com/containers => go.podman.io}/image/v5/copy/single.go (98%) rename vendor/{github.com/containers => go.podman.io}/image/v5/directory/directory_dest.go (96%) rename vendor/{github.com/containers => go.podman.io}/image/v5/directory/directory_src.go (91%) rename vendor/{github.com/containers => go.podman.io}/image/v5/directory/directory_transport.go (97%) rename vendor/{github.com/containers => go.podman.io}/image/v5/directory/explicitfilepath/path.go (98%) rename vendor/{github.com/containers => go.podman.io}/image/v5/docker/archive/dest.go (94%) rename vendor/{github.com/containers => go.podman.io}/image/v5/docker/archive/reader.go (95%) rename vendor/{github.com/containers => go.podman.io}/image/v5/docker/archive/src.go (88%) rename vendor/{github.com/containers => go.podman.io}/image/v5/docker/archive/transport.go (97%) rename vendor/{github.com/containers => go.podman.io}/image/v5/docker/archive/writer.go (95%) rename vendor/{github.com/containers => go.podman.io}/image/v5/docker/body_reader.go (100%) rename vendor/{github.com/containers => go.podman.io}/image/v5/docker/cache.go (89%) rename vendor/{github.com/containers => go.podman.io}/image/v5/docker/daemon/client.go (98%) rename vendor/{github.com/containers => go.podman.io}/image/v5/docker/daemon/daemon_dest.go (97%) rename vendor/{github.com/containers => go.podman.io}/image/v5/docker/daemon/daemon_src.go (92%) rename vendor/{github.com/containers => go.podman.io}/image/v5/docker/daemon/daemon_transport.go (97%) rename vendor/{github.com/containers => go.podman.io}/image/v5/docker/distribution_error.go (100%) rename vendor/{github.com/containers => go.podman.io}/image/v5/docker/docker_client.go (98%) rename vendor/{github.com/containers => go.podman.io}/image/v5/docker/docker_image.go (96%) rename vendor/{github.com/containers => go.podman.io}/image/v5/docker/docker_image_dest.go (97%) rename vendor/{github.com/containers => go.podman.io}/image/v5/docker/docker_image_src.go (98%) rename vendor/{github.com/containers => go.podman.io}/image/v5/docker/docker_transport.go (97%) rename vendor/{github.com/containers => go.podman.io}/image/v5/docker/errors.go (100%) rename vendor/{github.com/containers => go.podman.io}/image/v5/docker/internal/tarfile/dest.go (95%) rename vendor/{github.com/containers => go.podman.io}/image/v5/docker/internal/tarfile/reader.go (97%) rename vendor/{github.com/containers => go.podman.io}/image/v5/docker/internal/tarfile/src.go (96%) rename vendor/{github.com/containers => go.podman.io}/image/v5/docker/internal/tarfile/types.go (95%) rename vendor/{github.com/containers => go.podman.io}/image/v5/docker/internal/tarfile/writer.go (98%) rename vendor/{github.com/containers => go.podman.io}/image/v5/docker/paths_common.go (100%) rename vendor/{github.com/containers => go.podman.io}/image/v5/docker/paths_freebsd.go (100%) rename vendor/{github.com/containers => go.podman.io}/image/v5/docker/policyconfiguration/naming.go (98%) rename vendor/{github.com/containers => go.podman.io}/image/v5/docker/reference/README.md (100%) rename vendor/{github.com/containers => go.podman.io}/image/v5/docker/reference/helpers.go (100%) rename vendor/{github.com/containers => go.podman.io}/image/v5/docker/reference/normalize.go (100%) rename vendor/{github.com/containers => go.podman.io}/image/v5/docker/reference/reference.go (100%) rename vendor/{github.com/containers => go.podman.io}/image/v5/docker/reference/regexp-additions.go (100%) rename vendor/{github.com/containers => go.podman.io}/image/v5/docker/reference/regexp.go (98%) rename vendor/{github.com/containers => go.podman.io}/image/v5/docker/registries_d.go (98%) rename vendor/{github.com/containers => go.podman.io}/image/v5/docker/wwwauthenticate.go (100%) rename vendor/{github.com/containers => go.podman.io}/image/v5/image/docker_schema2.go (91%) rename vendor/{github.com/containers => go.podman.io}/image/v5/image/sourced.go (95%) rename vendor/{github.com/containers => go.podman.io}/image/v5/image/unparsed.go (90%) rename vendor/{github.com/containers => go.podman.io}/image/v5/internal/blobinfocache/blobinfocache.go (97%) rename vendor/{github.com/containers => go.podman.io}/image/v5/internal/blobinfocache/types.go (97%) rename vendor/{github.com/containers => go.podman.io}/image/v5/internal/image/docker_list.go (91%) rename vendor/{github.com/containers => go.podman.io}/image/v5/internal/image/docker_schema1.go (98%) rename vendor/{github.com/containers => go.podman.io}/image/v5/internal/image/docker_schema2.go (98%) rename vendor/{github.com/containers => go.podman.io}/image/v5/internal/image/manifest.go (97%) rename vendor/{github.com/containers => go.podman.io}/image/v5/internal/image/memory.go (98%) rename vendor/{github.com/containers => go.podman.io}/image/v5/internal/image/oci.go (97%) rename vendor/{github.com/containers => go.podman.io}/image/v5/internal/image/oci_index.go (91%) rename vendor/{github.com/containers => go.podman.io}/image/v5/internal/image/sourced.go (99%) rename vendor/{github.com/containers => go.podman.io}/image/v5/internal/image/unparsed.go (94%) rename vendor/{github.com/containers => go.podman.io}/image/v5/internal/imagedestination/impl/compat.go (96%) rename vendor/{github.com/containers => go.podman.io}/image/v5/internal/imagedestination/impl/helpers.go (82%) rename vendor/{github.com/containers => go.podman.io}/image/v5/internal/imagedestination/impl/properties.go (98%) rename vendor/{github.com/containers => go.podman.io}/image/v5/internal/imagedestination/stubs/original_oci_config.go (100%) rename vendor/{github.com/containers => go.podman.io}/image/v5/internal/imagedestination/stubs/put_blob_partial.go (95%) rename vendor/{github.com/containers => go.podman.io}/image/v5/internal/imagedestination/stubs/signatures.go (97%) rename vendor/{github.com/containers => go.podman.io}/image/v5/internal/imagedestination/stubs/stubs.go (100%) rename vendor/{github.com/containers => go.podman.io}/image/v5/internal/imagedestination/wrapper.go (96%) rename vendor/{github.com/containers => go.podman.io}/image/v5/internal/imagesource/impl/compat.go (94%) rename vendor/{github.com/containers => go.podman.io}/image/v5/internal/imagesource/impl/layer_infos.go (96%) rename vendor/{github.com/containers => go.podman.io}/image/v5/internal/imagesource/impl/properties.go (100%) rename vendor/{github.com/containers => go.podman.io}/image/v5/internal/imagesource/impl/signatures.go (93%) rename vendor/{github.com/containers => go.podman.io}/image/v5/internal/imagesource/stubs/get_blob_at.go (95%) rename vendor/{github.com/containers => go.podman.io}/image/v5/internal/imagesource/stubs/stubs.go (100%) rename vendor/{github.com/containers => go.podman.io}/image/v5/internal/imagesource/wrapper.go (90%) rename vendor/{github.com/containers => go.podman.io}/image/v5/internal/iolimits/iolimits.go (100%) rename vendor/{github.com/containers => go.podman.io}/image/v5/internal/manifest/common.go (100%) rename vendor/{github.com/containers => go.podman.io}/image/v5/internal/manifest/docker_schema2.go (100%) rename vendor/{github.com/containers => go.podman.io}/image/v5/internal/manifest/docker_schema2_list.go (98%) rename vendor/{github.com/containers => go.podman.io}/image/v5/internal/manifest/errors.go (100%) rename vendor/{github.com/containers => go.podman.io}/image/v5/internal/manifest/list.go (97%) rename vendor/{github.com/containers => go.podman.io}/image/v5/internal/manifest/manifest.go (99%) rename vendor/{github.com/containers => go.podman.io}/image/v5/internal/manifest/oci_index.go (99%) rename vendor/{github.com/containers => go.podman.io}/image/v5/internal/multierr/multierr.go (100%) rename vendor/{github.com/containers => go.podman.io}/image/v5/internal/pkg/platform/platform_matcher.go (99%) rename vendor/{github.com/containers => go.podman.io}/image/v5/internal/private/private.go (98%) rename vendor/{github.com/containers => go.podman.io}/image/v5/internal/putblobdigest/put_blob_digest.go (98%) rename vendor/{github.com/containers => go.podman.io}/image/v5/internal/rootless/rootless.go (100%) rename vendor/{github.com/containers => go.podman.io}/image/v5/internal/set/set.go (100%) rename vendor/{github.com/containers => go.podman.io}/image/v5/internal/signature/signature.go (100%) rename vendor/{github.com/containers => go.podman.io}/image/v5/internal/signature/sigstore.go (100%) rename vendor/{github.com/containers => go.podman.io}/image/v5/internal/signature/simple.go (100%) rename vendor/{github.com/containers => go.podman.io}/image/v5/internal/signer/signer.go (94%) rename vendor/{github.com/containers => go.podman.io}/image/v5/internal/streamdigest/stream_digest.go (89%) rename vendor/{github.com/containers => go.podman.io}/image/v5/internal/tmpdir/tmpdir.go (97%) rename vendor/{github.com/containers => go.podman.io}/image/v5/internal/unparsedimage/wrapper.go (86%) rename vendor/{github.com/containers => go.podman.io}/image/v5/internal/uploadreader/upload_reader.go (100%) rename vendor/{github.com/containers => go.podman.io}/image/v5/internal/useragent/useragent.go (83%) rename vendor/{github.com/containers => go.podman.io}/image/v5/manifest/common.go (98%) rename vendor/{github.com/containers => go.podman.io}/image/v5/manifest/docker_schema1.go (97%) rename vendor/{github.com/containers => go.podman.io}/image/v5/manifest/docker_schema2.go (98%) rename vendor/{github.com/containers => go.podman.io}/image/v5/manifest/docker_schema2_list.go (95%) rename vendor/{github.com/containers => go.podman.io}/image/v5/manifest/list.go (95%) rename vendor/{github.com/containers => go.podman.io}/image/v5/manifest/manifest.go (98%) rename vendor/{github.com/containers => go.podman.io}/image/v5/manifest/oci.go (98%) rename vendor/{github.com/containers => go.podman.io}/image/v5/manifest/oci_index.go (94%) rename vendor/{github.com/containers => go.podman.io}/image/v5/oci/archive/oci_dest.go (96%) rename vendor/{github.com/containers => go.podman.io}/image/v5/oci/archive/oci_src.go (95%) rename vendor/{github.com/containers => go.podman.io}/image/v5/oci/archive/oci_transport.go (94%) rename vendor/{github.com/containers => go.podman.io}/image/v5/oci/internal/oci_util.go (100%) rename vendor/{github.com/containers => go.podman.io}/image/v5/oci/layout/oci_delete.go (98%) rename vendor/{github.com/containers => go.podman.io}/image/v5/oci/layout/oci_dest.go (97%) rename vendor/{github.com/containers => go.podman.io}/image/v5/oci/layout/oci_src.go (95%) rename vendor/{github.com/containers => go.podman.io}/image/v5/oci/layout/oci_transport.go (97%) rename vendor/{github.com/containers => go.podman.io}/image/v5/oci/layout/reader.go (96%) rename vendor/{github.com/containers => go.podman.io}/image/v5/openshift/openshift-copies.go (99%) rename vendor/{github.com/containers => go.podman.io}/image/v5/openshift/openshift.go (98%) rename vendor/{github.com/containers => go.podman.io}/image/v5/openshift/openshift_dest.go (95%) rename vendor/{github.com/containers => go.podman.io}/image/v5/openshift/openshift_src.go (95%) rename vendor/{github.com/containers => go.podman.io}/image/v5/openshift/openshift_transport.go (95%) rename vendor/{github.com/containers => go.podman.io}/image/v5/pkg/blobcache/blobcache.go (96%) rename vendor/{github.com/containers => go.podman.io}/image/v5/pkg/blobcache/dest.go (96%) rename vendor/{github.com/containers => go.podman.io}/image/v5/pkg/blobcache/src.go (95%) rename vendor/{github.com/containers => go.podman.io}/image/v5/pkg/blobinfocache/default.go (94%) rename vendor/{github.com/containers => go.podman.io}/image/v5/pkg/blobinfocache/internal/prioritize/prioritize.go (98%) rename vendor/{github.com/containers => go.podman.io}/image/v5/pkg/blobinfocache/memory/memory.go (98%) rename vendor/{github.com/containers => go.podman.io}/image/v5/pkg/blobinfocache/none/none.go (97%) rename vendor/{github.com/containers => go.podman.io}/image/v5/pkg/blobinfocache/sqlite/sqlite.go (99%) rename vendor/{github.com/containers => go.podman.io}/image/v5/pkg/cli/passphrase.go (100%) rename vendor/{github.com/containers => go.podman.io}/image/v5/pkg/cli/sigstore/params/sigstore.go (100%) rename vendor/{github.com/containers => go.podman.io}/image/v5/pkg/cli/sigstore/sigstore.go (92%) rename vendor/{github.com/containers => go.podman.io}/image/v5/pkg/compression/compression.go (97%) rename vendor/{github.com/containers => go.podman.io}/image/v5/pkg/compression/internal/types.go (100%) rename vendor/{github.com/containers => go.podman.io}/image/v5/pkg/compression/types/types.go (97%) rename vendor/{github.com/containers => go.podman.io}/image/v5/pkg/compression/zstd.go (100%) rename vendor/{github.com/containers => go.podman.io}/image/v5/pkg/docker/config/config.go (98%) rename vendor/{github.com/containers => go.podman.io}/image/v5/pkg/shortnames/shortnames.go (98%) rename vendor/{github.com/containers => go.podman.io}/image/v5/pkg/strslice/README.md (100%) rename vendor/{github.com/containers => go.podman.io}/image/v5/pkg/strslice/strslice.go (100%) rename vendor/{github.com/containers => go.podman.io}/image/v5/pkg/sysregistriesv2/paths_common.go (100%) rename vendor/{github.com/containers => go.podman.io}/image/v5/pkg/sysregistriesv2/paths_freebsd.go (100%) rename vendor/{github.com/containers => go.podman.io}/image/v5/pkg/sysregistriesv2/shortnames.go (97%) rename vendor/{github.com/containers => go.podman.io}/image/v5/pkg/sysregistriesv2/system_registries_v2.go (99%) rename vendor/{github.com/containers => go.podman.io}/image/v5/pkg/tlsclientconfig/tlsclientconfig.go (100%) rename vendor/{github.com/containers => go.podman.io}/image/v5/sif/load.go (100%) rename vendor/{github.com/containers => go.podman.io}/image/v5/sif/src.go (96%) rename vendor/{github.com/containers => go.podman.io}/image/v5/sif/transport.go (96%) rename vendor/{github.com/containers => go.podman.io}/image/v5/signature/docker.go (86%) rename vendor/{github.com/containers => go.podman.io}/image/v5/signature/fulcio_cert.go (99%) rename vendor/{github.com/containers => go.podman.io}/image/v5/signature/internal/errors.go (100%) rename vendor/{github.com/containers => go.podman.io}/image/v5/signature/internal/json.go (98%) rename vendor/{github.com/containers => go.podman.io}/image/v5/signature/internal/rekor_api_types.go (100%) rename vendor/{github.com/containers => go.podman.io}/image/v5/signature/internal/rekor_set.go (100%) rename vendor/{github.com/containers => go.podman.io}/image/v5/signature/internal/sigstore_payload.go (99%) rename vendor/{github.com/containers => go.podman.io}/image/v5/signature/mechanism.go (83%) rename vendor/{github.com/containers => go.podman.io}/image/v5/signature/mechanism_gpgme.go (72%) rename vendor/{github.com/containers => go.podman.io}/image/v5/signature/mechanism_openpgp.go (93%) rename vendor/{github.com/containers => go.podman.io}/image/v5/signature/pki_cert.go (97%) rename vendor/{github.com/containers => go.podman.io}/image/v5/signature/policy_config.go (98%) rename vendor/{github.com/containers => go.podman.io}/image/v5/signature/policy_config_sigstore.go (99%) rename vendor/{github.com/containers => go.podman.io}/image/v5/signature/policy_eval.go (98%) rename vendor/{github.com/containers => go.podman.io}/image/v5/signature/policy_eval_baselayer.go (92%) rename vendor/{github.com/containers => go.podman.io}/image/v5/signature/policy_eval_signedby.go (86%) rename vendor/{github.com/containers => go.podman.io}/image/v5/signature/policy_eval_sigstore.go (98%) rename vendor/{github.com/containers => go.podman.io}/image/v5/signature/policy_eval_simple.go (92%) rename vendor/{github.com/containers => go.podman.io}/image/v5/signature/policy_paths_common.go (100%) rename vendor/{github.com/containers => go.podman.io}/image/v5/signature/policy_paths_freebsd.go (100%) rename vendor/{github.com/containers => go.podman.io}/image/v5/signature/policy_reference_match.go (97%) rename vendor/{github.com/containers => go.podman.io}/image/v5/signature/policy_types.go (100%) rename vendor/{github.com/containers => go.podman.io}/image/v5/signature/signer/signer.go (85%) rename vendor/{github.com/containers => go.podman.io}/image/v5/signature/sigstore/copied.go (100%) rename vendor/{github.com/containers => go.podman.io}/image/v5/signature/sigstore/fulcio/fulcio.go (98%) rename vendor/{github.com/containers => go.podman.io}/image/v5/signature/sigstore/generate.go (100%) rename vendor/{github.com/containers => go.podman.io}/image/v5/signature/sigstore/internal/signer.go (94%) rename vendor/{github.com/containers => go.podman.io}/image/v5/signature/sigstore/rekor/leveled_logger.go (100%) rename vendor/{github.com/containers => go.podman.io}/image/v5/signature/sigstore/rekor/openapi_infra.go (97%) rename vendor/{github.com/containers => go.podman.io}/image/v5/signature/sigstore/rekor/rekor.go (98%) rename vendor/{github.com/containers => go.podman.io}/image/v5/signature/sigstore/rekor/rekor_api.go (100%) rename vendor/{github.com/containers => go.podman.io}/image/v5/signature/sigstore/rekor/rekor_api_types.go (100%) rename vendor/{github.com/containers => go.podman.io}/image/v5/signature/sigstore/signer.go (89%) rename vendor/{github.com/containers => go.podman.io}/image/v5/signature/simple.go (89%) rename vendor/{github.com/containers => go.podman.io}/image/v5/signature/simplesigning/signer.go (92%) rename vendor/{github.com/containers => go.podman.io}/image/v5/storage/storage_dest.go (98%) rename vendor/{github.com/containers => go.podman.io}/image/v5/storage/storage_image.go (95%) rename vendor/{github.com/containers => go.podman.io}/image/v5/storage/storage_reference.go (98%) rename vendor/{github.com/containers => go.podman.io}/image/v5/storage/storage_src.go (97%) rename vendor/{github.com/containers => go.podman.io}/image/v5/storage/storage_transport.go (98%) rename vendor/{github.com/containers => go.podman.io}/image/v5/tarball/doc.go (86%) rename vendor/{github.com/containers => go.podman.io}/image/v5/tarball/tarball_reference.go (94%) rename vendor/{github.com/containers => go.podman.io}/image/v5/tarball/tarball_src.go (96%) rename vendor/{github.com/containers => go.podman.io}/image/v5/tarball/tarball_transport.go (95%) rename vendor/{github.com/containers => go.podman.io}/image/v5/transports/alltransports/alltransports.go (76%) rename vendor/{github.com/containers => go.podman.io}/image/v5/transports/alltransports/docker_daemon.go (71%) rename vendor/{github.com/containers => go.podman.io}/image/v5/transports/alltransports/docker_daemon_stub.go (75%) rename vendor/{github.com/containers => go.podman.io}/image/v5/transports/alltransports/storage.go (71%) rename vendor/{github.com/containers => go.podman.io}/image/v5/transports/alltransports/storage_stub.go (75%) rename vendor/{github.com/containers => go.podman.io}/image/v5/transports/stub.go (97%) rename vendor/{github.com/containers => go.podman.io}/image/v5/transports/transports.go (96%) rename vendor/{github.com/containers => go.podman.io}/image/v5/types/types.go (99%) rename vendor/{github.com/containers => go.podman.io}/image/v5/version/version.go (100%) rename vendor/{github.com/containers => go.podman.io}/storage/.cirrus.yml (98%) rename vendor/{github.com/containers => go.podman.io}/storage/.codespellrc (100%) rename vendor/{github.com/containers => go.podman.io}/storage/.dockerignore (100%) rename vendor/{github.com/containers => go.podman.io}/storage/.gitignore (100%) rename vendor/{github.com/containers => go.podman.io}/storage/.golangci.yml (100%) rename vendor/{github.com/containers => go.podman.io}/storage/.mailmap (100%) rename vendor/{github.com/containers => go.podman.io}/storage/AUTHORS (100%) rename vendor/{github.com/containers => go.podman.io}/storage/CODE-OF-CONDUCT.md (100%) rename vendor/{github.com/containers => go.podman.io}/storage/CONTRIBUTING.md (100%) rename vendor/{github.com/containers => go.podman.io}/storage/LICENSE (100%) rename vendor/{github.com/containers => go.podman.io}/storage/Makefile (98%) rename vendor/{github.com/containers => go.podman.io}/storage/NOTICE (100%) rename vendor/{github.com/containers => go.podman.io}/storage/OWNERS (100%) rename vendor/{github.com/containers => go.podman.io}/storage/README.md (100%) rename vendor/{github.com/containers => go.podman.io}/storage/SECURITY.md (100%) rename vendor/{github.com/containers => go.podman.io}/storage/VERSION (100%) rename vendor/{github.com/containers => go.podman.io}/storage/check.go (99%) rename vendor/{github.com/containers => go.podman.io}/storage/containers.go (99%) rename vendor/{github.com/containers => go.podman.io}/storage/deprecated.go (98%) rename vendor/{github.com/containers => go.podman.io}/storage/drivers/aufs/aufs.go (97%) rename vendor/{github.com/containers => go.podman.io}/storage/drivers/aufs/dirs.go (100%) rename vendor/{github.com/containers => go.podman.io}/storage/drivers/aufs/mount.go (100%) rename vendor/{github.com/containers => go.podman.io}/storage/drivers/aufs/mount_linux.go (100%) rename vendor/{github.com/containers => go.podman.io}/storage/drivers/btrfs/btrfs.go (97%) rename vendor/{github.com/containers => go.podman.io}/storage/drivers/btrfs/dummy_unsupported.go (100%) rename vendor/{github.com/containers => go.podman.io}/storage/drivers/btrfs/version.go (100%) rename vendor/{github.com/containers => go.podman.io}/storage/drivers/chown.go (97%) rename vendor/{github.com/containers => go.podman.io}/storage/drivers/chown_darwin.go (96%) rename vendor/{github.com/containers => go.podman.io}/storage/drivers/chown_unix.go (97%) rename vendor/{github.com/containers => go.podman.io}/storage/drivers/chown_windows.go (88%) rename vendor/{github.com/containers => go.podman.io}/storage/drivers/chroot_unix.go (100%) rename vendor/{github.com/containers => go.podman.io}/storage/drivers/chroot_windows.go (100%) rename vendor/{github.com/containers => go.podman.io}/storage/drivers/copy/copy_linux.go (97%) rename vendor/{github.com/containers => go.podman.io}/storage/drivers/copy/copy_unsupported.go (96%) rename vendor/{github.com/containers => go.podman.io}/storage/drivers/counter.go (100%) rename vendor/{github.com/containers => go.podman.io}/storage/drivers/driver.go (98%) rename vendor/{github.com/containers => go.podman.io}/storage/drivers/driver_darwin.go (100%) rename vendor/{github.com/containers => go.podman.io}/storage/drivers/driver_freebsd.go (95%) rename vendor/{github.com/containers => go.podman.io}/storage/drivers/driver_linux.go (99%) rename vendor/{github.com/containers => go.podman.io}/storage/drivers/driver_solaris.go (97%) rename vendor/{github.com/containers => go.podman.io}/storage/drivers/driver_unsupported.go (100%) rename vendor/{github.com/containers => go.podman.io}/storage/drivers/fsdiff.go (96%) rename vendor/{github.com/containers => go.podman.io}/storage/drivers/jsoniter.go (100%) rename vendor/{github.com/containers => go.podman.io}/storage/drivers/overlay/check.go (97%) rename vendor/{github.com/containers => go.podman.io}/storage/drivers/overlay/check_116.go (90%) rename vendor/{github.com/containers => go.podman.io}/storage/drivers/overlay/composefs.go (97%) rename vendor/{github.com/containers => go.podman.io}/storage/drivers/overlay/jsoniter.go (100%) rename vendor/{github.com/containers => go.podman.io}/storage/drivers/overlay/mount.go (99%) rename vendor/{github.com/containers => go.podman.io}/storage/drivers/overlay/overlay.go (99%) rename vendor/{github.com/containers => go.podman.io}/storage/drivers/overlay/overlay_disk_quota.go (92%) rename vendor/{github.com/containers => go.podman.io}/storage/drivers/overlay/overlay_disk_quota_unsupported.go (90%) rename vendor/{github.com/containers => go.podman.io}/storage/drivers/overlay/overlay_unsupported.go (100%) rename vendor/{github.com/containers => go.podman.io}/storage/drivers/overlay/randomid.go (100%) rename vendor/{github.com/containers => go.podman.io}/storage/drivers/overlayutils/overlayutils.go (91%) rename vendor/{github.com/containers => go.podman.io}/storage/drivers/quota/projectquota.go (100%) rename vendor/{github.com/containers => go.podman.io}/storage/drivers/quota/projectquota_supported.go (99%) rename vendor/{github.com/containers => go.podman.io}/storage/drivers/quota/projectquota_unsupported.go (100%) rename vendor/{github.com/containers => go.podman.io}/storage/drivers/register/register_aufs.go (69%) rename vendor/{github.com/containers => go.podman.io}/storage/drivers/register/register_btrfs.go (69%) rename vendor/{github.com/containers => go.podman.io}/storage/drivers/register/register_overlay.go (69%) create mode 100644 vendor/go.podman.io/storage/drivers/register/register_vfs.go rename vendor/{github.com/containers => go.podman.io}/storage/drivers/register/register_zfs.go (76%) rename vendor/{github.com/containers => go.podman.io}/storage/drivers/template.go (97%) rename vendor/{github.com/containers => go.podman.io}/storage/drivers/vfs/copy_linux.go (69%) rename vendor/{github.com/containers => go.podman.io}/storage/drivers/vfs/copy_unsupported.go (52%) rename vendor/{github.com/containers => go.podman.io}/storage/drivers/vfs/driver.go (96%) rename vendor/{github.com/containers => go.podman.io}/storage/drivers/zfs/MAINTAINERS (100%) rename vendor/{github.com/containers => go.podman.io}/storage/drivers/zfs/zfs.go (98%) rename vendor/{github.com/containers => go.podman.io}/storage/drivers/zfs/zfs_freebsd.go (94%) rename vendor/{github.com/containers => go.podman.io}/storage/drivers/zfs/zfs_linux.go (93%) rename vendor/{github.com/containers => go.podman.io}/storage/drivers/zfs/zfs_unsupported.go (100%) rename vendor/{github.com/containers => go.podman.io}/storage/errors.go (99%) rename vendor/{github.com/containers => go.podman.io}/storage/idset.go (98%) rename vendor/{github.com/containers => go.podman.io}/storage/images.go (99%) rename vendor/{github.com/containers => go.podman.io}/storage/internal/dedup/dedup.go (100%) rename vendor/{github.com/containers => go.podman.io}/storage/internal/dedup/dedup_linux.go (100%) rename vendor/{github.com/containers => go.podman.io}/storage/internal/dedup/dedup_unsupported.go (100%) rename vendor/{github.com/containers => go.podman.io}/storage/internal/rawfilelock/rawfilelock.go (100%) rename vendor/{github.com/containers => go.podman.io}/storage/internal/rawfilelock/rawfilelock_unix.go (100%) rename vendor/{github.com/containers => go.podman.io}/storage/internal/rawfilelock/rawfilelock_windows.go (100%) rename vendor/{github.com/containers => go.podman.io}/storage/internal/staging_lockfile/staging_lockfile.go (98%) rename vendor/{github.com/containers => go.podman.io}/storage/internal/tempdir/tempdir.go (99%) rename vendor/{github.com/containers => go.podman.io}/storage/jsoniter.go (100%) rename vendor/{github.com/containers => go.podman.io}/storage/layers.go (99%) rename vendor/{github.com/containers => go.podman.io}/storage/lockfile_compat.go (90%) rename vendor/{github.com/containers => go.podman.io}/storage/pkg/archive/README.md (100%) rename vendor/{github.com/containers => go.podman.io}/storage/pkg/archive/archive.go (99%) rename vendor/{github.com/containers => go.podman.io}/storage/pkg/archive/archive_110.go (100%) rename vendor/{github.com/containers => go.podman.io}/storage/pkg/archive/archive_19.go (100%) rename vendor/{github.com/containers => go.podman.io}/storage/pkg/archive/archive_bsd.go (100%) rename vendor/{github.com/containers => go.podman.io}/storage/pkg/archive/archive_linux.go (98%) rename vendor/{github.com/containers => go.podman.io}/storage/pkg/archive/archive_other.go (100%) rename vendor/{github.com/containers => go.podman.io}/storage/pkg/archive/archive_unix.go (97%) rename vendor/{github.com/containers => go.podman.io}/storage/pkg/archive/archive_windows.go (96%) rename vendor/{github.com/containers => go.podman.io}/storage/pkg/archive/archive_zstd.go (100%) rename vendor/{github.com/containers => go.podman.io}/storage/pkg/archive/changes.go (98%) rename vendor/{github.com/containers => go.podman.io}/storage/pkg/archive/changes_linux.go (99%) rename vendor/{github.com/containers => go.podman.io}/storage/pkg/archive/changes_other.go (96%) rename vendor/{github.com/containers => go.podman.io}/storage/pkg/archive/changes_unix.go (94%) rename vendor/{github.com/containers => go.podman.io}/storage/pkg/archive/changes_windows.go (93%) rename vendor/{github.com/containers => go.podman.io}/storage/pkg/archive/copy.go (99%) rename vendor/{github.com/containers => go.podman.io}/storage/pkg/archive/copy_unix.go (100%) rename vendor/{github.com/containers => go.podman.io}/storage/pkg/archive/copy_windows.go (100%) rename vendor/{github.com/containers => go.podman.io}/storage/pkg/archive/diff.go (97%) rename vendor/{github.com/containers => go.podman.io}/storage/pkg/archive/fflags_bsd.go (98%) rename vendor/{github.com/containers => go.podman.io}/storage/pkg/archive/fflags_unsupported.go (100%) rename vendor/{github.com/containers => go.podman.io}/storage/pkg/archive/filter.go (100%) rename vendor/{github.com/containers => go.podman.io}/storage/pkg/archive/time_linux.go (100%) rename vendor/{github.com/containers => go.podman.io}/storage/pkg/archive/time_unsupported.go (100%) rename vendor/{github.com/containers => go.podman.io}/storage/pkg/archive/whiteouts.go (100%) rename vendor/{github.com/containers => go.podman.io}/storage/pkg/archive/wrap.go (100%) rename vendor/{github.com/containers => go.podman.io}/storage/pkg/chrootarchive/archive.go (97%) rename vendor/{github.com/containers => go.podman.io}/storage/pkg/chrootarchive/archive_darwin.go (94%) rename vendor/{github.com/containers => go.podman.io}/storage/pkg/chrootarchive/archive_unix.go (98%) rename vendor/{github.com/containers => go.podman.io}/storage/pkg/chrootarchive/archive_windows.go (92%) rename vendor/{github.com/containers => go.podman.io}/storage/pkg/chrootarchive/chroot_linux.go (98%) rename vendor/{github.com/containers => go.podman.io}/storage/pkg/chrootarchive/chroot_unix.go (100%) rename vendor/{github.com/containers => go.podman.io}/storage/pkg/chrootarchive/diff.go (94%) rename vendor/{github.com/containers => go.podman.io}/storage/pkg/chrootarchive/diff_darwin.go (95%) rename vendor/{github.com/containers => go.podman.io}/storage/pkg/chrootarchive/diff_unix.go (94%) rename vendor/{github.com/containers => go.podman.io}/storage/pkg/chrootarchive/diff_windows.go (91%) rename vendor/{github.com/containers => go.podman.io}/storage/pkg/chrootarchive/init_unix.go (91%) rename vendor/{github.com/containers => go.podman.io}/storage/pkg/chrootarchive/jsoniter.go (100%) rename vendor/{github.com/containers => go.podman.io}/storage/pkg/chunked/bloom_filter_linux.go (100%) rename vendor/{github.com/containers => go.podman.io}/storage/pkg/chunked/cache_linux.go (99%) rename vendor/{github.com/containers => go.podman.io}/storage/pkg/chunked/compression.go (83%) rename vendor/{github.com/containers => go.podman.io}/storage/pkg/chunked/compression_linux.go (99%) rename vendor/{github.com/containers => go.podman.io}/storage/pkg/chunked/compressor/compressor.go (99%) rename vendor/{github.com/containers => go.podman.io}/storage/pkg/chunked/compressor/rollsum.go (100%) rename vendor/{github.com/containers => go.podman.io}/storage/pkg/chunked/dump/dump.go (97%) rename vendor/{github.com/containers => go.podman.io}/storage/pkg/chunked/filesystem_linux.go (98%) rename vendor/{github.com/containers => go.podman.io}/storage/pkg/chunked/internal/minimal/compression.go (99%) rename vendor/{github.com/containers => go.podman.io}/storage/pkg/chunked/internal/path/path.go (100%) rename vendor/{github.com/containers => go.podman.io}/storage/pkg/chunked/storage.go (100%) rename vendor/{github.com/containers => go.podman.io}/storage/pkg/chunked/storage_linux.go (99%) rename vendor/{github.com/containers => go.podman.io}/storage/pkg/chunked/storage_unsupported.go (85%) rename vendor/{github.com/containers => go.podman.io}/storage/pkg/chunked/toc/toc.go (95%) rename vendor/{github.com/containers => go.podman.io}/storage/pkg/config/config.go (100%) rename vendor/{github.com/containers => go.podman.io}/storage/pkg/directory/directory.go (100%) rename vendor/{github.com/containers => go.podman.io}/storage/pkg/directory/directory_unix.go (100%) rename vendor/{github.com/containers => go.podman.io}/storage/pkg/directory/directory_windows.go (100%) rename vendor/{github.com/containers => go.podman.io}/storage/pkg/fileutils/exists_freebsd.go (100%) rename vendor/{github.com/containers => go.podman.io}/storage/pkg/fileutils/exists_unix.go (100%) rename vendor/{github.com/containers => go.podman.io}/storage/pkg/fileutils/exists_windows.go (100%) rename vendor/{github.com/containers => go.podman.io}/storage/pkg/fileutils/fileutils.go (100%) rename vendor/{github.com/containers => go.podman.io}/storage/pkg/fileutils/fileutils_darwin.go (100%) rename vendor/{github.com/containers => go.podman.io}/storage/pkg/fileutils/fileutils_solaris.go (100%) rename vendor/{github.com/containers => go.podman.io}/storage/pkg/fileutils/fileutils_unix.go (100%) rename vendor/{github.com/containers => go.podman.io}/storage/pkg/fileutils/fileutils_windows.go (100%) rename vendor/{github.com/containers => go.podman.io}/storage/pkg/fileutils/reflink_linux.go (100%) rename vendor/{github.com/containers => go.podman.io}/storage/pkg/fileutils/reflink_unsupported.go (100%) rename vendor/{github.com/containers => go.podman.io}/storage/pkg/fsutils/fsutils_linux.go (100%) rename vendor/{github.com/containers => go.podman.io}/storage/pkg/fsverity/fsverity_linux.go (100%) rename vendor/{github.com/containers => go.podman.io}/storage/pkg/fsverity/fsverity_unsupported.go (100%) rename vendor/{github.com/containers => go.podman.io}/storage/pkg/homedir/homedir.go (100%) rename vendor/{github.com/containers => go.podman.io}/storage/pkg/homedir/homedir_unix.go (99%) rename vendor/{github.com/containers => go.podman.io}/storage/pkg/homedir/homedir_windows.go (100%) rename vendor/{github.com/containers => go.podman.io}/storage/pkg/idmap/idmapped_utils.go (98%) rename vendor/{github.com/containers => go.podman.io}/storage/pkg/idmap/idmapped_utils_unsupported.go (93%) rename vendor/{github.com/containers => go.podman.io}/storage/pkg/idtools/idtools.go (99%) rename vendor/{github.com/containers => go.podman.io}/storage/pkg/idtools/idtools_supported.go (100%) rename vendor/{github.com/containers => go.podman.io}/storage/pkg/idtools/idtools_unix.go (98%) rename vendor/{github.com/containers => go.podman.io}/storage/pkg/idtools/idtools_unsupported.go (100%) rename vendor/{github.com/containers => go.podman.io}/storage/pkg/idtools/idtools_windows.go (100%) rename vendor/{github.com/containers => go.podman.io}/storage/pkg/idtools/parser.go (100%) rename vendor/{github.com/containers => go.podman.io}/storage/pkg/idtools/usergroupadd_linux.go (99%) rename vendor/{github.com/containers => go.podman.io}/storage/pkg/idtools/usergroupadd_unsupported.go (100%) rename vendor/{github.com/containers => go.podman.io}/storage/pkg/idtools/utils_unix.go (100%) rename vendor/{github.com/containers => go.podman.io}/storage/pkg/ioutils/buffer.go (100%) rename vendor/{github.com/containers => go.podman.io}/storage/pkg/ioutils/bytespipe.go (100%) rename vendor/{github.com/containers => go.podman.io}/storage/pkg/ioutils/fswriters.go (100%) rename vendor/{github.com/containers => go.podman.io}/storage/pkg/ioutils/fswriters_linux.go (100%) rename vendor/{github.com/containers => go.podman.io}/storage/pkg/ioutils/fswriters_other.go (100%) rename vendor/{github.com/containers => go.podman.io}/storage/pkg/ioutils/readers.go (100%) rename vendor/{github.com/containers => go.podman.io}/storage/pkg/ioutils/temp_unix.go (100%) rename vendor/{github.com/containers => go.podman.io}/storage/pkg/ioutils/temp_windows.go (87%) rename vendor/{github.com/containers => go.podman.io}/storage/pkg/ioutils/writeflusher.go (100%) rename vendor/{github.com/containers => go.podman.io}/storage/pkg/ioutils/writers.go (100%) rename vendor/{github.com/containers => go.podman.io}/storage/pkg/locker/README.md (100%) rename vendor/{github.com/containers => go.podman.io}/storage/pkg/locker/locker.go (100%) rename vendor/{github.com/containers => go.podman.io}/storage/pkg/lockfile/lastwrite.go (100%) rename vendor/{github.com/containers => go.podman.io}/storage/pkg/lockfile/lockfile.go (99%) rename vendor/{github.com/containers => go.podman.io}/storage/pkg/lockfile/lockfile_unix.go (97%) rename vendor/{github.com/containers => go.podman.io}/storage/pkg/lockfile/lockfile_windows.go (100%) rename vendor/{github.com/containers => go.podman.io}/storage/pkg/longpath/longpath.go (100%) rename vendor/{github.com/containers => go.podman.io}/storage/pkg/loopback/attach_loopback.go (100%) rename vendor/{github.com/containers => go.podman.io}/storage/pkg/loopback/ioctl.go (100%) rename vendor/{github.com/containers => go.podman.io}/storage/pkg/loopback/loop_wrapper.go (100%) rename vendor/{github.com/containers => go.podman.io}/storage/pkg/loopback/loopback.go (100%) rename vendor/{github.com/containers => go.podman.io}/storage/pkg/loopback/loopback_unsupported.go (100%) rename vendor/{github.com/containers => go.podman.io}/storage/pkg/mount/flags.go (100%) rename vendor/{github.com/containers => go.podman.io}/storage/pkg/mount/flags_freebsd.go (100%) rename vendor/{github.com/containers => go.podman.io}/storage/pkg/mount/flags_linux.go (100%) rename vendor/{github.com/containers => go.podman.io}/storage/pkg/mount/flags_unsupported.go (100%) rename vendor/{github.com/containers => go.podman.io}/storage/pkg/mount/mount.go (100%) rename vendor/{github.com/containers => go.podman.io}/storage/pkg/mount/mounter_freebsd.go (100%) rename vendor/{github.com/containers => go.podman.io}/storage/pkg/mount/mounter_linux.go (100%) rename vendor/{github.com/containers => go.podman.io}/storage/pkg/mount/mounter_unsupported.go (100%) rename vendor/{github.com/containers => go.podman.io}/storage/pkg/mount/mountinfo.go (100%) rename vendor/{github.com/containers => go.podman.io}/storage/pkg/mount/mountinfo_linux.go (100%) rename vendor/{github.com/containers => go.podman.io}/storage/pkg/mount/sharedsubtree_linux.go (100%) rename vendor/{github.com/containers => go.podman.io}/storage/pkg/mount/unmount_unix.go (100%) rename vendor/{github.com/containers => go.podman.io}/storage/pkg/mount/unmount_unsupported.go (100%) rename vendor/{github.com/containers => go.podman.io}/storage/pkg/parsers/parsers.go (100%) rename vendor/{github.com/containers => go.podman.io}/storage/pkg/pools/pools.go (98%) rename vendor/{github.com/containers => go.podman.io}/storage/pkg/promise/promise.go (100%) rename vendor/{github.com/containers => go.podman.io}/storage/pkg/reexec/README.md (100%) rename vendor/{github.com/containers => go.podman.io}/storage/pkg/reexec/command_freebsd.go (100%) rename vendor/{github.com/containers => go.podman.io}/storage/pkg/reexec/command_linux.go (100%) rename vendor/{github.com/containers => go.podman.io}/storage/pkg/reexec/command_unix.go (100%) rename vendor/{github.com/containers => go.podman.io}/storage/pkg/reexec/command_unsupported.go (100%) rename vendor/{github.com/containers => go.podman.io}/storage/pkg/reexec/command_windows.go (100%) rename vendor/{github.com/containers => go.podman.io}/storage/pkg/reexec/reexec.go (100%) rename vendor/{github.com/containers => go.podman.io}/storage/pkg/regexp/regexp.go (100%) rename vendor/{github.com/containers => go.podman.io}/storage/pkg/regexp/regexp_dontprecompile.go (100%) rename vendor/{github.com/containers => go.podman.io}/storage/pkg/regexp/regexp_precompile.go (100%) rename vendor/{github.com/containers => go.podman.io}/storage/pkg/stringid/README.md (100%) rename vendor/{github.com/containers => go.podman.io}/storage/pkg/stringid/stringid.go (98%) rename vendor/{github.com/containers => go.podman.io}/storage/pkg/stringutils/README.md (100%) rename vendor/{github.com/containers => go.podman.io}/storage/pkg/stringutils/stringutils.go (100%) rename vendor/{github.com/containers => go.podman.io}/storage/pkg/system/chmod.go (100%) rename vendor/{github.com/containers => go.podman.io}/storage/pkg/system/chtimes.go (100%) rename vendor/{github.com/containers => go.podman.io}/storage/pkg/system/chtimes_unix.go (100%) rename vendor/{github.com/containers => go.podman.io}/storage/pkg/system/chtimes_windows.go (100%) rename vendor/{github.com/containers => go.podman.io}/storage/pkg/system/errors.go (100%) rename vendor/{github.com/containers => go.podman.io}/storage/pkg/system/exitcode.go (100%) rename vendor/{github.com/containers => go.podman.io}/storage/pkg/system/extattr_freebsd.go (100%) rename vendor/{github.com/containers => go.podman.io}/storage/pkg/system/extattr_unsupported.go (100%) rename vendor/{github.com/containers => go.podman.io}/storage/pkg/system/init.go (100%) rename vendor/{github.com/containers => go.podman.io}/storage/pkg/system/init_windows.go (100%) rename vendor/{github.com/containers => go.podman.io}/storage/pkg/system/lchflags_bsd.go (100%) rename vendor/{github.com/containers => go.podman.io}/storage/pkg/system/lchown.go (100%) rename vendor/{github.com/containers => go.podman.io}/storage/pkg/system/lcow_unix.go (100%) rename vendor/{github.com/containers => go.podman.io}/storage/pkg/system/lcow_windows.go (100%) rename vendor/{github.com/containers => go.podman.io}/storage/pkg/system/lstat_unix.go (100%) rename vendor/{github.com/containers => go.podman.io}/storage/pkg/system/lstat_windows.go (100%) rename vendor/{github.com/containers => go.podman.io}/storage/pkg/system/meminfo.go (100%) rename vendor/{github.com/containers => go.podman.io}/storage/pkg/system/meminfo_freebsd.go (100%) rename vendor/{github.com/containers => go.podman.io}/storage/pkg/system/meminfo_linux.go (100%) rename vendor/{github.com/containers => go.podman.io}/storage/pkg/system/meminfo_solaris.go (100%) rename vendor/{github.com/containers => go.podman.io}/storage/pkg/system/meminfo_unsupported.go (100%) rename vendor/{github.com/containers => go.podman.io}/storage/pkg/system/meminfo_windows.go (100%) rename vendor/{github.com/containers => go.podman.io}/storage/pkg/system/mknod.go (100%) rename vendor/{github.com/containers => go.podman.io}/storage/pkg/system/mknod_freebsd.go (100%) rename vendor/{github.com/containers => go.podman.io}/storage/pkg/system/mknod_windows.go (100%) rename vendor/{github.com/containers => go.podman.io}/storage/pkg/system/path.go (100%) rename vendor/{github.com/containers => go.podman.io}/storage/pkg/system/path_unix.go (100%) rename vendor/{github.com/containers => go.podman.io}/storage/pkg/system/path_windows.go (100%) rename vendor/{github.com/containers => go.podman.io}/storage/pkg/system/process_unix.go (100%) rename vendor/{github.com/containers => go.podman.io}/storage/pkg/system/rm.go (98%) rename vendor/{github.com/containers => go.podman.io}/storage/pkg/system/rm_common.go (100%) rename vendor/{github.com/containers => go.podman.io}/storage/pkg/system/rm_freebsd.go (100%) rename vendor/{github.com/containers => go.podman.io}/storage/pkg/system/stat_common.go (100%) rename vendor/{github.com/containers => go.podman.io}/storage/pkg/system/stat_darwin.go (100%) rename vendor/{github.com/containers => go.podman.io}/storage/pkg/system/stat_freebsd.go (100%) rename vendor/{github.com/containers => go.podman.io}/storage/pkg/system/stat_linux.go (100%) rename vendor/{github.com/containers => go.podman.io}/storage/pkg/system/stat_netbsd.go (100%) rename vendor/{github.com/containers => go.podman.io}/storage/pkg/system/stat_openbsd.go (100%) rename vendor/{github.com/containers => go.podman.io}/storage/pkg/system/stat_solaris.go (100%) rename vendor/{github.com/containers => go.podman.io}/storage/pkg/system/stat_unix.go (100%) rename vendor/{github.com/containers => go.podman.io}/storage/pkg/system/stat_windows.go (100%) rename vendor/{github.com/containers => go.podman.io}/storage/pkg/system/syscall_unix.go (100%) rename vendor/{github.com/containers => go.podman.io}/storage/pkg/system/syscall_windows.go (100%) rename vendor/{github.com/containers => go.podman.io}/storage/pkg/system/umask.go (100%) rename vendor/{github.com/containers => go.podman.io}/storage/pkg/system/umask_windows.go (100%) rename vendor/{github.com/containers => go.podman.io}/storage/pkg/system/utimes_freebsd.go (100%) rename vendor/{github.com/containers => go.podman.io}/storage/pkg/system/utimes_linux.go (100%) rename vendor/{github.com/containers => go.podman.io}/storage/pkg/system/utimes_unsupported.go (100%) rename vendor/{github.com/containers => go.podman.io}/storage/pkg/system/xattrs_darwin.go (100%) rename vendor/{github.com/containers => go.podman.io}/storage/pkg/system/xattrs_freebsd.go (100%) rename vendor/{github.com/containers => go.podman.io}/storage/pkg/system/xattrs_linux.go (100%) rename vendor/{github.com/containers => go.podman.io}/storage/pkg/system/xattrs_unsupported.go (100%) rename vendor/{github.com/containers => go.podman.io}/storage/pkg/tarlog/tarlogger.go (100%) rename vendor/{github.com/containers => go.podman.io}/storage/pkg/truncindex/truncindex.go (100%) rename vendor/{github.com/containers => go.podman.io}/storage/pkg/unshare/getenv_linux_cgo.go (100%) rename vendor/{github.com/containers => go.podman.io}/storage/pkg/unshare/getenv_linux_nocgo.go (100%) rename vendor/{github.com/containers => go.podman.io}/storage/pkg/unshare/unshare.c (100%) rename vendor/{github.com/containers => go.podman.io}/storage/pkg/unshare/unshare.go (100%) rename vendor/{github.com/containers => go.podman.io}/storage/pkg/unshare/unshare_cgo.go (100%) rename vendor/{github.com/containers => go.podman.io}/storage/pkg/unshare/unshare_darwin.go (97%) rename vendor/{github.com/containers => go.podman.io}/storage/pkg/unshare/unshare_freebsd.c (100%) rename vendor/{github.com/containers => go.podman.io}/storage/pkg/unshare/unshare_freebsd.go (98%) rename vendor/{github.com/containers => go.podman.io}/storage/pkg/unshare/unshare_gccgo.go (100%) rename vendor/{github.com/containers => go.podman.io}/storage/pkg/unshare/unshare_linux.go (99%) rename vendor/{github.com/containers => go.podman.io}/storage/pkg/unshare/unshare_unsupported.go (97%) rename vendor/{github.com/containers => go.podman.io}/storage/pkg/unshare/unshare_unsupported_cgo.go (100%) rename vendor/{github.com/containers => go.podman.io}/storage/storage.conf (100%) rename vendor/{github.com/containers => go.podman.io}/storage/storage.conf-freebsd (100%) rename vendor/{github.com/containers => go.podman.io}/storage/store.go (99%) rename vendor/{github.com/containers => go.podman.io}/storage/types/default_override_test.conf (100%) rename vendor/{github.com/containers => go.podman.io}/storage/types/errors.go (100%) rename vendor/{github.com/containers => go.podman.io}/storage/types/idmappings.go (98%) rename vendor/{github.com/containers => go.podman.io}/storage/types/options.go (98%) rename vendor/{github.com/containers => go.podman.io}/storage/types/options_bsd.go (100%) rename vendor/{github.com/containers => go.podman.io}/storage/types/options_darwin.go (100%) rename vendor/{github.com/containers => go.podman.io}/storage/types/options_linux.go (100%) rename vendor/{github.com/containers => go.podman.io}/storage/types/options_windows.go (100%) rename vendor/{github.com/containers => go.podman.io}/storage/types/storage_broken.conf (100%) rename vendor/{github.com/containers => go.podman.io}/storage/types/storage_test.conf (100%) rename vendor/{github.com/containers => go.podman.io}/storage/types/utils.go (95%) rename vendor/{github.com/containers => go.podman.io}/storage/userns.go (98%) rename vendor/{github.com/containers => go.podman.io}/storage/userns_unsupported.go (77%) rename vendor/{github.com/containers => go.podman.io}/storage/utils.go (97%) diff --git a/cmd/podman-mac-helper/install.go b/cmd/podman-mac-helper/install.go index 62e91212021..8c821a41079 100644 --- a/cmd/podman-mac-helper/install.go +++ b/cmd/podman-mac-helper/install.go @@ -14,8 +14,8 @@ import ( "syscall" "text/template" - "github.com/containers/storage/pkg/fileutils" "github.com/spf13/cobra" + "go.podman.io/storage/pkg/fileutils" ) const ( diff --git a/cmd/podman-mac-helper/uninstall.go b/cmd/podman-mac-helper/uninstall.go index 460516d56cf..edb5a7a6612 100644 --- a/cmd/podman-mac-helper/uninstall.go +++ b/cmd/podman-mac-helper/uninstall.go @@ -10,8 +10,8 @@ import ( "os/exec" "path/filepath" - "github.com/containers/storage/pkg/fileutils" "github.com/spf13/cobra" + "go.podman.io/storage/pkg/fileutils" ) var uninstallCmd = &cobra.Command{ diff --git a/cmd/podman-testing/create.go b/cmd/podman-testing/create.go index 99cb2917718..667e3264496 100644 --- a/cmd/podman-testing/create.go +++ b/cmd/podman-testing/create.go @@ -5,10 +5,10 @@ package main import ( "fmt" - "github.com/containers/common/pkg/completion" "github.com/containers/podman/v5/cmd/podman/validate" "github.com/containers/podman/v5/internal/domain/entities" "github.com/spf13/cobra" + "go.podman.io/common/pkg/completion" ) var ( diff --git a/cmd/podman-testing/data.go b/cmd/podman-testing/data.go index 81333cba3ff..613785ca543 100644 --- a/cmd/podman-testing/data.go +++ b/cmd/podman-testing/data.go @@ -6,10 +6,10 @@ import ( "errors" "os" - "github.com/containers/common/pkg/completion" "github.com/containers/podman/v5/cmd/podman/validate" "github.com/containers/podman/v5/internal/domain/entities" "github.com/spf13/cobra" + "go.podman.io/common/pkg/completion" ) var ( diff --git a/cmd/podman-testing/layer.go b/cmd/podman-testing/layer.go index 2b21ae2f6d0..5e845f968a6 100644 --- a/cmd/podman-testing/layer.go +++ b/cmd/podman-testing/layer.go @@ -6,10 +6,10 @@ import ( "errors" "os" - "github.com/containers/common/pkg/completion" "github.com/containers/podman/v5/cmd/podman/validate" "github.com/containers/podman/v5/internal/domain/entities" "github.com/spf13/cobra" + "go.podman.io/common/pkg/completion" ) var ( diff --git a/cmd/podman-testing/main.go b/cmd/podman-testing/main.go index e883a6b84e2..73ed17645e1 100644 --- a/cmd/podman-testing/main.go +++ b/cmd/podman-testing/main.go @@ -10,16 +10,16 @@ import ( "os/exec" "syscall" - "github.com/containers/common/pkg/config" _ "github.com/containers/podman/v5/cmd/podman/completion" ientities "github.com/containers/podman/v5/internal/domain/entities" "github.com/containers/podman/v5/internal/domain/infra" "github.com/containers/podman/v5/pkg/domain/entities" - "github.com/containers/storage" - "github.com/containers/storage/pkg/reexec" - "github.com/containers/storage/pkg/unshare" "github.com/sirupsen/logrus" "github.com/spf13/cobra" + "go.podman.io/common/pkg/config" + "go.podman.io/storage" + "go.podman.io/storage/pkg/reexec" + "go.podman.io/storage/pkg/unshare" ) var ( diff --git a/cmd/podman-testing/remove.go b/cmd/podman-testing/remove.go index 90efefa5878..289dab52121 100644 --- a/cmd/podman-testing/remove.go +++ b/cmd/podman-testing/remove.go @@ -5,10 +5,10 @@ package main import ( "fmt" - "github.com/containers/common/pkg/completion" "github.com/containers/podman/v5/cmd/podman/validate" "github.com/containers/podman/v5/internal/domain/entities" "github.com/spf13/cobra" + "go.podman.io/common/pkg/completion" ) var ( diff --git a/cmd/podman-testing/store_supported.go b/cmd/podman-testing/store_supported.go index b7a221ceb14..9cd28438803 100644 --- a/cmd/podman-testing/store_supported.go +++ b/cmd/podman-testing/store_supported.go @@ -7,8 +7,8 @@ import ( "os" "github.com/containers/podman/v5/pkg/domain/entities" - "github.com/containers/storage" - "github.com/containers/storage/types" + "go.podman.io/storage" + "go.podman.io/storage/types" ) var ( diff --git a/cmd/podman/artifact/add.go b/cmd/podman/artifact/add.go index 6049be02f59..1253d2fe6c2 100644 --- a/cmd/podman/artifact/add.go +++ b/cmd/podman/artifact/add.go @@ -4,12 +4,12 @@ import ( "fmt" "path/filepath" - "github.com/containers/common/pkg/completion" "github.com/containers/podman/v5/cmd/podman/common" "github.com/containers/podman/v5/cmd/podman/registry" "github.com/containers/podman/v5/pkg/domain/entities" "github.com/containers/podman/v5/pkg/domain/utils" "github.com/spf13/cobra" + "go.podman.io/common/pkg/completion" ) var ( diff --git a/cmd/podman/artifact/extract.go b/cmd/podman/artifact/extract.go index 0e488aa67ef..b778f5034fd 100644 --- a/cmd/podman/artifact/extract.go +++ b/cmd/podman/artifact/extract.go @@ -1,11 +1,11 @@ package artifact import ( - "github.com/containers/common/pkg/completion" "github.com/containers/podman/v5/cmd/podman/common" "github.com/containers/podman/v5/cmd/podman/registry" "github.com/containers/podman/v5/pkg/domain/entities" "github.com/spf13/cobra" + "go.podman.io/common/pkg/completion" ) var ( diff --git a/cmd/podman/artifact/list.go b/cmd/podman/artifact/list.go index fa070228160..ca921ac62a1 100644 --- a/cmd/podman/artifact/list.go +++ b/cmd/podman/artifact/list.go @@ -4,15 +4,15 @@ import ( "fmt" "os" - "github.com/containers/common/pkg/completion" - "github.com/containers/common/pkg/report" - "github.com/containers/image/v5/docker/reference" "github.com/containers/podman/v5/cmd/podman/common" "github.com/containers/podman/v5/cmd/podman/registry" "github.com/containers/podman/v5/cmd/podman/validate" "github.com/containers/podman/v5/pkg/domain/entities" "github.com/docker/go-units" "github.com/spf13/cobra" + "go.podman.io/common/pkg/completion" + "go.podman.io/common/pkg/report" + "go.podman.io/image/v5/docker/reference" ) var ( diff --git a/cmd/podman/artifact/pull.go b/cmd/podman/artifact/pull.go index 2cb40e33d2a..12e4e385d6a 100644 --- a/cmd/podman/artifact/pull.go +++ b/cmd/podman/artifact/pull.go @@ -5,14 +5,14 @@ import ( "os" "github.com/containers/buildah/pkg/cli" - "github.com/containers/common/pkg/auth" - "github.com/containers/common/pkg/completion" - "github.com/containers/image/v5/types" "github.com/containers/podman/v5/cmd/podman/common" "github.com/containers/podman/v5/cmd/podman/registry" "github.com/containers/podman/v5/pkg/domain/entities" "github.com/containers/podman/v5/pkg/util" "github.com/spf13/cobra" + "go.podman.io/common/pkg/auth" + "go.podman.io/common/pkg/completion" + "go.podman.io/image/v5/types" ) // pullOptionsWrapper wraps entities.ImagePullOptions and prevents leaking diff --git a/cmd/podman/artifact/push.go b/cmd/podman/artifact/push.go index 98637d55187..e20315fea4b 100644 --- a/cmd/podman/artifact/push.go +++ b/cmd/podman/artifact/push.go @@ -5,14 +5,14 @@ import ( "os" "github.com/containers/buildah/pkg/cli" - "github.com/containers/common/pkg/auth" - "github.com/containers/common/pkg/completion" - "github.com/containers/image/v5/types" "github.com/containers/podman/v5/cmd/podman/common" "github.com/containers/podman/v5/cmd/podman/registry" "github.com/containers/podman/v5/pkg/domain/entities" "github.com/containers/podman/v5/pkg/util" "github.com/spf13/cobra" + "go.podman.io/common/pkg/auth" + "go.podman.io/common/pkg/completion" + "go.podman.io/image/v5/types" ) // pushOptionsWrapper wraps entities.ImagepushOptions and prevents leaking diff --git a/cmd/podman/auto-update.go b/cmd/podman/auto-update.go index dbcbdcb8d41..35fc96661e6 100644 --- a/cmd/podman/auto-update.go +++ b/cmd/podman/auto-update.go @@ -5,15 +5,15 @@ import ( "fmt" "os" - "github.com/containers/common/pkg/auth" - "github.com/containers/common/pkg/completion" - "github.com/containers/common/pkg/report" - "github.com/containers/image/v5/types" "github.com/containers/podman/v5/cmd/podman/common" "github.com/containers/podman/v5/cmd/podman/registry" "github.com/containers/podman/v5/pkg/domain/entities" "github.com/containers/podman/v5/pkg/errorhandling" "github.com/spf13/cobra" + "go.podman.io/common/pkg/auth" + "go.podman.io/common/pkg/completion" + "go.podman.io/common/pkg/report" + "go.podman.io/image/v5/types" ) type cliAutoUpdateOptions struct { diff --git a/cmd/podman/common/build.go b/cmd/podman/common/build.go index 4b5aaa06f9e..d0a5b623e07 100644 --- a/cmd/podman/common/build.go +++ b/cmd/podman/common/build.go @@ -15,11 +15,6 @@ import ( buildahCLI "github.com/containers/buildah/pkg/cli" "github.com/containers/buildah/pkg/parse" buildahUtil "github.com/containers/buildah/pkg/util" - "github.com/containers/common/pkg/auth" - "github.com/containers/common/pkg/completion" - "github.com/containers/common/pkg/config" - "github.com/containers/image/v5/docker/reference" - "github.com/containers/image/v5/types" encconfig "github.com/containers/ocicrypt/config" enchelpers "github.com/containers/ocicrypt/helpers" "github.com/containers/podman/v5/cmd/podman/registry" @@ -29,6 +24,11 @@ import ( "github.com/openshift/imagebuilder" "github.com/sirupsen/logrus" "github.com/spf13/cobra" + "go.podman.io/common/pkg/auth" + "go.podman.io/common/pkg/completion" + "go.podman.io/common/pkg/config" + "go.podman.io/image/v5/docker/reference" + "go.podman.io/image/v5/types" ) // 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 90c0c69210a..d9c2f198fd6 100644 --- a/cmd/podman/common/completion.go +++ b/cmd/podman/common/completion.go @@ -12,12 +12,6 @@ import ( "strings" "unicode" - libimageDefine "github.com/containers/common/libimage/define" - "github.com/containers/common/libnetwork/types" - "github.com/containers/common/pkg/config" - "github.com/containers/common/pkg/ssh" - "github.com/containers/image/v5/pkg/sysregistriesv2" - imageTypes "github.com/containers/image/v5/types" "github.com/containers/podman/v5/cmd/podman/registry" "github.com/containers/podman/v5/libpod/define" "github.com/containers/podman/v5/libpod/events" @@ -28,6 +22,12 @@ import ( "github.com/containers/podman/v5/pkg/util" securejoin "github.com/cyphar/filepath-securejoin" "github.com/spf13/cobra" + libimageDefine "go.podman.io/common/libimage/define" + "go.podman.io/common/libnetwork/types" + "go.podman.io/common/pkg/config" + "go.podman.io/common/pkg/ssh" + "go.podman.io/image/v5/pkg/sysregistriesv2" + imageTypes "go.podman.io/image/v5/types" ) var ( diff --git a/cmd/podman/common/create.go b/cmd/podman/common/create.go index 96ec056e4c7..ef8939a55e1 100644 --- a/cmd/podman/common/create.go +++ b/cmd/podman/common/create.go @@ -4,14 +4,14 @@ import ( "errors" "time" - "github.com/containers/common/pkg/auth" - "github.com/containers/common/pkg/completion" - commonFlag "github.com/containers/common/pkg/flag" - "github.com/containers/image/v5/manifest" "github.com/containers/podman/v5/cmd/podman/registry" "github.com/containers/podman/v5/libpod/define" "github.com/containers/podman/v5/pkg/domain/entities" "github.com/spf13/cobra" + "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" ) const sizeWithUnitFormat = "(format: `[]`, where unit = b (bytes), k (kibibytes), m (mebibytes), or g (gibibytes))" diff --git a/cmd/podman/common/netflags.go b/cmd/podman/common/netflags.go index 64f02974762..69c39ae1a37 100644 --- a/cmd/podman/common/netflags.go +++ b/cmd/podman/common/netflags.go @@ -5,8 +5,6 @@ import ( "fmt" "net" - "github.com/containers/common/libnetwork/types" - "github.com/containers/common/pkg/completion" "github.com/containers/podman/v5/cmd/podman/parse" "github.com/containers/podman/v5/libpod/define" "github.com/containers/podman/v5/pkg/domain/entities" @@ -14,6 +12,8 @@ import ( "github.com/containers/podman/v5/pkg/specgenutil" "github.com/spf13/cobra" "github.com/spf13/pflag" + "go.podman.io/common/libnetwork/types" + "go.podman.io/common/pkg/completion" ) func DefineNetFlags(cmd *cobra.Command) { diff --git a/cmd/podman/common/registries.go b/cmd/podman/common/registries.go index f444585f6cf..df70100c681 100644 --- a/cmd/podman/common/registries.go +++ b/cmd/podman/common/registries.go @@ -3,7 +3,7 @@ package common import ( "os" - "github.com/containers/image/v5/types" + "go.podman.io/image/v5/types" ) // SetRegistriesConfPath sets the registries.conf path for the specified context. diff --git a/cmd/podman/common/sign.go b/cmd/podman/common/sign.go index fbe01d78815..57d1ed617c6 100644 --- a/cmd/podman/common/sign.go +++ b/cmd/podman/common/sign.go @@ -4,14 +4,14 @@ import ( "fmt" "os" - "github.com/containers/common/pkg/completion" - "github.com/containers/common/pkg/ssh" - "github.com/containers/image/v5/pkg/cli" - "github.com/containers/image/v5/pkg/cli/sigstore" - "github.com/containers/image/v5/signature/signer" "github.com/containers/podman/v5/cmd/podman/registry" "github.com/containers/podman/v5/pkg/domain/entities" "github.com/spf13/cobra" + "go.podman.io/common/pkg/completion" + "go.podman.io/common/pkg/ssh" + "go.podman.io/image/v5/pkg/cli" + "go.podman.io/image/v5/pkg/cli/sigstore" + "go.podman.io/image/v5/signature/signer" ) // SigningCLIOnlyOptions contains signing-related CLI options. diff --git a/cmd/podman/completion/completion.go b/cmd/podman/completion/completion.go index 3b6ba3295ed..b6299f40484 100644 --- a/cmd/podman/completion/completion.go +++ b/cmd/podman/completion/completion.go @@ -6,9 +6,9 @@ import ( "os" "strings" - commonComp "github.com/containers/common/pkg/completion" "github.com/containers/podman/v5/cmd/podman/registry" "github.com/spf13/cobra" + commonComp "go.podman.io/common/pkg/completion" ) const ( diff --git a/cmd/podman/containers/checkpoint.go b/cmd/podman/containers/checkpoint.go index ddd64a13513..53fdae8fa54 100644 --- a/cmd/podman/containers/checkpoint.go +++ b/cmd/podman/containers/checkpoint.go @@ -7,7 +7,6 @@ import ( "strings" "time" - "github.com/containers/common/pkg/completion" "github.com/containers/podman/v5/cmd/podman/common" "github.com/containers/podman/v5/cmd/podman/registry" "github.com/containers/podman/v5/cmd/podman/utils" @@ -15,8 +14,9 @@ import ( "github.com/containers/podman/v5/pkg/criu" "github.com/containers/podman/v5/pkg/domain/entities" "github.com/containers/podman/v5/pkg/rootless" - "github.com/containers/storage/pkg/archive" "github.com/spf13/cobra" + "go.podman.io/common/pkg/completion" + "go.podman.io/storage/pkg/archive" ) var ( diff --git a/cmd/podman/containers/cleanup.go b/cmd/podman/containers/cleanup.go index b19b1c2c7c6..6914327e0d8 100644 --- a/cmd/podman/containers/cleanup.go +++ b/cmd/podman/containers/cleanup.go @@ -4,7 +4,6 @@ import ( "errors" "fmt" - "github.com/containers/common/pkg/completion" "github.com/containers/podman/v5/cmd/podman/common" "github.com/containers/podman/v5/cmd/podman/registry" "github.com/containers/podman/v5/cmd/podman/utils" @@ -12,6 +11,7 @@ import ( "github.com/containers/podman/v5/pkg/domain/entities" "github.com/sirupsen/logrus" "github.com/spf13/cobra" + "go.podman.io/common/pkg/completion" ) var ( diff --git a/cmd/podman/containers/commit.go b/cmd/podman/containers/commit.go index 40e816f650b..fe50ac1fcec 100644 --- a/cmd/podman/containers/commit.go +++ b/cmd/podman/containers/commit.go @@ -6,11 +6,11 @@ import ( "os" "strings" - "github.com/containers/common/pkg/completion" "github.com/containers/podman/v5/cmd/podman/common" "github.com/containers/podman/v5/cmd/podman/registry" "github.com/containers/podman/v5/pkg/domain/entities" "github.com/spf13/cobra" + "go.podman.io/common/pkg/completion" ) var ( diff --git a/cmd/podman/containers/cp.go b/cmd/podman/containers/cp.go index 7f9882db8bb..263e1a2ed42 100644 --- a/cmd/podman/containers/cp.go +++ b/cmd/podman/containers/cp.go @@ -18,10 +18,10 @@ import ( "github.com/containers/podman/v5/pkg/copy" "github.com/containers/podman/v5/pkg/domain/entities" "github.com/containers/podman/v5/pkg/errorhandling" - "github.com/containers/storage/pkg/archive" - "github.com/containers/storage/pkg/idtools" "github.com/sirupsen/logrus" "github.com/spf13/cobra" + "go.podman.io/storage/pkg/archive" + "go.podman.io/storage/pkg/idtools" ) var ( diff --git a/cmd/podman/containers/create.go b/cmd/podman/containers/create.go index 97cf0e34059..668cbdfa561 100644 --- a/cmd/podman/containers/create.go +++ b/cmd/podman/containers/create.go @@ -10,10 +10,6 @@ import ( "strings" "github.com/containers/buildah/pkg/cli" - "github.com/containers/common/pkg/auth" - "github.com/containers/common/pkg/config" - "github.com/containers/image/v5/transports/alltransports" - "github.com/containers/image/v5/types" "github.com/containers/podman/v5/cmd/podman/common" "github.com/containers/podman/v5/cmd/podman/registry" "github.com/containers/podman/v5/cmd/podman/utils" @@ -24,6 +20,10 @@ import ( "github.com/containers/podman/v5/pkg/util" "github.com/sirupsen/logrus" "github.com/spf13/cobra" + "go.podman.io/common/pkg/auth" + "go.podman.io/common/pkg/config" + "go.podman.io/image/v5/transports/alltransports" + "go.podman.io/image/v5/types" "golang.org/x/term" ) diff --git a/cmd/podman/containers/exec.go b/cmd/podman/containers/exec.go index 849221e816b..73a06f0d4f0 100644 --- a/cmd/podman/containers/exec.go +++ b/cmd/podman/containers/exec.go @@ -9,7 +9,6 @@ import ( "strings" "time" - "github.com/containers/common/pkg/completion" "github.com/containers/podman/v5/cmd/podman/common" "github.com/containers/podman/v5/cmd/podman/registry" "github.com/containers/podman/v5/cmd/podman/validate" @@ -18,6 +17,7 @@ import ( envLib "github.com/containers/podman/v5/pkg/env" "github.com/containers/podman/v5/pkg/rootless" "github.com/spf13/cobra" + "go.podman.io/common/pkg/completion" ) var ( diff --git a/cmd/podman/containers/export.go b/cmd/podman/containers/export.go index 30b14e5482f..3a10ec13ea9 100644 --- a/cmd/podman/containers/export.go +++ b/cmd/podman/containers/export.go @@ -6,12 +6,12 @@ import ( "os" "strings" - "github.com/containers/common/pkg/completion" "github.com/containers/podman/v5/cmd/podman/common" "github.com/containers/podman/v5/cmd/podman/parse" "github.com/containers/podman/v5/cmd/podman/registry" "github.com/containers/podman/v5/pkg/domain/entities" "github.com/spf13/cobra" + "go.podman.io/common/pkg/completion" "golang.org/x/term" ) diff --git a/cmd/podman/containers/kill.go b/cmd/podman/containers/kill.go index b7ca04953ef..d81e61d5e04 100644 --- a/cmd/podman/containers/kill.go +++ b/cmd/podman/containers/kill.go @@ -7,7 +7,6 @@ import ( "os" "strings" - "github.com/containers/common/pkg/completion" "github.com/containers/podman/v5/cmd/podman/common" "github.com/containers/podman/v5/cmd/podman/registry" "github.com/containers/podman/v5/cmd/podman/utils" @@ -15,6 +14,7 @@ import ( "github.com/containers/podman/v5/pkg/domain/entities" "github.com/containers/podman/v5/pkg/signal" "github.com/spf13/cobra" + "go.podman.io/common/pkg/completion" ) var ( diff --git a/cmd/podman/containers/list.go b/cmd/podman/containers/list.go index 9c9fafa3881..2a044eb23cc 100644 --- a/cmd/podman/containers/list.go +++ b/cmd/podman/containers/list.go @@ -1,10 +1,10 @@ package containers import ( - "github.com/containers/common/pkg/completion" "github.com/containers/podman/v5/cmd/podman/registry" "github.com/containers/podman/v5/cmd/podman/validate" "github.com/spf13/cobra" + "go.podman.io/common/pkg/completion" ) var ( diff --git a/cmd/podman/containers/logs.go b/cmd/podman/containers/logs.go index ebe670ebf19..09ed18f3a26 100644 --- a/cmd/podman/containers/logs.go +++ b/cmd/podman/containers/logs.go @@ -5,7 +5,6 @@ import ( "fmt" "os" - "github.com/containers/common/pkg/completion" "github.com/containers/podman/v5/cmd/podman/common" "github.com/containers/podman/v5/cmd/podman/registry" "github.com/containers/podman/v5/cmd/podman/utils" @@ -13,6 +12,7 @@ import ( "github.com/containers/podman/v5/pkg/domain/entities" "github.com/containers/podman/v5/pkg/util" "github.com/spf13/cobra" + "go.podman.io/common/pkg/completion" ) // logsOptionsWrapper wraps entities.LogsOptions and prevents leaking diff --git a/cmd/podman/containers/mount.go b/cmd/podman/containers/mount.go index c7366bfb861..56c654ca424 100644 --- a/cmd/podman/containers/mount.go +++ b/cmd/podman/containers/mount.go @@ -5,13 +5,13 @@ import ( "fmt" "os" - "github.com/containers/common/pkg/report" "github.com/containers/podman/v5/cmd/podman/common" "github.com/containers/podman/v5/cmd/podman/registry" "github.com/containers/podman/v5/cmd/podman/utils" "github.com/containers/podman/v5/cmd/podman/validate" "github.com/containers/podman/v5/pkg/domain/entities" "github.com/spf13/cobra" + "go.podman.io/common/pkg/report" ) var ( diff --git a/cmd/podman/containers/pause.go b/cmd/podman/containers/pause.go index 2b576278ebf..06d6c3171e1 100644 --- a/cmd/podman/containers/pause.go +++ b/cmd/podman/containers/pause.go @@ -6,13 +6,13 @@ import ( "os" "strings" - "github.com/containers/common/pkg/completion" "github.com/containers/podman/v5/cmd/podman/common" "github.com/containers/podman/v5/cmd/podman/registry" "github.com/containers/podman/v5/cmd/podman/utils" "github.com/containers/podman/v5/cmd/podman/validate" "github.com/containers/podman/v5/pkg/domain/entities" "github.com/spf13/cobra" + "go.podman.io/common/pkg/completion" ) var ( diff --git a/cmd/podman/containers/prune.go b/cmd/podman/containers/prune.go index 0c26c4f0bcd..783ccd31ab9 100644 --- a/cmd/podman/containers/prune.go +++ b/cmd/podman/containers/prune.go @@ -7,7 +7,6 @@ import ( "os" "strings" - "github.com/containers/common/pkg/completion" "github.com/containers/podman/v5/cmd/podman/common" "github.com/containers/podman/v5/cmd/podman/parse" "github.com/containers/podman/v5/cmd/podman/registry" @@ -15,6 +14,7 @@ import ( "github.com/containers/podman/v5/cmd/podman/validate" "github.com/containers/podman/v5/pkg/domain/entities" "github.com/spf13/cobra" + "go.podman.io/common/pkg/completion" ) var ( diff --git a/cmd/podman/containers/ps.go b/cmd/podman/containers/ps.go index 0d5a65b0a03..33c63380d02 100644 --- a/cmd/podman/containers/ps.go +++ b/cmd/podman/containers/ps.go @@ -10,9 +10,6 @@ import ( "strings" "time" - "github.com/containers/common/libnetwork/types" - "github.com/containers/common/pkg/completion" - "github.com/containers/common/pkg/report" "github.com/containers/podman/v5/cmd/podman/common" "github.com/containers/podman/v5/cmd/podman/registry" "github.com/containers/podman/v5/cmd/podman/utils" @@ -21,6 +18,9 @@ import ( "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" ) var ( diff --git a/cmd/podman/containers/ps_test.go b/cmd/podman/containers/ps_test.go index ad2d1ab6638..9d4073e2755 100644 --- a/cmd/podman/containers/ps_test.go +++ b/cmd/podman/containers/ps_test.go @@ -3,8 +3,8 @@ package containers import ( "testing" - "github.com/containers/common/libnetwork/types" "github.com/stretchr/testify/assert" + "go.podman.io/common/libnetwork/types" ) func Test_portsToString(t *testing.T) { diff --git a/cmd/podman/containers/restart.go b/cmd/podman/containers/restart.go index 3b516a3ef33..e2045ca527a 100644 --- a/cmd/podman/containers/restart.go +++ b/cmd/podman/containers/restart.go @@ -6,13 +6,13 @@ import ( "os" "strings" - "github.com/containers/common/pkg/completion" "github.com/containers/podman/v5/cmd/podman/common" "github.com/containers/podman/v5/cmd/podman/registry" "github.com/containers/podman/v5/cmd/podman/utils" "github.com/containers/podman/v5/cmd/podman/validate" "github.com/containers/podman/v5/pkg/domain/entities" "github.com/spf13/cobra" + "go.podman.io/common/pkg/completion" ) var ( diff --git a/cmd/podman/containers/restore.go b/cmd/podman/containers/restore.go index 3938c3813df..c50e9a331a7 100644 --- a/cmd/podman/containers/restore.go +++ b/cmd/podman/containers/restore.go @@ -5,7 +5,6 @@ import ( "fmt" "time" - "github.com/containers/common/pkg/completion" "github.com/containers/podman/v5/cmd/podman/common" "github.com/containers/podman/v5/cmd/podman/registry" "github.com/containers/podman/v5/cmd/podman/utils" @@ -13,6 +12,7 @@ import ( "github.com/containers/podman/v5/pkg/domain/entities" "github.com/containers/podman/v5/pkg/rootless" "github.com/spf13/cobra" + "go.podman.io/common/pkg/completion" ) var ( diff --git a/cmd/podman/containers/rm.go b/cmd/podman/containers/rm.go index 30df1f1ec76..c2d51c5fbe2 100644 --- a/cmd/podman/containers/rm.go +++ b/cmd/podman/containers/rm.go @@ -7,7 +7,6 @@ import ( "os" "strings" - "github.com/containers/common/pkg/completion" "github.com/containers/podman/v5/cmd/podman/common" "github.com/containers/podman/v5/cmd/podman/registry" "github.com/containers/podman/v5/cmd/podman/utils" @@ -16,6 +15,7 @@ import ( "github.com/containers/podman/v5/pkg/domain/entities" "github.com/sirupsen/logrus" "github.com/spf13/cobra" + "go.podman.io/common/pkg/completion" ) var ( diff --git a/cmd/podman/containers/run.go b/cmd/podman/containers/run.go index 665e0082a0e..3b8c2a3b06f 100644 --- a/cmd/podman/containers/run.go +++ b/cmd/podman/containers/run.go @@ -6,8 +6,6 @@ import ( "os" "strings" - "github.com/containers/common/pkg/auth" - "github.com/containers/common/pkg/completion" "github.com/containers/podman/v5/cmd/podman/common" "github.com/containers/podman/v5/cmd/podman/registry" "github.com/containers/podman/v5/cmd/podman/utils" @@ -18,6 +16,8 @@ import ( "github.com/containers/podman/v5/pkg/specgenutil" "github.com/sirupsen/logrus" "github.com/spf13/cobra" + "go.podman.io/common/pkg/auth" + "go.podman.io/common/pkg/completion" "golang.org/x/term" ) diff --git a/cmd/podman/containers/runlabel.go b/cmd/podman/containers/runlabel.go index 7191dd87de9..7d114e14fed 100644 --- a/cmd/podman/containers/runlabel.go +++ b/cmd/podman/containers/runlabel.go @@ -4,14 +4,14 @@ import ( "context" "strings" - "github.com/containers/common/pkg/auth" - "github.com/containers/common/pkg/completion" - "github.com/containers/image/v5/types" "github.com/containers/podman/v5/cmd/podman/common" "github.com/containers/podman/v5/cmd/podman/registry" "github.com/containers/podman/v5/pkg/domain/entities" "github.com/sirupsen/logrus" "github.com/spf13/cobra" + "go.podman.io/common/pkg/auth" + "go.podman.io/common/pkg/completion" + "go.podman.io/image/v5/types" ) // runlabelOptionsWrapper allows for combining API-only with CLI-only options diff --git a/cmd/podman/containers/stats.go b/cmd/podman/containers/stats.go index 17fa6ce54e0..c0c961a32d9 100644 --- a/cmd/podman/containers/stats.go +++ b/cmd/podman/containers/stats.go @@ -6,8 +6,6 @@ import ( "os" "strconv" - "github.com/containers/common/pkg/completion" - "github.com/containers/common/pkg/report" "github.com/containers/podman/v5/cmd/podman/common" "github.com/containers/podman/v5/cmd/podman/registry" putils "github.com/containers/podman/v5/cmd/podman/utils" @@ -16,6 +14,8 @@ import ( "github.com/containers/podman/v5/pkg/domain/entities" "github.com/docker/go-units" "github.com/spf13/cobra" + "go.podman.io/common/pkg/completion" + "go.podman.io/common/pkg/report" ) var ( diff --git a/cmd/podman/containers/stop.go b/cmd/podman/containers/stop.go index 9e4147df997..0ac689269ac 100644 --- a/cmd/podman/containers/stop.go +++ b/cmd/podman/containers/stop.go @@ -7,13 +7,13 @@ import ( "os" "strings" - "github.com/containers/common/pkg/completion" "github.com/containers/podman/v5/cmd/podman/common" "github.com/containers/podman/v5/cmd/podman/registry" "github.com/containers/podman/v5/cmd/podman/utils" "github.com/containers/podman/v5/cmd/podman/validate" "github.com/containers/podman/v5/pkg/domain/entities" "github.com/spf13/cobra" + "go.podman.io/common/pkg/completion" ) var ( diff --git a/cmd/podman/containers/top.go b/cmd/podman/containers/top.go index 0df45744643..963243aaf74 100644 --- a/cmd/podman/containers/top.go +++ b/cmd/podman/containers/top.go @@ -7,7 +7,6 @@ import ( "os" "strings" - "github.com/containers/common/pkg/report" "github.com/containers/podman/v5/cmd/podman/common" "github.com/containers/podman/v5/cmd/podman/registry" "github.com/containers/podman/v5/cmd/podman/validate" @@ -15,6 +14,7 @@ import ( "github.com/containers/podman/v5/pkg/util" "github.com/spf13/cobra" "github.com/spf13/pflag" + "go.podman.io/common/pkg/report" ) var ( diff --git a/cmd/podman/containers/unpause.go b/cmd/podman/containers/unpause.go index ec13b54b151..1d2919c2a16 100644 --- a/cmd/podman/containers/unpause.go +++ b/cmd/podman/containers/unpause.go @@ -7,8 +7,6 @@ import ( "os" "strings" - "github.com/containers/common/pkg/cgroups" - "github.com/containers/common/pkg/completion" "github.com/containers/podman/v5/cmd/podman/common" "github.com/containers/podman/v5/cmd/podman/registry" "github.com/containers/podman/v5/cmd/podman/utils" @@ -16,6 +14,8 @@ import ( "github.com/containers/podman/v5/pkg/domain/entities" "github.com/containers/podman/v5/pkg/rootless" "github.com/spf13/cobra" + "go.podman.io/common/pkg/cgroups" + "go.podman.io/common/pkg/completion" ) var ( diff --git a/cmd/podman/containers/wait.go b/cmd/podman/containers/wait.go index 15d19dbd2db..bc7d57bc07a 100644 --- a/cmd/podman/containers/wait.go +++ b/cmd/podman/containers/wait.go @@ -6,13 +6,13 @@ import ( "fmt" "time" - "github.com/containers/common/pkg/completion" "github.com/containers/podman/v5/cmd/podman/common" "github.com/containers/podman/v5/cmd/podman/registry" "github.com/containers/podman/v5/cmd/podman/utils" "github.com/containers/podman/v5/cmd/podman/validate" "github.com/containers/podman/v5/pkg/domain/entities" "github.com/spf13/cobra" + "go.podman.io/common/pkg/completion" ) var ( diff --git a/cmd/podman/diff/diff.go b/cmd/podman/diff/diff.go index a38660d75dc..b01d8bf676b 100644 --- a/cmd/podman/diff/diff.go +++ b/cmd/podman/diff/diff.go @@ -6,11 +6,11 @@ import ( "fmt" "os" - "github.com/containers/common/pkg/report" "github.com/containers/podman/v5/cmd/podman/registry" "github.com/containers/podman/v5/pkg/domain/entities" - "github.com/containers/storage/pkg/archive" "github.com/spf13/cobra" + "go.podman.io/common/pkg/report" + "go.podman.io/storage/pkg/archive" ) func Diff(_ *cobra.Command, args []string, options entities.DiffOptions) error { diff --git a/cmd/podman/farm/build.go b/cmd/podman/farm/build.go index 649a73b0f34..488672a322a 100644 --- a/cmd/podman/farm/build.go +++ b/cmd/podman/farm/build.go @@ -6,13 +6,13 @@ import ( "os" "strings" - "github.com/containers/common/pkg/completion" "github.com/containers/podman/v5/cmd/podman/common" "github.com/containers/podman/v5/cmd/podman/registry" "github.com/containers/podman/v5/cmd/podman/utils" "github.com/containers/podman/v5/pkg/farm" "github.com/sirupsen/logrus" "github.com/spf13/cobra" + "go.podman.io/common/pkg/completion" ) type buildOptions struct { diff --git a/cmd/podman/farm/create.go b/cmd/podman/farm/create.go index a0171c860e5..9bc4fad00b5 100644 --- a/cmd/podman/farm/create.go +++ b/cmd/podman/farm/create.go @@ -4,11 +4,11 @@ import ( "fmt" "slices" - "github.com/containers/common/pkg/completion" - "github.com/containers/common/pkg/config" "github.com/containers/podman/v5/cmd/podman/registry" "github.com/containers/podman/v5/cmd/podman/validate" "github.com/spf13/cobra" + "go.podman.io/common/pkg/completion" + "go.podman.io/common/pkg/config" ) var ( diff --git a/cmd/podman/farm/list.go b/cmd/podman/farm/list.go index 49be84003af..3ca01f4119f 100644 --- a/cmd/podman/farm/list.go +++ b/cmd/podman/farm/list.go @@ -5,13 +5,13 @@ import ( "os" "sort" - "github.com/containers/common/pkg/completion" - "github.com/containers/common/pkg/config" - "github.com/containers/common/pkg/report" "github.com/containers/podman/v5/cmd/podman/common" "github.com/containers/podman/v5/cmd/podman/registry" "github.com/containers/podman/v5/cmd/podman/validate" "github.com/spf13/cobra" + "go.podman.io/common/pkg/completion" + "go.podman.io/common/pkg/config" + "go.podman.io/common/pkg/report" ) var ( diff --git a/cmd/podman/farm/remove.go b/cmd/podman/farm/remove.go index 96de335404f..d0f515d607a 100644 --- a/cmd/podman/farm/remove.go +++ b/cmd/podman/farm/remove.go @@ -4,12 +4,12 @@ import ( "errors" "fmt" - "github.com/containers/common/pkg/config" "github.com/containers/podman/v5/cmd/podman/common" "github.com/containers/podman/v5/cmd/podman/registry" "github.com/containers/podman/v5/cmd/podman/validate" "github.com/sirupsen/logrus" "github.com/spf13/cobra" + "go.podman.io/common/pkg/config" ) var ( diff --git a/cmd/podman/farm/update.go b/cmd/podman/farm/update.go index 66ced176c22..a26edf26cb9 100644 --- a/cmd/podman/farm/update.go +++ b/cmd/podman/farm/update.go @@ -5,12 +5,12 @@ import ( "fmt" "slices" - "github.com/containers/common/pkg/completion" - "github.com/containers/common/pkg/config" "github.com/containers/podman/v5/cmd/podman/common" "github.com/containers/podman/v5/cmd/podman/registry" "github.com/containers/podman/v5/cmd/podman/validate" "github.com/spf13/cobra" + "go.podman.io/common/pkg/completion" + "go.podman.io/common/pkg/config" ) var ( diff --git a/cmd/podman/generate/spec.go b/cmd/podman/generate/spec.go index 2f27b811d54..e9cb24270f4 100644 --- a/cmd/podman/generate/spec.go +++ b/cmd/podman/generate/spec.go @@ -4,12 +4,12 @@ import ( "fmt" "os" - "github.com/containers/common/pkg/completion" "github.com/containers/podman/v5/cmd/podman/common" "github.com/containers/podman/v5/cmd/podman/registry" "github.com/containers/podman/v5/cmd/podman/utils" "github.com/containers/podman/v5/pkg/domain/entities" "github.com/spf13/cobra" + "go.podman.io/common/pkg/completion" ) var ( diff --git a/cmd/podman/generate/systemd.go b/cmd/podman/generate/systemd.go index 058aeafe571..053bf35d97f 100644 --- a/cmd/podman/generate/systemd.go +++ b/cmd/podman/generate/systemd.go @@ -7,8 +7,6 @@ import ( "os" "path/filepath" - "github.com/containers/common/pkg/completion" - "github.com/containers/common/pkg/report" "github.com/containers/podman/v5/cmd/podman/common" "github.com/containers/podman/v5/cmd/podman/registry" "github.com/containers/podman/v5/cmd/podman/utils" @@ -17,6 +15,8 @@ import ( systemDefine "github.com/containers/podman/v5/pkg/systemd/define" "github.com/sirupsen/logrus" "github.com/spf13/cobra" + "go.podman.io/common/pkg/completion" + "go.podman.io/common/pkg/report" ) const ( diff --git a/cmd/podman/images/history.go b/cmd/podman/images/history.go index ccd3f415050..abdad37ea2c 100644 --- a/cmd/podman/images/history.go +++ b/cmd/podman/images/history.go @@ -5,13 +5,13 @@ import ( "os" "time" - "github.com/containers/common/pkg/report" "github.com/containers/podman/v5/cmd/podman/common" "github.com/containers/podman/v5/cmd/podman/registry" "github.com/containers/podman/v5/cmd/podman/utils" "github.com/containers/podman/v5/pkg/domain/entities" "github.com/docker/go-units" "github.com/spf13/cobra" + "go.podman.io/common/pkg/report" ) var ( diff --git a/cmd/podman/images/import.go b/cmd/podman/images/import.go index 64762606992..f73dd30b1cc 100644 --- a/cmd/podman/images/import.go +++ b/cmd/podman/images/import.go @@ -8,13 +8,13 @@ import ( "os" "strings" - "github.com/containers/common/pkg/completion" "github.com/containers/podman/v5/cmd/podman/common" "github.com/containers/podman/v5/cmd/podman/parse" "github.com/containers/podman/v5/cmd/podman/registry" "github.com/containers/podman/v5/pkg/domain/entities" "github.com/hashicorp/go-multierror" "github.com/spf13/cobra" + "go.podman.io/common/pkg/completion" ) var ( diff --git a/cmd/podman/images/list.go b/cmd/podman/images/list.go index 1b41976fd35..d7f429e0919 100644 --- a/cmd/podman/images/list.go +++ b/cmd/podman/images/list.go @@ -10,14 +10,14 @@ import ( "time" "unicode" - "github.com/containers/common/pkg/report" - "github.com/containers/image/v5/docker/reference" "github.com/containers/podman/v5/cmd/podman/common" "github.com/containers/podman/v5/cmd/podman/registry" "github.com/containers/podman/v5/cmd/podman/validate" "github.com/containers/podman/v5/pkg/domain/entities" "github.com/docker/go-units" "github.com/spf13/cobra" + "go.podman.io/common/pkg/report" + "go.podman.io/image/v5/docker/reference" ) type listFlagType struct { diff --git a/cmd/podman/images/load.go b/cmd/podman/images/load.go index ae9dadb8f38..077784f1b1c 100644 --- a/cmd/podman/images/load.go +++ b/cmd/podman/images/load.go @@ -8,14 +8,14 @@ import ( "os" "strings" - "github.com/containers/common/pkg/completion" - "github.com/containers/common/pkg/download" "github.com/containers/podman/v5/cmd/podman/registry" "github.com/containers/podman/v5/cmd/podman/validate" "github.com/containers/podman/v5/pkg/domain/entities" "github.com/containers/podman/v5/pkg/util" - "github.com/containers/storage/pkg/fileutils" "github.com/spf13/cobra" + "go.podman.io/common/pkg/completion" + "go.podman.io/common/pkg/download" + "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 53a0e8623c3..b4f6fc7274f 100644 --- a/cmd/podman/images/mount.go +++ b/cmd/podman/images/mount.go @@ -5,11 +5,11 @@ import ( "fmt" "os" - "github.com/containers/common/pkg/report" "github.com/containers/podman/v5/cmd/podman/common" "github.com/containers/podman/v5/cmd/podman/registry" "github.com/containers/podman/v5/pkg/domain/entities" "github.com/spf13/cobra" + "go.podman.io/common/pkg/report" ) var ( diff --git a/cmd/podman/images/prune.go b/cmd/podman/images/prune.go index 563faf894c2..9d7415becd4 100644 --- a/cmd/podman/images/prune.go +++ b/cmd/podman/images/prune.go @@ -6,7 +6,6 @@ import ( "os" "strings" - "github.com/containers/common/pkg/completion" "github.com/containers/podman/v5/cmd/podman/common" "github.com/containers/podman/v5/cmd/podman/parse" "github.com/containers/podman/v5/cmd/podman/registry" @@ -14,6 +13,7 @@ import ( "github.com/containers/podman/v5/cmd/podman/validate" "github.com/containers/podman/v5/pkg/domain/entities" "github.com/spf13/cobra" + "go.podman.io/common/pkg/completion" ) var ( diff --git a/cmd/podman/images/pull.go b/cmd/podman/images/pull.go index 6b769189ca6..bbd6b7afb48 100644 --- a/cmd/podman/images/pull.go +++ b/cmd/podman/images/pull.go @@ -7,16 +7,16 @@ import ( "strings" "github.com/containers/buildah/pkg/cli" - "github.com/containers/common/pkg/auth" - "github.com/containers/common/pkg/completion" - "github.com/containers/common/pkg/config" - "github.com/containers/image/v5/types" "github.com/containers/podman/v5/cmd/podman/common" "github.com/containers/podman/v5/cmd/podman/registry" "github.com/containers/podman/v5/cmd/podman/utils" "github.com/containers/podman/v5/pkg/domain/entities" "github.com/containers/podman/v5/pkg/util" "github.com/spf13/cobra" + "go.podman.io/common/pkg/auth" + "go.podman.io/common/pkg/completion" + "go.podman.io/common/pkg/config" + "go.podman.io/image/v5/types" ) // pullOptionsWrapper wraps entities.ImagePullOptions and prevents leaking diff --git a/cmd/podman/images/push.go b/cmd/podman/images/push.go index 96e3c46c9e3..953ee28f470 100644 --- a/cmd/podman/images/push.go +++ b/cmd/podman/images/push.go @@ -5,14 +5,14 @@ import ( "os" "github.com/containers/buildah/pkg/cli" - "github.com/containers/common/pkg/auth" - "github.com/containers/common/pkg/completion" - "github.com/containers/image/v5/types" "github.com/containers/podman/v5/cmd/podman/common" "github.com/containers/podman/v5/cmd/podman/registry" "github.com/containers/podman/v5/pkg/domain/entities" "github.com/containers/podman/v5/pkg/util" "github.com/spf13/cobra" + "go.podman.io/common/pkg/auth" + "go.podman.io/common/pkg/completion" + "go.podman.io/image/v5/types" ) // pushOptionsWrapper wraps entities.ImagepushOptions and prevents leaking diff --git a/cmd/podman/images/save.go b/cmd/podman/images/save.go index 9124fc43cf9..7239515837e 100644 --- a/cmd/podman/images/save.go +++ b/cmd/podman/images/save.go @@ -8,13 +8,13 @@ import ( "slices" "strings" - "github.com/containers/common/pkg/completion" "github.com/containers/podman/v5/cmd/podman/common" "github.com/containers/podman/v5/cmd/podman/parse" "github.com/containers/podman/v5/cmd/podman/registry" "github.com/containers/podman/v5/libpod/define" "github.com/containers/podman/v5/pkg/domain/entities" "github.com/spf13/cobra" + "go.podman.io/common/pkg/completion" "golang.org/x/term" ) diff --git a/cmd/podman/images/scp.go b/cmd/podman/images/scp.go index 976c6732f0a..3007530b2c6 100644 --- a/cmd/podman/images/scp.go +++ b/cmd/podman/images/scp.go @@ -4,11 +4,11 @@ import ( "os" "strings" - "github.com/containers/common/pkg/ssh" "github.com/containers/podman/v5/cmd/podman/common" "github.com/containers/podman/v5/cmd/podman/registry" "github.com/containers/podman/v5/pkg/domain/entities" "github.com/spf13/cobra" + "go.podman.io/common/pkg/ssh" ) var ( diff --git a/cmd/podman/images/search.go b/cmd/podman/images/search.go index 763ead10aba..479ff1d57e8 100644 --- a/cmd/podman/images/search.go +++ b/cmd/podman/images/search.go @@ -6,15 +6,15 @@ import ( "os" "strings" - "github.com/containers/common/pkg/auth" - "github.com/containers/common/pkg/completion" - "github.com/containers/common/pkg/report" - "github.com/containers/image/v5/types" "github.com/containers/podman/v5/cmd/podman/common" "github.com/containers/podman/v5/cmd/podman/registry" "github.com/containers/podman/v5/pkg/domain/entities" "github.com/containers/podman/v5/pkg/util" "github.com/spf13/cobra" + "go.podman.io/common/pkg/auth" + "go.podman.io/common/pkg/completion" + "go.podman.io/common/pkg/report" + "go.podman.io/image/v5/types" ) // searchOptionsWrapper wraps entities.ImagePullOptions and prevents leaking diff --git a/cmd/podman/images/sign.go b/cmd/podman/images/sign.go index f4353b5aec8..3cb229fc192 100644 --- a/cmd/podman/images/sign.go +++ b/cmd/podman/images/sign.go @@ -3,13 +3,13 @@ package images import ( "errors" - "github.com/containers/common/pkg/auth" - "github.com/containers/common/pkg/completion" "github.com/containers/podman/v5/cmd/podman/common" "github.com/containers/podman/v5/cmd/podman/registry" "github.com/containers/podman/v5/pkg/domain/entities" - "github.com/containers/storage/pkg/fileutils" "github.com/spf13/cobra" + "go.podman.io/common/pkg/auth" + "go.podman.io/common/pkg/completion" + "go.podman.io/storage/pkg/fileutils" ) var ( diff --git a/cmd/podman/images/trust_set.go b/cmd/podman/images/trust_set.go index 67ae1d32e05..d71cacfe2dd 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/common/pkg/completion" "github.com/containers/podman/v5/cmd/podman/common" "github.com/containers/podman/v5/cmd/podman/registry" "github.com/containers/podman/v5/pkg/domain/entities" "github.com/spf13/cobra" + "go.podman.io/common/pkg/completion" ) var ( diff --git a/cmd/podman/images/trust_show.go b/cmd/podman/images/trust_show.go index 2462a25f3f6..d09e4305ec3 100644 --- a/cmd/podman/images/trust_show.go +++ b/cmd/podman/images/trust_show.go @@ -4,11 +4,11 @@ import ( "fmt" "os" - "github.com/containers/common/pkg/report" "github.com/containers/podman/v5/cmd/podman/common" "github.com/containers/podman/v5/cmd/podman/registry" "github.com/containers/podman/v5/pkg/domain/entities" "github.com/spf13/cobra" + "go.podman.io/common/pkg/report" ) var ( diff --git a/cmd/podman/images/version.go b/cmd/podman/images/version.go index 1fec5c894bf..3b17bfaf766 100644 --- a/cmd/podman/images/version.go +++ b/cmd/podman/images/version.go @@ -4,10 +4,10 @@ import ( "fmt" "github.com/containers/buildah/define" - "github.com/containers/common/pkg/completion" "github.com/containers/podman/v5/cmd/podman/registry" "github.com/containers/podman/v5/cmd/podman/validate" "github.com/spf13/cobra" + "go.podman.io/common/pkg/completion" ) var ( diff --git a/cmd/podman/inspect/inspect.go b/cmd/podman/inspect/inspect.go index 7fd5db81952..02b4c7cf351 100644 --- a/cmd/podman/inspect/inspect.go +++ b/cmd/podman/inspect/inspect.go @@ -8,13 +8,13 @@ import ( "regexp" "strings" - "github.com/containers/common/pkg/report" "github.com/containers/podman/v5/cmd/podman/common" "github.com/containers/podman/v5/cmd/podman/registry" "github.com/containers/podman/v5/cmd/podman/utils" "github.com/containers/podman/v5/cmd/podman/validate" "github.com/containers/podman/v5/pkg/domain/entities" "github.com/spf13/cobra" + "go.podman.io/common/pkg/report" ) // 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 961fb072f81..03829605005 100644 --- a/cmd/podman/kube/apply.go +++ b/cmd/podman/kube/apply.go @@ -6,12 +6,12 @@ import ( "io" "os" - "github.com/containers/common/pkg/completion" "github.com/containers/podman/v5/cmd/podman/common" "github.com/containers/podman/v5/cmd/podman/registry" "github.com/containers/podman/v5/cmd/podman/utils" "github.com/containers/podman/v5/pkg/domain/entities" "github.com/spf13/cobra" + "go.podman.io/common/pkg/completion" ) var ( diff --git a/cmd/podman/kube/generate.go b/cmd/podman/kube/generate.go index c2cd5eba58d..ae4a9cd4808 100644 --- a/cmd/podman/kube/generate.go +++ b/cmd/podman/kube/generate.go @@ -5,14 +5,14 @@ import ( "io" "os" - "github.com/containers/common/pkg/completion" "github.com/containers/podman/v5/cmd/podman/common" "github.com/containers/podman/v5/cmd/podman/generate" "github.com/containers/podman/v5/cmd/podman/registry" "github.com/containers/podman/v5/cmd/podman/utils" "github.com/containers/podman/v5/pkg/domain/entities" - "github.com/containers/storage/pkg/fileutils" "github.com/spf13/cobra" + "go.podman.io/common/pkg/completion" + "go.podman.io/storage/pkg/fileutils" ) var ( diff --git a/cmd/podman/kube/play.go b/cmd/podman/kube/play.go index 72eba5b81e9..cfa6f39495a 100644 --- a/cmd/podman/kube/play.go +++ b/cmd/podman/kube/play.go @@ -13,9 +13,6 @@ import ( "syscall" buildahParse "github.com/containers/buildah/pkg/parse" - "github.com/containers/common/pkg/auth" - "github.com/containers/common/pkg/completion" - "github.com/containers/image/v5/types" "github.com/containers/podman/v5/cmd/podman/common" "github.com/containers/podman/v5/cmd/podman/parse" "github.com/containers/podman/v5/cmd/podman/registry" @@ -27,6 +24,9 @@ import ( "github.com/containers/podman/v5/pkg/errorhandling" "github.com/containers/podman/v5/pkg/util" "github.com/spf13/cobra" + "go.podman.io/common/pkg/auth" + "go.podman.io/common/pkg/completion" + "go.podman.io/image/v5/types" ) // playKubeOptionsWrapper allows for separating CLI-only fields from API-only diff --git a/cmd/podman/login.go b/cmd/podman/login.go index fe63a4ba3a3..fd30c2d322f 100644 --- a/cmd/podman/login.go +++ b/cmd/podman/login.go @@ -6,13 +6,13 @@ import ( "fmt" "os" - "github.com/containers/common/pkg/auth" - "github.com/containers/common/pkg/completion" - "github.com/containers/image/v5/types" "github.com/containers/podman/v5/cmd/podman/common" "github.com/containers/podman/v5/cmd/podman/registry" "github.com/containers/podman/v5/pkg/domain/entities" "github.com/spf13/cobra" + "go.podman.io/common/pkg/auth" + "go.podman.io/common/pkg/completion" + "go.podman.io/image/v5/types" ) type loginOptionsWrapper struct { diff --git a/cmd/podman/logout.go b/cmd/podman/logout.go index ef2dc17fe7d..5a32fef12eb 100644 --- a/cmd/podman/logout.go +++ b/cmd/podman/logout.go @@ -3,12 +3,12 @@ package main import ( "os" - "github.com/containers/common/pkg/auth" - "github.com/containers/common/pkg/completion" - "github.com/containers/image/v5/types" "github.com/containers/podman/v5/cmd/podman/common" "github.com/containers/podman/v5/cmd/podman/registry" "github.com/spf13/cobra" + "go.podman.io/common/pkg/auth" + "go.podman.io/common/pkg/completion" + "go.podman.io/image/v5/types" ) var ( diff --git a/cmd/podman/machine/client9p.go b/cmd/podman/machine/client9p.go index 1153ecbd002..34b0411e111 100644 --- a/cmd/podman/machine/client9p.go +++ b/cmd/podman/machine/client9p.go @@ -10,11 +10,11 @@ import ( "strconv" "time" - "github.com/containers/common/pkg/completion" "github.com/containers/podman/v5/cmd/podman/registry" "github.com/mdlayher/vsock" "github.com/sirupsen/logrus" "github.com/spf13/cobra" + "go.podman.io/common/pkg/completion" ) var ( diff --git a/cmd/podman/machine/info.go b/cmd/podman/machine/info.go index 793bc4efe8f..1e5d6bff789 100644 --- a/cmd/podman/machine/info.go +++ b/cmd/podman/machine/info.go @@ -7,8 +7,6 @@ import ( "os" "runtime" - "github.com/containers/common/pkg/completion" - "github.com/containers/common/pkg/report" "github.com/containers/podman/v5/cmd/podman/common" "github.com/containers/podman/v5/cmd/podman/registry" "github.com/containers/podman/v5/cmd/podman/validate" @@ -18,6 +16,8 @@ import ( "github.com/containers/podman/v5/pkg/machine/env" "github.com/containers/podman/v5/pkg/machine/vmconfigs" "github.com/spf13/cobra" + "go.podman.io/common/pkg/completion" + "go.podman.io/common/pkg/report" "gopkg.in/yaml.v3" ) diff --git a/cmd/podman/machine/init.go b/cmd/podman/machine/init.go index 54c411058d6..4bc484f2412 100644 --- a/cmd/podman/machine/init.go +++ b/cmd/podman/machine/init.go @@ -7,9 +7,6 @@ import ( "fmt" "os" - "github.com/containers/common/pkg/completion" - "github.com/containers/common/pkg/strongunits" - "github.com/containers/image/v5/types" "github.com/containers/podman/v5/cmd/podman/registry" ldefine "github.com/containers/podman/v5/libpod/define" "github.com/containers/podman/v5/libpod/events" @@ -19,6 +16,9 @@ import ( "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" ) var ( diff --git a/cmd/podman/machine/inspect.go b/cmd/podman/machine/inspect.go index c94781a1724..4b212b46ba2 100644 --- a/cmd/podman/machine/inspect.go +++ b/cmd/podman/machine/inspect.go @@ -5,7 +5,6 @@ package machine import ( "os" - "github.com/containers/common/pkg/report" "github.com/containers/podman/v5/cmd/podman/common" "github.com/containers/podman/v5/cmd/podman/registry" "github.com/containers/podman/v5/cmd/podman/utils" @@ -13,6 +12,7 @@ import ( "github.com/containers/podman/v5/pkg/machine/env" "github.com/containers/podman/v5/pkg/machine/vmconfigs" "github.com/spf13/cobra" + "go.podman.io/common/pkg/report" ) var ( diff --git a/cmd/podman/machine/list.go b/cmd/podman/machine/list.go index f6f7144ce26..721127a675c 100644 --- a/cmd/podman/machine/list.go +++ b/cmd/podman/machine/list.go @@ -10,9 +10,6 @@ import ( "strings" "time" - "github.com/containers/common/pkg/completion" - "github.com/containers/common/pkg/config" - "github.com/containers/common/pkg/report" "github.com/containers/podman/v5/cmd/podman/common" "github.com/containers/podman/v5/cmd/podman/registry" "github.com/containers/podman/v5/cmd/podman/validate" @@ -23,6 +20,9 @@ import ( "github.com/containers/podman/v5/pkg/machine/vmconfigs" "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" ) var ( diff --git a/cmd/podman/machine/os/manager.go b/cmd/podman/machine/os/manager.go index 234246cf1dd..4b7557303bb 100644 --- a/cmd/podman/machine/os/manager.go +++ b/cmd/podman/machine/os/manager.go @@ -8,12 +8,12 @@ import ( "os" "strings" - machineconfig "github.com/containers/common/pkg/machine" "github.com/containers/podman/v5/pkg/machine/define" "github.com/containers/podman/v5/pkg/machine/env" pkgOS "github.com/containers/podman/v5/pkg/machine/os" "github.com/containers/podman/v5/pkg/machine/provider" "github.com/containers/podman/v5/pkg/machine/vmconfigs" + machineconfig "go.podman.io/common/pkg/machine" ) type ManagerOpts struct { diff --git a/cmd/podman/machine/reset.go b/cmd/podman/machine/reset.go index bcfb88eabe3..a1d6e7851d5 100644 --- a/cmd/podman/machine/reset.go +++ b/cmd/podman/machine/reset.go @@ -9,7 +9,6 @@ import ( "strings" "text/tabwriter" - "github.com/containers/common/pkg/completion" "github.com/containers/podman/v5/cmd/podman/registry" "github.com/containers/podman/v5/cmd/podman/validate" "github.com/containers/podman/v5/pkg/machine" @@ -17,6 +16,7 @@ import ( "github.com/containers/podman/v5/pkg/machine/shim" "github.com/sirupsen/logrus" "github.com/spf13/cobra" + "go.podman.io/common/pkg/completion" ) var ( diff --git a/cmd/podman/machine/server9p.go b/cmd/podman/machine/server9p.go index dae39f759e9..9ec5dbb17f2 100644 --- a/cmd/podman/machine/server9p.go +++ b/cmd/podman/machine/server9p.go @@ -8,12 +8,12 @@ import ( "strings" "time" - "github.com/containers/common/pkg/completion" "github.com/containers/podman/v5/cmd/podman/registry" "github.com/containers/podman/v5/pkg/fileserver" psutil "github.com/shirou/gopsutil/v4/process" "github.com/sirupsen/logrus" "github.com/spf13/cobra" + "go.podman.io/common/pkg/completion" ) var ( diff --git a/cmd/podman/machine/set.go b/cmd/podman/machine/set.go index 07736bd507c..a49abe1953e 100644 --- a/cmd/podman/machine/set.go +++ b/cmd/podman/machine/set.go @@ -3,14 +3,14 @@ package machine import ( - "github.com/containers/common/pkg/completion" - "github.com/containers/common/pkg/strongunits" "github.com/containers/podman/v5/cmd/podman/registry" "github.com/containers/podman/v5/pkg/machine/define" "github.com/containers/podman/v5/pkg/machine/env" "github.com/containers/podman/v5/pkg/machine/shim" "github.com/containers/podman/v5/pkg/machine/vmconfigs" "github.com/spf13/cobra" + "go.podman.io/common/pkg/completion" + "go.podman.io/common/pkg/strongunits" ) var ( diff --git a/cmd/podman/machine/ssh.go b/cmd/podman/machine/ssh.go index 93c04fe7937..67e6fd5bfda 100644 --- a/cmd/podman/machine/ssh.go +++ b/cmd/podman/machine/ssh.go @@ -8,12 +8,12 @@ import ( "github.com/containers/podman/v5/pkg/machine/define" "github.com/containers/podman/v5/pkg/machine/env" - "github.com/containers/common/pkg/completion" "github.com/containers/podman/v5/cmd/podman/registry" "github.com/containers/podman/v5/cmd/podman/utils" "github.com/containers/podman/v5/pkg/machine" "github.com/containers/podman/v5/pkg/machine/vmconfigs" "github.com/spf13/cobra" + "go.podman.io/common/pkg/completion" ) var ( diff --git a/cmd/podman/main.go b/cmd/podman/main.go index 80ce600bf9a..54bf01db78d 100644 --- a/cmd/podman/main.go +++ b/cmd/podman/main.go @@ -30,9 +30,9 @@ import ( "github.com/containers/podman/v5/pkg/logiface" "github.com/containers/podman/v5/pkg/rootless" "github.com/containers/podman/v5/pkg/terminal" - "github.com/containers/storage/pkg/reexec" "github.com/sirupsen/logrus" "github.com/spf13/cobra" + "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 eafc9de3dc4..571b26c4653 100644 --- a/cmd/podman/manifest/add.go +++ b/cmd/podman/manifest/add.go @@ -7,15 +7,15 @@ import ( "os" "strings" - "github.com/containers/common/pkg/auth" - "github.com/containers/common/pkg/completion" - "github.com/containers/image/v5/types" "github.com/containers/podman/v5/cmd/podman/common" "github.com/containers/podman/v5/cmd/podman/registry" "github.com/containers/podman/v5/pkg/domain/entities" "github.com/containers/podman/v5/pkg/util" 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" ) // manifestAddOptsWrapper wraps entities.ManifestAddOptions and prevents diff --git a/cmd/podman/manifest/annotate.go b/cmd/podman/manifest/annotate.go index 9a54fe2166a..db6b7f89ad6 100644 --- a/cmd/podman/manifest/annotate.go +++ b/cmd/podman/manifest/annotate.go @@ -5,11 +5,11 @@ import ( "fmt" "strings" - "github.com/containers/common/pkg/completion" "github.com/containers/podman/v5/cmd/podman/common" "github.com/containers/podman/v5/cmd/podman/registry" "github.com/containers/podman/v5/pkg/domain/entities" "github.com/spf13/cobra" + "go.podman.io/common/pkg/completion" ) // manifestAnnotateOptsWrapper wraps entities.ManifestAnnotateOptions and diff --git a/cmd/podman/manifest/create.go b/cmd/podman/manifest/create.go index 4e953ab5a24..2ed0c8f4e74 100644 --- a/cmd/podman/manifest/create.go +++ b/cmd/podman/manifest/create.go @@ -5,12 +5,12 @@ import ( "fmt" "strings" - "github.com/containers/common/pkg/completion" - "github.com/containers/image/v5/types" "github.com/containers/podman/v5/cmd/podman/common" "github.com/containers/podman/v5/cmd/podman/registry" "github.com/containers/podman/v5/pkg/domain/entities" "github.com/spf13/cobra" + "go.podman.io/common/pkg/completion" + "go.podman.io/image/v5/types" ) // manifestCreateOptsWrapper wraps entities.ManifestCreateOptions and prevents leaking diff --git a/cmd/podman/manifest/inspect.go b/cmd/podman/manifest/inspect.go index 4b0d86d816d..c0931924f48 100644 --- a/cmd/podman/manifest/inspect.go +++ b/cmd/podman/manifest/inspect.go @@ -4,13 +4,13 @@ import ( "encoding/json" "fmt" - "github.com/containers/common/pkg/auth" - "github.com/containers/common/pkg/completion" - "github.com/containers/image/v5/types" "github.com/containers/podman/v5/cmd/podman/common" "github.com/containers/podman/v5/cmd/podman/registry" "github.com/containers/podman/v5/pkg/domain/entities" "github.com/spf13/cobra" + "go.podman.io/common/pkg/auth" + "go.podman.io/common/pkg/completion" + "go.podman.io/image/v5/types" ) var ( diff --git a/cmd/podman/manifest/push.go b/cmd/podman/manifest/push.go index aedee3e74d3..0c0942ad386 100644 --- a/cmd/podman/manifest/push.go +++ b/cmd/podman/manifest/push.go @@ -5,15 +5,15 @@ import ( "fmt" "os" - "github.com/containers/common/pkg/auth" - "github.com/containers/common/pkg/completion" - "github.com/containers/image/v5/types" "github.com/containers/podman/v5/cmd/podman/common" "github.com/containers/podman/v5/cmd/podman/registry" "github.com/containers/podman/v5/cmd/podman/utils" "github.com/containers/podman/v5/pkg/domain/entities" "github.com/containers/podman/v5/pkg/util" "github.com/spf13/cobra" + "go.podman.io/common/pkg/auth" + "go.podman.io/common/pkg/completion" + "go.podman.io/image/v5/types" ) // manifestPushOptsWrapper wraps entities.ManifestPushOptions and prevents leaking diff --git a/cmd/podman/networks/connect.go b/cmd/podman/networks/connect.go index 6ab1b028912..4ab99613fa0 100644 --- a/cmd/podman/networks/connect.go +++ b/cmd/podman/networks/connect.go @@ -3,12 +3,12 @@ package network import ( "net" - "github.com/containers/common/libnetwork/types" - "github.com/containers/common/pkg/completion" "github.com/containers/podman/v5/cmd/podman/common" "github.com/containers/podman/v5/cmd/podman/registry" "github.com/containers/podman/v5/pkg/domain/entities" "github.com/spf13/cobra" + "go.podman.io/common/libnetwork/types" + "go.podman.io/common/pkg/completion" ) var ( diff --git a/cmd/podman/networks/create.go b/cmd/podman/networks/create.go index 7be21dfdeb0..ef49c872c27 100644 --- a/cmd/podman/networks/create.go +++ b/cmd/podman/networks/create.go @@ -7,15 +7,15 @@ import ( "strconv" "strings" - "github.com/containers/common/libnetwork/types" - "github.com/containers/common/libnetwork/util" - "github.com/containers/common/pkg/completion" "github.com/containers/podman/v5/cmd/podman/common" "github.com/containers/podman/v5/cmd/podman/parse" "github.com/containers/podman/v5/cmd/podman/registry" "github.com/containers/podman/v5/pkg/domain/entities" "github.com/sirupsen/logrus" "github.com/spf13/cobra" + "go.podman.io/common/libnetwork/types" + "go.podman.io/common/libnetwork/util" + "go.podman.io/common/pkg/completion" ) var ( diff --git a/cmd/podman/networks/list.go b/cmd/podman/networks/list.go index 8a47020e646..3bd8c9979e7 100644 --- a/cmd/podman/networks/list.go +++ b/cmd/podman/networks/list.go @@ -6,9 +6,6 @@ import ( "sort" "strings" - "github.com/containers/common/libnetwork/types" - "github.com/containers/common/pkg/completion" - "github.com/containers/common/pkg/report" "github.com/containers/podman/v5/cmd/podman/common" "github.com/containers/podman/v5/cmd/podman/parse" "github.com/containers/podman/v5/cmd/podman/registry" @@ -16,6 +13,9 @@ import ( "github.com/containers/podman/v5/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" ) var ( diff --git a/cmd/podman/networks/rm.go b/cmd/podman/networks/rm.go index 896ee9ccef8..185873ef4bc 100644 --- a/cmd/podman/networks/rm.go +++ b/cmd/podman/networks/rm.go @@ -5,7 +5,6 @@ import ( "fmt" "strings" - "github.com/containers/common/pkg/completion" "github.com/containers/podman/v5/cmd/podman/common" "github.com/containers/podman/v5/cmd/podman/registry" "github.com/containers/podman/v5/cmd/podman/utils" @@ -13,6 +12,7 @@ import ( "github.com/containers/podman/v5/pkg/domain/entities" "github.com/spf13/cobra" "github.com/spf13/pflag" + "go.podman.io/common/pkg/completion" ) var ( diff --git a/cmd/podman/networks/update.go b/cmd/podman/networks/update.go index 0589c533cdf..5cc91e64ec9 100644 --- a/cmd/podman/networks/update.go +++ b/cmd/podman/networks/update.go @@ -3,11 +3,11 @@ package network import ( "fmt" - "github.com/containers/common/pkg/completion" "github.com/containers/podman/v5/cmd/podman/common" "github.com/containers/podman/v5/cmd/podman/registry" "github.com/containers/podman/v5/pkg/domain/entities" "github.com/spf13/cobra" + "go.podman.io/common/pkg/completion" ) var ( diff --git a/cmd/podman/parse/net.go b/cmd/podman/parse/net.go index c1dd72aa35f..d797ef87454 100644 --- a/cmd/podman/parse/net.go +++ b/cmd/podman/parse/net.go @@ -10,8 +10,8 @@ import ( "os" "strings" - "github.com/containers/common/libnetwork/etchosts" - "github.com/containers/storage/pkg/regexp" + "go.podman.io/common/libnetwork/etchosts" + "go.podman.io/storage/pkg/regexp" ) const ( diff --git a/cmd/podman/parse/net_test.go b/cmd/podman/parse/net_test.go index 9dc8abe30f3..c0aebe0df46 100644 --- a/cmd/podman/parse/net_test.go +++ b/cmd/podman/parse/net_test.go @@ -9,8 +9,8 @@ import ( "os" "testing" - "github.com/containers/common/libnetwork/etchosts" "github.com/stretchr/testify/assert" + "go.podman.io/common/libnetwork/etchosts" ) var ( diff --git a/cmd/podman/pods/clone.go b/cmd/podman/pods/clone.go index 0ba84c477e7..a87d40b3152 100644 --- a/cmd/podman/pods/clone.go +++ b/cmd/podman/pods/clone.go @@ -4,12 +4,12 @@ import ( "context" "fmt" - "github.com/containers/common/pkg/completion" "github.com/containers/podman/v5/cmd/podman/common" "github.com/containers/podman/v5/cmd/podman/registry" "github.com/containers/podman/v5/libpod/define" "github.com/containers/podman/v5/pkg/domain/entities" "github.com/spf13/cobra" + "go.podman.io/common/pkg/completion" ) var ( diff --git a/cmd/podman/pods/create.go b/cmd/podman/pods/create.go index b0ef3f1bab9..75d97019f03 100644 --- a/cmd/podman/pods/create.go +++ b/cmd/podman/pods/create.go @@ -9,8 +9,6 @@ import ( "strconv" "strings" - "github.com/containers/common/pkg/completion" - "github.com/containers/common/pkg/sysinfo" "github.com/containers/podman/v5/cmd/podman/common" "github.com/containers/podman/v5/cmd/podman/containers" "github.com/containers/podman/v5/cmd/podman/parse" @@ -21,9 +19,11 @@ import ( "github.com/containers/podman/v5/pkg/specgen" "github.com/containers/podman/v5/pkg/specgenutil" "github.com/containers/podman/v5/pkg/util" - "github.com/containers/storage/pkg/parsers" "github.com/sirupsen/logrus" "github.com/spf13/cobra" + "go.podman.io/common/pkg/completion" + "go.podman.io/common/pkg/sysinfo" + "go.podman.io/storage/pkg/parsers" ) var ( diff --git a/cmd/podman/pods/logs.go b/cmd/podman/pods/logs.go index 56d3269fd98..aa0203e4025 100644 --- a/cmd/podman/pods/logs.go +++ b/cmd/podman/pods/logs.go @@ -5,7 +5,6 @@ import ( "fmt" "os" - "github.com/containers/common/pkg/completion" "github.com/containers/podman/v5/cmd/podman/common" "github.com/containers/podman/v5/cmd/podman/registry" "github.com/containers/podman/v5/cmd/podman/validate" @@ -13,6 +12,7 @@ import ( "github.com/containers/podman/v5/pkg/domain/entities" "github.com/containers/podman/v5/pkg/util" "github.com/spf13/cobra" + "go.podman.io/common/pkg/completion" ) // logsOptionsWrapper wraps entities.LogsOptions and prevents leaking diff --git a/cmd/podman/pods/prune.go b/cmd/podman/pods/prune.go index 6c23df28ae2..a6bd193a430 100644 --- a/cmd/podman/pods/prune.go +++ b/cmd/podman/pods/prune.go @@ -7,12 +7,12 @@ import ( "os" "strings" - "github.com/containers/common/pkg/completion" "github.com/containers/podman/v5/cmd/podman/registry" "github.com/containers/podman/v5/cmd/podman/utils" "github.com/containers/podman/v5/cmd/podman/validate" "github.com/containers/podman/v5/pkg/domain/entities" "github.com/spf13/cobra" + "go.podman.io/common/pkg/completion" ) var ( diff --git a/cmd/podman/pods/ps.go b/cmd/podman/pods/ps.go index c5771a7969a..c0baa923528 100644 --- a/cmd/podman/pods/ps.go +++ b/cmd/podman/pods/ps.go @@ -10,8 +10,6 @@ import ( "strings" "time" - "github.com/containers/common/pkg/completion" - "github.com/containers/common/pkg/report" "github.com/containers/podman/v5/cmd/podman/common" "github.com/containers/podman/v5/cmd/podman/registry" "github.com/containers/podman/v5/cmd/podman/utils" @@ -19,6 +17,8 @@ import ( "github.com/containers/podman/v5/pkg/domain/entities" "github.com/docker/go-units" "github.com/spf13/cobra" + "go.podman.io/common/pkg/completion" + "go.podman.io/common/pkg/report" ) var ( diff --git a/cmd/podman/pods/rm.go b/cmd/podman/pods/rm.go index ac5bde0807d..690f3a6c3bb 100644 --- a/cmd/podman/pods/rm.go +++ b/cmd/podman/pods/rm.go @@ -7,7 +7,6 @@ import ( "os" "strings" - "github.com/containers/common/pkg/completion" "github.com/containers/podman/v5/cmd/podman/common" "github.com/containers/podman/v5/cmd/podman/registry" "github.com/containers/podman/v5/cmd/podman/utils" @@ -16,6 +15,7 @@ import ( "github.com/containers/podman/v5/pkg/domain/entities" "github.com/containers/podman/v5/pkg/specgenutil" "github.com/spf13/cobra" + "go.podman.io/common/pkg/completion" ) // allows for splitting API and CLI-only options diff --git a/cmd/podman/pods/start.go b/cmd/podman/pods/start.go index 79b3f72162e..0f53b64c8c5 100644 --- a/cmd/podman/pods/start.go +++ b/cmd/podman/pods/start.go @@ -4,7 +4,6 @@ import ( "context" "fmt" - "github.com/containers/common/pkg/completion" "github.com/containers/podman/v5/cmd/podman/common" "github.com/containers/podman/v5/cmd/podman/registry" "github.com/containers/podman/v5/cmd/podman/utils" @@ -12,6 +11,7 @@ import ( "github.com/containers/podman/v5/pkg/domain/entities" "github.com/containers/podman/v5/pkg/specgenutil" "github.com/spf13/cobra" + "go.podman.io/common/pkg/completion" ) // allows for splitting API and CLI-only options diff --git a/cmd/podman/pods/stats.go b/cmd/podman/pods/stats.go index 53720b8dd55..b66285c6275 100644 --- a/cmd/podman/pods/stats.go +++ b/cmd/podman/pods/stats.go @@ -6,12 +6,12 @@ import ( "os" "time" - "github.com/containers/common/pkg/report" "github.com/containers/podman/v5/cmd/podman/common" "github.com/containers/podman/v5/cmd/podman/registry" "github.com/containers/podman/v5/cmd/podman/validate" "github.com/containers/podman/v5/pkg/domain/entities" "github.com/spf13/cobra" + "go.podman.io/common/pkg/report" ) type podStatsOptionsWrapper struct { diff --git a/cmd/podman/pods/stop.go b/cmd/podman/pods/stop.go index 7e9c11f3cfd..f6107e479da 100644 --- a/cmd/podman/pods/stop.go +++ b/cmd/podman/pods/stop.go @@ -4,7 +4,6 @@ import ( "context" "fmt" - "github.com/containers/common/pkg/completion" "github.com/containers/podman/v5/cmd/podman/common" "github.com/containers/podman/v5/cmd/podman/registry" "github.com/containers/podman/v5/cmd/podman/utils" @@ -12,6 +11,7 @@ import ( "github.com/containers/podman/v5/pkg/domain/entities" "github.com/containers/podman/v5/pkg/specgenutil" "github.com/spf13/cobra" + "go.podman.io/common/pkg/completion" ) // allows for splitting API and CLI-only options diff --git a/cmd/podman/pods/top.go b/cmd/podman/pods/top.go index c54fecf8bbc..f24f5d84eec 100644 --- a/cmd/podman/pods/top.go +++ b/cmd/podman/pods/top.go @@ -7,13 +7,13 @@ import ( "os" "strings" - "github.com/containers/common/pkg/report" "github.com/containers/podman/v5/cmd/podman/common" "github.com/containers/podman/v5/cmd/podman/registry" "github.com/containers/podman/v5/cmd/podman/validate" "github.com/containers/podman/v5/pkg/domain/entities" "github.com/containers/podman/v5/pkg/util" "github.com/spf13/cobra" + "go.podman.io/common/pkg/report" ) var ( diff --git a/cmd/podman/quadlet/install.go b/cmd/podman/quadlet/install.go index bf069918494..60e9854e4c3 100644 --- a/cmd/podman/quadlet/install.go +++ b/cmd/podman/quadlet/install.go @@ -4,11 +4,11 @@ import ( "errors" "fmt" - "github.com/containers/common/pkg/completion" "github.com/containers/podman/v5/cmd/podman/registry" "github.com/containers/podman/v5/cmd/podman/utils" "github.com/containers/podman/v5/pkg/domain/entities" "github.com/spf13/cobra" + "go.podman.io/common/pkg/completion" ) var ( diff --git a/cmd/podman/quadlet/list.go b/cmd/podman/quadlet/list.go index 270af99a0f4..e4c7d179588 100644 --- a/cmd/podman/quadlet/list.go +++ b/cmd/podman/quadlet/list.go @@ -4,13 +4,13 @@ import ( "fmt" "os" - "github.com/containers/common/pkg/completion" - "github.com/containers/common/pkg/report" "github.com/containers/podman/v5/cmd/podman/common" "github.com/containers/podman/v5/cmd/podman/registry" "github.com/containers/podman/v5/cmd/podman/validate" "github.com/containers/podman/v5/pkg/domain/entities" "github.com/spf13/cobra" + "go.podman.io/common/pkg/completion" + "go.podman.io/common/pkg/report" ) var ( diff --git a/cmd/podman/registry/config.go b/cmd/podman/registry/config.go index 6a6d3adb708..d40a1e29ca0 100644 --- a/cmd/podman/registry/config.go +++ b/cmd/podman/registry/config.go @@ -7,13 +7,13 @@ import ( "runtime" "sync" - "github.com/containers/common/pkg/config" "github.com/containers/podman/v5/pkg/domain/entities" "github.com/containers/podman/v5/pkg/rootless" "github.com/containers/podman/v5/pkg/util" - "github.com/containers/storage/pkg/fileutils" "github.com/spf13/cobra" "github.com/spf13/pflag" + "go.podman.io/common/pkg/config" + "go.podman.io/storage/pkg/fileutils" ) const ( diff --git a/cmd/podman/root.go b/cmd/podman/root.go index 00dd6a20b77..e4859644ebb 100644 --- a/cmd/podman/root.go +++ b/cmd/podman/root.go @@ -11,8 +11,6 @@ import ( "strconv" "strings" - "github.com/containers/common/pkg/completion" - "github.com/containers/common/pkg/ssh" "github.com/containers/podman/v5/cmd/podman/common" "github.com/containers/podman/v5/cmd/podman/registry" "github.com/containers/podman/v5/cmd/podman/validate" @@ -23,10 +21,12 @@ import ( "github.com/containers/podman/v5/pkg/domain/entities" "github.com/containers/podman/v5/pkg/parallel" "github.com/containers/podman/v5/version" - "github.com/containers/storage" "github.com/sirupsen/logrus" "github.com/spf13/cobra" "github.com/spf13/pflag" + "go.podman.io/common/pkg/completion" + "go.podman.io/common/pkg/ssh" + "go.podman.io/storage" "sigs.k8s.io/yaml" ) diff --git a/cmd/podman/secrets/create.go b/cmd/podman/secrets/create.go index 70c8cdab02e..86e6977247d 100644 --- a/cmd/podman/secrets/create.go +++ b/cmd/podman/secrets/create.go @@ -8,12 +8,12 @@ import ( "os" "strings" - "github.com/containers/common/pkg/completion" "github.com/containers/podman/v5/cmd/podman/common" "github.com/containers/podman/v5/cmd/podman/parse" "github.com/containers/podman/v5/cmd/podman/registry" "github.com/containers/podman/v5/pkg/domain/entities" "github.com/spf13/cobra" + "go.podman.io/common/pkg/completion" ) var ( diff --git a/cmd/podman/secrets/inspect.go b/cmd/podman/secrets/inspect.go index 18f686e588b..ac8fbde2512 100644 --- a/cmd/podman/secrets/inspect.go +++ b/cmd/podman/secrets/inspect.go @@ -6,11 +6,11 @@ import ( "fmt" "os" - "github.com/containers/common/pkg/report" "github.com/containers/podman/v5/cmd/podman/common" "github.com/containers/podman/v5/cmd/podman/registry" "github.com/containers/podman/v5/pkg/domain/entities" "github.com/spf13/cobra" + "go.podman.io/common/pkg/report" ) var ( diff --git a/cmd/podman/secrets/list.go b/cmd/podman/secrets/list.go index 7bcf31e18a8..b222c84a6e3 100644 --- a/cmd/podman/secrets/list.go +++ b/cmd/podman/secrets/list.go @@ -6,8 +6,6 @@ import ( "os" "time" - "github.com/containers/common/pkg/completion" - "github.com/containers/common/pkg/report" "github.com/containers/podman/v5/cmd/podman/common" "github.com/containers/podman/v5/cmd/podman/parse" "github.com/containers/podman/v5/cmd/podman/registry" @@ -15,6 +13,8 @@ import ( "github.com/containers/podman/v5/pkg/domain/entities" "github.com/docker/go-units" "github.com/spf13/cobra" + "go.podman.io/common/pkg/completion" + "go.podman.io/common/pkg/report" ) var ( diff --git a/cmd/podman/shell_completion_test.go b/cmd/podman/shell_completion_test.go index 7d5b2379187..8c2c96ba738 100644 --- a/cmd/podman/shell_completion_test.go +++ b/cmd/podman/shell_completion_test.go @@ -7,7 +7,7 @@ Shell completion functions are defined in: - "github.com/containers/podman/v5/cmd/podman/common/completion.go" - - "github.com/containers/common/pkg/completion" + - "go.podman.io/common/pkg/completion" and are called Autocomplete... To apply such function to a command use the ValidArgsFunction field. diff --git a/cmd/podman/system/check.go b/cmd/podman/system/check.go index f3893f54e5e..6c210fd11ea 100644 --- a/cmd/podman/system/check.go +++ b/cmd/podman/system/check.go @@ -6,12 +6,12 @@ import ( "fmt" "time" - "github.com/containers/common/pkg/completion" "github.com/containers/podman/v5/cmd/podman/registry" "github.com/containers/podman/v5/cmd/podman/validate" "github.com/containers/podman/v5/pkg/domain/entities/types" multierror "github.com/hashicorp/go-multierror" "github.com/spf13/cobra" + "go.podman.io/common/pkg/completion" ) var ( diff --git a/cmd/podman/system/connection/add.go b/cmd/podman/system/connection/add.go index ba0723ac9f7..88611fea2eb 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/common/pkg/completion" - "github.com/containers/common/pkg/config" - "github.com/containers/common/pkg/ssh" "github.com/containers/podman/v5/cmd/podman/common" "github.com/containers/podman/v5/cmd/podman/registry" "github.com/containers/podman/v5/cmd/podman/system" "github.com/sirupsen/logrus" "github.com/spf13/cobra" + "go.podman.io/common/pkg/completion" + "go.podman.io/common/pkg/config" + "go.podman.io/common/pkg/ssh" ) var ( diff --git a/cmd/podman/system/connection/default.go b/cmd/podman/system/connection/default.go index eeddd4dbe36..d344e4ba9df 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/common/pkg/config" "github.com/containers/podman/v5/cmd/podman/common" "github.com/containers/podman/v5/cmd/podman/registry" "github.com/containers/podman/v5/cmd/podman/system" "github.com/spf13/cobra" + "go.podman.io/common/pkg/config" ) var ( diff --git a/cmd/podman/system/connection/list.go b/cmd/podman/system/connection/list.go index 24e6b29d294..8adb55eb2a6 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/common/pkg/completion" - "github.com/containers/common/pkg/config" - "github.com/containers/common/pkg/report" "github.com/containers/podman/v5/cmd/podman/common" "github.com/containers/podman/v5/cmd/podman/registry" "github.com/containers/podman/v5/cmd/podman/system" "github.com/containers/podman/v5/cmd/podman/validate" "github.com/spf13/cobra" + "go.podman.io/common/pkg/completion" + "go.podman.io/common/pkg/config" + "go.podman.io/common/pkg/report" ) var ( diff --git a/cmd/podman/system/connection/remove.go b/cmd/podman/system/connection/remove.go index 3398a7601fd..1fca4343df0 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/common/pkg/config" "github.com/containers/podman/v5/cmd/podman/common" "github.com/containers/podman/v5/cmd/podman/registry" "github.com/containers/podman/v5/cmd/podman/system" "github.com/spf13/cobra" + "go.podman.io/common/pkg/config" ) var ( diff --git a/cmd/podman/system/connection/rename.go b/cmd/podman/system/connection/rename.go index abc38d3bbce..d2f1ee6f296 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/common/pkg/config" "github.com/containers/podman/v5/cmd/podman/common" "github.com/containers/podman/v5/cmd/podman/registry" "github.com/containers/podman/v5/cmd/podman/system" "github.com/spf13/cobra" + "go.podman.io/common/pkg/config" ) var ( diff --git a/cmd/podman/system/df.go b/cmd/podman/system/df.go index c3553a5399b..73e12384903 100644 --- a/cmd/podman/system/df.go +++ b/cmd/podman/system/df.go @@ -8,14 +8,14 @@ import ( "strings" "time" - "github.com/containers/common/pkg/completion" - "github.com/containers/common/pkg/report" "github.com/containers/podman/v5/cmd/podman/common" "github.com/containers/podman/v5/cmd/podman/registry" "github.com/containers/podman/v5/cmd/podman/validate" "github.com/containers/podman/v5/pkg/domain/entities" "github.com/docker/go-units" "github.com/spf13/cobra" + "go.podman.io/common/pkg/completion" + "go.podman.io/common/pkg/report" ) var ( diff --git a/cmd/podman/system/events.go b/cmd/podman/system/events.go index fa4ce5f95e9..a50c2a8e6d0 100644 --- a/cmd/podman/system/events.go +++ b/cmd/podman/system/events.go @@ -5,8 +5,6 @@ import ( "fmt" "os" - "github.com/containers/common/pkg/completion" - "github.com/containers/common/pkg/report" "github.com/containers/podman/v5/cmd/podman/common" "github.com/containers/podman/v5/cmd/podman/registry" "github.com/containers/podman/v5/cmd/podman/validate" @@ -14,6 +12,8 @@ import ( "github.com/containers/podman/v5/pkg/domain/entities" "github.com/sirupsen/logrus" "github.com/spf13/cobra" + "go.podman.io/common/pkg/completion" + "go.podman.io/common/pkg/report" ) var ( diff --git a/cmd/podman/system/info.go b/cmd/podman/system/info.go index d664333da62..2d07988f7e8 100644 --- a/cmd/podman/system/info.go +++ b/cmd/podman/system/info.go @@ -4,13 +4,13 @@ import ( "fmt" "os" - "github.com/containers/common/pkg/completion" - "github.com/containers/common/pkg/report" "github.com/containers/podman/v5/cmd/podman/common" "github.com/containers/podman/v5/cmd/podman/registry" "github.com/containers/podman/v5/cmd/podman/validate" "github.com/containers/podman/v5/libpod/define" "github.com/spf13/cobra" + "go.podman.io/common/pkg/completion" + "go.podman.io/common/pkg/report" "sigs.k8s.io/yaml" ) diff --git a/cmd/podman/system/migrate.go b/cmd/podman/system/migrate.go index 8dbdb0b3d68..3373af027f4 100644 --- a/cmd/podman/system/migrate.go +++ b/cmd/podman/system/migrate.go @@ -6,12 +6,12 @@ import ( "fmt" "os" - "github.com/containers/common/pkg/completion" "github.com/containers/podman/v5/cmd/podman/registry" "github.com/containers/podman/v5/cmd/podman/validate" "github.com/containers/podman/v5/libpod/define" "github.com/containers/podman/v5/pkg/domain/entities" "github.com/spf13/cobra" + "go.podman.io/common/pkg/completion" ) var ( diff --git a/cmd/podman/system/prune.go b/cmd/podman/system/prune.go index d8991c21ad1..7c5b55a10d5 100644 --- a/cmd/podman/system/prune.go +++ b/cmd/podman/system/prune.go @@ -7,7 +7,6 @@ import ( "os" "strings" - "github.com/containers/common/pkg/completion" "github.com/containers/podman/v5/cmd/podman/common" "github.com/containers/podman/v5/cmd/podman/parse" "github.com/containers/podman/v5/cmd/podman/registry" @@ -16,6 +15,7 @@ import ( "github.com/containers/podman/v5/pkg/domain/entities" "github.com/docker/go-units" "github.com/spf13/cobra" + "go.podman.io/common/pkg/completion" ) var ( diff --git a/cmd/podman/system/renumber.go b/cmd/podman/system/renumber.go index bd425c1f43a..0f755d0bb89 100644 --- a/cmd/podman/system/renumber.go +++ b/cmd/podman/system/renumber.go @@ -6,11 +6,11 @@ import ( "fmt" "os" - "github.com/containers/common/pkg/completion" "github.com/containers/podman/v5/cmd/podman/registry" "github.com/containers/podman/v5/cmd/podman/validate" "github.com/containers/podman/v5/libpod/define" "github.com/spf13/cobra" + "go.podman.io/common/pkg/completion" ) var ( diff --git a/cmd/podman/system/reset.go b/cmd/podman/system/reset.go index 9e83518a5b8..0e29f423d17 100644 --- a/cmd/podman/system/reset.go +++ b/cmd/podman/system/reset.go @@ -9,11 +9,11 @@ import ( "strings" "github.com/containers/buildah/pkg/volumes" - "github.com/containers/common/pkg/completion" "github.com/containers/podman/v5/cmd/podman/registry" "github.com/containers/podman/v5/cmd/podman/validate" "github.com/sirupsen/logrus" "github.com/spf13/cobra" + "go.podman.io/common/pkg/completion" ) var ( diff --git a/cmd/podman/system/service.go b/cmd/podman/system/service.go index 7806ca2e308..c0c802ca126 100644 --- a/cmd/podman/system/service.go +++ b/cmd/podman/system/service.go @@ -9,7 +9,6 @@ import ( "syscall" "time" - "github.com/containers/common/pkg/completion" "github.com/containers/podman/v5/cmd/podman/common" "github.com/containers/podman/v5/cmd/podman/registry" "github.com/containers/podman/v5/pkg/domain/entities" @@ -19,6 +18,7 @@ import ( "github.com/sirupsen/logrus" "github.com/spf13/cobra" "github.com/spf13/pflag" + "go.podman.io/common/pkg/completion" ) var ( diff --git a/cmd/podman/system/service_abi_linux.go b/cmd/podman/system/service_abi_linux.go index d899ce9cce5..326f57de732 100644 --- a/cmd/podman/system/service_abi_linux.go +++ b/cmd/podman/system/service_abi_linux.go @@ -3,10 +3,10 @@ package system import ( - "github.com/containers/common/pkg/cgroups" - "github.com/containers/common/pkg/servicereaper" "github.com/containers/podman/v5/pkg/rootless" "github.com/sirupsen/logrus" + "go.podman.io/common/pkg/cgroups" + "go.podman.io/common/pkg/servicereaper" ) // Currently, we only need servicereaper on Linux to support slirp4netns. diff --git a/cmd/podman/system/unshare.go b/cmd/podman/system/unshare.go index 4ff068708f3..f27320db2c2 100644 --- a/cmd/podman/system/unshare.go +++ b/cmd/podman/system/unshare.go @@ -4,13 +4,13 @@ import ( "errors" "os" - "github.com/containers/common/pkg/completion" "github.com/containers/podman/v5/cmd/podman/registry" "github.com/containers/podman/v5/cmd/podman/utils" "github.com/containers/podman/v5/pkg/domain/entities" "github.com/containers/podman/v5/pkg/rootless" "github.com/spf13/cobra" "github.com/spf13/pflag" + "go.podman.io/common/pkg/completion" ) var ( diff --git a/cmd/podman/system/version.go b/cmd/podman/system/version.go index eb70b1ef724..ae708557a5a 100644 --- a/cmd/podman/system/version.go +++ b/cmd/podman/system/version.go @@ -5,14 +5,14 @@ import ( "os" "strings" - "github.com/containers/common/pkg/completion" - "github.com/containers/common/pkg/report" "github.com/containers/podman/v5/cmd/podman/common" "github.com/containers/podman/v5/cmd/podman/registry" "github.com/containers/podman/v5/cmd/podman/validate" "github.com/containers/podman/v5/pkg/domain/entities" "github.com/sirupsen/logrus" "github.com/spf13/cobra" + "go.podman.io/common/pkg/completion" + "go.podman.io/common/pkg/report" ) var ( diff --git a/cmd/podman/volumes/create.go b/cmd/podman/volumes/create.go index 52817bb99fa..3ab129b628e 100644 --- a/cmd/podman/volumes/create.go +++ b/cmd/podman/volumes/create.go @@ -4,11 +4,11 @@ import ( "context" "fmt" - "github.com/containers/common/pkg/completion" "github.com/containers/podman/v5/cmd/podman/parse" "github.com/containers/podman/v5/cmd/podman/registry" "github.com/containers/podman/v5/pkg/domain/entities" "github.com/spf13/cobra" + "go.podman.io/common/pkg/completion" ) var ( diff --git a/cmd/podman/volumes/export.go b/cmd/podman/volumes/export.go index 1c1e9ba8aeb..bc00395d5d6 100644 --- a/cmd/podman/volumes/export.go +++ b/cmd/podman/volumes/export.go @@ -6,11 +6,11 @@ import ( "fmt" "os" - "github.com/containers/common/pkg/completion" "github.com/containers/podman/v5/cmd/podman/common" "github.com/containers/podman/v5/cmd/podman/registry" "github.com/containers/podman/v5/pkg/domain/entities" "github.com/spf13/cobra" + "go.podman.io/common/pkg/completion" "golang.org/x/term" ) diff --git a/cmd/podman/volumes/list.go b/cmd/podman/volumes/list.go index 184e61f25eb..d4638d90652 100644 --- a/cmd/podman/volumes/list.go +++ b/cmd/podman/volumes/list.go @@ -6,14 +6,14 @@ import ( "fmt" "os" - "github.com/containers/common/pkg/completion" - "github.com/containers/common/pkg/report" "github.com/containers/podman/v5/cmd/podman/common" "github.com/containers/podman/v5/cmd/podman/parse" "github.com/containers/podman/v5/cmd/podman/registry" "github.com/containers/podman/v5/cmd/podman/validate" "github.com/containers/podman/v5/pkg/domain/entities" "github.com/spf13/cobra" + "go.podman.io/common/pkg/completion" + "go.podman.io/common/pkg/report" ) var ( diff --git a/cmd/podman/volumes/prune.go b/cmd/podman/volumes/prune.go index 7db368a38fe..1290edd9dbb 100644 --- a/cmd/podman/volumes/prune.go +++ b/cmd/podman/volumes/prune.go @@ -7,7 +7,6 @@ import ( "os" "strings" - "github.com/containers/common/pkg/completion" "github.com/containers/podman/v5/cmd/podman/common" "github.com/containers/podman/v5/cmd/podman/parse" "github.com/containers/podman/v5/cmd/podman/registry" @@ -15,6 +14,7 @@ import ( "github.com/containers/podman/v5/cmd/podman/validate" "github.com/containers/podman/v5/pkg/domain/entities" "github.com/spf13/cobra" + "go.podman.io/common/pkg/completion" ) var ( diff --git a/cmd/podman/volumes/reload.go b/cmd/podman/volumes/reload.go index 63b9bf2d7c0..2edad663cf2 100644 --- a/cmd/podman/volumes/reload.go +++ b/cmd/podman/volumes/reload.go @@ -3,11 +3,11 @@ package volumes import ( "fmt" - "github.com/containers/common/pkg/completion" "github.com/containers/podman/v5/cmd/podman/registry" "github.com/containers/podman/v5/cmd/podman/utils" "github.com/containers/podman/v5/cmd/podman/validate" "github.com/spf13/cobra" + "go.podman.io/common/pkg/completion" ) var ( diff --git a/cmd/podman/volumes/rm.go b/cmd/podman/volumes/rm.go index 358a3704c2b..80e84469e5c 100644 --- a/cmd/podman/volumes/rm.go +++ b/cmd/podman/volumes/rm.go @@ -6,13 +6,13 @@ import ( "fmt" "strings" - "github.com/containers/common/pkg/completion" "github.com/containers/podman/v5/cmd/podman/common" "github.com/containers/podman/v5/cmd/podman/registry" "github.com/containers/podman/v5/cmd/podman/utils" "github.com/containers/podman/v5/libpod/define" "github.com/containers/podman/v5/pkg/domain/entities" "github.com/spf13/cobra" + "go.podman.io/common/pkg/completion" ) var ( diff --git a/cmd/rootlessport/main.go b/cmd/rootlessport/main.go index 1f5692d10bc..b03f8a187c5 100644 --- a/cmd/rootlessport/main.go +++ b/cmd/rootlessport/main.go @@ -15,12 +15,12 @@ import ( "strings" "github.com/containernetworking/plugins/pkg/ns" - "github.com/containers/common/libnetwork/types" - "github.com/containers/common/pkg/rootlessport" rkport "github.com/rootless-containers/rootlesskit/v2/pkg/port" rkbuiltin "github.com/rootless-containers/rootlesskit/v2/pkg/port/builtin" rkportutil "github.com/rootless-containers/rootlesskit/v2/pkg/port/portutil" "github.com/sirupsen/logrus" + "go.podman.io/common/libnetwork/types" + "go.podman.io/common/pkg/rootlessport" "golang.org/x/sys/unix" ) diff --git a/cmd/rootlessport/wsl.go b/cmd/rootlessport/wsl.go index 0e527b07fad..06009df3499 100644 --- a/cmd/rootlessport/wsl.go +++ b/cmd/rootlessport/wsl.go @@ -6,8 +6,8 @@ import ( "net" "strings" - "github.com/containers/common/pkg/machine" rkport "github.com/rootless-containers/rootlesskit/v2/pkg/port" + "go.podman.io/common/pkg/machine" ) // WSL machines do not relay ipv4 traffic to dual-stack ports, simulate instead diff --git a/cmd/rootlessport/wsl_test.go b/cmd/rootlessport/wsl_test.go index 9cbf4d99dba..0a6812d22fd 100644 --- a/cmd/rootlessport/wsl_test.go +++ b/cmd/rootlessport/wsl_test.go @@ -5,9 +5,9 @@ package main import ( "testing" - "github.com/containers/common/pkg/machine" "github.com/rootless-containers/rootlesskit/v2/pkg/port" "github.com/stretchr/testify/assert" + "go.podman.io/common/pkg/machine" ) type SpecData struct { diff --git a/go.mod b/go.mod index b5312ca37f5..3be5fa80dd8 100644 --- a/go.mod +++ b/go.mod @@ -11,15 +11,12 @@ require ( github.com/checkpoint-restore/checkpointctl v1.3.0 github.com/checkpoint-restore/go-criu/v7 v7.2.0 github.com/containernetworking/plugins v1.7.1 - github.com/containers/buildah v1.41.1-0.20250825221131-264309dc1081 - github.com/containers/common v0.64.2-0.20250826074712-7692941ae9c8 + github.com/containers/buildah v1.41.1-0.20250829135344-3367a9bc2c9f github.com/containers/conmon v2.0.20+incompatible github.com/containers/gvisor-tap-vsock v0.8.7 - github.com/containers/image/v5 v5.36.2-0.20250825172340-9b99818eb1db - github.com/containers/libhvee v0.10.0 + github.com/containers/libhvee v0.10.1-0.20250829163521-178d10e67860 github.com/containers/ocicrypt v1.2.1 - github.com/containers/psgo v1.9.0 - github.com/containers/storage v1.59.2-0.20250820181736-3f7c116059ca + github.com/containers/psgo v1.9.1-0.20250826150930-4ae76f200c86 github.com/containers/winquit v1.1.0 github.com/coreos/go-systemd/v22 v22.6.0 github.com/crc-org/vfkit v0.6.1 @@ -58,7 +55,7 @@ require ( github.com/opencontainers/runtime-spec v1.2.1 github.com/opencontainers/runtime-tools v0.9.1-0.20250523060157-0ea5ed0382a2 github.com/opencontainers/selinux v1.12.0 - github.com/openshift/imagebuilder v1.2.16 + github.com/openshift/imagebuilder v1.2.16-0.20250828154754-e22ebd3ff511 github.com/rootless-containers/rootlesskit/v2 v2.3.5 github.com/shirou/gopsutil/v4 v4.25.7 github.com/sirupsen/logrus v1.9.3 @@ -68,6 +65,9 @@ require ( github.com/vbauerster/mpb/v8 v8.10.2 github.com/vishvananda/netlink v1.3.1 go.etcd.io/bbolt v1.4.3 + go.podman.io/common v0.0.0-20250826054041-6e4bed3c9118 + go.podman.io/image/v5 v5.36.1-0.20250820085751-a13b38f45723 + go.podman.io/storage v1.59.1-0.20250820085751-a13b38f45723 golang.org/x/crypto v0.41.0 golang.org/x/net v0.43.0 golang.org/x/sync v0.16.0 @@ -96,6 +96,7 @@ require ( github.com/containerd/stargz-snapshotter/estargz v0.17.0 // indirect github.com/containerd/typeurl/v2 v2.2.3 // indirect github.com/containernetworking/cni v1.3.0 // indirect + github.com/containers/common v0.62.2 // indirect github.com/containers/libtrust v0.0.0-20230121012942-c1716e8a8d01 // indirect github.com/containers/luksy v0.0.0-20250714213221-8fccf784694e // indirect github.com/coreos/go-oidc/v3 v3.14.1 // indirect @@ -168,10 +169,9 @@ require ( github.com/tklauser/go-sysconf v0.3.15 // indirect github.com/tklauser/numcpus v0.10.0 // indirect github.com/u-root/uio v0.0.0-20240224005618-d2acac8f3701 // indirect - github.com/ulikunitz/xz v0.5.13 // indirect + github.com/ulikunitz/xz v0.5.15 // indirect github.com/vbatts/tar-split v0.12.1 // indirect github.com/vishvananda/netns v0.0.5 // indirect - github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect github.com/yusufpapurcu/wmi v1.2.4 // indirect go.opentelemetry.io/auto/sdk v1.1.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.60.0 // indirect diff --git a/go.sum b/go.sum index a5f167a6655..375b0e91b71 100644 --- a/go.sum +++ b/go.sum @@ -55,28 +55,24 @@ github.com/containernetworking/cni v1.3.0 h1:v6EpN8RznAZj9765HhXQrtXgX+ECGebEYEm github.com/containernetworking/cni v1.3.0/go.mod h1:Bs8glZjjFfGPHMw6hQu82RUgEPNGEaBb9KS5KtNMnJ4= github.com/containernetworking/plugins v1.7.1 h1:CNAR0jviDj6FS5Vg85NTgKWLDzZPfi/lj+VJfhMDTIs= github.com/containernetworking/plugins v1.7.1/go.mod h1:xuMdjuio+a1oVQsHKjr/mgzuZ24leAsqUYRnzGoXHy0= -github.com/containers/buildah v1.41.1-0.20250825221131-264309dc1081 h1:Ndq70PQjuxlYogXU/+mImYwt7YOpCvw0s3nMWKWgy1E= -github.com/containers/buildah v1.41.1-0.20250825221131-264309dc1081/go.mod h1:ziMqk5VeNrj/s4nJIWPna1/5KLNLKPzv/HNYfuqurBo= -github.com/containers/common v0.64.2-0.20250826074712-7692941ae9c8 h1:UK34xlXoZb28CPQSXTEJgRjp7q3h/MssgAempB8e7SM= -github.com/containers/common v0.64.2-0.20250826074712-7692941ae9c8/go.mod h1:woK9sIc8wvVW1KiWpgFIfBtHaBhSeAtbk9T4LtA/pVY= +github.com/containers/buildah v1.41.1-0.20250829135344-3367a9bc2c9f h1:t2zdi9mHtJoGmRMXa3i+oD/7xlYHIgoA+/Jtd0Ysf6c= +github.com/containers/buildah v1.41.1-0.20250829135344-3367a9bc2c9f/go.mod h1:LtwfkfBed4dUOFTcBG+O+9Vcu5znw/PLYWDJ1mieHic= +github.com/containers/common v0.62.2 h1:xO45OOoeq17EZMIDZoSyRqg7GXGcRHa9sXlrr75zH+U= +github.com/containers/common v0.62.2/go.mod h1:veFiR9iq2j3CHXtB4YnPHuOkSRdhIQ3bAY8AFMP/5bE= github.com/containers/conmon v2.0.20+incompatible h1:YbCVSFSCqFjjVwHTPINGdMX1F6JXHGTUje2ZYobNrkg= github.com/containers/conmon v2.0.20+incompatible/go.mod h1:hgwZ2mtuDrppv78a/cOBNiCm6O0UMWGx1mu7P00nu5I= github.com/containers/gvisor-tap-vsock v0.8.7 h1:mFMMU5CIXO9sbtsgECc90loUHx15km3AN6Zuhg3X4qM= github.com/containers/gvisor-tap-vsock v0.8.7/go.mod h1:Rf2gm4Lpac0IZbg8wwQDh7UuKCxHmnxar0hEZ08OXY8= -github.com/containers/image/v5 v5.36.2-0.20250825172340-9b99818eb1db h1:+ABWXOR7hMDEzAWeY4+TjYXSfOI1bOWCKvJT5umo24w= -github.com/containers/image/v5 v5.36.2-0.20250825172340-9b99818eb1db/go.mod h1:Z+Cvuk5crGihGEmoNAxSWVulQKfae2maEGKI/KkJY6U= -github.com/containers/libhvee v0.10.0 h1:7VLv8keWZpHuGmWvyY4c1mVH5V1JYb1G78VC+8AlrM0= -github.com/containers/libhvee v0.10.0/go.mod h1:at0h8lRcK5jCKfQgU/e6Io0Mw12F36zRLjXVOXRoDTM= +github.com/containers/libhvee v0.10.1-0.20250829163521-178d10e67860 h1:YOhl3KCie5f4vLmW3N6nnpucD6Wot0bHj2hSzL8ugU8= +github.com/containers/libhvee v0.10.1-0.20250829163521-178d10e67860/go.mod h1:/A6jL8HXzYB4aUQEjlyYImaQTgSw2jYZunSVCwqgaCI= github.com/containers/libtrust v0.0.0-20230121012942-c1716e8a8d01 h1:Qzk5C6cYglewc+UyGf6lc8Mj2UaPTHy/iF2De0/77CA= github.com/containers/libtrust v0.0.0-20230121012942-c1716e8a8d01/go.mod h1:9rfv8iPl1ZP7aqh9YA68wnZv2NUDbXdcdPHVz0pFbPY= github.com/containers/luksy v0.0.0-20250714213221-8fccf784694e h1:nrNp2M6tTNGvLVrJpgqge9GwHgsWBGp2HBKg84BdVd8= github.com/containers/luksy v0.0.0-20250714213221-8fccf784694e/go.mod h1:kPe8hxQEh1x1Uojxjr//MKkxK5x11sxDoY6rW905OL0= github.com/containers/ocicrypt v1.2.1 h1:0qIOTT9DoYwcKmxSt8QJt+VzMY18onl9jUXsxpVhSmM= github.com/containers/ocicrypt v1.2.1/go.mod h1:aD0AAqfMp0MtwqWgHM1bUwe1anx0VazI108CRrSKINQ= -github.com/containers/psgo v1.9.0 h1:eJ74jzSaCHnWt26OlKZROSyUyRcGDf+gYBdXnxrMW4g= -github.com/containers/psgo v1.9.0/go.mod h1:0YoluUm43Mz2UnBIh1P+6V6NWcbpTL5uRtXyOcH0B5A= -github.com/containers/storage v1.59.2-0.20250820181736-3f7c116059ca h1:FaGcdG+JhWHPlhvmJ1MfUdQ5o6c3cWuGKqG1IgLt0kk= -github.com/containers/storage v1.59.2-0.20250820181736-3f7c116059ca/go.mod h1:JoBK4aSy/y402OxJbGjbwZzvNvvn5XkQAOgB89uajFI= +github.com/containers/psgo v1.9.1-0.20250826150930-4ae76f200c86 h1:bYj0TVlkRZtMJYd6SbFOi1gjUJDJmVsYCpJla3URD7Y= +github.com/containers/psgo v1.9.1-0.20250826150930-4ae76f200c86/go.mod h1:52GX23ST30pXpeviDvNpOCXoHqr+WJDv+7BjEH+AabY= github.com/containers/winquit v1.1.0 h1:jArun04BNDQvt2W0Y78kh9TazN2EIEMG5Im6/JY7+pE= github.com/containers/winquit v1.1.0/go.mod h1:PsPeZlnbkmGGIToMPHF1zhWjBUkd8aHjMOr/vFcPxw8= github.com/coreos/go-oidc/v3 v3.14.1 h1:9ePWwfdwC4QKRlCXsJGou56adA/owXczOzwKdOumLqk= @@ -304,8 +300,8 @@ github.com/opencontainers/runtime-tools v0.9.1-0.20250523060157-0ea5ed0382a2 h1: github.com/opencontainers/runtime-tools v0.9.1-0.20250523060157-0ea5ed0382a2/go.mod h1:MXdPzqAA8pHC58USHqNCSjyLnRQ6D+NjbpP+02Z1U/0= github.com/opencontainers/selinux v1.12.0 h1:6n5JV4Cf+4y0KNXW48TLj5DwfXpvWlxXplUkdTrmPb8= github.com/opencontainers/selinux v1.12.0/go.mod h1:BTPX+bjVbWGXw7ZZWUbdENt8w0htPSrlgOOysQaU62U= -github.com/openshift/imagebuilder v1.2.16 h1:Vqjy5uPoVDJiX5JUKHo0Cf440ih5cKI7lVe2ZJ2X+RA= -github.com/openshift/imagebuilder v1.2.16/go.mod h1:gASl6jikVG3bCFnLjG6Ow5TeKwKVvrqUUj8C7EUmqc8= +github.com/openshift/imagebuilder v1.2.16-0.20250828154754-e22ebd3ff511 h1:8pU6rEt+HyVdXlszfbWIwUDf8THLXvjXX5n+5EkxlW8= +github.com/openshift/imagebuilder v1.2.16-0.20250828154754-e22ebd3ff511/go.mod h1:I9FlC4LVo0z/8GM8wdWVhxmw3tUVNM6tiwb8tRv4jvQ= github.com/pierrec/lz4/v4 v4.1.21 h1:yOVMLb6qSIDP67pl/5F7RepeKYu/VmTyEXvuMI5d9mQ= github.com/pierrec/lz4/v4 v4.1.21/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= @@ -399,8 +395,8 @@ github.com/u-root/u-root v0.12.1-0.20240114161452-ab3534910ced h1:G0F7Hmwph1Ojoz github.com/u-root/u-root v0.12.1-0.20240114161452-ab3534910ced/go.mod h1:jtkuv6BVn5jo/WAHgQ1k9XfzHEe1hZmq9yDUvbgL+Iw= github.com/u-root/uio v0.0.0-20240224005618-d2acac8f3701 h1:pyC9PaHYZFgEKFdlp3G8RaCKgVpHZnecvArXvPXcFkM= github.com/u-root/uio v0.0.0-20240224005618-d2acac8f3701/go.mod h1:P3a5rG4X7tI17Nn3aOIAYr5HbIMukwXG0urG0WuL8OA= -github.com/ulikunitz/xz v0.5.13 h1:ar98gWrjf4H1ev05fYP/o29PDZw9DrI3niHtnEqyuXA= -github.com/ulikunitz/xz v0.5.13/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14= +github.com/ulikunitz/xz v0.5.15 h1:9DNdB5s+SgV3bQ2ApL10xRc35ck0DuIX/isZvIk+ubY= +github.com/ulikunitz/xz v0.5.15/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14= github.com/vbatts/tar-split v0.12.1 h1:CqKoORW7BUWBe7UL/iqTVvkTBOF8UvOMKOIZykxnnbo= github.com/vbatts/tar-split v0.12.1/go.mod h1:eF6B6i6ftWQcDqEn3/iGFRFRo8cBIMSJVOpnNdfTMFA= github.com/vbauerster/mpb/v8 v8.10.2 h1:2uBykSHAYHekE11YvJhKxYmLATKHAGorZwFlyNw4hHM= @@ -453,6 +449,12 @@ go.opentelemetry.io/otel/trace v1.35.0 h1:dPpEfJu1sDIqruz7BHFG3c7528f6ddfSWfFDVt go.opentelemetry.io/otel/trace v1.35.0/go.mod h1:WUk7DtFp1Aw2MkvqGdwiXYDZZNvA/1J8o6xRXLrIkyc= go.opentelemetry.io/proto/otlp v1.5.0 h1:xJvq7gMzB31/d406fB8U5CBdyQGw4P399D1aQWU/3i4= go.opentelemetry.io/proto/otlp v1.5.0/go.mod h1:keN8WnHxOy8PG0rQZjJJ5A2ebUoafqWp0eVQ4yIXvJ4= +go.podman.io/common v0.0.0-20250826054041-6e4bed3c9118 h1:irrh47HeVh6YzKd/sDQPxeu4Tr1Cp3HfQt2l9icrDsg= +go.podman.io/common v0.0.0-20250826054041-6e4bed3c9118/go.mod h1:h7a5Zne6vSHzdYC8m4w+AOtuPGTne1852qc6YgLAwMU= +go.podman.io/image/v5 v5.36.1-0.20250820085751-a13b38f45723 h1:FMz5EojZwmYiWQuEs5fu7Iw870k293OPLmBxOsVBzDk= +go.podman.io/image/v5 v5.36.1-0.20250820085751-a13b38f45723/go.mod h1:IHbL4OPh79ir/Au4i3Z/U1Vcumvw3Lu0dgZjwLaydL0= +go.podman.io/storage v1.59.1-0.20250820085751-a13b38f45723 h1:Yvy8mEjlmlocJETNBKr1PV3BuwhNEKiRj8mFUPjsHWA= +go.podman.io/storage v1.59.1-0.20250820085751-a13b38f45723/go.mod h1:NFVh1MHgSeRrphOpLEeJsWV9F5AqT7ZxbYBFRLe0uJM= go.uber.org/automaxprocs v1.6.0 h1:O3y2/QNTOdbF+e/dpXNNW7Rx2hZ4sTIPyybbxyNqTUs= go.uber.org/automaxprocs v1.6.0/go.mod h1:ifeIMSnPZuznNm6jmdzmU3/bfk01Fe2fotchwEFJ8r8= go.yaml.in/yaml/v2 v2.4.2 h1:DzmwEr2rDGHl7lsFgAHxmNz/1NlQ7xLIrlN2h5d1eGI= diff --git a/internal/domain/infra/abi/testing.go b/internal/domain/infra/abi/testing.go index f617656dbd5..ce0074c6da9 100644 --- a/internal/domain/infra/abi/testing.go +++ b/internal/domain/infra/abi/testing.go @@ -9,13 +9,13 @@ import ( "os" "path/filepath" - "github.com/containers/image/v5/manifest" "github.com/containers/podman/v5/internal/domain/entities" "github.com/containers/podman/v5/libpod" - "github.com/containers/storage" - graphdriver "github.com/containers/storage/drivers" - "github.com/containers/storage/pkg/chrootarchive" - "github.com/containers/storage/pkg/stringid" + "go.podman.io/image/v5/manifest" + "go.podman.io/storage" + graphdriver "go.podman.io/storage/drivers" + "go.podman.io/storage/pkg/chrootarchive" + "go.podman.io/storage/pkg/stringid" ) type TestingEngine struct { diff --git a/internal/domain/infra/runtime_proxy.go b/internal/domain/infra/runtime_proxy.go index 2e2600cd659..61f72271312 100644 --- a/internal/domain/infra/runtime_proxy.go +++ b/internal/domain/infra/runtime_proxy.go @@ -9,8 +9,8 @@ import ( "github.com/containers/podman/v5/internal/domain/infra/abi" "github.com/containers/podman/v5/pkg/domain/entities" "github.com/containers/podman/v5/pkg/domain/infra" - "github.com/containers/storage" flag "github.com/spf13/pflag" + "go.podman.io/storage" ) func NewLibpodTestingRuntime(flags *flag.FlagSet, opts *entities.PodmanConfig) (ientities.TestingEngine, error) { diff --git a/internal/localapi/utils.go b/internal/localapi/utils.go index 01e265318e2..6e07e87edfc 100644 --- a/internal/localapi/utils.go +++ b/internal/localapi/utils.go @@ -18,8 +18,8 @@ import ( "github.com/containers/podman/v5/pkg/machine/provider" "github.com/containers/podman/v5/pkg/machine/vmconfigs" "github.com/containers/podman/v5/pkg/specgen" - "github.com/containers/storage/pkg/fileutils" "github.com/sirupsen/logrus" + "go.podman.io/storage/pkg/fileutils" ) // FindMachineByPort finds a running machine that matches the given connection port. diff --git a/libpod/boltdb_state.go b/libpod/boltdb_state.go index ee872ad6be2..bac92f56ffc 100644 --- a/libpod/boltdb_state.go +++ b/libpod/boltdb_state.go @@ -14,11 +14,11 @@ import ( "sync" "time" - "github.com/containers/common/libnetwork/types" "github.com/containers/podman/v5/libpod/define" - "github.com/containers/storage/pkg/fileutils" "github.com/sirupsen/logrus" bolt "go.etcd.io/bbolt" + "go.podman.io/common/libnetwork/types" + "go.podman.io/storage/pkg/fileutils" ) // BoltState is a state implementation backed by a Bolt DB diff --git a/libpod/boltdb_state_internal.go b/libpod/boltdb_state_internal.go index a9b8d278bbb..61a4c4224e5 100644 --- a/libpod/boltdb_state_internal.go +++ b/libpod/boltdb_state_internal.go @@ -10,9 +10,9 @@ import ( "strings" "github.com/containers/podman/v5/libpod/define" - "github.com/containers/storage" "github.com/sirupsen/logrus" bolt "go.etcd.io/bbolt" + "go.podman.io/storage" ) const ( diff --git a/libpod/common_test.go b/libpod/common_test.go index a4af91d2975..2c4bdfe05ec 100644 --- a/libpod/common_test.go +++ b/libpod/common_test.go @@ -9,13 +9,13 @@ import ( "testing" "time" - "github.com/containers/common/libnetwork/types" - "github.com/containers/common/pkg/config" "github.com/containers/podman/v5/libpod/define" "github.com/containers/podman/v5/libpod/lock" "github.com/opencontainers/runtime-tools/generate" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "go.podman.io/common/libnetwork/types" + "go.podman.io/common/pkg/config" ) func getTestContainer(id, name string, manager lock.Manager) (*Container, error) { diff --git a/libpod/container.go b/libpod/container.go index 3fba6c8819a..e7882efa40b 100644 --- a/libpod/container.go +++ b/libpod/container.go @@ -12,16 +12,16 @@ import ( "strings" "time" - "github.com/containers/common/libnetwork/pasta" - "github.com/containers/common/libnetwork/types" - "github.com/containers/common/pkg/config" - "github.com/containers/common/pkg/secrets" - "github.com/containers/image/v5/manifest" "github.com/containers/podman/v5/libpod/define" "github.com/containers/podman/v5/libpod/lock" - "github.com/containers/storage" spec "github.com/opencontainers/runtime-spec/specs-go" "github.com/sirupsen/logrus" + "go.podman.io/common/libnetwork/pasta" + "go.podman.io/common/libnetwork/types" + "go.podman.io/common/pkg/config" + "go.podman.io/common/pkg/secrets" + "go.podman.io/image/v5/manifest" + "go.podman.io/storage" "golang.org/x/sys/unix" ) diff --git a/libpod/container_api.go b/libpod/container_api.go index 5d61d6ca716..f819c77d92c 100644 --- a/libpod/container_api.go +++ b/libpod/container_api.go @@ -11,12 +11,12 @@ import ( "os" "time" - "github.com/containers/common/pkg/resize" "github.com/containers/podman/v5/libpod/define" "github.com/containers/podman/v5/libpod/events" "github.com/containers/podman/v5/pkg/domain/entities" - "github.com/containers/storage/pkg/archive" "github.com/sirupsen/logrus" + "go.podman.io/common/pkg/resize" + "go.podman.io/storage/pkg/archive" "golang.org/x/sys/unix" ) diff --git a/libpod/container_commit.go b/libpod/container_commit.go index 642556995e7..6ee55bad215 100644 --- a/libpod/container_commit.go +++ b/libpod/container_commit.go @@ -9,12 +9,12 @@ import ( "strings" "github.com/containers/buildah" - "github.com/containers/common/libimage" - is "github.com/containers/image/v5/storage" - "github.com/containers/image/v5/types" "github.com/containers/podman/v5/libpod/define" "github.com/containers/podman/v5/libpod/events" "github.com/sirupsen/logrus" + "go.podman.io/common/libimage" + is "go.podman.io/image/v5/storage" + "go.podman.io/image/v5/types" ) // 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 eaf2d8e9076..74d802798f7 100644 --- a/libpod/container_config.go +++ b/libpod/container_config.go @@ -6,14 +6,14 @@ import ( "net" "time" - "github.com/containers/common/libnetwork/types" - "github.com/containers/common/pkg/secrets" - "github.com/containers/image/v5/manifest" "github.com/containers/podman/v5/libpod/define" "github.com/containers/podman/v5/pkg/namespaces" "github.com/containers/podman/v5/pkg/specgen" - "github.com/containers/storage" spec "github.com/opencontainers/runtime-spec/specs-go" + "go.podman.io/common/libnetwork/types" + "go.podman.io/common/pkg/secrets" + "go.podman.io/image/v5/manifest" + "go.podman.io/storage" ) // ContainerConfig contains all information that was used to create the diff --git a/libpod/container_copy_common.go b/libpod/container_copy_common.go index da16b2a91b0..66b66e8c924 100644 --- a/libpod/container_copy_common.go +++ b/libpod/container_copy_common.go @@ -16,11 +16,11 @@ import ( "github.com/containers/podman/v5/libpod/define" "github.com/containers/podman/v5/libpod/shutdown" "github.com/containers/podman/v5/pkg/rootless" - "github.com/containers/storage/pkg/archive" - "github.com/containers/storage/pkg/idtools" - "github.com/containers/storage/pkg/stringid" "github.com/opencontainers/runtime-spec/specs-go" "github.com/sirupsen/logrus" + "go.podman.io/storage/pkg/archive" + "go.podman.io/storage/pkg/idtools" + "go.podman.io/storage/pkg/stringid" ) func (c *Container) copyFromArchive(path string, chown, noOverwriteDirNonDir bool, rename map[string]string, reader io.Reader) (func() error, error) { diff --git a/libpod/container_exec.go b/libpod/container_exec.go index b7397b71b26..b99da2b91e3 100644 --- a/libpod/container_exec.go +++ b/libpod/container_exec.go @@ -12,13 +12,13 @@ import ( "strconv" "time" - "github.com/containers/common/pkg/resize" - "github.com/containers/common/pkg/util" "github.com/containers/podman/v5/libpod/define" "github.com/containers/podman/v5/libpod/events" "github.com/containers/podman/v5/pkg/pidhandle" - "github.com/containers/storage/pkg/stringid" "github.com/sirupsen/logrus" + "go.podman.io/common/pkg/resize" + "go.podman.io/common/pkg/util" + "go.podman.io/storage/pkg/stringid" "golang.org/x/sys/unix" ) diff --git a/libpod/container_inspect_linux.go b/libpod/container_inspect_linux.go index ea7a391d968..63608db79f5 100644 --- a/libpod/container_inspect_linux.go +++ b/libpod/container_inspect_linux.go @@ -7,13 +7,13 @@ import ( "sort" "strings" - "github.com/containers/common/pkg/config" "github.com/containers/podman/v5/libpod/define" "github.com/containers/podman/v5/pkg/util" - "github.com/containers/storage/types" "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/storage/types" ) func (c *Container) platformInspectContainerHostConfig(ctrSpec *spec.Spec, hostConfig *define.InspectContainerHostConfig) error { diff --git a/libpod/container_internal.go b/libpod/container_internal.go index aeedbf3f429..9e2e4895615 100644 --- a/libpod/container_internal.go +++ b/libpod/container_internal.go @@ -22,14 +22,6 @@ import ( "github.com/containers/buildah/copier" "github.com/containers/buildah/pkg/overlay" butil "github.com/containers/buildah/util" - "github.com/containers/common/libnetwork/etchosts" - "github.com/containers/common/pkg/cgroups" - "github.com/containers/common/pkg/chown" - "github.com/containers/common/pkg/config" - "github.com/containers/common/pkg/hooks" - "github.com/containers/common/pkg/hooks/exec" - "github.com/containers/common/pkg/timezone" - cutil "github.com/containers/common/pkg/util" "github.com/containers/podman/v5/libpod/define" "github.com/containers/podman/v5/libpod/events" "github.com/containers/podman/v5/libpod/shutdown" @@ -41,19 +33,27 @@ import ( "github.com/containers/podman/v5/pkg/selinux" "github.com/containers/podman/v5/pkg/systemd/notifyproxy" "github.com/containers/podman/v5/pkg/util" - "github.com/containers/storage" - "github.com/containers/storage/pkg/chrootarchive" - "github.com/containers/storage/pkg/fileutils" - "github.com/containers/storage/pkg/idmap" - "github.com/containers/storage/pkg/idtools" - "github.com/containers/storage/pkg/lockfile" - "github.com/containers/storage/pkg/mount" "github.com/coreos/go-systemd/v22/daemon" securejoin "github.com/cyphar/filepath-securejoin" spec "github.com/opencontainers/runtime-spec/specs-go" "github.com/opencontainers/runtime-tools/generate" "github.com/opencontainers/selinux/go-selinux/label" "github.com/sirupsen/logrus" + "go.podman.io/common/libnetwork/etchosts" + "go.podman.io/common/pkg/cgroups" + "go.podman.io/common/pkg/chown" + "go.podman.io/common/pkg/config" + "go.podman.io/common/pkg/hooks" + "go.podman.io/common/pkg/hooks/exec" + "go.podman.io/common/pkg/timezone" + cutil "go.podman.io/common/pkg/util" + "go.podman.io/storage" + "go.podman.io/storage/pkg/chrootarchive" + "go.podman.io/storage/pkg/fileutils" + "go.podman.io/storage/pkg/idmap" + "go.podman.io/storage/pkg/idtools" + "go.podman.io/storage/pkg/lockfile" + "go.podman.io/storage/pkg/mount" "golang.org/x/sys/unix" ) diff --git a/libpod/container_internal_common.go b/libpod/container_internal_common.go index efb6074d726..e92e78fc212 100644 --- a/libpod/container_internal_common.go +++ b/libpod/container_internal_common.go @@ -27,15 +27,6 @@ import ( "github.com/containers/buildah/pkg/chrootuser" "github.com/containers/buildah/pkg/overlay" butil "github.com/containers/buildah/util" - "github.com/containers/common/libnetwork/etchosts" - "github.com/containers/common/libnetwork/resolvconf" - "github.com/containers/common/libnetwork/types" - "github.com/containers/common/pkg/apparmor" - "github.com/containers/common/pkg/chown" - "github.com/containers/common/pkg/config" - "github.com/containers/common/pkg/subscriptions" - "github.com/containers/common/pkg/umask" - is "github.com/containers/image/v5/storage" "github.com/containers/podman/v5/libpod/define" "github.com/containers/podman/v5/libpod/events" "github.com/containers/podman/v5/pkg/annotations" @@ -46,12 +37,6 @@ import ( "github.com/containers/podman/v5/pkg/rootless" "github.com/containers/podman/v5/pkg/util" "github.com/containers/podman/v5/version" - "github.com/containers/storage/pkg/archive" - "github.com/containers/storage/pkg/fileutils" - "github.com/containers/storage/pkg/idtools" - "github.com/containers/storage/pkg/lockfile" - "github.com/containers/storage/pkg/unshare" - stypes "github.com/containers/storage/types" securejoin "github.com/cyphar/filepath-securejoin" runcuser "github.com/moby/sys/user" spec "github.com/opencontainers/runtime-spec/specs-go" @@ -59,6 +44,21 @@ import ( "github.com/opencontainers/selinux/go-selinux" "github.com/opencontainers/selinux/go-selinux/label" "github.com/sirupsen/logrus" + "go.podman.io/common/libnetwork/etchosts" + "go.podman.io/common/libnetwork/resolvconf" + "go.podman.io/common/libnetwork/types" + "go.podman.io/common/pkg/apparmor" + "go.podman.io/common/pkg/chown" + "go.podman.io/common/pkg/config" + "go.podman.io/common/pkg/subscriptions" + "go.podman.io/common/pkg/umask" + is "go.podman.io/image/v5/storage" + "go.podman.io/storage/pkg/archive" + "go.podman.io/storage/pkg/fileutils" + "go.podman.io/storage/pkg/idtools" + "go.podman.io/storage/pkg/lockfile" + "go.podman.io/storage/pkg/unshare" + stypes "go.podman.io/storage/types" "golang.org/x/sys/unix" cdi "tags.cncf.io/container-device-interface/pkg/cdi" ) diff --git a/libpod/container_internal_freebsd.go b/libpod/container_internal_freebsd.go index 2db1b19c41c..502228563c3 100644 --- a/libpod/container_internal_freebsd.go +++ b/libpod/container_internal_freebsd.go @@ -12,12 +12,12 @@ import ( "syscall" "time" - "github.com/containers/common/libnetwork/types" "github.com/containers/podman/v5/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" "golang.org/x/sys/unix" ) diff --git a/libpod/container_internal_linux.go b/libpod/container_internal_linux.go index 1de76d0e13b..a0054ebed37 100644 --- a/libpod/container_internal_linux.go +++ b/libpod/container_internal_linux.go @@ -14,10 +14,6 @@ import ( "syscall" "time" - "github.com/containers/common/libnetwork/slirp4netns" - "github.com/containers/common/libnetwork/types" - "github.com/containers/common/pkg/cgroups" - "github.com/containers/common/pkg/config" "github.com/containers/podman/v5/libpod/define" "github.com/containers/podman/v5/libpod/shutdown" "github.com/containers/podman/v5/pkg/rootless" @@ -27,6 +23,10 @@ import ( "github.com/opencontainers/runtime-tools/generate" "github.com/opencontainers/selinux/go-selinux/label" "github.com/sirupsen/logrus" + "go.podman.io/common/libnetwork/slirp4netns" + "go.podman.io/common/libnetwork/types" + "go.podman.io/common/pkg/cgroups" + "go.podman.io/common/pkg/config" "golang.org/x/sys/unix" ) diff --git a/libpod/container_internal_test.go b/libpod/container_internal_test.go index 91bb3f30cc2..0f9e213ecc7 100644 --- a/libpod/container_internal_test.go +++ b/libpod/container_internal_test.go @@ -11,10 +11,10 @@ import ( "strings" "testing" - "github.com/containers/storage/pkg/idtools" - stypes "github.com/containers/storage/types" rspec "github.com/opencontainers/runtime-spec/specs-go" "github.com/stretchr/testify/assert" + "go.podman.io/storage/pkg/idtools" + stypes "go.podman.io/storage/types" ) // hookPath is the path to an example hook executable. diff --git a/libpod/container_top_linux.go b/libpod/container_top_linux.go index bc8ed2511b2..021bd1ee874 100644 --- a/libpod/container_top_linux.go +++ b/libpod/container_top_linux.go @@ -20,9 +20,9 @@ import ( "github.com/containers/podman/v5/libpod/define" "github.com/containers/podman/v5/pkg/rootless" "github.com/containers/psgo" - "github.com/containers/storage/pkg/reexec" "github.com/google/shlex" "github.com/sirupsen/logrus" + "go.podman.io/storage/pkg/reexec" "golang.org/x/sys/unix" ) diff --git a/libpod/container_validate.go b/libpod/container_validate.go index b80c5c57e38..f3fa222f8f8 100644 --- a/libpod/container_validate.go +++ b/libpod/container_validate.go @@ -6,11 +6,11 @@ import ( "fmt" "strings" - "github.com/containers/image/v5/docker" - "github.com/containers/image/v5/pkg/shortnames" - "github.com/containers/image/v5/transports/alltransports" "github.com/containers/podman/v5/libpod/define" spec "github.com/opencontainers/runtime-spec/specs-go" + "go.podman.io/image/v5/docker" + "go.podman.io/image/v5/pkg/shortnames" + "go.podman.io/image/v5/transports/alltransports" ) // Validate that the configuration of a container is valid. diff --git a/libpod/define/config.go b/libpod/define/config.go index c76238e6dd6..e28be865593 100644 --- a/libpod/define/config.go +++ b/libpod/define/config.go @@ -4,7 +4,7 @@ import ( "bufio" "io" - "github.com/containers/common/libnetwork/types" + "go.podman.io/common/libnetwork/types" ) var ( diff --git a/libpod/define/container_inspect.go b/libpod/define/container_inspect.go index bd3492d3d4e..a3018d2d9ba 100644 --- a/libpod/define/container_inspect.go +++ b/libpod/define/container_inspect.go @@ -6,8 +6,8 @@ import ( "strings" "time" - "github.com/containers/image/v5/manifest" "github.com/containers/podman/v5/pkg/signal" + "go.podman.io/image/v5/manifest" ) type InspectIDMappings struct { diff --git a/libpod/define/errors.go b/libpod/define/errors.go index b9f0d83fdd4..ac502b8bba1 100644 --- a/libpod/define/errors.go +++ b/libpod/define/errors.go @@ -4,8 +4,8 @@ import ( "errors" "fmt" - "github.com/containers/common/libnetwork/types" - "github.com/containers/common/pkg/detach" + "go.podman.io/common/libnetwork/types" + "go.podman.io/common/pkg/detach" ) var ( diff --git a/libpod/define/healthchecks.go b/libpod/define/healthchecks.go index 641526369e1..6e1560d70bd 100644 --- a/libpod/define/healthchecks.go +++ b/libpod/define/healthchecks.go @@ -6,7 +6,7 @@ import ( "path/filepath" "strings" - "github.com/containers/image/v5/manifest" + "go.podman.io/image/v5/manifest" ) const ( diff --git a/libpod/define/info.go b/libpod/define/info.go index 967a664c99b..6132df4de07 100644 --- a/libpod/define/info.go +++ b/libpod/define/info.go @@ -1,8 +1,8 @@ package define import ( - "github.com/containers/common/libnetwork/types" - "github.com/containers/storage/pkg/idtools" + "go.podman.io/common/libnetwork/types" + "go.podman.io/storage/pkg/idtools" ) // Info is the overall struct that describes the host system diff --git a/libpod/diff.go b/libpod/diff.go index b32881facad..1cff86e9560 100644 --- a/libpod/diff.go +++ b/libpod/diff.go @@ -7,7 +7,7 @@ import ( "github.com/containers/podman/v5/libpod/define" "github.com/containers/podman/v5/libpod/layers" - "github.com/containers/storage/pkg/archive" + "go.podman.io/storage/pkg/archive" ) var initInodes = map[string]bool{ diff --git a/libpod/driver/driver.go b/libpod/driver/driver.go index 789089a23f3..35ed69fefd2 100644 --- a/libpod/driver/driver.go +++ b/libpod/driver/driver.go @@ -2,7 +2,7 @@ package driver import ( "github.com/containers/podman/v5/libpod/define" - "github.com/containers/storage" + "go.podman.io/storage" ) // GetDriverData returns information on a given store's running graph driver. diff --git a/libpod/events/events.go b/libpod/events/events.go index 2b699b33c03..1638ffb62f5 100644 --- a/libpod/events/events.go +++ b/libpod/events/events.go @@ -6,7 +6,7 @@ import ( "fmt" "time" - "github.com/containers/storage/pkg/stringid" + "go.podman.io/storage/pkg/stringid" ) // ErrNoJournaldLogging indicates that there is no journald logging diff --git a/libpod/events/logfile.go b/libpod/events/logfile.go index 97d9ef875bc..c862119bcaa 100644 --- a/libpod/events/logfile.go +++ b/libpod/events/logfile.go @@ -14,9 +14,9 @@ import ( "time" "github.com/containers/podman/v5/pkg/util" - "github.com/containers/storage/pkg/lockfile" "github.com/nxadm/tail" "github.com/sirupsen/logrus" + "go.podman.io/storage/pkg/lockfile" "golang.org/x/sys/unix" ) diff --git a/libpod/healthcheck_config.go b/libpod/healthcheck_config.go index 8b9b25833bc..32947a62b3e 100644 --- a/libpod/healthcheck_config.go +++ b/libpod/healthcheck_config.go @@ -7,9 +7,9 @@ import ( "strings" "time" - "github.com/containers/image/v5/manifest" "github.com/containers/podman/v5/libpod/define" "github.com/containers/podman/v5/pkg/specgenutil" + "go.podman.io/image/v5/manifest" ) type HealthCheckConfig struct { diff --git a/libpod/healthcheck_linux.go b/libpod/healthcheck_linux.go index 28acd6f17dc..2723c1eb21a 100644 --- a/libpod/healthcheck_linux.go +++ b/libpod/healthcheck_linux.go @@ -11,11 +11,11 @@ import ( "os/exec" "strings" - systemdCommon "github.com/containers/common/pkg/systemd" "github.com/containers/podman/v5/pkg/errorhandling" "github.com/containers/podman/v5/pkg/rootless" "github.com/containers/podman/v5/pkg/systemd" "github.com/sirupsen/logrus" + systemdCommon "go.podman.io/common/pkg/systemd" ) // createTimer systemd timers for healthchecks of a container diff --git a/libpod/info.go b/libpod/info.go index 550b279ac0b..913fb119241 100644 --- a/libpod/info.go +++ b/libpod/info.go @@ -17,13 +17,13 @@ import ( "github.com/containers/buildah" "github.com/containers/buildah/pkg/parse" "github.com/containers/buildah/pkg/util" - "github.com/containers/common/pkg/version" - "github.com/containers/image/v5/pkg/sysregistriesv2" "github.com/containers/podman/v5/libpod/define" "github.com/containers/podman/v5/libpod/linkmode" - "github.com/containers/storage" - "github.com/containers/storage/pkg/system" "github.com/sirupsen/logrus" + "go.podman.io/common/pkg/version" + "go.podman.io/image/v5/pkg/sysregistriesv2" + "go.podman.io/storage" + "go.podman.io/storage/pkg/system" ) // Info returns the store and host information diff --git a/libpod/info_linux.go b/libpod/info_linux.go index 1e6bed8c891..2ab534070b2 100644 --- a/libpod/info_linux.go +++ b/libpod/info_linux.go @@ -10,18 +10,18 @@ import ( "strconv" "strings" - "github.com/containers/common/libnetwork/pasta" - "github.com/containers/common/libnetwork/slirp4netns" - "github.com/containers/common/pkg/apparmor" - "github.com/containers/common/pkg/cgroups" - "github.com/containers/common/pkg/seccomp" - "github.com/containers/common/pkg/version" "github.com/containers/podman/v5/libpod/define" "github.com/containers/podman/v5/pkg/rootless" "github.com/containers/podman/v5/pkg/util" - "github.com/containers/storage/pkg/unshare" "github.com/opencontainers/selinux/go-selinux" "github.com/sirupsen/logrus" + "go.podman.io/common/libnetwork/pasta" + "go.podman.io/common/libnetwork/slirp4netns" + "go.podman.io/common/pkg/apparmor" + "go.podman.io/common/pkg/cgroups" + "go.podman.io/common/pkg/seccomp" + "go.podman.io/common/pkg/version" + "go.podman.io/storage/pkg/unshare" ) func (r *Runtime) setPlatformHostInfo(info *define.HostInfo) error { diff --git a/libpod/kube.go b/libpod/kube.go index 76433e67f4e..c63e8f72e82 100644 --- a/libpod/kube.go +++ b/libpod/kube.go @@ -15,8 +15,6 @@ import ( "strings" "time" - "github.com/containers/common/libnetwork/types" - "github.com/containers/common/pkg/config" "github.com/containers/podman/v5/libpod/define" "github.com/containers/podman/v5/pkg/domain/entities" "github.com/containers/podman/v5/pkg/env" @@ -30,6 +28,8 @@ import ( "github.com/containers/podman/v5/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" ) // GenerateForKube takes a slice of libpod containers and generates diff --git a/libpod/layers/layer.go b/libpod/layers/layer.go index 865cbe7009b..d1e5bd5ab47 100644 --- a/libpod/layers/layer.go +++ b/libpod/layers/layer.go @@ -1,6 +1,6 @@ package layers -import cstorage "github.com/containers/storage" +import cstorage "go.podman.io/storage" // FullID gets the full id of a layer given a partial id or name func FullID(store cstorage.Store, id string) (string, error) { diff --git a/libpod/lock/file/file_lock.go b/libpod/lock/file/file_lock.go index 58e4f560ade..e2b9f021cb1 100644 --- a/libpod/lock/file/file_lock.go +++ b/libpod/lock/file/file_lock.go @@ -9,9 +9,9 @@ import ( "strconv" "syscall" - "github.com/containers/storage/pkg/fileutils" - "github.com/containers/storage/pkg/lockfile" "github.com/sirupsen/logrus" + "go.podman.io/storage/pkg/fileutils" + "go.podman.io/storage/pkg/lockfile" ) // FileLocks is a struct enabling POSIX lock locking in a shared memory diff --git a/libpod/networking_common.go b/libpod/networking_common.go index 8fbcacd66d6..86ecf513a37 100644 --- a/libpod/networking_common.go +++ b/libpod/networking_common.go @@ -10,16 +10,16 @@ import ( "slices" "sort" - "github.com/containers/common/libnetwork/etchosts" - "github.com/containers/common/libnetwork/types" - "github.com/containers/common/pkg/config" - "github.com/containers/common/pkg/machine" "github.com/containers/podman/v5/libpod/define" "github.com/containers/podman/v5/libpod/events" "github.com/containers/podman/v5/pkg/namespaces" "github.com/containers/podman/v5/pkg/rootless" - "github.com/containers/storage/pkg/lockfile" "github.com/sirupsen/logrus" + "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/storage/pkg/lockfile" ) // bindPorts ports to keep them open via conmon so no other process can use them and we can check if they are in use. diff --git a/libpod/networking_freebsd.go b/libpod/networking_freebsd.go index 66048c3a247..e18e812142b 100644 --- a/libpod/networking_freebsd.go +++ b/libpod/networking_freebsd.go @@ -11,9 +11,9 @@ import ( "os/exec" "github.com/containers/buildah/pkg/jail" - "github.com/containers/common/libnetwork/types" "github.com/containers/podman/v5/libpod/define" "github.com/sirupsen/logrus" + "go.podman.io/common/libnetwork/types" ) type Netstat struct { diff --git a/libpod/networking_linux.go b/libpod/networking_linux.go index 688985b5ec9..7c58936b2fc 100644 --- a/libpod/networking_linux.go +++ b/libpod/networking_linux.go @@ -7,13 +7,13 @@ import ( "net" "github.com/containernetworking/plugins/pkg/ns" - "github.com/containers/common/libnetwork/types" - "github.com/containers/common/pkg/netns" "github.com/containers/podman/v5/libpod/define" "github.com/containers/podman/v5/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" ) // 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 51f8bc724b4..3abcaa3cba2 100644 --- a/libpod/networking_linux_test.go +++ b/libpod/networking_linux_test.go @@ -10,8 +10,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/containers/common/libnetwork/types" "github.com/containers/podman/v5/libpod/define" + "go.podman.io/common/libnetwork/types" ) func Test_ocicniPortsToNetTypesPorts(t *testing.T) { diff --git a/libpod/networking_machine.go b/libpod/networking_machine.go index 7804b53d64d..a3af915bdfb 100644 --- a/libpod/networking_machine.go +++ b/libpod/networking_machine.go @@ -14,9 +14,9 @@ import ( "strings" "time" - "github.com/containers/common/libnetwork/types" - "github.com/containers/common/pkg/machine" "github.com/sirupsen/logrus" + "go.podman.io/common/libnetwork/types" + "go.podman.io/common/pkg/machine" ) const machineGvproxyEndpoint = "gateway.containers.internal" diff --git a/libpod/networking_pasta_linux.go b/libpod/networking_pasta_linux.go index 89724514b40..af173e8ecc6 100644 --- a/libpod/networking_pasta_linux.go +++ b/libpod/networking_pasta_linux.go @@ -9,7 +9,7 @@ package libpod -import "github.com/containers/common/libnetwork/pasta" +import "go.podman.io/common/libnetwork/pasta" func (r *Runtime) setupPasta(ctr *Container, netns string) error { res, err := pasta.Setup(&pasta.SetupOptions{ diff --git a/libpod/networking_slirp4netns.go b/libpod/networking_slirp4netns.go index 0de8e439f6a..9685f8507af 100644 --- a/libpod/networking_slirp4netns.go +++ b/libpod/networking_slirp4netns.go @@ -9,10 +9,10 @@ import ( "os" "path/filepath" - "github.com/containers/common/libnetwork/slirp4netns" - "github.com/containers/common/libnetwork/types" "github.com/containers/podman/v5/pkg/errorhandling" "github.com/sirupsen/logrus" + "go.podman.io/common/libnetwork/slirp4netns" + "go.podman.io/common/libnetwork/types" ) // setupSlirp4netns can be called in rootful as well as in rootless diff --git a/libpod/oci.go b/libpod/oci.go index f14b4acf832..75c1ce6845b 100644 --- a/libpod/oci.go +++ b/libpod/oci.go @@ -5,9 +5,9 @@ package libpod import ( "net/http" - "github.com/containers/common/pkg/resize" "github.com/containers/podman/v5/libpod/define" "github.com/opencontainers/runtime-spec/specs-go" + "go.podman.io/common/pkg/resize" ) // 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 c2e1b6351fc..7debcaa71f6 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/common/pkg/config" - "github.com/containers/common/pkg/detach" - "github.com/containers/common/pkg/resize" "github.com/containers/podman/v5/libpod/define" "github.com/containers/podman/v5/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" "golang.org/x/sys/unix" ) diff --git a/libpod/oci_conmon_common.go b/libpod/oci_conmon_common.go index 72697094126..8ef3e47f7c6 100644 --- a/libpod/oci_conmon_common.go +++ b/libpod/oci_conmon_common.go @@ -21,10 +21,6 @@ import ( "text/template" "time" - "github.com/containers/common/pkg/config" - "github.com/containers/common/pkg/detach" - "github.com/containers/common/pkg/resize" - "github.com/containers/common/pkg/version" conmonConfig "github.com/containers/conmon/runner/config" "github.com/containers/podman/v5/libpod/define" "github.com/containers/podman/v5/libpod/logs" @@ -34,9 +30,13 @@ import ( "github.com/containers/podman/v5/pkg/specgenutil" "github.com/containers/podman/v5/pkg/util" "github.com/containers/podman/v5/utils" - "github.com/containers/storage/pkg/idtools" 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/storage/pkg/idtools" "golang.org/x/sys/unix" ) diff --git a/libpod/oci_conmon_exec_common.go b/libpod/oci_conmon_exec_common.go index 8d14924711a..f25153ed286 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/common/pkg/config" - "github.com/containers/common/pkg/detach" - "github.com/containers/common/pkg/resize" "github.com/containers/podman/v5/libpod/define" "github.com/containers/podman/v5/pkg/errorhandling" "github.com/containers/podman/v5/pkg/lookup" "github.com/containers/podman/v5/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" "golang.org/x/sys/unix" ) diff --git a/libpod/oci_conmon_exec_linux.go b/libpod/oci_conmon_exec_linux.go index e0d2f58422d..78c5c6220fa 100644 --- a/libpod/oci_conmon_exec_linux.go +++ b/libpod/oci_conmon_exec_linux.go @@ -3,9 +3,9 @@ package libpod import ( - "github.com/containers/common/pkg/capabilities" "github.com/moby/sys/user" spec "github.com/opencontainers/runtime-spec/specs-go" + "go.podman.io/common/pkg/capabilities" ) func (c *Container) setProcessCapabilitiesExec(options *ExecOptions, user string, execUser *user.ExecUser, pspec *spec.Process) error { diff --git a/libpod/oci_conmon_linux.go b/libpod/oci_conmon_linux.go index 93dd53f77c4..4290670a9ff 100644 --- a/libpod/oci_conmon_linux.go +++ b/libpod/oci_conmon_linux.go @@ -13,17 +13,17 @@ import ( "strings" "sync" - "github.com/containers/common/pkg/cgroups" - "github.com/containers/common/pkg/config" - "github.com/containers/common/pkg/systemd" "github.com/containers/podman/v5/pkg/errorhandling" "github.com/containers/podman/v5/pkg/rootless" - pmount "github.com/containers/storage/pkg/mount" runcconfig "github.com/opencontainers/cgroups" devices "github.com/opencontainers/cgroups/devices/config" spec "github.com/opencontainers/runtime-spec/specs-go" "github.com/opencontainers/selinux/go-selinux" "github.com/sirupsen/logrus" + "go.podman.io/common/pkg/cgroups" + "go.podman.io/common/pkg/config" + "go.podman.io/common/pkg/systemd" + 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 bfdbbf228e8..39a1617a31d 100644 --- a/libpod/oci_missing.go +++ b/libpod/oci_missing.go @@ -8,10 +8,10 @@ import ( "path/filepath" "sync" - "github.com/containers/common/pkg/resize" "github.com/containers/podman/v5/libpod/define" spec "github.com/opencontainers/runtime-spec/specs-go" "github.com/sirupsen/logrus" + "go.podman.io/common/pkg/resize" ) var ( diff --git a/libpod/oci_util.go b/libpod/oci_util.go index 8b20af70cfa..4a29c028213 100644 --- a/libpod/oci_util.go +++ b/libpod/oci_util.go @@ -10,9 +10,9 @@ import ( "strings" "time" - "github.com/containers/common/libnetwork/types" "github.com/containers/podman/v5/libpod/define" "github.com/sirupsen/logrus" + "go.podman.io/common/libnetwork/types" ) // Timeout before declaring that runtime has failed to kill a given diff --git a/libpod/options.go b/libpod/options.go index 5a24d890152..741dc765c2c 100644 --- a/libpod/options.go +++ b/libpod/options.go @@ -13,22 +13,22 @@ import ( "time" "github.com/containers/buildah/pkg/parse" - nettypes "github.com/containers/common/libnetwork/types" - "github.com/containers/common/pkg/config" - "github.com/containers/common/pkg/secrets" - "github.com/containers/image/v5/manifest" - "github.com/containers/image/v5/types" "github.com/containers/podman/v5/libpod/define" "github.com/containers/podman/v5/libpod/events" "github.com/containers/podman/v5/pkg/namespaces" "github.com/containers/podman/v5/pkg/util" - "github.com/containers/storage" - "github.com/containers/storage/pkg/fileutils" - "github.com/containers/storage/pkg/idtools" - "github.com/containers/storage/pkg/regexp" "github.com/opencontainers/runtime-spec/specs-go" "github.com/opencontainers/runtime-tools/generate" "github.com/sirupsen/logrus" + nettypes "go.podman.io/common/libnetwork/types" + "go.podman.io/common/pkg/config" + "go.podman.io/common/pkg/secrets" + "go.podman.io/image/v5/manifest" + "go.podman.io/image/v5/types" + "go.podman.io/storage" + "go.podman.io/storage/pkg/fileutils" + "go.podman.io/storage/pkg/idtools" + "go.podman.io/storage/pkg/regexp" ) var umaskRegex = regexp.Delayed(`^[0-7]{1,4}$`) diff --git a/libpod/plugin/volume_api.go b/libpod/plugin/volume_api.go index 834d9c9800d..0de49085ad8 100644 --- a/libpod/plugin/volume_api.go +++ b/libpod/plugin/volume_api.go @@ -14,13 +14,13 @@ import ( "sync" "time" - "github.com/containers/common/pkg/config" "github.com/containers/podman/v5/libpod/define" - "github.com/containers/storage/pkg/fileutils" "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/storage/pkg/fileutils" ) var json = jsoniter.ConfigCompatibleWithStandardLibrary diff --git a/libpod/pod.go b/libpod/pod.go index 1a3ee3cb425..b7571757f63 100644 --- a/libpod/pod.go +++ b/libpod/pod.go @@ -9,10 +9,10 @@ import ( "strings" "time" - "github.com/containers/common/pkg/config" "github.com/containers/podman/v5/libpod/define" "github.com/containers/podman/v5/libpod/lock" "github.com/opencontainers/runtime-spec/specs-go" + "go.podman.io/common/pkg/config" ) // Pod represents a group of containers that are managed together. diff --git a/libpod/pod_api.go b/libpod/pod_api.go index 7d166eef073..adaff0a3221 100644 --- a/libpod/pod_api.go +++ b/libpod/pod_api.go @@ -7,13 +7,13 @@ import ( "errors" "fmt" - "github.com/containers/common/pkg/cgroups" "github.com/containers/podman/v5/libpod/define" "github.com/containers/podman/v5/libpod/events" "github.com/containers/podman/v5/pkg/parallel" "github.com/containers/podman/v5/pkg/rootless" "github.com/opencontainers/runtime-spec/specs-go" "github.com/sirupsen/logrus" + "go.podman.io/common/pkg/cgroups" ) // startInitContainers starts a pod's init containers. diff --git a/libpod/pod_internal.go b/libpod/pod_internal.go index 8af8615649d..b559ae7f641 100644 --- a/libpod/pod_internal.go +++ b/libpod/pod_internal.go @@ -7,7 +7,7 @@ import ( "time" "github.com/containers/podman/v5/libpod/define" - "github.com/containers/storage/pkg/stringid" + "go.podman.io/storage/pkg/stringid" ) // Creates a new, empty pod diff --git a/libpod/pod_internal_linux.go b/libpod/pod_internal_linux.go index 873e2c24aad..e4ea3d3074f 100644 --- a/libpod/pod_internal_linux.go +++ b/libpod/pod_internal_linux.go @@ -6,10 +6,10 @@ import ( "fmt" "path/filepath" - "github.com/containers/common/pkg/config" "github.com/containers/podman/v5/libpod/define" "github.com/containers/podman/v5/pkg/rootless" "github.com/sirupsen/logrus" + "go.podman.io/common/pkg/config" ) func (p *Pod) platformRefresh() error { diff --git a/libpod/reset.go b/libpod/reset.go index 00ae3bd42c8..addb40c7063 100644 --- a/libpod/reset.go +++ b/libpod/reset.go @@ -9,16 +9,16 @@ import ( "os" "path/filepath" - "github.com/containers/common/libimage" - "github.com/containers/common/libnetwork/types" - blobinfocache "github.com/containers/image/v5/pkg/blobinfocache" "github.com/containers/podman/v5/libpod/define" "github.com/containers/podman/v5/pkg/errorhandling" "github.com/containers/podman/v5/pkg/util" - "github.com/containers/storage" - "github.com/containers/storage/pkg/lockfile" - stypes "github.com/containers/storage/types" "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/storage" + "go.podman.io/storage/pkg/lockfile" + stypes "go.podman.io/storage/types" ) // removeAllDirs removes all Podman storage directories. It is intended to be diff --git a/libpod/runtime.go b/libpod/runtime.go index 4c874d33e01..d6d5364874e 100644 --- a/libpod/runtime.go +++ b/libpod/runtime.go @@ -17,16 +17,6 @@ import ( "time" "github.com/containers/buildah/pkg/parse" - "github.com/containers/common/libimage" - "github.com/containers/common/libnetwork/network" - nettypes "github.com/containers/common/libnetwork/types" - "github.com/containers/common/pkg/cgroups" - "github.com/containers/common/pkg/config" - "github.com/containers/common/pkg/secrets" - systemdCommon "github.com/containers/common/pkg/systemd" - "github.com/containers/image/v5/pkg/sysregistriesv2" - is "github.com/containers/image/v5/storage" - "github.com/containers/image/v5/types" "github.com/containers/podman/v5/libpod/define" "github.com/containers/podman/v5/libpod/events" "github.com/containers/podman/v5/libpod/lock" @@ -38,15 +28,25 @@ import ( "github.com/containers/podman/v5/pkg/rootless" "github.com/containers/podman/v5/pkg/systemd" "github.com/containers/podman/v5/pkg/util" - "github.com/containers/storage" - "github.com/containers/storage/pkg/fileutils" - "github.com/containers/storage/pkg/lockfile" - "github.com/containers/storage/pkg/unshare" "github.com/docker/docker/pkg/namesgenerator" "github.com/hashicorp/go-multierror" jsoniter "github.com/json-iterator/go" spec "github.com/opencontainers/runtime-spec/specs-go" "github.com/sirupsen/logrus" + "go.podman.io/common/libimage" + "go.podman.io/common/libnetwork/network" + nettypes "go.podman.io/common/libnetwork/types" + "go.podman.io/common/pkg/cgroups" + "go.podman.io/common/pkg/config" + "go.podman.io/common/pkg/secrets" + systemdCommon "go.podman.io/common/pkg/systemd" + "go.podman.io/image/v5/pkg/sysregistriesv2" + is "go.podman.io/image/v5/storage" + "go.podman.io/image/v5/types" + "go.podman.io/storage" + "go.podman.io/storage/pkg/fileutils" + "go.podman.io/storage/pkg/lockfile" + "go.podman.io/storage/pkg/unshare" ) // Set up the JSON library for all of Libpod diff --git a/libpod/runtime_cstorage.go b/libpod/runtime_cstorage.go index 21078999bb9..ed16dcace0e 100644 --- a/libpod/runtime_cstorage.go +++ b/libpod/runtime_cstorage.go @@ -8,8 +8,8 @@ import ( "time" "github.com/containers/podman/v5/libpod/define" - "github.com/containers/storage" "github.com/sirupsen/logrus" + "go.podman.io/storage" ) // StorageContainer represents a container present in c/storage but not in diff --git a/libpod/runtime_ctr.go b/libpod/runtime_ctr.go index 941d3e048c3..22aa76543e4 100644 --- a/libpod/runtime_ctr.go +++ b/libpod/runtime_ctr.go @@ -15,9 +15,6 @@ import ( "time" "github.com/containers/buildah" - "github.com/containers/common/libnetwork/types" - "github.com/containers/common/pkg/cgroups" - "github.com/containers/common/pkg/config" "github.com/containers/podman/v5/libpod/define" "github.com/containers/podman/v5/libpod/events" "github.com/containers/podman/v5/libpod/shutdown" @@ -25,12 +22,15 @@ import ( "github.com/containers/podman/v5/pkg/rootless" "github.com/containers/podman/v5/pkg/specgen" "github.com/containers/podman/v5/pkg/util" - "github.com/containers/storage" - "github.com/containers/storage/pkg/stringid" "github.com/docker/go-units" 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/common/pkg/cgroups" + "go.podman.io/common/pkg/config" + "go.podman.io/storage" + "go.podman.io/storage/pkg/stringid" ) // Contains the public Runtime API for containers diff --git a/libpod/runtime_img.go b/libpod/runtime_img.go index 905ed207fc7..98474ee90af 100644 --- a/libpod/runtime_img.go +++ b/libpod/runtime_img.go @@ -9,11 +9,11 @@ import ( buildahDefine "github.com/containers/buildah/define" "github.com/containers/buildah/imagebuildah" - "github.com/containers/common/libimage" - "github.com/containers/image/v5/docker/reference" "github.com/containers/podman/v5/libpod/define" "github.com/containers/podman/v5/libpod/events" "github.com/sirupsen/logrus" + "go.podman.io/common/libimage" + "go.podman.io/image/v5/docker/reference" ) // Runtime API diff --git a/libpod/runtime_linux.go b/libpod/runtime_linux.go index 065a11959ca..85c271e397d 100644 --- a/libpod/runtime_linux.go +++ b/libpod/runtime_linux.go @@ -9,10 +9,10 @@ import ( "golang.org/x/sys/unix" - "github.com/containers/common/pkg/cgroups" "github.com/containers/podman/v5/pkg/rootless" "github.com/containers/podman/v5/pkg/systemd" "github.com/sirupsen/logrus" + "go.podman.io/common/pkg/cgroups" ) func checkCgroups2UnifiedMode(runtime *Runtime) { diff --git a/libpod/runtime_pod_linux.go b/libpod/runtime_pod_linux.go index b0f39b101b0..0dec268d445 100644 --- a/libpod/runtime_pod_linux.go +++ b/libpod/runtime_pod_linux.go @@ -8,12 +8,12 @@ import ( "path/filepath" "strings" - "github.com/containers/common/pkg/cgroups" - "github.com/containers/common/pkg/config" "github.com/containers/podman/v5/libpod/define" "github.com/containers/podman/v5/pkg/rootless" spec "github.com/opencontainers/runtime-spec/specs-go" "github.com/sirupsen/logrus" + "go.podman.io/common/pkg/cgroups" + "go.podman.io/common/pkg/config" ) func (r *Runtime) platformMakePod(pod *Pod, resourceLimits *spec.LinuxResources) (string, error) { diff --git a/libpod/runtime_volume_common.go b/libpod/runtime_volume_common.go index 5bf8c84eb1d..1e1a6e84706 100644 --- a/libpod/runtime_volume_common.go +++ b/libpod/runtime_volume_common.go @@ -14,14 +14,14 @@ import ( "github.com/containers/podman/v5/libpod/define" "github.com/containers/podman/v5/libpod/events" volplugin "github.com/containers/podman/v5/libpod/plugin" - "github.com/containers/storage" - "github.com/containers/storage/drivers/quota" - "github.com/containers/storage/pkg/fileutils" - "github.com/containers/storage/pkg/idtools" - "github.com/containers/storage/pkg/stringid" pluginapi "github.com/docker/go-plugins-helpers/volume" "github.com/opencontainers/selinux/go-selinux" "github.com/sirupsen/logrus" + "go.podman.io/storage" + "go.podman.io/storage/drivers/quota" + "go.podman.io/storage/pkg/fileutils" + "go.podman.io/storage/pkg/idtools" + "go.podman.io/storage/pkg/stringid" ) const volumeSuffix = "+volume" diff --git a/libpod/sqlite_state.go b/libpod/sqlite_state.go index 72fb83f62f3..9dc80f9cf28 100644 --- a/libpod/sqlite_state.go +++ b/libpod/sqlite_state.go @@ -12,10 +12,10 @@ import ( "strings" "time" - "github.com/containers/common/libnetwork/types" "github.com/containers/podman/v5/libpod/define" - "github.com/containers/storage" "github.com/sirupsen/logrus" + "go.podman.io/common/libnetwork/types" + "go.podman.io/storage" // SQLite backend for database/sql _ "github.com/mattn/go-sqlite3" diff --git a/libpod/sqlite_state_internal.go b/libpod/sqlite_state_internal.go index 7aa2048eddd..a295380662d 100644 --- a/libpod/sqlite_state_internal.go +++ b/libpod/sqlite_state_internal.go @@ -9,9 +9,9 @@ import ( "os" "strings" - "github.com/containers/common/libnetwork/types" "github.com/containers/podman/v5/libpod/define" "github.com/sirupsen/logrus" + "go.podman.io/common/libnetwork/types" // SQLite backend for database/sql _ "github.com/mattn/go-sqlite3" diff --git a/libpod/state.go b/libpod/state.go index ae9290bc5a2..a07ee92a6ce 100644 --- a/libpod/state.go +++ b/libpod/state.go @@ -2,7 +2,7 @@ package libpod -import "github.com/containers/common/libnetwork/types" +import "go.podman.io/common/libnetwork/types" // State is a storage backend for libpod's current state. // A State is only initialized once per instance of libpod. diff --git a/libpod/state_test.go b/libpod/state_test.go index 5572638602d..3b804b413a2 100644 --- a/libpod/state_test.go +++ b/libpod/state_test.go @@ -9,13 +9,13 @@ import ( "testing" "time" - "github.com/containers/common/libnetwork/types" - "github.com/containers/common/pkg/config" "github.com/containers/podman/v5/libpod/define" "github.com/containers/podman/v5/libpod/lock" - "github.com/containers/storage" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "go.podman.io/common/libnetwork/types" + "go.podman.io/common/pkg/config" + "go.podman.io/storage" ) // Returns state, tmp directory containing all state files, lock manager, and diff --git a/libpod/stats_freebsd.go b/libpod/stats_freebsd.go index 01cb4dfad10..47933269c1a 100644 --- a/libpod/stats_freebsd.go +++ b/libpod/stats_freebsd.go @@ -9,8 +9,8 @@ import ( "github.com/containers/podman/v5/libpod/define" "github.com/containers/podman/v5/pkg/rctl" - "github.com/containers/storage/pkg/system" "github.com/sirupsen/logrus" + "go.podman.io/storage/pkg/system" ) // getPlatformContainerStats gets the platform-specific running stats diff --git a/libpod/stats_linux.go b/libpod/stats_linux.go index 0bb8e3958dd..8ee32cdd54d 100644 --- a/libpod/stats_linux.go +++ b/libpod/stats_linux.go @@ -9,9 +9,9 @@ import ( "syscall" "time" - "github.com/containers/common/pkg/cgroups" "github.com/containers/podman/v5/libpod/define" runccgroup "github.com/opencontainers/cgroups" + "go.podman.io/common/pkg/cgroups" "golang.org/x/sys/unix" ) diff --git a/libpod/storage.go b/libpod/storage.go index b9db7921fa2..0acfc2afa82 100644 --- a/libpod/storage.go +++ b/libpod/storage.go @@ -7,13 +7,13 @@ import ( "errors" "time" - istorage "github.com/containers/image/v5/storage" - "github.com/containers/image/v5/types" "github.com/containers/podman/v5/libpod/define" - "github.com/containers/storage" - "github.com/containers/storage/pkg/idtools" v1 "github.com/opencontainers/image-spec/specs-go/v1" "github.com/sirupsen/logrus" + istorage "go.podman.io/image/v5/storage" + "go.podman.io/image/v5/types" + "go.podman.io/storage" + "go.podman.io/storage/pkg/idtools" ) type storageService struct { diff --git a/libpod/util.go b/libpod/util.go index 6a860cfcb2d..7d53e36669c 100644 --- a/libpod/util.go +++ b/libpod/util.go @@ -16,14 +16,14 @@ import ( "strconv" "strings" - "github.com/containers/common/libnetwork/types" - "github.com/containers/common/pkg/config" "github.com/containers/podman/v5/libpod/define" "github.com/containers/podman/v5/pkg/api/handlers/utils/apiutil" - "github.com/containers/storage/pkg/fileutils" 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/storage/pkg/fileutils" "golang.org/x/sys/unix" ) diff --git a/libpod/util_linux.go b/libpod/util_linux.go index 2fbb3686ae9..ead130b2ffc 100644 --- a/libpod/util_linux.go +++ b/libpod/util_linux.go @@ -9,14 +9,14 @@ import ( "strings" "syscall" - "github.com/containers/common/pkg/cgroups" "github.com/containers/podman/v5/libpod/define" "github.com/containers/podman/v5/pkg/rootless" - "github.com/containers/storage/pkg/fileutils" 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/storage/pkg/fileutils" "golang.org/x/sys/unix" ) diff --git a/libpod/volume.go b/libpod/volume.go index 68c15009c3c..aa20a76b8a9 100644 --- a/libpod/volume.go +++ b/libpod/volume.go @@ -11,9 +11,9 @@ import ( "github.com/containers/podman/v5/libpod/lock" "github.com/containers/podman/v5/libpod/plugin" "github.com/containers/podman/v5/utils" - "github.com/containers/storage/pkg/archive" - "github.com/containers/storage/pkg/directory" "github.com/sirupsen/logrus" + "go.podman.io/storage/pkg/archive" + "go.podman.io/storage/pkg/directory" ) // Volume is a libpod named volume. diff --git a/pkg/api/handlers/compat/auth.go b/pkg/api/handlers/compat/auth.go index 162f7d65207..c0a0ee91e79 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/common/pkg/auth" - DockerClient "github.com/containers/image/v5/docker" - "github.com/containers/image/v5/types" "github.com/containers/podman/v5/libpod" "github.com/containers/podman/v5/pkg/api/handlers/utils" api "github.com/containers/podman/v5/pkg/api/types" "github.com/containers/podman/v5/pkg/domain/entities" "github.com/docker/docker/api/types/registry" + "go.podman.io/common/pkg/auth" + DockerClient "go.podman.io/image/v5/docker" + "go.podman.io/image/v5/types" ) func Auth(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 8db96fdd108..5cd9fe19faa 100644 --- a/pkg/api/handlers/compat/containers_create.go +++ b/pkg/api/handlers/compat/containers_create.go @@ -14,10 +14,6 @@ import ( "strings" "github.com/containers/buildah/pkg/parse" - "github.com/containers/common/libimage" - "github.com/containers/common/libnetwork/types" - "github.com/containers/common/pkg/cgroups" - "github.com/containers/common/pkg/config" "github.com/containers/podman/v5/libpod" "github.com/containers/podman/v5/libpod/define" "github.com/containers/podman/v5/pkg/api/handlers" @@ -28,9 +24,13 @@ import ( "github.com/containers/podman/v5/pkg/rootless" "github.com/containers/podman/v5/pkg/specgen" "github.com/containers/podman/v5/pkg/specgenutil" - "github.com/containers/storage" - "github.com/containers/storage/pkg/fileutils" "github.com/docker/docker/api/types/mount" + "go.podman.io/common/libimage" + "go.podman.io/common/libnetwork/types" + "go.podman.io/common/pkg/cgroups" + "go.podman.io/common/pkg/config" + "go.podman.io/storage" + "go.podman.io/storage/pkg/fileutils" ) func CreateContainer(w http.ResponseWriter, r *http.Request) { diff --git a/pkg/api/handlers/compat/containers_stats_linux.go b/pkg/api/handlers/compat/containers_stats_linux.go index e08e2bb1f7e..698680d2d02 100644 --- a/pkg/api/handlers/compat/containers_stats_linux.go +++ b/pkg/api/handlers/compat/containers_stats_linux.go @@ -8,15 +8,15 @@ import ( "net/http" "time" - "github.com/containers/common/pkg/cgroups" "github.com/containers/podman/v5/libpod" "github.com/containers/podman/v5/libpod/define" "github.com/containers/podman/v5/pkg/api/handlers/utils" api "github.com/containers/podman/v5/pkg/api/types" - "github.com/containers/storage/pkg/system" "github.com/docker/docker/api/types/container" runccgroups "github.com/opencontainers/cgroups" "github.com/sirupsen/logrus" + "go.podman.io/common/pkg/cgroups" + "go.podman.io/storage/pkg/system" ) const DefaultStatsPeriod = 5 * time.Second diff --git a/pkg/api/handlers/compat/exec.go b/pkg/api/handlers/compat/exec.go index a83bf749a9f..fbf925aba82 100644 --- a/pkg/api/handlers/compat/exec.go +++ b/pkg/api/handlers/compat/exec.go @@ -9,7 +9,6 @@ import ( "net/http" "strings" - "github.com/containers/common/pkg/resize" "github.com/containers/podman/v5/libpod" "github.com/containers/podman/v5/libpod/define" "github.com/containers/podman/v5/pkg/api/handlers" @@ -21,6 +20,7 @@ import ( "github.com/containers/podman/v5/pkg/util" "github.com/gorilla/mux" "github.com/sirupsen/logrus" + "go.podman.io/common/pkg/resize" ) // 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 e9fdab590d1..fd416c176d1 100644 --- a/pkg/api/handlers/compat/images.go +++ b/pkg/api/handlers/compat/images.go @@ -12,10 +12,6 @@ import ( "time" "github.com/containers/buildah" - "github.com/containers/common/libimage" - "github.com/containers/common/pkg/config" - "github.com/containers/common/pkg/filters" - "github.com/containers/image/v5/manifest" "github.com/containers/podman/v5/libpod" "github.com/containers/podman/v5/pkg/api/handlers" "github.com/containers/podman/v5/pkg/api/handlers/utils" @@ -25,7 +21,6 @@ import ( "github.com/containers/podman/v5/pkg/domain/entities" "github.com/containers/podman/v5/pkg/domain/infra/abi" "github.com/containers/podman/v5/pkg/util" - "github.com/containers/storage" dockerContainer "github.com/docker/docker/api/types/container" dockerImage "github.com/docker/docker/api/types/image" dockerStorage "github.com/docker/docker/api/types/storage" @@ -33,6 +28,11 @@ import ( "github.com/opencontainers/go-digest" imageSpec "github.com/opencontainers/image-spec/specs-go/v1" "github.com/sirupsen/logrus" + "go.podman.io/common/libimage" + "go.podman.io/common/pkg/config" + "go.podman.io/common/pkg/filters" + "go.podman.io/image/v5/manifest" + "go.podman.io/storage" ) // mergeNameAndTagOrDigest creates an image reference as string from the diff --git a/pkg/api/handlers/compat/images_build.go b/pkg/api/handlers/compat/images_build.go index e3dd422c377..dce5ff7e07e 100644 --- a/pkg/api/handlers/compat/images_build.go +++ b/pkg/api/handlers/compat/images_build.go @@ -20,8 +20,6 @@ import ( "github.com/containers/buildah" buildahDefine "github.com/containers/buildah/define" "github.com/containers/buildah/pkg/parse" - "github.com/containers/image/v5/docker/reference" - "github.com/containers/image/v5/types" "github.com/containers/podman/v5/libpod" "github.com/containers/podman/v5/pkg/api/handlers/utils" api "github.com/containers/podman/v5/pkg/api/types" @@ -30,12 +28,14 @@ import ( "github.com/containers/podman/v5/pkg/channel" "github.com/containers/podman/v5/pkg/rootless" "github.com/containers/podman/v5/pkg/util" - "github.com/containers/storage/pkg/archive" - "github.com/containers/storage/pkg/chrootarchive" - "github.com/containers/storage/pkg/fileutils" "github.com/docker/docker/pkg/jsonmessage" "github.com/opencontainers/runtime-spec/specs-go" "github.com/sirupsen/logrus" + "go.podman.io/image/v5/docker/reference" + "go.podman.io/image/v5/types" + "go.podman.io/storage/pkg/archive" + "go.podman.io/storage/pkg/chrootarchive" + "go.podman.io/storage/pkg/fileutils" ) func genSpaceErr(err error) error { diff --git a/pkg/api/handlers/compat/images_push.go b/pkg/api/handlers/compat/images_push.go index bf0ab6389d1..ff6d64e7b23 100644 --- a/pkg/api/handlers/compat/images_push.go +++ b/pkg/api/handlers/compat/images_push.go @@ -9,16 +9,16 @@ import ( "net/http" "strings" - "github.com/containers/image/v5/types" "github.com/containers/podman/v5/libpod" "github.com/containers/podman/v5/pkg/api/handlers/utils" api "github.com/containers/podman/v5/pkg/api/types" "github.com/containers/podman/v5/pkg/auth" "github.com/containers/podman/v5/pkg/domain/entities" "github.com/containers/podman/v5/pkg/domain/infra/abi" - "github.com/containers/storage" "github.com/docker/docker/pkg/jsonmessage" "github.com/sirupsen/logrus" + "go.podman.io/image/v5/types" + "go.podman.io/storage" ) // PushImage is the handler for the compat http endpoint for pushing images. diff --git a/pkg/api/handlers/compat/images_remove.go b/pkg/api/handlers/compat/images_remove.go index 9382ebb86e3..52577c8f9ca 100644 --- a/pkg/api/handlers/compat/images_remove.go +++ b/pkg/api/handlers/compat/images_remove.go @@ -13,7 +13,7 @@ import ( api "github.com/containers/podman/v5/pkg/api/types" "github.com/containers/podman/v5/pkg/domain/entities" "github.com/containers/podman/v5/pkg/domain/infra/abi" - "github.com/containers/storage" + "go.podman.io/storage" ) func RemoveImage(w http.ResponseWriter, r *http.Request) { diff --git a/pkg/api/handlers/compat/images_search.go b/pkg/api/handlers/compat/images_search.go index 93f2c47870b..787c721c38b 100644 --- a/pkg/api/handlers/compat/images_search.go +++ b/pkg/api/handlers/compat/images_search.go @@ -6,14 +6,14 @@ import ( "fmt" "net/http" - "github.com/containers/image/v5/types" "github.com/containers/podman/v5/libpod" "github.com/containers/podman/v5/pkg/api/handlers/utils" api "github.com/containers/podman/v5/pkg/api/types" "github.com/containers/podman/v5/pkg/auth" "github.com/containers/podman/v5/pkg/domain/entities" "github.com/containers/podman/v5/pkg/domain/infra/abi" - "github.com/containers/storage" + "go.podman.io/image/v5/types" + "go.podman.io/storage" ) func SearchImages(w http.ResponseWriter, r *http.Request) { diff --git a/pkg/api/handlers/compat/images_tag.go b/pkg/api/handlers/compat/images_tag.go index 9e5dc09d0c0..203b9e56387 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/common/libimage" "github.com/containers/podman/v5/libpod" "github.com/containers/podman/v5/pkg/api/handlers/utils" api "github.com/containers/podman/v5/pkg/api/types" + "go.podman.io/common/libimage" ) 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 c6dc7e2c666..cb3fa790093 100644 --- a/pkg/api/handlers/compat/info.go +++ b/pkg/api/handlers/compat/info.go @@ -10,9 +10,6 @@ import ( "strings" "time" - "github.com/containers/common/pkg/config" - "github.com/containers/common/pkg/sysinfo" - "github.com/containers/image/v5/pkg/sysregistriesv2" "github.com/containers/podman/v5/libpod" "github.com/containers/podman/v5/libpod/define" "github.com/containers/podman/v5/pkg/api/handlers" @@ -25,6 +22,9 @@ import ( "github.com/google/uuid" "github.com/opencontainers/selinux/go-selinux" log "github.com/sirupsen/logrus" + "go.podman.io/common/pkg/config" + "go.podman.io/common/pkg/sysinfo" + "go.podman.io/image/v5/pkg/sysregistriesv2" ) 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 a2e88ca3bac..c835ffdfed7 100644 --- a/pkg/api/handlers/compat/networks.go +++ b/pkg/api/handlers/compat/networks.go @@ -10,8 +10,6 @@ import ( "net" "net/http" - nettypes "github.com/containers/common/libnetwork/types" - netutil "github.com/containers/common/libnetwork/util" "github.com/containers/podman/v5/libpod" "github.com/containers/podman/v5/libpod/define" "github.com/containers/podman/v5/pkg/api/handlers/utils" @@ -19,6 +17,8 @@ import ( "github.com/containers/podman/v5/pkg/domain/entities" "github.com/containers/podman/v5/pkg/domain/infra/abi" "github.com/containers/podman/v5/pkg/util" + nettypes "go.podman.io/common/libnetwork/types" + netutil "go.podman.io/common/libnetwork/util" dockerNetwork "github.com/docker/docker/api/types/network" "github.com/sirupsen/logrus" diff --git a/pkg/api/handlers/compat/resize.go b/pkg/api/handlers/compat/resize.go index 19ce87929cd..8ca54151649 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/common/pkg/resize" "github.com/containers/podman/v5/libpod" "github.com/containers/podman/v5/libpod/define" "github.com/containers/podman/v5/pkg/api/handlers/utils" api "github.com/containers/podman/v5/pkg/api/types" "github.com/gorilla/mux" + "go.podman.io/common/pkg/resize" ) func ResizeTTY(w http.ResponseWriter, r *http.Request) { diff --git a/pkg/api/handlers/decoder.go b/pkg/api/handlers/decoder.go index 7f079f65681..6a3cbf8d5ed 100644 --- a/pkg/api/handlers/decoder.go +++ b/pkg/api/handlers/decoder.go @@ -10,11 +10,11 @@ import ( "syscall" "time" - "github.com/containers/image/v5/types" "github.com/containers/podman/v5/libpod/define" "github.com/containers/podman/v5/pkg/util" "github.com/gorilla/schema" "github.com/sirupsen/logrus" + "go.podman.io/image/v5/types" ) // NewAPIDecoder returns a configured schema.Decoder diff --git a/pkg/api/handlers/libpod/artifacts.go b/pkg/api/handlers/libpod/artifacts.go index 78293752519..34186068810 100644 --- a/pkg/api/handlers/libpod/artifacts.go +++ b/pkg/api/handlers/libpod/artifacts.go @@ -7,8 +7,6 @@ import ( "fmt" "net/http" - "github.com/containers/image/v5/oci/layout" - "github.com/containers/image/v5/types" "github.com/containers/podman/v5/libpod" "github.com/containers/podman/v5/pkg/api/handlers/utils" api "github.com/containers/podman/v5/pkg/api/types" @@ -19,6 +17,8 @@ import ( libartifact_types "github.com/containers/podman/v5/pkg/libartifact/types" "github.com/docker/distribution/registry/api/errcode" "github.com/gorilla/schema" + "go.podman.io/image/v5/oci/layout" + "go.podman.io/image/v5/types" ) func InspectArtifact(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 55bb8a9bd45..8e09b452b92 100644 --- a/pkg/api/handlers/libpod/containers_create.go +++ b/pkg/api/handlers/libpod/containers_create.go @@ -18,8 +18,8 @@ import ( "github.com/containers/podman/v5/pkg/specgen" "github.com/containers/podman/v5/pkg/specgen/generate" "github.com/containers/podman/v5/pkg/specgenutil" - "github.com/containers/storage" "github.com/opencontainers/runtime-spec/specs-go" + "go.podman.io/storage" ) // The JSON decoder correctly cannot decode (overflow) negative values (e.g., `-1`) for fields of type `uint64`, diff --git a/pkg/api/handlers/libpod/containers_stats.go b/pkg/api/handlers/libpod/containers_stats.go index d595e3d6070..7dc4dd67541 100644 --- a/pkg/api/handlers/libpod/containers_stats.go +++ b/pkg/api/handlers/libpod/containers_stats.go @@ -8,7 +8,6 @@ import ( "fmt" "net/http" - "github.com/containers/common/pkg/cgroups" "github.com/containers/podman/v5/libpod" "github.com/containers/podman/v5/pkg/api/handlers/utils" api "github.com/containers/podman/v5/pkg/api/types" @@ -17,6 +16,7 @@ import ( "github.com/containers/podman/v5/pkg/rootless" "github.com/gorilla/schema" "github.com/sirupsen/logrus" + "go.podman.io/common/pkg/cgroups" ) 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 7a64141d703..114f389e12b 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/common/pkg/config" "github.com/containers/podman/v5/libpod" "github.com/containers/podman/v5/pkg/api/handlers/utils" api "github.com/containers/podman/v5/pkg/api/types" "github.com/containers/podman/v5/pkg/domain/entities" "github.com/containers/podman/v5/pkg/domain/infra/abi" "github.com/gorilla/schema" + "go.podman.io/common/pkg/config" ) func GenerateSystemd(w http.ResponseWriter, r *http.Request) { diff --git a/pkg/api/handlers/libpod/images.go b/pkg/api/handlers/libpod/images.go index ea4a38fd5f5..f21ce4fda7e 100644 --- a/pkg/api/handlers/libpod/images.go +++ b/pkg/api/handlers/libpod/images.go @@ -16,11 +16,6 @@ import ( "strings" "github.com/containers/buildah" - "github.com/containers/common/libimage" - "github.com/containers/common/pkg/ssh" - "github.com/containers/image/v5/manifest" - "github.com/containers/image/v5/pkg/shortnames" - "github.com/containers/image/v5/types" "github.com/containers/podman/v5/libpod" "github.com/containers/podman/v5/libpod/define" "github.com/containers/podman/v5/pkg/api/handlers" @@ -35,14 +30,19 @@ import ( "github.com/containers/podman/v5/pkg/errorhandling" "github.com/containers/podman/v5/pkg/util" utils2 "github.com/containers/podman/v5/utils" - "github.com/containers/storage" - "github.com/containers/storage/pkg/archive" - "github.com/containers/storage/pkg/chrootarchive" - "github.com/containers/storage/pkg/fileutils" - "github.com/containers/storage/pkg/idtools" "github.com/docker/docker/pkg/jsonmessage" "github.com/gorilla/schema" "github.com/sirupsen/logrus" + "go.podman.io/common/libimage" + "go.podman.io/common/pkg/ssh" + "go.podman.io/image/v5/manifest" + "go.podman.io/image/v5/pkg/shortnames" + "go.podman.io/image/v5/types" + "go.podman.io/storage" + "go.podman.io/storage/pkg/archive" + "go.podman.io/storage/pkg/chrootarchive" + "go.podman.io/storage/pkg/fileutils" + "go.podman.io/storage/pkg/idtools" ) // Commit diff --git a/pkg/api/handlers/libpod/images_pull.go b/pkg/api/handlers/libpod/images_pull.go index 317e33d64e0..f2402f32eaf 100644 --- a/pkg/api/handlers/libpod/images_pull.go +++ b/pkg/api/handlers/libpod/images_pull.go @@ -10,9 +10,6 @@ import ( "net/http" "time" - "github.com/containers/common/libimage" - "github.com/containers/common/pkg/config" - "github.com/containers/image/v5/types" "github.com/containers/podman/v5/libpod" "github.com/containers/podman/v5/pkg/api/handlers/utils" api "github.com/containers/podman/v5/pkg/api/types" @@ -21,6 +18,9 @@ import ( "github.com/containers/podman/v5/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" ) // ImagesPull is the v2 libpod endpoint for pulling images. Note that the diff --git a/pkg/api/handlers/libpod/images_push.go b/pkg/api/handlers/libpod/images_push.go index 576f25cf64b..5c3fca95a76 100644 --- a/pkg/api/handlers/libpod/images_push.go +++ b/pkg/api/handlers/libpod/images_push.go @@ -9,7 +9,6 @@ import ( "net/http" "strings" - "github.com/containers/image/v5/types" "github.com/containers/podman/v5/libpod" "github.com/containers/podman/v5/pkg/api/handlers/utils" api "github.com/containers/podman/v5/pkg/api/types" @@ -19,6 +18,7 @@ import ( "github.com/containers/podman/v5/pkg/domain/infra/abi" "github.com/gorilla/schema" "github.com/sirupsen/logrus" + "go.podman.io/image/v5/types" ) // PushImage is the handler for the compat http endpoint for pushing images. diff --git a/pkg/api/handlers/libpod/kube.go b/pkg/api/handlers/libpod/kube.go index 344fba44161..9e2f7ecbb42 100644 --- a/pkg/api/handlers/libpod/kube.go +++ b/pkg/api/handlers/libpod/kube.go @@ -12,9 +12,8 @@ import ( "os" "path/filepath" - "github.com/containers/storage/pkg/archive" + "go.podman.io/storage/pkg/archive" - "github.com/containers/image/v5/types" "github.com/containers/podman/v5/libpod" "github.com/containers/podman/v5/pkg/api/handlers/utils" api "github.com/containers/podman/v5/pkg/api/types" @@ -23,6 +22,7 @@ import ( "github.com/containers/podman/v5/pkg/domain/infra/abi" "github.com/gorilla/schema" "github.com/sirupsen/logrus" + "go.podman.io/image/v5/types" ) // ExtractPlayReader provide an io.Reader given a http.Request object diff --git a/pkg/api/handlers/libpod/manifests.go b/pkg/api/handlers/libpod/manifests.go index 3aaf0fd33e3..36a324c843b 100644 --- a/pkg/api/handlers/libpod/manifests.go +++ b/pkg/api/handlers/libpod/manifests.go @@ -18,8 +18,6 @@ import ( "strings" "sync" - "github.com/containers/image/v5/docker/reference" - "github.com/containers/image/v5/types" "github.com/containers/podman/v5/libpod" "github.com/containers/podman/v5/pkg/api/handlers" "github.com/containers/podman/v5/pkg/api/handlers/utils" @@ -35,6 +33,8 @@ import ( "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" ) 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 1bbcfa9f5e7..9a98f3393c5 100644 --- a/pkg/api/handlers/libpod/networks.go +++ b/pkg/api/handlers/libpod/networks.go @@ -9,7 +9,6 @@ import ( "errors" - "github.com/containers/common/libnetwork/types" "github.com/containers/podman/v5/libpod" "github.com/containers/podman/v5/libpod/define" "github.com/containers/podman/v5/pkg/api/handlers/utils" @@ -18,6 +17,7 @@ import ( "github.com/containers/podman/v5/pkg/domain/infra/abi" "github.com/containers/podman/v5/pkg/util" "github.com/gorilla/schema" + "go.podman.io/common/libnetwork/types" ) func CreateNetwork(w http.ResponseWriter, r *http.Request) { diff --git a/pkg/api/handlers/libpod/secrets.go b/pkg/api/handlers/libpod/secrets.go index ece86bc4f12..c5b6c543d00 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/common/pkg/secrets" "github.com/containers/podman/v5/libpod" "github.com/containers/podman/v5/pkg/api/handlers/utils" api "github.com/containers/podman/v5/pkg/api/types" "github.com/containers/podman/v5/pkg/domain/entities" "github.com/containers/podman/v5/pkg/domain/infra/abi" "github.com/gorilla/schema" + "go.podman.io/common/pkg/secrets" ) 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 bcfb407e382..1f5d9a927cd 100644 --- a/pkg/api/handlers/libpod/swagger_spec.go +++ b/pkg/api/handlers/libpod/swagger_spec.go @@ -9,7 +9,7 @@ import ( "os" "github.com/containers/podman/v5/pkg/api/handlers/utils" - "github.com/containers/storage/pkg/fileutils" + "go.podman.io/storage/pkg/fileutils" ) // DefaultPodmanSwaggerSpec provides the default path to the podman swagger spec file diff --git a/pkg/api/handlers/swagger/responses.go b/pkg/api/handlers/swagger/responses.go index cd4804f2043..7b349f26add 100644 --- a/pkg/api/handlers/swagger/responses.go +++ b/pkg/api/handlers/swagger/responses.go @@ -4,8 +4,6 @@ package swagger import ( - "github.com/containers/common/libnetwork/types" - "github.com/containers/image/v5/manifest" "github.com/containers/podman/v5/libpod/define" "github.com/containers/podman/v5/pkg/api/handlers" "github.com/containers/podman/v5/pkg/domain/entities" @@ -15,6 +13,8 @@ import ( dockerImage "github.com/docker/docker/api/types/image" "github.com/docker/docker/api/types/network" "github.com/docker/docker/api/types/volume" + "go.podman.io/common/libnetwork/types" + "go.podman.io/image/v5/manifest" ) // Image Tree diff --git a/pkg/api/handlers/utils/errors.go b/pkg/api/handlers/utils/errors.go index 8b6ffb60c5d..b75edb86240 100644 --- a/pkg/api/handlers/utils/errors.go +++ b/pkg/api/handlers/utils/errors.go @@ -9,8 +9,8 @@ import ( "github.com/containers/podman/v5/libpod/define" "github.com/containers/podman/v5/pkg/errorhandling" - "github.com/containers/storage" log "github.com/sirupsen/logrus" + "go.podman.io/storage" ) var ( diff --git a/pkg/api/handlers/utils/images.go b/pkg/api/handlers/utils/images.go index 00e7eac669f..c67d26d7cd0 100644 --- a/pkg/api/handlers/utils/images.go +++ b/pkg/api/handlers/utils/images.go @@ -9,20 +9,20 @@ import ( "net/http" "strings" - "github.com/containers/common/libimage" - "github.com/containers/common/pkg/config" - "github.com/containers/image/v5/docker" - "github.com/containers/image/v5/docker/reference" - storageTransport "github.com/containers/image/v5/storage" - "github.com/containers/image/v5/transports/alltransports" - "github.com/containers/image/v5/types" "github.com/containers/podman/v5/libpod" api "github.com/containers/podman/v5/pkg/api/types" "github.com/containers/podman/v5/pkg/errorhandling" - "github.com/containers/storage" "github.com/docker/distribution/registry/api/errcode" "github.com/docker/docker/pkg/jsonmessage" "github.com/sirupsen/logrus" + "go.podman.io/common/libimage" + "go.podman.io/common/pkg/config" + "go.podman.io/image/v5/docker" + "go.podman.io/image/v5/docker/reference" + storageTransport "go.podman.io/image/v5/storage" + "go.podman.io/image/v5/transports/alltransports" + "go.podman.io/image/v5/types" + "go.podman.io/storage" ) // NormalizeToDockerHub normalizes the specified nameOrID to Docker Hub if the diff --git a/pkg/auth/auth.go b/pkg/auth/auth.go index ecbf4d3aee2..f9b9b4368e2 100644 --- a/pkg/auth/auth.go +++ b/pkg/auth/auth.go @@ -8,10 +8,10 @@ import ( "os" "strings" - imageAuth "github.com/containers/image/v5/pkg/docker/config" - "github.com/containers/image/v5/types" dockerAPITypes "github.com/docker/docker/api/types/registry" "github.com/sirupsen/logrus" + imageAuth "go.podman.io/image/v5/pkg/docker/config" + "go.podman.io/image/v5/types" ) // xRegistryAuthHeader is the key to the encoded registry authentication configuration in an http-request header. diff --git a/pkg/auth/auth_test.go b/pkg/auth/auth_test.go index ccb205c18e1..8f73a4512d4 100644 --- a/pkg/auth/auth_test.go +++ b/pkg/auth/auth_test.go @@ -9,10 +9,10 @@ import ( "os" "testing" - "github.com/containers/image/v5/pkg/docker/config" - "github.com/containers/image/v5/types" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "go.podman.io/image/v5/pkg/docker/config" + "go.podman.io/image/v5/types" ) const largeAuthFile = `{"auths":{ diff --git a/pkg/autoupdate/autoupdate.go b/pkg/autoupdate/autoupdate.go index 5ab4ddd8a0e..c81134a52f4 100644 --- a/pkg/autoupdate/autoupdate.go +++ b/pkg/autoupdate/autoupdate.go @@ -9,9 +9,6 @@ import ( "os" "sort" - "github.com/containers/common/libimage" - "github.com/containers/common/pkg/config" - "github.com/containers/image/v5/docker" "github.com/containers/podman/v5/libpod" "github.com/containers/podman/v5/libpod/define" "github.com/containers/podman/v5/libpod/events" @@ -20,6 +17,9 @@ import ( systemdDefine "github.com/containers/podman/v5/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" ) // Policy represents an auto-update policy. diff --git a/pkg/bindings/artifacts/pull.go b/pkg/bindings/artifacts/pull.go index 1103e176ff8..2e856ea44cc 100644 --- a/pkg/bindings/artifacts/pull.go +++ b/pkg/bindings/artifacts/pull.go @@ -4,10 +4,10 @@ import ( "context" "net/http" - imageTypes "github.com/containers/image/v5/types" "github.com/containers/podman/v5/pkg/auth" "github.com/containers/podman/v5/pkg/bindings" "github.com/containers/podman/v5/pkg/domain/entities" + imageTypes "go.podman.io/image/v5/types" ) 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 0a83f0d3561..0bd7b82c595 100644 --- a/pkg/bindings/artifacts/push.go +++ b/pkg/bindings/artifacts/push.go @@ -4,10 +4,10 @@ import ( "context" "net/http" - imageTypes "github.com/containers/image/v5/types" "github.com/containers/podman/v5/pkg/auth" "github.com/containers/podman/v5/pkg/bindings" "github.com/containers/podman/v5/pkg/domain/entities" + imageTypes "go.podman.io/image/v5/types" ) func Push(ctx context.Context, name string, options *PushOptions) (*entities.ArtifactPushReport, error) { diff --git a/pkg/bindings/connection.go b/pkg/bindings/connection.go index 7f7572489b3..3dbe739fc41 100644 --- a/pkg/bindings/connection.go +++ b/pkg/bindings/connection.go @@ -17,11 +17,11 @@ import ( "time" "github.com/blang/semver/v4" - "github.com/containers/common/pkg/ssh" "github.com/containers/podman/v5/version" - "github.com/containers/storage/pkg/fileutils" "github.com/kevinburke/ssh_config" "github.com/sirupsen/logrus" + "go.podman.io/common/pkg/ssh" + "go.podman.io/storage/pkg/fileutils" "golang.org/x/net/proxy" ) diff --git a/pkg/bindings/containers/attach.go b/pkg/bindings/containers/attach.go index ca3974a3ce7..6b2aab45e9c 100644 --- a/pkg/bindings/containers/attach.go +++ b/pkg/bindings/containers/attach.go @@ -15,11 +15,11 @@ import ( "strconv" "time" - "github.com/containers/common/pkg/detach" "github.com/containers/podman/v5/libpod/define" "github.com/containers/podman/v5/pkg/bindings" "github.com/moby/term" "github.com/sirupsen/logrus" + "go.podman.io/common/pkg/detach" terminal "golang.org/x/term" ) diff --git a/pkg/bindings/containers/commit.go b/pkg/bindings/containers/commit.go index 2d4489d90bb..a14591ad377 100644 --- a/pkg/bindings/containers/commit.go +++ b/pkg/bindings/containers/commit.go @@ -12,7 +12,7 @@ import ( "github.com/containers/podman/v5/pkg/bindings" "github.com/containers/podman/v5/pkg/bindings/images" "github.com/containers/podman/v5/pkg/domain/entities/types" - "github.com/containers/storage/pkg/regexp" + "go.podman.io/storage/pkg/regexp" ) var iidRegex = regexp.Delayed(`^[0-9a-f]{12}`) diff --git a/pkg/bindings/containers/diff.go b/pkg/bindings/containers/diff.go index e782aa92012..c196ce0637d 100644 --- a/pkg/bindings/containers/diff.go +++ b/pkg/bindings/containers/diff.go @@ -5,7 +5,7 @@ import ( "net/http" "github.com/containers/podman/v5/pkg/bindings" - "github.com/containers/storage/pkg/archive" + "go.podman.io/storage/pkg/archive" ) // Diff provides the changes between two container layers diff --git a/pkg/bindings/images/build.go b/pkg/bindings/images/build.go index cff4ed3f05c..a581f6885a7 100644 --- a/pkg/bindings/images/build.go +++ b/pkg/bindings/images/build.go @@ -19,23 +19,23 @@ import ( "github.com/blang/semver/v4" "github.com/containers/buildah/define" - imageTypes "github.com/containers/image/v5/types" ldefine "github.com/containers/podman/v5/libpod/define" "github.com/containers/podman/v5/pkg/auth" "github.com/containers/podman/v5/pkg/bindings" "github.com/containers/podman/v5/pkg/domain/entities/types" "github.com/containers/podman/v5/pkg/specgen" "github.com/containers/podman/v5/pkg/util" - "github.com/containers/storage/pkg/archive" - "github.com/containers/storage/pkg/fileutils" - "github.com/containers/storage/pkg/ioutils" - "github.com/containers/storage/pkg/regexp" "github.com/docker/docker/pkg/jsonmessage" "github.com/docker/go-units" "github.com/hashicorp/go-multierror" jsoniter "github.com/json-iterator/go" gzip "github.com/klauspost/pgzip" "github.com/sirupsen/logrus" + imageTypes "go.podman.io/image/v5/types" + "go.podman.io/storage/pkg/archive" + "go.podman.io/storage/pkg/fileutils" + "go.podman.io/storage/pkg/ioutils" + "go.podman.io/storage/pkg/regexp" ) type devino struct { diff --git a/pkg/bindings/images/diff.go b/pkg/bindings/images/diff.go index b4eaac8a0ed..eaa576c60fd 100644 --- a/pkg/bindings/images/diff.go +++ b/pkg/bindings/images/diff.go @@ -5,7 +5,7 @@ import ( "net/http" "github.com/containers/podman/v5/pkg/bindings" - "github.com/containers/storage/pkg/archive" + "go.podman.io/storage/pkg/archive" ) // Diff provides the changes between two container layers diff --git a/pkg/bindings/images/images.go b/pkg/bindings/images/images.go index 7f119ad20bc..3357e24b476 100644 --- a/pkg/bindings/images/images.go +++ b/pkg/bindings/images/images.go @@ -9,12 +9,12 @@ import ( "net/url" "strconv" - imageTypes "github.com/containers/image/v5/types" handlersTypes "github.com/containers/podman/v5/pkg/api/handlers/types" "github.com/containers/podman/v5/pkg/auth" "github.com/containers/podman/v5/pkg/bindings" "github.com/containers/podman/v5/pkg/domain/entities/reports" "github.com/containers/podman/v5/pkg/domain/entities/types" + imageTypes "go.podman.io/image/v5/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 ed0d16186ef..f65f654e044 100644 --- a/pkg/bindings/images/pull.go +++ b/pkg/bindings/images/pull.go @@ -10,11 +10,11 @@ import ( "os" "strconv" - imgTypes "github.com/containers/image/v5/types" "github.com/containers/podman/v5/pkg/auth" "github.com/containers/podman/v5/pkg/bindings" "github.com/containers/podman/v5/pkg/domain/entities/types" "github.com/containers/podman/v5/pkg/errorhandling" + imgTypes "go.podman.io/image/v5/types" ) // 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 8c51cabc691..292fb8ce974 100644 --- a/pkg/bindings/images/push.go +++ b/pkg/bindings/images/push.go @@ -10,10 +10,10 @@ import ( "os" "strconv" - imageTypes "github.com/containers/image/v5/types" "github.com/containers/podman/v5/pkg/auth" "github.com/containers/podman/v5/pkg/bindings" "github.com/containers/podman/v5/pkg/domain/entities/types" + imageTypes "go.podman.io/image/v5/types" ) // Push is the binding for libpod's endpoints for push images. Note that diff --git a/pkg/bindings/kube/kube.go b/pkg/bindings/kube/kube.go index c8e4bb66499..f11e0a57e56 100644 --- a/pkg/bindings/kube/kube.go +++ b/pkg/bindings/kube/kube.go @@ -8,12 +8,12 @@ import ( "os" "strconv" - "github.com/containers/image/v5/types" "github.com/containers/podman/v5/pkg/auth" "github.com/containers/podman/v5/pkg/bindings" "github.com/containers/podman/v5/pkg/bindings/generate" entitiesTypes "github.com/containers/podman/v5/pkg/domain/entities/types" "github.com/sirupsen/logrus" + "go.podman.io/image/v5/types" ) func Play(ctx context.Context, path string, options *PlayOptions) (*entitiesTypes.KubePlayReport, error) { diff --git a/pkg/bindings/manifests/manifests.go b/pkg/bindings/manifests/manifests.go index 48720cb2041..04466d44d77 100644 --- a/pkg/bindings/manifests/manifests.go +++ b/pkg/bindings/manifests/manifests.go @@ -16,15 +16,15 @@ import ( "strings" "sync" - "github.com/containers/common/libimage/define" - "github.com/containers/image/v5/manifest" - imageTypes "github.com/containers/image/v5/types" "github.com/containers/podman/v5/pkg/auth" "github.com/containers/podman/v5/pkg/bindings" "github.com/containers/podman/v5/pkg/bindings/images" entitiesTypes "github.com/containers/podman/v5/pkg/domain/entities/types" "github.com/containers/podman/v5/pkg/errorhandling" 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" ) // Create creates a manifest for the given name. Optional images to be associated with diff --git a/pkg/bindings/network/network.go b/pkg/bindings/network/network.go index a0512d5ec44..695f93f3cad 100644 --- a/pkg/bindings/network/network.go +++ b/pkg/bindings/network/network.go @@ -6,10 +6,10 @@ import ( "net/url" "strings" - "github.com/containers/common/libnetwork/types" "github.com/containers/podman/v5/pkg/bindings" entitiesTypes "github.com/containers/podman/v5/pkg/domain/entities/types" jsoniter "github.com/json-iterator/go" + "go.podman.io/common/libnetwork/types" ) // Create makes a new network configuration diff --git a/pkg/bindings/test/auth_test.go b/pkg/bindings/test/auth_test.go index 017dafad7c7..0df962bdc00 100644 --- a/pkg/bindings/test/auth_test.go +++ b/pkg/bindings/test/auth_test.go @@ -4,13 +4,13 @@ import ( "os" "time" - "github.com/containers/common/pkg/auth" - "github.com/containers/image/v5/types" podmanRegistry "github.com/containers/podman/v5/hack/podman-registry-go" "github.com/containers/podman/v5/pkg/bindings/images" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "github.com/onsi/gomega/gexec" + "go.podman.io/common/pkg/auth" + "go.podman.io/image/v5/types" ) var _ = Describe("Podman images", func() { diff --git a/pkg/bindings/test/networks_test.go b/pkg/bindings/test/networks_test.go index bcce82ce2a3..6b2b955d98e 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/common/libnetwork/types" "github.com/containers/podman/v5/pkg/bindings" "github.com/containers/podman/v5/pkg/bindings/containers" "github.com/containers/podman/v5/pkg/bindings/network" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "github.com/onsi/gomega/gexec" + "go.podman.io/common/libnetwork/types" ) var _ = Describe("Podman networks", func() { diff --git a/pkg/checkpoint/checkpoint_restore.go b/pkg/checkpoint/checkpoint_restore.go index 3fae15764c7..6e0a82899fe 100644 --- a/pkg/checkpoint/checkpoint_restore.go +++ b/pkg/checkpoint/checkpoint_restore.go @@ -9,8 +9,6 @@ import ( "os" metadata "github.com/checkpoint-restore/checkpointctl/lib" - "github.com/containers/common/libimage" - "github.com/containers/common/pkg/config" "github.com/containers/podman/v5/libpod" ann "github.com/containers/podman/v5/pkg/annotations" "github.com/containers/podman/v5/pkg/checkpoint/crutils" @@ -20,6 +18,8 @@ import ( "github.com/containers/podman/v5/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" ) // Prefixing the checkpoint/restore related functions with 'cr' diff --git a/pkg/checkpoint/crutils/checkpoint_restore_utils.go b/pkg/checkpoint/crutils/checkpoint_restore_utils.go index ad4ea9e275e..1709429bad8 100644 --- a/pkg/checkpoint/crutils/checkpoint_restore_utils.go +++ b/pkg/checkpoint/crutils/checkpoint_restore_utils.go @@ -11,8 +11,8 @@ import ( metadata "github.com/checkpoint-restore/checkpointctl/lib" "github.com/checkpoint-restore/go-criu/v7/stats" - "github.com/containers/storage/pkg/archive" "github.com/opencontainers/selinux/go-selinux/label" + "go.podman.io/storage/pkg/archive" ) // This file mainly exists to make the checkpoint/restore functions diff --git a/pkg/domain/entities/artifact.go b/pkg/domain/entities/artifact.go index 7b3beddf216..7eede3dfeeb 100644 --- a/pkg/domain/entities/artifact.go +++ b/pkg/domain/entities/artifact.go @@ -3,9 +3,9 @@ package entities import ( "io" - "github.com/containers/image/v5/types" encconfig "github.com/containers/ocicrypt/config" entitiesTypes "github.com/containers/podman/v5/pkg/domain/entities/types" + "go.podman.io/image/v5/types" ) type ArtifactAddOptions struct { diff --git a/pkg/domain/entities/auto-update.go b/pkg/domain/entities/auto-update.go index 195f27f84a9..92968479f46 100644 --- a/pkg/domain/entities/auto-update.go +++ b/pkg/domain/entities/auto-update.go @@ -1,6 +1,6 @@ package entities -import "github.com/containers/image/v5/types" +import "go.podman.io/image/v5/types" // AutoUpdateOptions are the options for running auto-update. type AutoUpdateOptions struct { diff --git a/pkg/domain/entities/containers.go b/pkg/domain/entities/containers.go index 3b166caed21..ad89b0f417c 100644 --- a/pkg/domain/entities/containers.go +++ b/pkg/domain/entities/containers.go @@ -6,12 +6,12 @@ import ( "os" "time" - nettypes "github.com/containers/common/libnetwork/types" - imageTypes "github.com/containers/image/v5/types" "github.com/containers/podman/v5/libpod/define" "github.com/containers/podman/v5/pkg/domain/entities/types" "github.com/containers/podman/v5/pkg/specgen" - "github.com/containers/storage/pkg/archive" + nettypes "go.podman.io/common/libnetwork/types" + imageTypes "go.podman.io/image/v5/types" + "go.podman.io/storage/pkg/archive" ) // ContainerRunlabelOptions are the options to execute container-runlabel. diff --git a/pkg/domain/entities/engine.go b/pkg/domain/entities/engine.go index 92695d9476e..8e176797917 100644 --- a/pkg/domain/entities/engine.go +++ b/pkg/domain/entities/engine.go @@ -1,8 +1,8 @@ package entities import ( - "github.com/containers/common/pkg/config" "github.com/spf13/pflag" + "go.podman.io/common/pkg/config" ) // EngineMode is the connection type podman is using to access libpod diff --git a/pkg/domain/entities/engine_container.go b/pkg/domain/entities/engine_container.go index 8af843bb97b..d81d5c13219 100644 --- a/pkg/domain/entities/engine_container.go +++ b/pkg/domain/entities/engine_container.go @@ -4,12 +4,12 @@ import ( "context" "io" - netTypes "github.com/containers/common/libnetwork/types" - "github.com/containers/common/pkg/config" "github.com/containers/podman/v5/libpod/define" "github.com/containers/podman/v5/pkg/domain/entities/reports" "github.com/containers/podman/v5/pkg/domain/entities/types" "github.com/containers/podman/v5/pkg/specgen" + netTypes "go.podman.io/common/libnetwork/types" + "go.podman.io/common/pkg/config" ) type ContainerCopyFunc = types.ContainerCopyFunc diff --git a/pkg/domain/entities/engine_image.go b/pkg/domain/entities/engine_image.go index 46ab08e9381..0e75ddcb9b7 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/common/libimage/define" - "github.com/containers/common/pkg/config" "github.com/containers/podman/v5/pkg/domain/entities/reports" + "go.podman.io/common/libimage/define" + "go.podman.io/common/pkg/config" ) type ImageEngine interface { //nolint:interfacebloat diff --git a/pkg/domain/entities/images.go b/pkg/domain/entities/images.go index ca8d7db45ab..491f1532778 100644 --- a/pkg/domain/entities/images.go +++ b/pkg/domain/entities/images.go @@ -4,11 +4,11 @@ import ( "io" "net/url" - "github.com/containers/common/pkg/config" - "github.com/containers/image/v5/signature/signer" - "github.com/containers/image/v5/types" encconfig "github.com/containers/ocicrypt/config" entitiesTypes "github.com/containers/podman/v5/pkg/domain/entities/types" + "go.podman.io/common/pkg/config" + "go.podman.io/image/v5/signature/signer" + "go.podman.io/image/v5/types" ) type ImageSummary = entitiesTypes.ImageSummary diff --git a/pkg/domain/entities/manifest.go b/pkg/domain/entities/manifest.go index 4a2cde8a788..b5e1eb24033 100644 --- a/pkg/domain/entities/manifest.go +++ b/pkg/domain/entities/manifest.go @@ -1,8 +1,8 @@ package entities import ( - "github.com/containers/image/v5/types" entitiesTypes "github.com/containers/podman/v5/pkg/domain/entities/types" + "go.podman.io/image/v5/types" ) // ManifestCreateOptions provides model for creating manifest list or image index diff --git a/pkg/domain/entities/play.go b/pkg/domain/entities/play.go index 0fa4f4a145a..ae51bebd67f 100644 --- a/pkg/domain/entities/play.go +++ b/pkg/domain/entities/play.go @@ -3,8 +3,8 @@ package entities import ( "net" - "github.com/containers/image/v5/types" entitiesTypes "github.com/containers/podman/v5/pkg/domain/entities/types" + "go.podman.io/image/v5/types" ) // PlayKubeOptions controls playing kube YAML files. diff --git a/pkg/domain/entities/pods.go b/pkg/domain/entities/pods.go index 4da106f9fd9..3c7f7c93025 100644 --- a/pkg/domain/entities/pods.go +++ b/pkg/domain/entities/pods.go @@ -4,12 +4,12 @@ import ( "errors" "strings" - commonFlag "github.com/containers/common/pkg/flag" "github.com/containers/podman/v5/libpod/define" "github.com/containers/podman/v5/pkg/domain/entities/types" "github.com/containers/podman/v5/pkg/specgen" "github.com/containers/podman/v5/pkg/util" "github.com/opencontainers/runtime-spec/specs-go" + commonFlag "go.podman.io/common/pkg/flag" ) type PodKillOptions struct { diff --git a/pkg/domain/entities/scp.go b/pkg/domain/entities/scp.go index 93b1629cde4..d15a7118f6b 100644 --- a/pkg/domain/entities/scp.go +++ b/pkg/domain/entities/scp.go @@ -3,7 +3,7 @@ package entities import ( "net/url" - "github.com/containers/common/pkg/ssh" + "go.podman.io/common/pkg/ssh" ) // ScpTransferImageOptions provide options for securely copying images to and from a remote host diff --git a/pkg/domain/entities/types.go b/pkg/domain/entities/types.go index 1c1d78afb45..9563a3eae80 100644 --- a/pkg/domain/entities/types.go +++ b/pkg/domain/entities/types.go @@ -3,12 +3,12 @@ package entities import ( "net" - "github.com/containers/common/libnetwork/types" "github.com/containers/podman/v5/libpod/define" "github.com/containers/podman/v5/libpod/events" entitiesTypes "github.com/containers/podman/v5/pkg/domain/entities/types" "github.com/containers/podman/v5/pkg/specgen" - "github.com/containers/storage/pkg/archive" + "go.podman.io/common/libnetwork/types" + "go.podman.io/storage/pkg/archive" ) type Report struct { diff --git a/pkg/domain/entities/types/container_ps.go b/pkg/domain/entities/types/container_ps.go index 139a87c0362..8889298152a 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" - netTypes "github.com/containers/common/libnetwork/types" define "github.com/containers/podman/v5/pkg/ps/define" + netTypes "go.podman.io/common/libnetwork/types" ) // ListContainer describes a container suitable for listing diff --git a/pkg/domain/entities/types/network.go b/pkg/domain/entities/types/network.go index cf7a76936b2..2e60df3032f 100644 --- a/pkg/domain/entities/types/network.go +++ b/pkg/domain/entities/types/network.go @@ -1,7 +1,7 @@ package types import ( - commonTypes "github.com/containers/common/libnetwork/types" + commonTypes "go.podman.io/common/libnetwork/types" ) // NetworkPruneReport containers the name of network and an error diff --git a/pkg/domain/filters/containers.go b/pkg/domain/filters/containers.go index 5d694e76d1d..98e0296f3b5 100644 --- a/pkg/domain/filters/containers.go +++ b/pkg/domain/filters/containers.go @@ -10,12 +10,12 @@ import ( "strings" "time" - "github.com/containers/common/pkg/filters" - "github.com/containers/common/pkg/util" "github.com/containers/podman/v5/libpod" "github.com/containers/podman/v5/libpod/define" "github.com/containers/podman/v5/pkg/domain/entities/types" - "github.com/containers/storage" + "go.podman.io/common/pkg/filters" + "go.podman.io/common/pkg/util" + "go.podman.io/storage" ) // GenerateContainerFilterFuncs return ContainerFilter functions based of filter. diff --git a/pkg/domain/filters/pods.go b/pkg/domain/filters/pods.go index b52be1339a4..38ea973a92a 100644 --- a/pkg/domain/filters/pods.go +++ b/pkg/domain/filters/pods.go @@ -9,10 +9,10 @@ import ( "strconv" "strings" - "github.com/containers/common/pkg/filters" - "github.com/containers/common/pkg/util" "github.com/containers/podman/v5/libpod" "github.com/containers/podman/v5/libpod/define" + "go.podman.io/common/pkg/filters" + "go.podman.io/common/pkg/util" ) // GeneratePodFilterFunc takes a filter and filtervalue (key, value) diff --git a/pkg/domain/filters/volumes.go b/pkg/domain/filters/volumes.go index 07e2cac86c6..734e1793d58 100644 --- a/pkg/domain/filters/volumes.go +++ b/pkg/domain/filters/volumes.go @@ -7,9 +7,9 @@ import ( "strings" "time" - "github.com/containers/common/pkg/filters" "github.com/containers/podman/v5/libpod" "github.com/containers/podman/v5/pkg/util" + "go.podman.io/common/pkg/filters" ) func GenerateVolumeFilters(filter string, filterValues []string, runtime *libpod.Runtime) (libpod.VolumeFilter, error) { diff --git a/pkg/domain/infra/abi/artifact.go b/pkg/domain/infra/abi/artifact.go index 232e4e1ed10..c53ce2eac6a 100644 --- a/pkg/domain/infra/abi/artifact.go +++ b/pkg/domain/infra/abi/artifact.go @@ -9,10 +9,10 @@ import ( "os" "time" - "github.com/containers/common/libimage" "github.com/containers/podman/v5/pkg/domain/entities" "github.com/containers/podman/v5/pkg/libartifact/types" "github.com/opencontainers/go-digest" + "go.podman.io/common/libimage" ) func (ir *ImageEngine) ArtifactInspect(ctx context.Context, name string, _ entities.ArtifactInspectOptions) (*entities.ArtifactInspectReport, error) { diff --git a/pkg/domain/infra/abi/config.go b/pkg/domain/infra/abi/config.go index bc41498a8ed..3381b907f5e 100644 --- a/pkg/domain/infra/abi/config.go +++ b/pkg/domain/infra/abi/config.go @@ -7,7 +7,7 @@ import ( "errors" "io" - "github.com/containers/image/v5/manifest" + "go.podman.io/image/v5/manifest" ) // DecodeOverrideConfig reads a Schema2Config from a Reader, suppressing EOF diff --git a/pkg/domain/infra/abi/config_test.go b/pkg/domain/infra/abi/config_test.go index 6ac29276ca4..fcebdffb083 100644 --- a/pkg/domain/infra/abi/config_test.go +++ b/pkg/domain/infra/abi/config_test.go @@ -6,8 +6,8 @@ import ( "strings" "testing" - "github.com/containers/image/v5/manifest" "github.com/stretchr/testify/assert" + "go.podman.io/image/v5/manifest" ) func TestDecodeOverrideConfig(t *testing.T) { diff --git a/pkg/domain/infra/abi/containers.go b/pkg/domain/infra/abi/containers.go index cd5620fd2ab..429b9ee01c6 100644 --- a/pkg/domain/infra/abi/containers.go +++ b/pkg/domain/infra/abi/containers.go @@ -14,9 +14,6 @@ import ( "time" "github.com/containers/buildah" - "github.com/containers/common/pkg/cgroups" - "github.com/containers/common/pkg/config" - "github.com/containers/image/v5/manifest" "github.com/containers/podman/v5/libpod" "github.com/containers/podman/v5/libpod/define" "github.com/containers/podman/v5/libpod/logs" @@ -34,11 +31,14 @@ import ( "github.com/containers/podman/v5/pkg/specgen/generate" "github.com/containers/podman/v5/pkg/specgenutil" "github.com/containers/podman/v5/pkg/util" - "github.com/containers/storage" - "github.com/containers/storage/pkg/unshare" - "github.com/containers/storage/types" "github.com/hashicorp/go-multierror" "github.com/sirupsen/logrus" + "go.podman.io/common/pkg/cgroups" + "go.podman.io/common/pkg/config" + "go.podman.io/image/v5/manifest" + "go.podman.io/storage" + "go.podman.io/storage/pkg/unshare" + "go.podman.io/storage/types" ) type getContainersOptions struct { diff --git a/pkg/domain/infra/abi/containers_runlabel.go b/pkg/domain/infra/abi/containers_runlabel.go index d27ea0ec7da..baa957d0fac 100644 --- a/pkg/domain/infra/abi/containers_runlabel.go +++ b/pkg/domain/infra/abi/containers_runlabel.go @@ -11,15 +11,15 @@ import ( "path/filepath" "strings" - "github.com/containers/common/libimage" - "github.com/containers/common/pkg/config" "github.com/containers/podman/v5/libpod/define" "github.com/containers/podman/v5/pkg/domain/entities" envLib "github.com/containers/podman/v5/pkg/env" "github.com/containers/podman/v5/utils" - "github.com/containers/storage/pkg/fileutils" "github.com/google/shlex" "github.com/sirupsen/logrus" + "go.podman.io/common/libimage" + "go.podman.io/common/pkg/config" + "go.podman.io/storage/pkg/fileutils" ) func (ic *ContainerEngine) ContainerRunlabel(ctx context.Context, label string, imageRef string, args []string, options entities.ContainerRunlabelOptions) error { diff --git a/pkg/domain/infra/abi/farm.go b/pkg/domain/infra/abi/farm.go index a055fdef498..9e8f3c9c7fb 100644 --- a/pkg/domain/infra/abi/farm.go +++ b/pkg/domain/infra/abi/farm.go @@ -8,9 +8,9 @@ import ( "strings" "github.com/containers/buildah/pkg/parse" - lplatform "github.com/containers/common/libimage/platform" "github.com/containers/podman/v5/pkg/domain/entities" "github.com/containers/podman/v5/pkg/emulation" + lplatform "go.podman.io/common/libimage/platform" ) // FarmNodeName returns the local engine's name. diff --git a/pkg/domain/infra/abi/images.go b/pkg/domain/infra/abi/images.go index 4c582208786..5775b7c92c9 100644 --- a/pkg/domain/infra/abi/images.go +++ b/pkg/domain/infra/abi/images.go @@ -21,29 +21,29 @@ import ( bdefine "github.com/containers/buildah/define" "github.com/containers/buildah/pkg/volumes" - "github.com/containers/common/libimage" - "github.com/containers/common/libimage/filter" - "github.com/containers/common/pkg/config" - "github.com/containers/image/v5/docker" - "github.com/containers/image/v5/docker/reference" - "github.com/containers/image/v5/image" - "github.com/containers/image/v5/manifest" - "github.com/containers/image/v5/pkg/compression" - "github.com/containers/image/v5/signature" - "github.com/containers/image/v5/transports" - "github.com/containers/image/v5/transports/alltransports" "github.com/containers/podman/v5/libpod/define" "github.com/containers/podman/v5/pkg/domain/entities" "github.com/containers/podman/v5/pkg/domain/entities/reports" domainUtils "github.com/containers/podman/v5/pkg/domain/utils" "github.com/containers/podman/v5/pkg/errorhandling" "github.com/containers/podman/v5/pkg/rootless" - "github.com/containers/storage" - "github.com/containers/storage/pkg/unshare" - "github.com/containers/storage/types" "github.com/opencontainers/go-digest" imgspecv1 "github.com/opencontainers/image-spec/specs-go/v1" "github.com/sirupsen/logrus" + "go.podman.io/common/libimage" + "go.podman.io/common/libimage/filter" + "go.podman.io/common/pkg/config" + "go.podman.io/image/v5/docker" + "go.podman.io/image/v5/docker/reference" + "go.podman.io/image/v5/image" + "go.podman.io/image/v5/manifest" + "go.podman.io/image/v5/pkg/compression" + "go.podman.io/image/v5/signature" + "go.podman.io/image/v5/transports" + "go.podman.io/image/v5/transports/alltransports" + "go.podman.io/storage" + "go.podman.io/storage/pkg/unshare" + "go.podman.io/storage/types" ) const UnknownDigestSuffix = docker.UnknownDigestSuffix diff --git a/pkg/domain/infra/abi/images_list.go b/pkg/domain/infra/abi/images_list.go index ad3dc328b7c..d8a40d4d7d4 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/common/libimage" "github.com/containers/podman/v5/libpod/define" "github.com/containers/podman/v5/pkg/domain/entities" + "go.podman.io/common/libimage" ) func (ir *ImageEngine) List(ctx context.Context, opts entities.ImageListOptions) ([]*entities.ImageSummary, error) { diff --git a/pkg/domain/infra/abi/images_test.go b/pkg/domain/infra/abi/images_test.go index f24a11cd0e3..3abe7ec17b4 100644 --- a/pkg/domain/infra/abi/images_test.go +++ b/pkg/domain/infra/abi/images_test.go @@ -5,8 +5,8 @@ package abi import ( "testing" - "github.com/containers/common/libimage" "github.com/stretchr/testify/assert" + "go.podman.io/common/libimage" ) // This is really intended to verify what happens with a diff --git a/pkg/domain/infra/abi/manifest.go b/pkg/domain/infra/abi/manifest.go index b49657125dd..c305313e61d 100644 --- a/pkg/domain/infra/abi/manifest.go +++ b/pkg/domain/infra/abi/manifest.go @@ -12,23 +12,23 @@ import ( "slices" "strings" - "github.com/containers/common/libimage" - "github.com/containers/common/libimage/define" - cp "github.com/containers/image/v5/copy" - "github.com/containers/image/v5/docker" - "github.com/containers/image/v5/image" - "github.com/containers/image/v5/manifest" - "github.com/containers/image/v5/pkg/compression" - "github.com/containers/image/v5/pkg/shortnames" - "github.com/containers/image/v5/transports" - "github.com/containers/image/v5/transports/alltransports" - "github.com/containers/image/v5/types" "github.com/containers/podman/v5/pkg/domain/entities" envLib "github.com/containers/podman/v5/pkg/env" - "github.com/containers/storage" "github.com/opencontainers/go-digest" imgspecv1 "github.com/opencontainers/image-spec/specs-go/v1" "github.com/sirupsen/logrus" + "go.podman.io/common/libimage" + "go.podman.io/common/libimage/define" + cp "go.podman.io/image/v5/copy" + "go.podman.io/image/v5/docker" + "go.podman.io/image/v5/image" + "go.podman.io/image/v5/manifest" + "go.podman.io/image/v5/pkg/compression" + "go.podman.io/image/v5/pkg/shortnames" + "go.podman.io/image/v5/transports" + "go.podman.io/image/v5/transports/alltransports" + "go.podman.io/image/v5/types" + "go.podman.io/storage" ) // ManifestCreate implements logic for creating manifest lists via ImageEngine diff --git a/pkg/domain/infra/abi/network.go b/pkg/domain/infra/abi/network.go index ee99c8127b5..00ac2546fb7 100644 --- a/pkg/domain/infra/abi/network.go +++ b/pkg/domain/infra/abi/network.go @@ -9,13 +9,13 @@ import ( "slices" "strconv" - "github.com/containers/common/libnetwork/pasta" - "github.com/containers/common/libnetwork/slirp4netns" - "github.com/containers/common/libnetwork/types" - netutil "github.com/containers/common/libnetwork/util" "github.com/containers/podman/v5/libpod/define" "github.com/containers/podman/v5/libpod/events" "github.com/containers/podman/v5/pkg/domain/entities" + "go.podman.io/common/libnetwork/pasta" + "go.podman.io/common/libnetwork/slirp4netns" + "go.podman.io/common/libnetwork/types" + netutil "go.podman.io/common/libnetwork/util" ) func (ic *ContainerEngine) NetworkUpdate(ctx context.Context, netName string, options entities.NetworkUpdateOptions) error { diff --git a/pkg/domain/infra/abi/play.go b/pkg/domain/infra/abi/play.go index 9d22e88cdb6..549b625eaca 100644 --- a/pkg/domain/infra/abi/play.go +++ b/pkg/domain/infra/abi/play.go @@ -16,12 +16,6 @@ import ( buildahDefine "github.com/containers/buildah/define" bparse "github.com/containers/buildah/pkg/parse" - "github.com/containers/common/libimage" - nettypes "github.com/containers/common/libnetwork/types" - "github.com/containers/common/pkg/config" - "github.com/containers/common/pkg/secrets" - "github.com/containers/image/v5/docker/reference" - "github.com/containers/image/v5/types" "github.com/containers/podman/v5/cmd/podman/parse" "github.com/containers/podman/v5/libpod" "github.com/containers/podman/v5/libpod/define" @@ -38,12 +32,18 @@ import ( "github.com/containers/podman/v5/pkg/specgenutil" "github.com/containers/podman/v5/pkg/systemd/notifyproxy" "github.com/containers/podman/v5/pkg/util" - "github.com/containers/storage/pkg/archive" - "github.com/containers/storage/pkg/fileutils" "github.com/coreos/go-systemd/v22/daemon" "github.com/opencontainers/go-digest" "github.com/opencontainers/selinux/go-selinux" "github.com/sirupsen/logrus" + "go.podman.io/common/libimage" + nettypes "go.podman.io/common/libnetwork/types" + "go.podman.io/common/pkg/config" + "go.podman.io/common/pkg/secrets" + "go.podman.io/image/v5/docker/reference" + "go.podman.io/image/v5/types" + "go.podman.io/storage/pkg/archive" + "go.podman.io/storage/pkg/fileutils" yamlv3 "gopkg.in/yaml.v3" "sigs.k8s.io/yaml" ) diff --git a/pkg/domain/infra/abi/pods_stats.go b/pkg/domain/infra/abi/pods_stats.go index 3b76407f7d7..c48a052c948 100644 --- a/pkg/domain/infra/abi/pods_stats.go +++ b/pkg/domain/infra/abi/pods_stats.go @@ -8,12 +8,12 @@ import ( "fmt" "strconv" - "github.com/containers/common/pkg/cgroups" "github.com/containers/podman/v5/libpod" "github.com/containers/podman/v5/libpod/define" "github.com/containers/podman/v5/pkg/domain/entities" "github.com/containers/podman/v5/pkg/rootless" "github.com/docker/go-units" + "go.podman.io/common/pkg/cgroups" ) // PodStats implements printing stats about pods. diff --git a/pkg/domain/infra/abi/quadlet.go b/pkg/domain/infra/abi/quadlet.go index ad02aeb0129..db11bf47ef9 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/common/pkg/config" "github.com/containers/podman/v5/pkg/domain/entities" "github.com/containers/podman/v5/pkg/rootless" "github.com/containers/podman/v5/pkg/systemd" "github.com/containers/podman/v5/pkg/systemd/parser" systemdquadlet "github.com/containers/podman/v5/pkg/systemd/quadlet" "github.com/containers/podman/v5/pkg/util" - "github.com/containers/storage/pkg/fileutils" "github.com/sirupsen/logrus" + "go.podman.io/common/pkg/config" + "go.podman.io/storage/pkg/fileutils" ) // deleteAsset reads ..asset, deletes listed files, then deletes the asset file diff --git a/pkg/domain/infra/abi/secrets.go b/pkg/domain/infra/abi/secrets.go index 3969ca79905..00e330e4ab1 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/common/pkg/secrets" "github.com/containers/podman/v5/libpod/events" "github.com/containers/podman/v5/pkg/domain/entities" "github.com/containers/podman/v5/pkg/domain/utils" + "go.podman.io/common/pkg/secrets" ) func (ic *ContainerEngine) SecretCreate(ctx context.Context, name string, reader io.Reader, options entities.SecretCreateOptions) (*entities.SecretCreateReport, error) { diff --git a/pkg/domain/infra/abi/secrets_test.go b/pkg/domain/infra/abi/secrets_test.go index fb6157d9c55..d11d8726d26 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/common/pkg/secrets" "github.com/containers/podman/v5/pkg/domain/entities" "github.com/stretchr/testify/assert" + "go.podman.io/common/pkg/secrets" ) func Test_secretToReport(t *testing.T) { diff --git a/pkg/domain/infra/abi/system.go b/pkg/domain/infra/abi/system.go index 73c21a775ed..b140f40ae8c 100644 --- a/pkg/domain/infra/abi/system.go +++ b/pkg/domain/infra/abi/system.go @@ -17,9 +17,9 @@ import ( "github.com/containers/podman/v5/pkg/domain/entities/reports" "github.com/containers/podman/v5/pkg/emulation" "github.com/containers/podman/v5/pkg/util" - "github.com/containers/storage" - "github.com/containers/storage/pkg/directory" - "github.com/containers/storage/pkg/fileutils" + "go.podman.io/storage" + "go.podman.io/storage/pkg/directory" + "go.podman.io/storage/pkg/fileutils" ) func (ic *ContainerEngine) Info(ctx context.Context) (*define.Info, error) { diff --git a/pkg/domain/infra/abi/system_linux.go b/pkg/domain/infra/abi/system_linux.go index 50e4632408e..7acaa9bd19f 100644 --- a/pkg/domain/infra/abi/system_linux.go +++ b/pkg/domain/infra/abi/system_linux.go @@ -7,13 +7,13 @@ import ( "fmt" "os" - "github.com/containers/common/pkg/cgroups" - "github.com/containers/common/pkg/config" - "github.com/containers/common/pkg/systemd" "github.com/containers/podman/v5/pkg/rootless" "github.com/containers/podman/v5/pkg/util" - "github.com/containers/storage/pkg/unshare" "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/storage/pkg/unshare" ) // Default path for system runtime state diff --git a/pkg/domain/infra/abi/terminal/terminal.go b/pkg/domain/infra/abi/terminal/terminal.go index 954997c095e..9c654c26053 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" - "github.com/containers/common/pkg/resize" lsignal "github.com/containers/podman/v5/pkg/signal" "github.com/moby/term" "github.com/sirupsen/logrus" + "go.podman.io/common/pkg/resize" ) // RawTtyFormatter ... diff --git a/pkg/domain/infra/abi/terminal/terminal_common.go b/pkg/domain/infra/abi/terminal/terminal_common.go index 065ac3012d0..169fcde36cb 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/common/pkg/resize" "github.com/containers/podman/v5/libpod" "github.com/containers/podman/v5/libpod/define" "github.com/sirupsen/logrus" + "go.podman.io/common/pkg/resize" "golang.org/x/term" ) diff --git a/pkg/domain/infra/runtime_libpod.go b/pkg/domain/infra/runtime_libpod.go index fc8d8ff2201..34cea76b2fd 100644 --- a/pkg/domain/infra/runtime_libpod.go +++ b/pkg/domain/infra/runtime_libpod.go @@ -13,16 +13,16 @@ import ( "sync" "syscall" - "github.com/containers/common/pkg/cgroups" "github.com/containers/podman/v5/libpod" "github.com/containers/podman/v5/pkg/domain/entities" "github.com/containers/podman/v5/pkg/namespaces" "github.com/containers/podman/v5/pkg/rootless" "github.com/containers/podman/v5/pkg/util" - "github.com/containers/storage/pkg/idtools" - "github.com/containers/storage/types" "github.com/sirupsen/logrus" flag "github.com/spf13/pflag" + "go.podman.io/common/pkg/cgroups" + "go.podman.io/storage/pkg/idtools" + "go.podman.io/storage/types" ) var ( diff --git a/pkg/domain/infra/tunnel/artifact.go b/pkg/domain/infra/tunnel/artifact.go index 312ccf60085..34e79c9dc5c 100644 --- a/pkg/domain/infra/tunnel/artifact.go +++ b/pkg/domain/infra/tunnel/artifact.go @@ -7,9 +7,9 @@ import ( "io" "os" - "github.com/containers/image/v5/types" "github.com/containers/podman/v5/pkg/bindings/artifacts" "github.com/containers/podman/v5/pkg/domain/entities" + "go.podman.io/image/v5/types" ) func (ir *ImageEngine) ArtifactExtract(_ context.Context, name string, target string, opts entities.ArtifactExtractOptions) error { diff --git a/pkg/domain/infra/tunnel/containers.go b/pkg/domain/infra/tunnel/containers.go index 13c0f9ad460..308c1383836 100644 --- a/pkg/domain/infra/tunnel/containers.go +++ b/pkg/domain/infra/tunnel/containers.go @@ -12,8 +12,6 @@ import ( "strings" "time" - "github.com/containers/common/pkg/config" - "github.com/containers/image/v5/docker/reference" "github.com/containers/podman/v5/libpod/define" "github.com/containers/podman/v5/pkg/api/handlers" "github.com/containers/podman/v5/pkg/bindings" @@ -24,8 +22,10 @@ import ( "github.com/containers/podman/v5/pkg/errorhandling" "github.com/containers/podman/v5/pkg/specgen" "github.com/containers/podman/v5/pkg/util" - "github.com/containers/storage/types" "github.com/sirupsen/logrus" + "go.podman.io/common/pkg/config" + "go.podman.io/image/v5/docker/reference" + "go.podman.io/storage/types" ) func (ic *ContainerEngine) ContainerRunlabel(ctx context.Context, label string, image string, args []string, options entities.ContainerRunlabelOptions) error { diff --git a/pkg/domain/infra/tunnel/images.go b/pkg/domain/infra/tunnel/images.go index de1ca450457..9a260ef994e 100644 --- a/pkg/domain/infra/tunnel/images.go +++ b/pkg/domain/infra/tunnel/images.go @@ -11,10 +11,6 @@ import ( "time" bdefine "github.com/containers/buildah/define" - "github.com/containers/common/libimage/filter" - "github.com/containers/common/pkg/config" - "github.com/containers/image/v5/docker/reference" - "github.com/containers/image/v5/types" "github.com/containers/podman/v5/internal/localapi" "github.com/containers/podman/v5/libpod/define" "github.com/containers/podman/v5/pkg/bindings/images" @@ -22,7 +18,11 @@ import ( "github.com/containers/podman/v5/pkg/domain/entities/reports" "github.com/containers/podman/v5/pkg/domain/utils" "github.com/containers/podman/v5/pkg/errorhandling" - "github.com/containers/storage/pkg/archive" + "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/storage/pkg/archive" ) func (ir *ImageEngine) Exists(_ context.Context, nameOrID string) (*entities.BoolReport, error) { diff --git a/pkg/domain/infra/tunnel/kube.go b/pkg/domain/infra/tunnel/kube.go index 319e7eb04aa..179d37ce278 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/image/v5/types" "github.com/containers/podman/v5/pkg/bindings/generate" "github.com/containers/podman/v5/pkg/bindings/kube" "github.com/containers/podman/v5/pkg/bindings/play" "github.com/containers/podman/v5/pkg/domain/entities" + "go.podman.io/image/v5/types" ) func (ic *ContainerEngine) GenerateSystemd(ctx context.Context, nameOrID string, opts entities.GenerateSystemdOptions) (*entities.GenerateSystemdReport, error) { diff --git a/pkg/domain/infra/tunnel/manifest.go b/pkg/domain/infra/tunnel/manifest.go index d89ff80699d..d0b91e8afe1 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/common/libimage/define" - "github.com/containers/image/v5/types" "github.com/containers/podman/v5/pkg/bindings/images" "github.com/containers/podman/v5/pkg/bindings/manifests" "github.com/containers/podman/v5/pkg/domain/entities" envLib "github.com/containers/podman/v5/pkg/env" + "go.podman.io/common/libimage/define" + "go.podman.io/image/v5/types" ) // ManifestCreate implements manifest create via ImageEngine diff --git a/pkg/domain/infra/tunnel/network.go b/pkg/domain/infra/tunnel/network.go index bd48f6dcaab..d81ca3e8c19 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/common/libnetwork/types" "github.com/containers/podman/v5/libpod/define" "github.com/containers/podman/v5/pkg/bindings/network" "github.com/containers/podman/v5/pkg/domain/entities" "github.com/containers/podman/v5/pkg/errorhandling" + "go.podman.io/common/libnetwork/types" ) func (ic *ContainerEngine) NetworkUpdate(ctx context.Context, netName string, opts entities.NetworkUpdateOptions) error { diff --git a/pkg/domain/utils/scp.go b/pkg/domain/utils/scp.go index 58b20d8194b..03a5f629885 100644 --- a/pkg/domain/utils/scp.go +++ b/pkg/domain/utils/scp.go @@ -9,12 +9,12 @@ import ( "strconv" "strings" - "github.com/containers/common/pkg/config" - "github.com/containers/common/pkg/ssh" - "github.com/containers/image/v5/transports/alltransports" "github.com/containers/podman/v5/libpod/define" "github.com/containers/podman/v5/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" ) func ExecuteTransfer(src, dst string, opts entities.ScpExecuteTransferOptions) (*entities.ScpExecuteTransferReport, error) { diff --git a/pkg/domain/utils/secrets_filters.go b/pkg/domain/utils/secrets_filters.go index 48162ce08c9..a7529e8d05c 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/common/pkg/secrets" "github.com/containers/podman/v5/pkg/util" + "go.podman.io/common/pkg/secrets" ) func IfPassesSecretsFilter(s secrets.Secret, filters map[string][]string) (bool, error) { diff --git a/pkg/farm/farm.go b/pkg/farm/farm.go index 076aa1a7095..75e15e7bc1b 100644 --- a/pkg/farm/farm.go +++ b/pkg/farm/farm.go @@ -12,12 +12,12 @@ import ( "sync" "github.com/containers/buildah/define" - lplatform "github.com/containers/common/libimage/platform" - "github.com/containers/common/pkg/config" "github.com/containers/podman/v5/pkg/domain/entities" "github.com/containers/podman/v5/pkg/domain/infra" "github.com/hashicorp/go-multierror" "github.com/sirupsen/logrus" + lplatform "go.podman.io/common/libimage/platform" + "go.podman.io/common/pkg/config" ) // Farm represents a group of connections to builders. diff --git a/pkg/farm/list_builder.go b/pkg/farm/list_builder.go index 79cf2f5ce94..06d2ea6f8f2 100644 --- a/pkg/farm/list_builder.go +++ b/pkg/farm/list_builder.go @@ -6,11 +6,11 @@ import ( "os" "sync" - "github.com/containers/image/v5/docker" - "github.com/containers/image/v5/types" "github.com/containers/podman/v5/pkg/domain/entities" "github.com/hashicorp/go-multierror" "github.com/sirupsen/logrus" + "go.podman.io/image/v5/docker" + "go.podman.io/image/v5/types" ) type listBuilderOptions struct { diff --git a/pkg/inspect/inspect.go b/pkg/inspect/inspect.go index 26436155bf8..f516931fe92 100644 --- a/pkg/inspect/inspect.go +++ b/pkg/inspect/inspect.go @@ -3,10 +3,10 @@ package inspect import ( "time" - "github.com/containers/image/v5/manifest" "github.com/containers/podman/v5/libpod/define" "github.com/opencontainers/go-digest" v1 "github.com/opencontainers/image-spec/specs-go/v1" + "go.podman.io/image/v5/manifest" ) // ImageData holds the inspect information of an image. diff --git a/pkg/libartifact/artifact.go b/pkg/libartifact/artifact.go index d611b4351b3..48183b55d9a 100644 --- a/pkg/libartifact/artifact.go +++ b/pkg/libartifact/artifact.go @@ -5,9 +5,9 @@ import ( "fmt" "strings" - "github.com/containers/image/v5/manifest" "github.com/containers/podman/v5/pkg/libartifact/types" "github.com/opencontainers/go-digest" + "go.podman.io/image/v5/manifest" ) type Artifact struct { diff --git a/pkg/libartifact/store/config.go b/pkg/libartifact/store/config.go index 5613e18554e..f5b9a6a1266 100644 --- a/pkg/libartifact/store/config.go +++ b/pkg/libartifact/store/config.go @@ -6,8 +6,8 @@ import ( "context" "encoding/json" - "github.com/containers/image/v5/types" specV1 "github.com/opencontainers/image-spec/specs-go/v1" + "go.podman.io/image/v5/types" ) // unparsedArtifactImage is an interface based on the UnParsedImage and diff --git a/pkg/libartifact/store/store.go b/pkg/libartifact/store/store.go index 2f3b803d6b3..a8fd0178a8f 100644 --- a/pkg/libartifact/store/store.go +++ b/pkg/libartifact/store/store.go @@ -18,22 +18,22 @@ import ( "strings" "time" - "github.com/containers/common/libimage" - "github.com/containers/image/v5/image" - "github.com/containers/image/v5/manifest" - "github.com/containers/image/v5/oci/layout" - "github.com/containers/image/v5/pkg/blobinfocache/none" - "github.com/containers/image/v5/transports/alltransports" - "github.com/containers/image/v5/types" "github.com/containers/podman/v5/pkg/domain/entities" "github.com/containers/podman/v5/pkg/libartifact" libartTypes "github.com/containers/podman/v5/pkg/libartifact/types" - "github.com/containers/storage/pkg/fileutils" - "github.com/containers/storage/pkg/lockfile" "github.com/opencontainers/go-digest" "github.com/opencontainers/image-spec/specs-go" specV1 "github.com/opencontainers/image-spec/specs-go/v1" "github.com/sirupsen/logrus" + "go.podman.io/common/libimage" + "go.podman.io/image/v5/image" + "go.podman.io/image/v5/manifest" + "go.podman.io/image/v5/oci/layout" + "go.podman.io/image/v5/pkg/blobinfocache/none" + "go.podman.io/image/v5/transports/alltransports" + "go.podman.io/image/v5/types" + "go.podman.io/storage/pkg/fileutils" + "go.podman.io/storage/pkg/lockfile" ) var ( diff --git a/pkg/machine/apple/apple.go b/pkg/machine/apple/apple.go index e065108f6a8..3f11bbccd8d 100644 --- a/pkg/machine/apple/apple.go +++ b/pkg/machine/apple/apple.go @@ -12,8 +12,6 @@ import ( "syscall" "time" - "github.com/containers/common/pkg/config" - "github.com/containers/common/pkg/strongunits" gvproxy "github.com/containers/gvisor-tap-vsock/pkg/types" "github.com/containers/podman/v5/pkg/machine" "github.com/containers/podman/v5/pkg/machine/define" @@ -23,6 +21,8 @@ import ( "github.com/containers/podman/v5/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" ) const applehvMACAddress = "5a:94:ef:e4:0c:ee" diff --git a/pkg/machine/applehv/stubber.go b/pkg/machine/applehv/stubber.go index 258a352dc74..709ac6c71bf 100644 --- a/pkg/machine/applehv/stubber.go +++ b/pkg/machine/applehv/stubber.go @@ -7,7 +7,6 @@ import ( "runtime" "strconv" - "github.com/containers/common/pkg/config" gvproxy "github.com/containers/gvisor-tap-vsock/pkg/types" "github.com/containers/podman/v5/pkg/machine" "github.com/containers/podman/v5/pkg/machine/apple" @@ -17,6 +16,7 @@ import ( "github.com/containers/podman/v5/pkg/machine/vmconfigs" "github.com/containers/podman/v5/utils" vfConfig "github.com/crc-org/vfkit/pkg/config" + "go.podman.io/common/pkg/config" ) // applehcMACAddress is a pre-defined mac address that vfkit recognizes diff --git a/pkg/machine/compression/decompress.go b/pkg/machine/compression/decompress.go index 5e2448f5db2..817afa82539 100644 --- a/pkg/machine/compression/decompress.go +++ b/pkg/machine/compression/decompress.go @@ -8,8 +8,8 @@ import ( "github.com/containers/podman/v5/pkg/machine/define" "github.com/containers/podman/v5/utils" - "github.com/containers/storage/pkg/archive" "github.com/sirupsen/logrus" + "go.podman.io/storage/pkg/archive" ) const ( diff --git a/pkg/machine/compression/generic.go b/pkg/machine/compression/generic.go index 0b70ff92e9d..f16fb4ab670 100644 --- a/pkg/machine/compression/generic.go +++ b/pkg/machine/compression/generic.go @@ -6,8 +6,8 @@ import ( "os" "runtime" - "github.com/containers/image/v5/pkg/compression" "github.com/sirupsen/logrus" + "go.podman.io/image/v5/pkg/compression" ) type genericDecompressor struct { diff --git a/pkg/machine/config.go b/pkg/machine/config.go index aa237ccb2ea..be35b348e36 100644 --- a/pkg/machine/config.go +++ b/pkg/machine/config.go @@ -12,11 +12,11 @@ import ( "strings" "time" - "github.com/containers/common/pkg/strongunits" "github.com/containers/podman/v5/pkg/machine/compression" "github.com/containers/podman/v5/pkg/machine/define" "github.com/containers/podman/v5/pkg/machine/vmconfigs" "github.com/sirupsen/logrus" + "go.podman.io/common/pkg/strongunits" ) const apiUpTimeout = 20 * time.Second diff --git a/pkg/machine/connection/connection.go b/pkg/machine/connection/connection.go index 9c77ddeeffb..e93dcc6f751 100644 --- a/pkg/machine/connection/connection.go +++ b/pkg/machine/connection/connection.go @@ -8,8 +8,8 @@ import ( "net" "net/url" - "github.com/containers/common/pkg/config" "github.com/containers/podman/v5/pkg/machine/define" + "go.podman.io/common/pkg/config" ) const LocalhostIP = "127.0.0.1" diff --git a/pkg/machine/define/initopts.go b/pkg/machine/define/initopts.go index c7699338279..e89b64f0ca7 100644 --- a/pkg/machine/define/initopts.go +++ b/pkg/machine/define/initopts.go @@ -3,7 +3,7 @@ package define import ( "net/url" - "github.com/containers/image/v5/types" + "go.podman.io/image/v5/types" ) type InitOptions struct { diff --git a/pkg/machine/define/setopts.go b/pkg/machine/define/setopts.go index 6b00478ec08..5ddbbe76c4a 100644 --- a/pkg/machine/define/setopts.go +++ b/pkg/machine/define/setopts.go @@ -1,6 +1,6 @@ package define -import "github.com/containers/common/pkg/strongunits" +import "go.podman.io/common/pkg/strongunits" type SetOptions struct { CPUs *uint64 diff --git a/pkg/machine/e2e/config_test.go b/pkg/machine/e2e/config_test.go index 77662a8485f..28d30e2498b 100644 --- a/pkg/machine/e2e/config_test.go +++ b/pkg/machine/e2e/config_test.go @@ -15,12 +15,12 @@ import ( "github.com/containers/podman/v5/pkg/machine" "github.com/containers/podman/v5/pkg/machine/define" - "github.com/containers/storage/pkg/stringid" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "github.com/onsi/gomega/format" . "github.com/onsi/gomega/gexec" "github.com/onsi/gomega/types" + "go.podman.io/storage/pkg/stringid" ) var originalHomeDir = os.Getenv("HOME") diff --git a/pkg/machine/e2e/init_test.go b/pkg/machine/e2e/init_test.go index e1bbca40513..af0d3214d05 100644 --- a/pkg/machine/e2e/init_test.go +++ b/pkg/machine/e2e/init_test.go @@ -9,7 +9,6 @@ import ( "strings" "time" - "github.com/containers/common/pkg/strongunits" "github.com/containers/podman/v5/pkg/machine/define" "github.com/containers/podman/v5/utils" . "github.com/onsi/ginkgo/v2" @@ -17,6 +16,7 @@ import ( . "github.com/onsi/gomega/gexec" "github.com/shirou/gopsutil/v4/mem" "github.com/sirupsen/logrus" + "go.podman.io/common/pkg/strongunits" ) var _ = Describe("podman machine init", func() { diff --git a/pkg/machine/e2e/machine_pull_test.go b/pkg/machine/e2e/machine_pull_test.go index c5f67c2d7ac..9374b3b18b0 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/image/v5/types" "github.com/containers/podman/v5/pkg/machine/compression" "github.com/containers/podman/v5/pkg/machine/define" "github.com/containers/podman/v5/pkg/machine/ocipull" + "go.podman.io/image/v5/types" ) 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 a4c3084a1ac..0dfb0274c94 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/common/pkg/config" "github.com/containers/podman/v5/pkg/machine/define" "github.com/containers/podman/v5/pkg/machine/provider" "github.com/containers/podman/v5/pkg/machine/vmconfigs" "github.com/containers/podman/v5/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + "go.podman.io/common/pkg/config" ) func TestMain(m *testing.M) { diff --git a/pkg/machine/env/dir.go b/pkg/machine/env/dir.go index 3296857f3ca..41850569749 100644 --- a/pkg/machine/env/dir.go +++ b/pkg/machine/env/dir.go @@ -7,8 +7,8 @@ import ( "strings" "github.com/containers/podman/v5/pkg/machine/define" - "github.com/containers/storage/pkg/fileutils" - "github.com/containers/storage/pkg/homedir" + "go.podman.io/storage/pkg/fileutils" + "go.podman.io/storage/pkg/homedir" ) // GetDataDir returns the filepath where vm images should diff --git a/pkg/machine/hyperv/stubber.go b/pkg/machine/hyperv/stubber.go index a2116a69848..1447631455f 100644 --- a/pkg/machine/hyperv/stubber.go +++ b/pkg/machine/hyperv/stubber.go @@ -11,7 +11,6 @@ import ( "path/filepath" "github.com/Microsoft/go-winio" - "github.com/containers/common/pkg/strongunits" gvproxy "github.com/containers/gvisor-tap-vsock/pkg/types" "github.com/containers/libhvee/pkg/hypervctl" "github.com/containers/podman/v5/pkg/machine" @@ -22,6 +21,7 @@ import ( "github.com/containers/podman/v5/pkg/machine/vmconfigs" "github.com/containers/podman/v5/pkg/systemd/parser" "github.com/sirupsen/logrus" + "go.podman.io/common/pkg/strongunits" ) type HyperVStubber struct { diff --git a/pkg/machine/ignition/ignition.go b/pkg/machine/ignition/ignition.go index 4525796692b..3275e252cdf 100644 --- a/pkg/machine/ignition/ignition.go +++ b/pkg/machine/ignition/ignition.go @@ -14,8 +14,8 @@ import ( "github.com/containers/podman/v5/pkg/machine/define" "github.com/containers/podman/v5/pkg/systemd/parser" - "github.com/containers/storage/pkg/fileutils" "github.com/sirupsen/logrus" + "go.podman.io/storage/pkg/fileutils" ) /* diff --git a/pkg/machine/keys.go b/pkg/machine/keys.go index 8afa072151e..eb6d5e6accc 100644 --- a/pkg/machine/keys.go +++ b/pkg/machine/keys.go @@ -10,7 +10,7 @@ import ( "path/filepath" "strings" - "github.com/containers/storage/pkg/fileutils" + "go.podman.io/storage/pkg/fileutils" ) var sshCommand = []string{"ssh-keygen", "-N", "", "-t", "ed25519", "-f"} diff --git a/pkg/machine/lock/lock.go b/pkg/machine/lock/lock.go index dbe941eb951..0a5a05db018 100644 --- a/pkg/machine/lock/lock.go +++ b/pkg/machine/lock/lock.go @@ -5,7 +5,7 @@ import ( "path/filepath" "github.com/containers/podman/v5/pkg/machine/env" - "github.com/containers/storage/pkg/lockfile" + "go.podman.io/storage/pkg/lockfile" ) func GetMachineLock(name string, machineConfigDir string) (*lockfile.LockFile, error) { diff --git a/pkg/machine/machine_windows.go b/pkg/machine/machine_windows.go index 3ea059f39b0..1463c627b6c 100644 --- a/pkg/machine/machine_windows.go +++ b/pkg/machine/machine_windows.go @@ -19,8 +19,8 @@ import ( "github.com/containers/podman/v5/pkg/machine/define" "github.com/containers/podman/v5/pkg/machine/env" "github.com/containers/podman/v5/pkg/machine/sockets" - "github.com/containers/storage/pkg/fileutils" "github.com/sirupsen/logrus" + "go.podman.io/storage/pkg/fileutils" ) const ( diff --git a/pkg/machine/ocipull/ociartifact.go b/pkg/machine/ocipull/ociartifact.go index 1c5522b9a3c..360869f47a8 100644 --- a/pkg/machine/ocipull/ociartifact.go +++ b/pkg/machine/ocipull/ociartifact.go @@ -10,17 +10,17 @@ import ( "runtime" "strings" - "github.com/containers/image/v5/docker" - "github.com/containers/image/v5/docker/reference" - "github.com/containers/image/v5/image" - "github.com/containers/image/v5/transports/alltransports" - "github.com/containers/image/v5/types" "github.com/containers/podman/v5/pkg/machine/compression" "github.com/containers/podman/v5/pkg/machine/define" "github.com/containers/podman/v5/utils" "github.com/opencontainers/go-digest" specV1 "github.com/opencontainers/image-spec/specs-go/v1" "github.com/sirupsen/logrus" + "go.podman.io/image/v5/docker" + "go.podman.io/image/v5/docker/reference" + "go.podman.io/image/v5/image" + "go.podman.io/image/v5/transports/alltransports" + "go.podman.io/image/v5/types" ) const ( diff --git a/pkg/machine/ocipull/policy_unix.go b/pkg/machine/ocipull/policy_unix.go index 2fd0443583a..6a94b76e484 100644 --- a/pkg/machine/ocipull/policy_unix.go +++ b/pkg/machine/ocipull/policy_unix.go @@ -5,8 +5,8 @@ package ocipull import ( "path/filepath" - "github.com/containers/common/pkg/config" - "github.com/containers/storage/pkg/homedir" + "go.podman.io/common/pkg/config" + "go.podman.io/storage/pkg/homedir" ) func localPolicyOverwrites() []string { diff --git a/pkg/machine/ocipull/pull.go b/pkg/machine/ocipull/pull.go index 17e3f65262f..aa6aac34894 100644 --- a/pkg/machine/ocipull/pull.go +++ b/pkg/machine/ocipull/pull.go @@ -8,12 +8,12 @@ import ( "os" "github.com/containers/buildah/pkg/parse" - "github.com/containers/image/v5/copy" - "github.com/containers/image/v5/oci/layout" - "github.com/containers/image/v5/signature" - "github.com/containers/image/v5/types" "github.com/containers/podman/v5/pkg/machine/define" "github.com/sirupsen/logrus" + "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" ) // PullOptions includes data to alter certain knobs when pulling a source diff --git a/pkg/machine/ocipull/source.go b/pkg/machine/ocipull/source.go index 4267fe2a748..0fe242bd207 100644 --- a/pkg/machine/ocipull/source.go +++ b/pkg/machine/ocipull/source.go @@ -6,13 +6,13 @@ import ( "errors" "fmt" - "github.com/containers/image/v5/image" - "github.com/containers/image/v5/manifest" - "github.com/containers/image/v5/oci/layout" - "github.com/containers/image/v5/types" "github.com/opencontainers/go-digest" specV1 "github.com/opencontainers/image-spec/specs-go/v1" "github.com/sirupsen/logrus" + "go.podman.io/image/v5/image" + "go.podman.io/image/v5/manifest" + "go.podman.io/image/v5/oci/layout" + "go.podman.io/image/v5/types" ) func GetLocalBlob(ctx context.Context, path string) (*types.BlobInfo, error) { diff --git a/pkg/machine/os/ostree.go b/pkg/machine/os/ostree.go index f335129806e..c9c78fb62b6 100644 --- a/pkg/machine/os/ostree.go +++ b/pkg/machine/os/ostree.go @@ -10,8 +10,8 @@ import ( "regexp" "strings" - "github.com/containers/image/v5/transports/alltransports" "github.com/sirupsen/logrus" + "go.podman.io/image/v5/transports/alltransports" ) // OSTree deals with operations on ostree based os's diff --git a/pkg/machine/ports/ports.go b/pkg/machine/ports/ports.go index e9e9afa2b4a..a61188cbbf4 100644 --- a/pkg/machine/ports/ports.go +++ b/pkg/machine/ports/ports.go @@ -12,9 +12,9 @@ import ( "strconv" "github.com/containers/podman/v5/pkg/machine/env" - "github.com/containers/storage/pkg/ioutils" - "github.com/containers/storage/pkg/lockfile" "github.com/sirupsen/logrus" + "go.podman.io/storage/pkg/ioutils" + "go.podman.io/storage/pkg/lockfile" ) const ( diff --git a/pkg/machine/provider/platform_darwin.go b/pkg/machine/provider/platform_darwin.go index 5751b42a938..a6e415f07b9 100644 --- a/pkg/machine/provider/platform_darwin.go +++ b/pkg/machine/provider/platform_darwin.go @@ -10,12 +10,12 @@ import ( "strings" "github.com/blang/semver/v4" - "github.com/containers/common/pkg/config" "github.com/containers/podman/v5/pkg/machine/applehv" "github.com/containers/podman/v5/pkg/machine/define" "github.com/containers/podman/v5/pkg/machine/libkrun" "github.com/containers/podman/v5/pkg/machine/vmconfigs" "github.com/sirupsen/logrus" + "go.podman.io/common/pkg/config" ) func Get() (vmconfigs.VMProvider, error) { diff --git a/pkg/machine/provider/platform_unix.go b/pkg/machine/provider/platform_unix.go index d5e2318ae8e..82312b8f2c9 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/common/pkg/config" "github.com/containers/podman/v5/pkg/machine/define" "github.com/containers/podman/v5/pkg/machine/qemu" "github.com/containers/podman/v5/pkg/machine/vmconfigs" "github.com/sirupsen/logrus" + "go.podman.io/common/pkg/config" ) func Get() (vmconfigs.VMProvider, error) { diff --git a/pkg/machine/provider/platform_windows.go b/pkg/machine/provider/platform_windows.go index eab7502af5c..b93212f4c96 100644 --- a/pkg/machine/provider/platform_windows.go +++ b/pkg/machine/provider/platform_windows.go @@ -9,10 +9,10 @@ import ( "github.com/containers/podman/v5/pkg/machine/wsl" "github.com/containers/podman/v5/pkg/machine/wsl/wutil" - "github.com/containers/common/pkg/config" "github.com/containers/podman/v5/pkg/machine/define" "github.com/containers/podman/v5/pkg/machine/hyperv" "github.com/sirupsen/logrus" + "go.podman.io/common/pkg/config" ) func Get() (vmconfigs.VMProvider, error) { diff --git a/pkg/machine/proxyenv/env.go b/pkg/machine/proxyenv/env.go index fb0dab576fc..3cc78e115ba 100644 --- a/pkg/machine/proxyenv/env.go +++ b/pkg/machine/proxyenv/env.go @@ -6,11 +6,11 @@ import ( "os" "strings" - "github.com/containers/common/libnetwork/etchosts" - "github.com/containers/common/pkg/config" "github.com/containers/podman/v5/pkg/machine" "github.com/containers/podman/v5/pkg/machine/vmconfigs" "github.com/sirupsen/logrus" + "go.podman.io/common/libnetwork/etchosts" + "go.podman.io/common/pkg/config" ) const proxySetupScriptTemplate = `#!/bin/bash diff --git a/pkg/machine/qemu/command/command.go b/pkg/machine/qemu/command/command.go index de94ab396c5..e7e205ea891 100644 --- a/pkg/machine/qemu/command/command.go +++ b/pkg/machine/qemu/command/command.go @@ -11,7 +11,7 @@ import ( "time" "github.com/containers/podman/v5/pkg/machine/define" - "github.com/containers/storage/pkg/fileutils" + "go.podman.io/storage/pkg/fileutils" ) // defaultQMPTimeout is the timeout duration for the diff --git a/pkg/machine/qemu/command/command_unix.go b/pkg/machine/qemu/command/command_unix.go index a9ecd4a7d63..a46a8c206e2 100644 --- a/pkg/machine/qemu/command/command_unix.go +++ b/pkg/machine/qemu/command/command_unix.go @@ -6,7 +6,7 @@ import ( "fmt" "strconv" - "github.com/containers/common/pkg/strongunits" + "go.podman.io/common/pkg/strongunits" ) // SetMemory adds the specified amount of memory for the machine diff --git a/pkg/machine/qemu/command/command_windows.go b/pkg/machine/qemu/command/command_windows.go index 61a5ffa4a0b..aaa061d6736 100644 --- a/pkg/machine/qemu/command/command_windows.go +++ b/pkg/machine/qemu/command/command_windows.go @@ -5,7 +5,7 @@ package command import ( "strconv" - "github.com/containers/common/pkg/strongunits" + "go.podman.io/common/pkg/strongunits" ) // SetMemory adds the specified amount of memory for the machine diff --git a/pkg/machine/qemu/config.go b/pkg/machine/qemu/config.go index 760df18eadc..695f5ab6665 100644 --- a/pkg/machine/qemu/config.go +++ b/pkg/machine/qemu/config.go @@ -3,7 +3,7 @@ package qemu import ( - "github.com/containers/common/pkg/config" + "go.podman.io/common/pkg/config" ) // setNewMachineCMDOpts are options needed to pass diff --git a/pkg/machine/qemu/machine.go b/pkg/machine/qemu/machine.go index 310b803c711..17ab8d93477 100644 --- a/pkg/machine/qemu/machine.go +++ b/pkg/machine/qemu/machine.go @@ -17,9 +17,9 @@ import ( "github.com/containers/podman/v5/pkg/errorhandling" "github.com/containers/podman/v5/pkg/machine/define" "github.com/containers/podman/v5/pkg/machine/vmconfigs" - "github.com/containers/storage/pkg/fileutils" "github.com/digitalocean/go-qemu/qmp" "github.com/sirupsen/logrus" + "go.podman.io/storage/pkg/fileutils" ) func NewStubber() (*QEMUStubber, error) { diff --git a/pkg/machine/qemu/options_linux_arm64.go b/pkg/machine/qemu/options_linux_arm64.go index 09be86a62db..c11f6a3d6a9 100644 --- a/pkg/machine/qemu/options_linux_arm64.go +++ b/pkg/machine/qemu/options_linux_arm64.go @@ -5,7 +5,7 @@ package qemu import ( "path/filepath" - "github.com/containers/storage/pkg/fileutils" + "go.podman.io/storage/pkg/fileutils" ) var ( diff --git a/pkg/machine/qemu/stubber.go b/pkg/machine/qemu/stubber.go index 48625810e6f..da9f99bff0d 100644 --- a/pkg/machine/qemu/stubber.go +++ b/pkg/machine/qemu/stubber.go @@ -13,8 +13,6 @@ import ( "strings" "time" - "github.com/containers/common/pkg/config" - "github.com/containers/common/pkg/strongunits" gvproxy "github.com/containers/gvisor-tap-vsock/pkg/types" "github.com/containers/podman/v5/pkg/machine" "github.com/containers/podman/v5/pkg/machine/define" @@ -23,6 +21,8 @@ import ( "github.com/containers/podman/v5/pkg/machine/sockets" "github.com/containers/podman/v5/pkg/machine/vmconfigs" "github.com/sirupsen/logrus" + "go.podman.io/common/pkg/config" + "go.podman.io/common/pkg/strongunits" ) type QEMUStubber struct { diff --git a/pkg/machine/qemu/virtiofsd.go b/pkg/machine/qemu/virtiofsd.go index 29f6ba215c9..7f358bbda86 100644 --- a/pkg/machine/qemu/virtiofsd.go +++ b/pkg/machine/qemu/virtiofsd.go @@ -8,11 +8,11 @@ import ( "os/exec" "time" - "github.com/containers/common/pkg/config" "github.com/containers/podman/v5/pkg/machine/define" "github.com/containers/podman/v5/pkg/machine/vmconfigs" - "github.com/containers/storage/pkg/fileutils" "github.com/sirupsen/logrus" + "go.podman.io/common/pkg/config" + "go.podman.io/storage/pkg/fileutils" ) // VirtiofsdSpawner spawns an instance of virtiofsd diff --git a/pkg/machine/shim/diskpull/diskpull.go b/pkg/machine/shim/diskpull/diskpull.go index 7cc8c5d0ac1..2facbfd5f43 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/image/v5/types" "github.com/containers/podman/v5/pkg/machine/define" "github.com/containers/podman/v5/pkg/machine/ocipull" "github.com/containers/podman/v5/pkg/machine/stdpull" + "go.podman.io/image/v5/types" ) 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/networking.go b/pkg/machine/shim/networking.go index 503a4030a46..7fcc69bc984 100644 --- a/pkg/machine/shim/networking.go +++ b/pkg/machine/shim/networking.go @@ -8,7 +8,6 @@ import ( "strings" "time" - "github.com/containers/common/pkg/config" gvproxy "github.com/containers/gvisor-tap-vsock/pkg/types" "github.com/containers/podman/v5/pkg/machine" "github.com/containers/podman/v5/pkg/machine/connection" @@ -17,6 +16,7 @@ import ( "github.com/containers/podman/v5/pkg/machine/ports" "github.com/containers/podman/v5/pkg/machine/vmconfigs" "github.com/sirupsen/logrus" + "go.podman.io/common/pkg/config" ) const ( diff --git a/pkg/machine/sockets/sockets.go b/pkg/machine/sockets/sockets.go index 412db3aabc4..ea5baa8df1c 100644 --- a/pkg/machine/sockets/sockets.go +++ b/pkg/machine/sockets/sockets.go @@ -10,8 +10,8 @@ import ( "time" "github.com/containers/podman/v5/pkg/machine/define" - "github.com/containers/storage/pkg/fileutils" "github.com/sirupsen/logrus" + "go.podman.io/storage/pkg/fileutils" ) // ListenAndWaitOnSocket waits for a new connection to the listener and sends diff --git a/pkg/machine/stdpull/local.go b/pkg/machine/stdpull/local.go index 3ece20bb093..b8d45ca92f9 100644 --- a/pkg/machine/stdpull/local.go +++ b/pkg/machine/stdpull/local.go @@ -3,8 +3,8 @@ package stdpull import ( "github.com/containers/podman/v5/pkg/machine/compression" "github.com/containers/podman/v5/pkg/machine/define" - "github.com/containers/storage/pkg/fileutils" "github.com/sirupsen/logrus" + "go.podman.io/storage/pkg/fileutils" ) type StdDiskPull struct { diff --git a/pkg/machine/stdpull/url.go b/pkg/machine/stdpull/url.go index c724d54ef8a..6a07ca20280 100644 --- a/pkg/machine/stdpull/url.go +++ b/pkg/machine/stdpull/url.go @@ -14,8 +14,8 @@ import ( "github.com/containers/podman/v5/pkg/machine/compression" "github.com/containers/podman/v5/pkg/machine/define" "github.com/containers/podman/v5/utils" - "github.com/containers/storage/pkg/fileutils" "github.com/sirupsen/logrus" + "go.podman.io/storage/pkg/fileutils" ) type DiskFromURL struct { diff --git a/pkg/machine/vmconfigs/config.go b/pkg/machine/vmconfigs/config.go index 404b745e543..ad34884ade0 100644 --- a/pkg/machine/vmconfigs/config.go +++ b/pkg/machine/vmconfigs/config.go @@ -3,11 +3,11 @@ package vmconfigs import ( "time" - "github.com/containers/common/pkg/strongunits" gvproxy "github.com/containers/gvisor-tap-vsock/pkg/types" "github.com/containers/podman/v5/pkg/machine/define" "github.com/containers/podman/v5/pkg/machine/ignition" - "github.com/containers/storage/pkg/lockfile" + "go.podman.io/common/pkg/strongunits" + "go.podman.io/storage/pkg/lockfile" ) const MachineConfigVersion = 1 diff --git a/pkg/machine/vmconfigs/machine.go b/pkg/machine/vmconfigs/machine.go index e10b30c7f41..becca8955cc 100644 --- a/pkg/machine/vmconfigs/machine.go +++ b/pkg/machine/vmconfigs/machine.go @@ -10,16 +10,16 @@ import ( "strings" "time" - "github.com/containers/common/pkg/strongunits" "github.com/containers/podman/v5/pkg/errorhandling" "github.com/containers/podman/v5/pkg/machine/connection" "github.com/containers/podman/v5/pkg/machine/define" "github.com/containers/podman/v5/pkg/machine/lock" "github.com/containers/podman/v5/pkg/machine/ports" - "github.com/containers/storage/pkg/fileutils" - "github.com/containers/storage/pkg/ioutils" - "github.com/containers/storage/pkg/lockfile" "github.com/sirupsen/logrus" + "go.podman.io/common/pkg/strongunits" + "go.podman.io/storage/pkg/fileutils" + "go.podman.io/storage/pkg/ioutils" + "go.podman.io/storage/pkg/lockfile" ) /* diff --git a/pkg/machine/wsl/machine.go b/pkg/machine/wsl/machine.go index 4390a8f4388..e3b72c6ace3 100644 --- a/pkg/machine/wsl/machine.go +++ b/pkg/machine/wsl/machine.go @@ -14,16 +14,16 @@ import ( "strconv" "strings" - "github.com/containers/common/pkg/config" - "github.com/containers/common/pkg/strongunits" "github.com/containers/podman/v5/pkg/machine/define" "github.com/containers/podman/v5/pkg/machine/env" "github.com/containers/podman/v5/pkg/machine/ignition" "github.com/containers/podman/v5/pkg/machine/vmconfigs" "github.com/containers/podman/v5/pkg/machine/wsl/wutil" "github.com/containers/podman/v5/utils" - "github.com/containers/storage/pkg/homedir" "github.com/sirupsen/logrus" + "go.podman.io/common/pkg/config" + "go.podman.io/common/pkg/strongunits" + "go.podman.io/storage/pkg/homedir" ) var ( diff --git a/pkg/machine/wsl/util_windows.go b/pkg/machine/wsl/util_windows.go index 08d602d3cbc..8c5795a4807 100644 --- a/pkg/machine/wsl/util_windows.go +++ b/pkg/machine/wsl/util_windows.go @@ -17,9 +17,9 @@ import ( "github.com/Microsoft/go-winio" "github.com/containers/podman/v5/pkg/machine/define" - "github.com/containers/storage/pkg/fileutils" - "github.com/containers/storage/pkg/homedir" "github.com/sirupsen/logrus" + "go.podman.io/storage/pkg/fileutils" + "go.podman.io/storage/pkg/homedir" "golang.org/x/sys/windows" "golang.org/x/sys/windows/registry" ) diff --git a/pkg/ps/ps.go b/pkg/ps/ps.go index 619aafed60c..0f343aca11e 100644 --- a/pkg/ps/ps.go +++ b/pkg/ps/ps.go @@ -13,15 +13,15 @@ import ( "strings" "time" - libnetworkTypes "github.com/containers/common/libnetwork/types" "github.com/containers/podman/v5/libpod" "github.com/containers/podman/v5/libpod/define" "github.com/containers/podman/v5/pkg/domain/entities" "github.com/containers/podman/v5/pkg/domain/filters" psdefine "github.com/containers/podman/v5/pkg/ps/define" - "github.com/containers/storage" - "github.com/containers/storage/types" "github.com/sirupsen/logrus" + libnetworkTypes "go.podman.io/common/libnetwork/types" + "go.podman.io/storage" + "go.podman.io/storage/types" ) // ExternalContainerFilter is a function to determine whether a container list is included diff --git a/pkg/rootless/rootless.go b/pkg/rootless/rootless.go index 10e19c16858..6f1f0f39c53 100644 --- a/pkg/rootless/rootless.go +++ b/pkg/rootless/rootless.go @@ -7,10 +7,10 @@ import ( "sort" "sync" - "github.com/containers/storage/pkg/fileutils" - "github.com/containers/storage/pkg/lockfile" "github.com/moby/sys/user" spec "github.com/opencontainers/runtime-spec/specs-go" + "go.podman.io/storage/pkg/fileutils" + "go.podman.io/storage/pkg/lockfile" ) // TryJoinPauseProcess attempts to join the namespaces of the pause PID via diff --git a/pkg/rootless/rootless_freebsd.go b/pkg/rootless/rootless_freebsd.go index 63b6f33e23d..8938ca60d4e 100644 --- a/pkg/rootless/rootless_freebsd.go +++ b/pkg/rootless/rootless_freebsd.go @@ -5,7 +5,7 @@ package rootless import ( "errors" - "github.com/containers/storage/pkg/idtools" + "go.podman.io/storage/pkg/idtools" ) // extern int is_fd_inherited(int fd); diff --git a/pkg/rootless/rootless_linux.go b/pkg/rootless/rootless_linux.go index ff92bfa09aa..1180f4e5b39 100644 --- a/pkg/rootless/rootless_linux.go +++ b/pkg/rootless/rootless_linux.go @@ -17,11 +17,11 @@ import ( "unsafe" "github.com/containers/podman/v5/pkg/errorhandling" - "github.com/containers/storage/pkg/idtools" - pmount "github.com/containers/storage/pkg/mount" - "github.com/containers/storage/pkg/unshare" "github.com/moby/sys/capability" "github.com/sirupsen/logrus" + "go.podman.io/storage/pkg/idtools" + pmount "go.podman.io/storage/pkg/mount" + "go.podman.io/storage/pkg/unshare" "golang.org/x/sys/unix" ) diff --git a/pkg/rootless/rootless_unsupported.go b/pkg/rootless/rootless_unsupported.go index 73282fb2a63..3af66d7b829 100644 --- a/pkg/rootless/rootless_unsupported.go +++ b/pkg/rootless/rootless_unsupported.go @@ -6,7 +6,7 @@ import ( "errors" "os" - "github.com/containers/storage/pkg/idtools" + "go.podman.io/storage/pkg/idtools" ) // IsRootless returns whether the user is rootless diff --git a/pkg/specgen/generate/config_freebsd.go b/pkg/specgen/generate/config_freebsd.go index bc8f84d1aff..a595e771b05 100644 --- a/pkg/specgen/generate/config_freebsd.go +++ b/pkg/specgen/generate/config_freebsd.go @@ -9,9 +9,9 @@ import ( "path/filepath" "strings" - "github.com/containers/common/pkg/config" "github.com/opencontainers/runtime-tools/generate" "github.com/sirupsen/logrus" + "go.podman.io/common/pkg/config" "golang.org/x/sys/unix" "tags.cncf.io/container-device-interface/pkg/cdi" ) diff --git a/pkg/specgen/generate/config_linux.go b/pkg/specgen/generate/config_linux.go index 468604ffac3..2dbcc69fc49 100644 --- a/pkg/specgen/generate/config_linux.go +++ b/pkg/specgen/generate/config_linux.go @@ -10,11 +10,11 @@ import ( "path/filepath" "strings" - "github.com/containers/common/pkg/config" "github.com/containers/podman/v5/libpod/define" "github.com/containers/podman/v5/pkg/rootless" "github.com/containers/podman/v5/pkg/util" - "github.com/containers/storage/pkg/fileutils" + "go.podman.io/common/pkg/config" + "go.podman.io/storage/pkg/fileutils" spec "github.com/opencontainers/runtime-spec/specs-go" "github.com/opencontainers/runtime-tools/generate" diff --git a/pkg/specgen/generate/config_linux_seccomp.go b/pkg/specgen/generate/config_linux_seccomp.go index 04f2a3c3e42..86f084e57a7 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/common/libimage" - goSeccomp "github.com/containers/common/pkg/seccomp" "github.com/containers/podman/v5/pkg/seccomp" "github.com/containers/podman/v5/pkg/specgen" spec "github.com/opencontainers/runtime-spec/specs-go" "github.com/sirupsen/logrus" + "go.podman.io/common/libimage" + goSeccomp "go.podman.io/common/pkg/seccomp" ) 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 9ec81cf4fe2..15dd8188acc 100644 --- a/pkg/specgen/generate/container.go +++ b/pkg/specgen/generate/container.go @@ -12,9 +12,6 @@ import ( "strings" "time" - "github.com/containers/common/libimage" - "github.com/containers/common/pkg/config" - "github.com/containers/image/v5/manifest" "github.com/containers/podman/v5/libpod" "github.com/containers/podman/v5/libpod/define" ann "github.com/containers/podman/v5/pkg/annotations" @@ -23,6 +20,9 @@ import ( "github.com/containers/podman/v5/pkg/specgen" "github.com/openshift/imagebuilder" "github.com/sirupsen/logrus" + "go.podman.io/common/libimage" + "go.podman.io/common/pkg/config" + "go.podman.io/image/v5/manifest" ) 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 119533d1b0f..d06cf7559b6 100644 --- a/pkg/specgen/generate/container_create.go +++ b/pkg/specgen/generate/container_create.go @@ -11,9 +11,6 @@ import ( "path/filepath" "strings" - "github.com/containers/common/libimage" - "github.com/containers/common/libnetwork/pasta" - "github.com/containers/common/libnetwork/slirp4netns" "github.com/containers/podman/v5/libpod" "github.com/containers/podman/v5/libpod/define" "github.com/containers/podman/v5/pkg/namespaces" @@ -24,6 +21,9 @@ import ( "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/common/libnetwork/slirp4netns" "tags.cncf.io/container-device-interface/pkg/parser" ) diff --git a/pkg/specgen/generate/kube/kube.go b/pkg/specgen/generate/kube/kube.go index 6a357f98a68..c3c99590246 100644 --- a/pkg/specgen/generate/kube/kube.go +++ b/pkg/specgen/generate/kube/kube.go @@ -17,13 +17,6 @@ import ( "strings" "time" - "github.com/containers/common/libimage" - "github.com/containers/common/libnetwork/types" - "github.com/containers/common/pkg/config" - "github.com/containers/common/pkg/parse" - "github.com/containers/common/pkg/secrets" - "github.com/containers/image/v5/manifest" - itypes "github.com/containers/image/v5/types" "github.com/containers/podman/v5/libpod/define" ann "github.com/containers/podman/v5/pkg/annotations" "github.com/containers/podman/v5/pkg/domain/entities" @@ -38,6 +31,13 @@ import ( "github.com/docker/go-units" 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/common/pkg/parse" + "go.podman.io/common/pkg/secrets" + "go.podman.io/image/v5/manifest" + itypes "go.podman.io/image/v5/types" "sigs.k8s.io/yaml" cdiparser "tags.cncf.io/container-device-interface/pkg/parser" ) diff --git a/pkg/specgen/generate/kube/play_test.go b/pkg/specgen/generate/kube/play_test.go index 9ce6e83269c..616bcb2542f 100644 --- a/pkg/specgen/generate/kube/play_test.go +++ b/pkg/specgen/generate/kube/play_test.go @@ -8,7 +8,6 @@ import ( "strconv" "testing" - "github.com/containers/common/pkg/secrets" "github.com/containers/podman/v5/libpod/define" v1 "github.com/containers/podman/v5/pkg/k8s.io/api/core/v1" "github.com/containers/podman/v5/pkg/k8s.io/apimachinery/pkg/api/resource" @@ -18,6 +17,7 @@ import ( "github.com/docker/docker/pkg/meminfo" spec "github.com/opencontainers/runtime-spec/specs-go" "github.com/stretchr/testify/assert" + "go.podman.io/common/pkg/secrets" "sigs.k8s.io/yaml" ) diff --git a/pkg/specgen/generate/kube/volume.go b/pkg/specgen/generate/kube/volume.go index 65e8e2d1822..7f62405fa3c 100644 --- a/pkg/specgen/generate/kube/volume.go +++ b/pkg/specgen/generate/kube/volume.go @@ -8,11 +8,11 @@ import ( "io/fs" "os" - "github.com/containers/common/pkg/parse" - "github.com/containers/common/pkg/secrets" "github.com/containers/podman/v5/libpod" v1 "github.com/containers/podman/v5/pkg/k8s.io/api/core/v1" - "github.com/containers/storage/pkg/fileutils" + "go.podman.io/common/pkg/parse" + "go.podman.io/common/pkg/secrets" + "go.podman.io/storage/pkg/fileutils" "github.com/sirupsen/logrus" "sigs.k8s.io/yaml" diff --git a/pkg/specgen/generate/namespaces.go b/pkg/specgen/generate/namespaces.go index 6b1467f6598..0a657ccf7b7 100644 --- a/pkg/specgen/generate/namespaces.go +++ b/pkg/specgen/generate/namespaces.go @@ -6,9 +6,6 @@ import ( "fmt" "strings" - "github.com/containers/common/libimage" - "github.com/containers/common/libnetwork/types" - "github.com/containers/common/pkg/config" "github.com/containers/podman/v5/libpod" "github.com/containers/podman/v5/libpod/define" "github.com/containers/podman/v5/pkg/namespaces" @@ -17,6 +14,9 @@ import ( "github.com/containers/podman/v5/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" ) const host = "host" diff --git a/pkg/specgen/generate/namespaces_linux.go b/pkg/specgen/generate/namespaces_linux.go index 2c304f7b1b5..e29ce7cb15c 100644 --- a/pkg/specgen/generate/namespaces_linux.go +++ b/pkg/specgen/generate/namespaces_linux.go @@ -9,10 +9,10 @@ import ( "github.com/containers/podman/v5/libpod" "github.com/containers/podman/v5/libpod/define" "github.com/containers/podman/v5/pkg/specgen" - "github.com/containers/storage/pkg/fileutils" spec "github.com/opencontainers/runtime-spec/specs-go" "github.com/opencontainers/runtime-tools/generate" "github.com/sirupsen/logrus" + "go.podman.io/storage/pkg/fileutils" ) func specConfigureNamespaces(s *specgen.SpecGenerator, g *generate.Generator, rt *libpod.Runtime, pod *libpod.Pod) error { diff --git a/pkg/specgen/generate/oci.go b/pkg/specgen/generate/oci.go index 5cec103fbed..f5dcacbbb6b 100644 --- a/pkg/specgen/generate/oci.go +++ b/pkg/specgen/generate/oci.go @@ -5,11 +5,11 @@ package generate import ( "strings" - "github.com/containers/common/libimage" "github.com/containers/podman/v5/libpod/define" "github.com/containers/podman/v5/pkg/specgen" "github.com/opencontainers/runtime-tools/generate" "github.com/sirupsen/logrus" + "go.podman.io/common/libimage" ) 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 947e48f6318..2a58591ccc5 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/common/libimage" - "github.com/containers/common/pkg/config" "github.com/containers/podman/v5/libpod" "github.com/containers/podman/v5/libpod/define" "github.com/containers/podman/v5/pkg/specgen" spec "github.com/opencontainers/runtime-spec/specs-go" "github.com/opencontainers/runtime-tools/generate" + "go.podman.io/common/libimage" + "go.podman.io/common/pkg/config" ) // 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 f12c61f2de6..e0e5793cd91 100644 --- a/pkg/specgen/generate/oci_linux.go +++ b/pkg/specgen/generate/oci_linux.go @@ -9,9 +9,6 @@ import ( "path" "strings" - "github.com/containers/common/libimage" - "github.com/containers/common/pkg/cgroups" - "github.com/containers/common/pkg/config" "github.com/containers/podman/v5/libpod" "github.com/containers/podman/v5/libpod/define" "github.com/containers/podman/v5/pkg/rootless" @@ -20,6 +17,9 @@ import ( spec "github.com/opencontainers/runtime-spec/specs-go" "github.com/opencontainers/runtime-tools/generate" "github.com/sirupsen/logrus" + "go.podman.io/common/libimage" + "go.podman.io/common/pkg/cgroups" + "go.podman.io/common/pkg/config" "golang.org/x/sys/unix" ) diff --git a/pkg/specgen/generate/pause_image.go b/pkg/specgen/generate/pause_image.go index 6cadc94ffc0..d6d80f557b6 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/common/pkg/config" "github.com/containers/podman/v5/libpod" + "go.podman.io/common/pkg/config" ) // PullInfraImage pulls down the specified image or the one set in diff --git a/pkg/specgen/generate/pod_create_test.go b/pkg/specgen/generate/pod_create_test.go index a5833361a04..f571519eab6 100644 --- a/pkg/specgen/generate/pod_create_test.go +++ b/pkg/specgen/generate/pod_create_test.go @@ -5,10 +5,10 @@ package generate import ( "net" - "github.com/containers/common/libnetwork/types" "github.com/containers/podman/v5/pkg/specgen" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "go.podman.io/common/libnetwork/types" "testing" ) diff --git a/pkg/specgen/generate/ports.go b/pkg/specgen/generate/ports.go index 0ff3eadbe3d..699779a0f83 100644 --- a/pkg/specgen/generate/ports.go +++ b/pkg/specgen/generate/ports.go @@ -9,12 +9,12 @@ import ( "sort" "strings" - "github.com/containers/common/libimage" - "github.com/containers/common/libnetwork/types" "github.com/containers/podman/v5/pkg/specgen" "github.com/containers/podman/v5/pkg/specgenutil" "github.com/containers/podman/v5/utils" "github.com/sirupsen/logrus" + "go.podman.io/common/libimage" + "go.podman.io/common/libnetwork/types" ) const ( diff --git a/pkg/specgen/generate/ports_bench_test.go b/pkg/specgen/generate/ports_bench_test.go index 4a236de0eb1..77f7a1351c4 100644 --- a/pkg/specgen/generate/ports_bench_test.go +++ b/pkg/specgen/generate/ports_bench_test.go @@ -6,7 +6,7 @@ import ( "fmt" "testing" - "github.com/containers/common/libnetwork/types" + "go.podman.io/common/libnetwork/types" ) func benchmarkParsePortMapping(b *testing.B, ports []types.PortMapping) { diff --git a/pkg/specgen/generate/ports_test.go b/pkg/specgen/generate/ports_test.go index e94d0ad94d4..1dbaa9a13f6 100644 --- a/pkg/specgen/generate/ports_test.go +++ b/pkg/specgen/generate/ports_test.go @@ -5,8 +5,8 @@ package generate import ( "testing" - "github.com/containers/common/libnetwork/types" "github.com/stretchr/testify/assert" + "go.podman.io/common/libnetwork/types" ) func TestParsePortMappingWithHostPort(t *testing.T) { diff --git a/pkg/specgen/generate/security_freebsd.go b/pkg/specgen/generate/security_freebsd.go index 948acd3f5b0..75036334f37 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/common/libimage" - "github.com/containers/common/pkg/config" "github.com/containers/podman/v5/libpod" "github.com/containers/podman/v5/pkg/specgen" "github.com/opencontainers/runtime-tools/generate" + "go.podman.io/common/libimage" + "go.podman.io/common/pkg/config" ) // 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 39702f508d1..32e035a9d20 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/common/libimage" - "github.com/containers/common/pkg/apparmor" - "github.com/containers/common/pkg/capabilities" - "github.com/containers/common/pkg/config" "github.com/containers/podman/v5/libpod" "github.com/containers/podman/v5/libpod/define" "github.com/containers/podman/v5/pkg/specgen" @@ -18,6 +14,10 @@ import ( "github.com/opencontainers/runtime-tools/generate" "github.com/opencontainers/selinux/go-selinux" "github.com/sirupsen/logrus" + "go.podman.io/common/libimage" + "go.podman.io/common/pkg/apparmor" + "go.podman.io/common/pkg/capabilities" + "go.podman.io/common/pkg/config" ) // 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 a79a6cf6b2b..aa6952afc1f 100644 --- a/pkg/specgen/generate/storage.go +++ b/pkg/specgen/generate/storage.go @@ -11,16 +11,16 @@ import ( "path/filepath" "strings" - "github.com/containers/common/libimage" - "github.com/containers/common/pkg/config" - "github.com/containers/common/pkg/parse" "github.com/containers/podman/v5/libpod" "github.com/containers/podman/v5/libpod/define" "github.com/containers/podman/v5/pkg/specgen" "github.com/containers/podman/v5/pkg/util" - "github.com/containers/storage/pkg/fileutils" 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/storage/pkg/fileutils" ) // Produce final mounts and named volumes for a container diff --git a/pkg/specgen/generate/storage_freebsd.go b/pkg/specgen/generate/storage_freebsd.go index 9c496e3eb58..6c0aa3b178a 100644 --- a/pkg/specgen/generate/storage_freebsd.go +++ b/pkg/specgen/generate/storage_freebsd.go @@ -5,7 +5,7 @@ package generate import ( "context" - "github.com/containers/common/libimage" + "go.podman.io/common/libimage" ) func imageRunPath(ctx context.Context, img *libimage.Image) (string, error) { diff --git a/pkg/specgen/generate/storage_linux.go b/pkg/specgen/generate/storage_linux.go index 8336dd59b70..20c6a002261 100644 --- a/pkg/specgen/generate/storage_linux.go +++ b/pkg/specgen/generate/storage_linux.go @@ -5,7 +5,7 @@ package generate import ( "context" - "github.com/containers/common/libimage" + "go.podman.io/common/libimage" ) func imageRunPath(ctx context.Context, img *libimage.Image) (string, error) { diff --git a/pkg/specgen/generate/validate_linux.go b/pkg/specgen/generate/validate_linux.go index 3603b137570..0fa8a915228 100644 --- a/pkg/specgen/generate/validate_linux.go +++ b/pkg/specgen/generate/validate_linux.go @@ -9,12 +9,12 @@ import ( "path/filepath" "reflect" - "github.com/containers/common/pkg/cgroups" - "github.com/containers/common/pkg/sysinfo" "github.com/containers/podman/v5/pkg/rootless" "github.com/containers/podman/v5/pkg/specgen" - "github.com/containers/storage/pkg/fileutils" "github.com/opencontainers/runtime-spec/specs-go" + "go.podman.io/common/pkg/cgroups" + "go.podman.io/common/pkg/sysinfo" + "go.podman.io/storage/pkg/fileutils" ) // Verify resource limits are sanely set when running on cgroup v1. diff --git a/pkg/specgen/namespaces.go b/pkg/specgen/namespaces.go index 002867e7611..1ab1d38d1a7 100644 --- a/pkg/specgen/namespaces.go +++ b/pkg/specgen/namespaces.go @@ -7,18 +7,18 @@ import ( "slices" "strings" - "github.com/containers/common/libnetwork/types" - "github.com/containers/common/pkg/cgroups" - "github.com/containers/common/pkg/config" "github.com/containers/podman/v5/libpod/define" "github.com/containers/podman/v5/pkg/namespaces" "github.com/containers/podman/v5/pkg/rootless" "github.com/containers/podman/v5/pkg/util" - "github.com/containers/storage/pkg/fileutils" - "github.com/containers/storage/pkg/unshare" - storageTypes "github.com/containers/storage/types" 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/cgroups" + "go.podman.io/common/pkg/config" + "go.podman.io/storage/pkg/fileutils" + "go.podman.io/storage/pkg/unshare" + storageTypes "go.podman.io/storage/types" ) type NamespaceMode string diff --git a/pkg/specgen/namespaces_test.go b/pkg/specgen/namespaces_test.go index 18784368d09..22b84ee6461 100644 --- a/pkg/specgen/namespaces_test.go +++ b/pkg/specgen/namespaces_test.go @@ -4,8 +4,8 @@ import ( "net" "testing" - "github.com/containers/common/libnetwork/types" "github.com/stretchr/testify/assert" + "go.podman.io/common/libnetwork/types" ) func parsMacNoErr(mac string) types.HardwareAddr { diff --git a/pkg/specgen/podspecgen.go b/pkg/specgen/podspecgen.go index 6a7f47b5e98..46489465ef4 100644 --- a/pkg/specgen/podspecgen.go +++ b/pkg/specgen/podspecgen.go @@ -3,9 +3,9 @@ package specgen import ( "net" - "github.com/containers/common/libnetwork/types" - storageTypes "github.com/containers/storage/types" spec "github.com/opencontainers/runtime-spec/specs-go" + "go.podman.io/common/libnetwork/types" + storageTypes "go.podman.io/storage/types" ) // PodBasicConfig contains basic configuration options for pods. diff --git a/pkg/specgen/resources_freebsd.go b/pkg/specgen/resources_freebsd.go index 49e5976bb7c..835a0f5afca 100644 --- a/pkg/specgen/resources_freebsd.go +++ b/pkg/specgen/resources_freebsd.go @@ -1,7 +1,7 @@ package specgen import ( - "github.com/containers/common/pkg/config" + "go.podman.io/common/pkg/config" ) func (s *SpecGenerator) InitResourceLimits(rtc *config.Config) { diff --git a/pkg/specgen/resources_linux.go b/pkg/specgen/resources_linux.go index ffa9e5786f0..4b329d346a3 100644 --- a/pkg/specgen/resources_linux.go +++ b/pkg/specgen/resources_linux.go @@ -1,8 +1,8 @@ package specgen import ( - "github.com/containers/common/pkg/config" spec "github.com/opencontainers/runtime-spec/specs-go" + "go.podman.io/common/pkg/config" ) func (s *SpecGenerator) InitResourceLimits(rtc *config.Config) { diff --git a/pkg/specgen/specgen.go b/pkg/specgen/specgen.go index a8ebd6170ef..f59966c99c1 100644 --- a/pkg/specgen/specgen.go +++ b/pkg/specgen/specgen.go @@ -6,11 +6,11 @@ import ( "strings" "syscall" - nettypes "github.com/containers/common/libnetwork/types" - "github.com/containers/image/v5/manifest" "github.com/containers/podman/v5/libpod/define" - "github.com/containers/storage/types" spec "github.com/opencontainers/runtime-spec/specs-go" + nettypes "go.podman.io/common/libnetwork/types" + "go.podman.io/image/v5/manifest" + "go.podman.io/storage/types" ) // LogConfig describes the logging characteristics for a container diff --git a/pkg/specgen/specgen_local.go b/pkg/specgen/specgen_local.go index 3ed3ec04354..8f424c2f0ef 100644 --- a/pkg/specgen/specgen_local.go +++ b/pkg/specgen/specgen_local.go @@ -2,7 +2,7 @@ package specgen -import "github.com/containers/common/libimage" +import "go.podman.io/common/libimage" type cacheLibImage struct { image *libimage.Image `json:"-"` diff --git a/pkg/specgen/volumes.go b/pkg/specgen/volumes.go index 3243333da51..69dbd858e18 100644 --- a/pkg/specgen/volumes.go +++ b/pkg/specgen/volumes.go @@ -6,10 +6,10 @@ import ( "path/filepath" "strings" - "github.com/containers/common/pkg/parse" "github.com/containers/podman/v5/libpod/define" spec "github.com/opencontainers/runtime-spec/specs-go" "github.com/sirupsen/logrus" + "go.podman.io/common/pkg/parse" ) // NamedVolume holds information about a named volume that will be mounted into diff --git a/pkg/specgen/winpath_linux.go b/pkg/specgen/winpath_linux.go index f33b3002e33..758ccaff23d 100644 --- a/pkg/specgen/winpath_linux.go +++ b/pkg/specgen/winpath_linux.go @@ -1,8 +1,8 @@ package specgen import ( - "github.com/containers/common/pkg/machine" - "github.com/containers/storage/pkg/fileutils" + "go.podman.io/common/pkg/machine" + "go.podman.io/storage/pkg/fileutils" ) func shouldResolveWinPaths() bool { diff --git a/pkg/specgen/winpath_windows.go b/pkg/specgen/winpath_windows.go index 168e30062c6..eead1f765ed 100644 --- a/pkg/specgen/winpath_windows.go +++ b/pkg/specgen/winpath_windows.go @@ -3,8 +3,8 @@ package specgen import ( "path/filepath" - "github.com/containers/storage/pkg/fileutils" "github.com/sirupsen/logrus" + "go.podman.io/storage/pkg/fileutils" ) func shouldResolveUnixWinVariant(path string) bool { diff --git a/pkg/specgenutil/createparse.go b/pkg/specgenutil/createparse.go index 04bd8b0aa95..091919cff9b 100644 --- a/pkg/specgenutil/createparse.go +++ b/pkg/specgenutil/createparse.go @@ -3,8 +3,8 @@ package specgenutil import ( "errors" - "github.com/containers/common/pkg/config" "github.com/containers/podman/v5/pkg/domain/entities" + "go.podman.io/common/pkg/config" ) // 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 791110312c7..06efa443d59 100644 --- a/pkg/specgenutil/specgen.go +++ b/pkg/specgenutil/specgen.go @@ -9,8 +9,6 @@ import ( "strings" "time" - "github.com/containers/common/pkg/config" - "github.com/containers/image/v5/manifest" "github.com/containers/podman/v5/cmd/podman/parse" "github.com/containers/podman/v5/libpod/define" "github.com/containers/podman/v5/pkg/domain/entities" @@ -22,6 +20,8 @@ import ( "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" ) const ( diff --git a/pkg/specgenutil/specgenutil_test.go b/pkg/specgenutil/specgenutil_test.go index 3810bbec3d4..41a178de494 100644 --- a/pkg/specgenutil/specgenutil_test.go +++ b/pkg/specgenutil/specgenutil_test.go @@ -7,11 +7,11 @@ import ( "strings" "testing" - "github.com/containers/common/pkg/machine" "github.com/containers/podman/v5/libpod/define" "github.com/containers/podman/v5/pkg/domain/entities" "github.com/containers/podman/v5/pkg/specgen" "github.com/stretchr/testify/assert" + "go.podman.io/common/pkg/machine" ) func TestWinPath(t *testing.T) { diff --git a/pkg/specgenutil/util.go b/pkg/specgenutil/util.go index ff152f7709c..f33fabf8675 100644 --- a/pkg/specgenutil/util.go +++ b/pkg/specgenutil/util.go @@ -8,10 +8,10 @@ import ( "strconv" "strings" - "github.com/containers/common/libnetwork/types" - "github.com/containers/common/pkg/config" - storageTypes "github.com/containers/storage/types" "github.com/sirupsen/logrus" + "go.podman.io/common/libnetwork/types" + "go.podman.io/common/pkg/config" + storageTypes "go.podman.io/storage/types" ) // ReadPodIDFile reads the specified file and returns its content (i.e., first diff --git a/pkg/specgenutil/volumes.go b/pkg/specgenutil/volumes.go index 69366a1e902..52086c7cb87 100644 --- a/pkg/specgenutil/volumes.go +++ b/pkg/specgenutil/volumes.go @@ -7,14 +7,14 @@ import ( "path/filepath" "strings" - "github.com/containers/common/pkg/config" - "github.com/containers/common/pkg/parse" "github.com/containers/podman/v5/libpod/define" "github.com/containers/podman/v5/pkg/rootless" "github.com/containers/podman/v5/pkg/specgen" "github.com/containers/podman/v5/pkg/specgenutilexternal" "github.com/containers/podman/v5/pkg/util" spec "github.com/opencontainers/runtime-spec/specs-go" + "go.podman.io/common/pkg/config" + "go.podman.io/common/pkg/parse" ) var ( diff --git a/pkg/systemd/quadlet/quadlet.go b/pkg/systemd/quadlet/quadlet.go index d41effaf933..d560ed8000a 100644 --- a/pkg/systemd/quadlet/quadlet.go +++ b/pkg/systemd/quadlet/quadlet.go @@ -11,7 +11,7 @@ import ( "github.com/containers/podman/v5/pkg/specgenutilexternal" "github.com/containers/podman/v5/pkg/systemd/parser" - "github.com/containers/storage/pkg/regexp" + "go.podman.io/storage/pkg/regexp" ) const ( diff --git a/pkg/trust/policy.go b/pkg/trust/policy.go index 42532e61328..2be0e9a2b18 100644 --- a/pkg/trust/policy.go +++ b/pkg/trust/policy.go @@ -13,11 +13,11 @@ import ( "path/filepath" "strings" - "github.com/containers/common/pkg/config" - "github.com/containers/image/v5/types" - "github.com/containers/storage/pkg/fileutils" - "github.com/containers/storage/pkg/homedir" "github.com/sirupsen/logrus" + "go.podman.io/common/pkg/config" + "go.podman.io/image/v5/types" + "go.podman.io/storage/pkg/fileutils" + "go.podman.io/storage/pkg/homedir" ) // policyContent is the overall structure of a policy.json file (= c/image/v5/signature.Policy) diff --git a/pkg/trust/policy_test.go b/pkg/trust/policy_test.go index 3952b72c397..58141abd18f 100644 --- a/pkg/trust/policy_test.go +++ b/pkg/trust/policy_test.go @@ -6,9 +6,9 @@ import ( "path/filepath" "testing" - "github.com/containers/image/v5/signature" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "go.podman.io/image/v5/signature" ) func TestAddPolicyEntries(t *testing.T) { diff --git a/pkg/trust/registries.go b/pkg/trust/registries.go index d4516f7fcf9..b24d02d776d 100644 --- a/pkg/trust/registries.go +++ b/pkg/trust/registries.go @@ -6,9 +6,9 @@ import ( "path/filepath" "strings" - "github.com/containers/image/v5/types" - "github.com/containers/storage/pkg/fileutils" "github.com/docker/docker/pkg/homedir" + "go.podman.io/image/v5/types" + "go.podman.io/storage/pkg/fileutils" "sigs.k8s.io/yaml" ) diff --git a/pkg/trust/trust_test.go b/pkg/trust/trust_test.go index 22b780fc99a..90b9c2a3236 100644 --- a/pkg/trust/trust_test.go +++ b/pkg/trust/trust_test.go @@ -7,9 +7,9 @@ import ( "strings" "testing" - "github.com/containers/image/v5/signature" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "go.podman.io/image/v5/signature" ) func TestPolicyDescription(t *testing.T) { diff --git a/pkg/util/filters_test.go b/pkg/util/filters_test.go index 03f90748ab2..dffca56142a 100644 --- a/pkg/util/filters_test.go +++ b/pkg/util/filters_test.go @@ -3,7 +3,7 @@ package util import ( "testing" - "github.com/containers/common/pkg/filters" + "go.podman.io/common/pkg/filters" ) func TestMatchLabelFilters(t *testing.T) { diff --git a/pkg/util/utils.go b/pkg/util/utils.go index c386474678f..227c2d8cf9f 100644 --- a/pkg/util/utils.go +++ b/pkg/util/utils.go @@ -16,20 +16,20 @@ import ( "syscall" "time" - "github.com/containers/image/v5/types" "github.com/containers/podman/v5/libpod/define" "github.com/containers/podman/v5/pkg/namespaces" "github.com/containers/podman/v5/pkg/rootless" "github.com/containers/podman/v5/pkg/signal" - "github.com/containers/storage/pkg/directory" - "github.com/containers/storage/pkg/fileutils" - "github.com/containers/storage/pkg/idtools" - "github.com/containers/storage/pkg/unshare" - stypes "github.com/containers/storage/types" 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/storage/pkg/directory" + "go.podman.io/storage/pkg/fileutils" + "go.podman.io/storage/pkg/idtools" + "go.podman.io/storage/pkg/unshare" + stypes "go.podman.io/storage/types" "golang.org/x/term" ) diff --git a/pkg/util/utils_supported.go b/pkg/util/utils_supported.go index 28c52f29360..3f8dca5baea 100644 --- a/pkg/util/utils_supported.go +++ b/pkg/util/utils_supported.go @@ -9,7 +9,7 @@ import ( "path/filepath" "github.com/containers/podman/v5/pkg/rootless" - "github.com/containers/storage/pkg/homedir" + "go.podman.io/storage/pkg/homedir" ) // GetRootlessRuntimeDir returns the runtime directory when running as non root diff --git a/pkg/util/utils_test.go b/pkg/util/utils_test.go index 797e481772d..d7116f5c85a 100644 --- a/pkg/util/utils_test.go +++ b/pkg/util/utils_test.go @@ -8,11 +8,11 @@ import ( "testing" "time" - "github.com/containers/storage/pkg/idtools" - stypes "github.com/containers/storage/types" ruser "github.com/moby/sys/user" "github.com/opencontainers/runtime-spec/specs-go" "github.com/stretchr/testify/assert" + "go.podman.io/storage/pkg/idtools" + stypes "go.podman.io/storage/types" ) func BreakInsert(mapping []idtools.IDMap, extension idtools.IDMap) (result []idtools.IDMap) { diff --git a/pkg/util/utils_windows.go b/pkg/util/utils_windows.go index 0fbe9c2608f..be4908273b6 100644 --- a/pkg/util/utils_windows.go +++ b/pkg/util/utils_windows.go @@ -7,7 +7,7 @@ import ( "fmt" "path/filepath" - "github.com/containers/storage/pkg/homedir" + "go.podman.io/storage/pkg/homedir" ) var errNotImplemented = errors.New("not yet implemented") diff --git a/test/e2e/common_test.go b/test/e2e/common_test.go index 9d081087a7d..a351fda84d5 100644 --- a/test/e2e/common_test.go +++ b/test/e2e/common_test.go @@ -25,21 +25,21 @@ import ( "testing" "time" - "github.com/containers/common/pkg/cgroups" "github.com/containers/podman/v5/libpod/define" "github.com/containers/podman/v5/pkg/inspect" "github.com/containers/podman/v5/pkg/libartifact" . "github.com/containers/podman/v5/test/utils" "github.com/containers/podman/v5/utils" - "github.com/containers/storage/pkg/ioutils" - "github.com/containers/storage/pkg/lockfile" - "github.com/containers/storage/pkg/reexec" - "github.com/containers/storage/pkg/stringid" 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/cgroups" + "go.podman.io/storage/pkg/ioutils" + "go.podman.io/storage/pkg/lockfile" + "go.podman.io/storage/pkg/reexec" + "go.podman.io/storage/pkg/stringid" ) var ( diff --git a/test/e2e/create_staticmac_test.go b/test/e2e/create_staticmac_test.go index 9d9e3457dfb..b0515db0675 100644 --- a/test/e2e/create_staticmac_test.go +++ b/test/e2e/create_staticmac_test.go @@ -4,9 +4,9 @@ package integration import ( . "github.com/containers/podman/v5/test/utils" - "github.com/containers/storage/pkg/stringid" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + "go.podman.io/storage/pkg/stringid" ) var _ = Describe("Podman run with --mac-address flag", func() { diff --git a/test/e2e/create_test.go b/test/e2e/create_test.go index ca59962f967..8c8bf92f031 100644 --- a/test/e2e/create_test.go +++ b/test/e2e/create_test.go @@ -11,10 +11,10 @@ import ( "strings" . "github.com/containers/podman/v5/test/utils" - "github.com/containers/storage/pkg/stringid" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" + "go.podman.io/storage/pkg/stringid" ) var _ = Describe("Podman create", func() { diff --git a/test/e2e/diff_test.go b/test/e2e/diff_test.go index cbf276008f1..4eb2e6d2e1b 100644 --- a/test/e2e/diff_test.go +++ b/test/e2e/diff_test.go @@ -7,9 +7,9 @@ import ( "sort" . "github.com/containers/podman/v5/test/utils" - "github.com/containers/storage/pkg/stringid" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + "go.podman.io/storage/pkg/stringid" ) var _ = Describe("Podman diff", func() { diff --git a/test/e2e/events_test.go b/test/e2e/events_test.go index c86ef9e78b0..76111bc90da 100644 --- a/test/e2e/events_test.go +++ b/test/e2e/events_test.go @@ -11,9 +11,9 @@ import ( "github.com/containers/podman/v5/cmd/podman/system" . "github.com/containers/podman/v5/test/utils" - "github.com/containers/storage/pkg/stringid" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + "go.podman.io/storage/pkg/stringid" ) var _ = Describe("Podman events", func() { diff --git a/test/e2e/image_scp_test.go b/test/e2e/image_scp_test.go index 917363fd708..bb6359eb6b3 100644 --- a/test/e2e/image_scp_test.go +++ b/test/e2e/image_scp_test.go @@ -7,9 +7,9 @@ import ( "path/filepath" . "github.com/containers/podman/v5/test/utils" - "github.com/containers/storage/pkg/homedir" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + "go.podman.io/storage/pkg/homedir" ) var _ = Describe("podman image scp", func() { diff --git a/test/e2e/logs_test.go b/test/e2e/logs_test.go index 14b4388827b..a04552befc4 100644 --- a/test/e2e/logs_test.go +++ b/test/e2e/logs_test.go @@ -9,11 +9,11 @@ import ( "time" . "github.com/containers/podman/v5/test/utils" - "github.com/containers/storage/pkg/stringid" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "github.com/onsi/gomega/format" . "github.com/onsi/gomega/gexec" + "go.podman.io/storage/pkg/stringid" ) func isEventBackendJournald(podmanTest *PodmanTestIntegration) bool { diff --git a/test/e2e/manifest_test.go b/test/e2e/manifest_test.go index 035f67c34a0..e2d6872564d 100644 --- a/test/e2e/manifest_test.go +++ b/test/e2e/manifest_test.go @@ -9,18 +9,18 @@ import ( "path/filepath" "strings" - "github.com/containers/common/libimage/define" - "github.com/containers/image/v5/docker/reference" - manifest "github.com/containers/image/v5/manifest" - "github.com/containers/image/v5/transports/alltransports" podmanRegistry "github.com/containers/podman/v5/hack/podman-registry-go" . "github.com/containers/podman/v5/test/utils" - "github.com/containers/storage/pkg/archive" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" imgspec "github.com/opencontainers/image-spec/specs-go" imgspecv1 "github.com/opencontainers/image-spec/specs-go/v1" + "go.podman.io/common/libimage/define" + "go.podman.io/image/v5/docker/reference" + manifest "go.podman.io/image/v5/manifest" + "go.podman.io/image/v5/transports/alltransports" + "go.podman.io/storage/pkg/archive" ) // validateManifestHasAllArchs checks that the specified manifest has all diff --git a/test/e2e/network_connect_disconnect_test.go b/test/e2e/network_connect_disconnect_test.go index 3b2059b2448..f33c6de62bc 100644 --- a/test/e2e/network_connect_disconnect_test.go +++ b/test/e2e/network_connect_disconnect_test.go @@ -6,10 +6,10 @@ import ( "fmt" . "github.com/containers/podman/v5/test/utils" - "github.com/containers/storage/pkg/stringid" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "github.com/onsi/gomega/types" + "go.podman.io/storage/pkg/stringid" ) var _ = Describe("Podman network connect and disconnect", func() { diff --git a/test/e2e/network_create_test.go b/test/e2e/network_create_test.go index b9fcec6431a..793edd1d917 100644 --- a/test/e2e/network_create_test.go +++ b/test/e2e/network_create_test.go @@ -7,13 +7,13 @@ import ( "fmt" "net" - "github.com/containers/common/libnetwork/types" "github.com/containers/podman/v5/pkg/domain/entities" . "github.com/containers/podman/v5/test/utils" - "github.com/containers/storage/pkg/stringid" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" + "go.podman.io/common/libnetwork/types" + "go.podman.io/storage/pkg/stringid" ) func removeNetworkDevice(name string) { diff --git a/test/e2e/network_test.go b/test/e2e/network_test.go index 67f22aca670..0c7aae05af5 100644 --- a/test/e2e/network_test.go +++ b/test/e2e/network_test.go @@ -11,10 +11,10 @@ import ( "github.com/containers/podman/v5/pkg/domain/entities" . "github.com/containers/podman/v5/test/utils" - "github.com/containers/storage/pkg/stringid" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" + "go.podman.io/storage/pkg/stringid" ) var _ = Describe("Podman network", func() { diff --git a/test/e2e/play_kube_test.go b/test/e2e/play_kube_test.go index 8db7d3b4df8..eace72ce160 100644 --- a/test/e2e/play_kube_test.go +++ b/test/e2e/play_kube_test.go @@ -28,13 +28,13 @@ import ( "github.com/containers/podman/v5/pkg/util" . "github.com/containers/podman/v5/test/utils" "github.com/containers/podman/v5/utils" - "github.com/containers/storage/pkg/stringid" "github.com/google/uuid" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "github.com/onsi/gomega/format" . "github.com/onsi/gomega/gexec" "github.com/opencontainers/selinux/go-selinux" + "go.podman.io/storage/pkg/stringid" ) var secretYaml = ` diff --git a/test/e2e/pod_create_test.go b/test/e2e/pod_create_test.go index d18bb1f00ec..a82c2f2cb9e 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/common/pkg/apparmor" - "github.com/containers/common/pkg/seccomp" - "github.com/containers/common/pkg/sysinfo" "github.com/containers/podman/v5/pkg/util" . "github.com/containers/podman/v5/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "github.com/opencontainers/selinux/go-selinux" + "go.podman.io/common/pkg/apparmor" + "go.podman.io/common/pkg/seccomp" + "go.podman.io/common/pkg/sysinfo" ) var _ = Describe("Podman pod create", func() { diff --git a/test/e2e/pod_ps_test.go b/test/e2e/pod_ps_test.go index 0fb18d30388..e94b52d59bc 100644 --- a/test/e2e/pod_ps_test.go +++ b/test/e2e/pod_ps_test.go @@ -7,9 +7,9 @@ import ( "sort" . "github.com/containers/podman/v5/test/utils" - "github.com/containers/storage/pkg/stringid" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + "go.podman.io/storage/pkg/stringid" ) var _ = Describe("Podman ps", func() { diff --git a/test/e2e/ps_test.go b/test/e2e/ps_test.go index 16530cd5e56..e22550dd502 100644 --- a/test/e2e/ps_test.go +++ b/test/e2e/ps_test.go @@ -9,11 +9,11 @@ import ( "strconv" . "github.com/containers/podman/v5/test/utils" - "github.com/containers/storage/pkg/stringid" "github.com/docker/go-units" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" + "go.podman.io/storage/pkg/stringid" ) var _ = Describe("Podman ps", func() { diff --git a/test/e2e/push_test.go b/test/e2e/push_test.go index 1b4ae01db06..d9e37cc0682 100644 --- a/test/e2e/push_test.go +++ b/test/e2e/push_test.go @@ -10,10 +10,10 @@ import ( "strings" . "github.com/containers/podman/v5/test/utils" - "github.com/containers/storage/pkg/archive" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" + "go.podman.io/storage/pkg/archive" ) var _ = Describe("Podman push", func() { diff --git a/test/e2e/run_apparmor_test.go b/test/e2e/run_apparmor_test.go index 5f44473a9b5..f06b3829ba6 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/common/pkg/apparmor" . "github.com/containers/podman/v5/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + "go.podman.io/common/pkg/apparmor" ) // wip diff --git a/test/e2e/run_networking_test.go b/test/e2e/run_networking_test.go index 0a56689325f..7fd84d90d4c 100644 --- a/test/e2e/run_networking_test.go +++ b/test/e2e/run_networking_test.go @@ -16,11 +16,11 @@ import ( "github.com/containernetworking/plugins/pkg/ns" "github.com/containers/podman/v5/pkg/domain/entities" . "github.com/containers/podman/v5/test/utils" - "github.com/containers/storage/pkg/stringid" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" "github.com/vishvananda/netlink" + "go.podman.io/storage/pkg/stringid" ) var _ = Describe("Podman run networking", func() { diff --git a/test/e2e/run_staticip_test.go b/test/e2e/run_staticip_test.go index fd727dac087..a410e6a7bb4 100644 --- a/test/e2e/run_staticip_test.go +++ b/test/e2e/run_staticip_test.go @@ -8,9 +8,9 @@ import ( "time" . "github.com/containers/podman/v5/test/utils" - "github.com/containers/storage/pkg/stringid" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + "go.podman.io/storage/pkg/stringid" ) var _ = Describe("Podman run with --ip flag", func() { diff --git a/test/e2e/run_test.go b/test/e2e/run_test.go index 6681db90007..dd3abab50c2 100644 --- a/test/e2e/run_test.go +++ b/test/e2e/run_test.go @@ -14,15 +14,15 @@ import ( "syscall" "time" - "github.com/containers/common/pkg/cgroups" - "github.com/containers/common/pkg/config" "github.com/containers/podman/v5/libpod/define" . "github.com/containers/podman/v5/test/utils" - "github.com/containers/storage/pkg/fileutils" - "github.com/containers/storage/pkg/stringid" . "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/storage/pkg/fileutils" + "go.podman.io/storage/pkg/stringid" ) var _ = Describe("Podman run", func() { diff --git a/test/e2e/run_userns_test.go b/test/e2e/run_userns_test.go index 00fd5d53f0b..8e4021c2cc5 100644 --- a/test/e2e/run_userns_test.go +++ b/test/e2e/run_userns_test.go @@ -11,9 +11,9 @@ import ( "strings" . "github.com/containers/podman/v5/test/utils" - "github.com/containers/storage" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + "go.podman.io/storage" ) func createContainersConfFileWithCustomUserns(pTest *PodmanTestIntegration, userns string) { diff --git a/test/e2e/secret_test.go b/test/e2e/secret_test.go index d8951089fd2..102e082161a 100644 --- a/test/e2e/secret_test.go +++ b/test/e2e/secret_test.go @@ -8,9 +8,9 @@ import ( "path/filepath" . "github.com/containers/podman/v5/test/utils" - "github.com/containers/storage/pkg/stringid" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + "go.podman.io/storage/pkg/stringid" ) var _ = Describe("Podman secret", func() { diff --git a/test/e2e/update_test.go b/test/e2e/update_test.go index 87399357cc5..167a63ab787 100644 --- a/test/e2e/update_test.go +++ b/test/e2e/update_test.go @@ -3,12 +3,12 @@ package integration import ( - "github.com/containers/common/pkg/cgroupv2" . "github.com/containers/podman/v5/test/utils" - "github.com/containers/storage/pkg/fileutils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" + "go.podman.io/common/pkg/cgroupv2" + "go.podman.io/storage/pkg/fileutils" ) var _ = Describe("Podman update", func() { diff --git a/test/e2e/volume_exists_test.go b/test/e2e/volume_exists_test.go index 1a19f516991..9fabf3eb47f 100644 --- a/test/e2e/volume_exists_test.go +++ b/test/e2e/volume_exists_test.go @@ -4,9 +4,9 @@ package integration import ( . "github.com/containers/podman/v5/test/utils" - "github.com/containers/storage/pkg/stringid" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + "go.podman.io/storage/pkg/stringid" ) var _ = Describe("Podman volume exists", func() { diff --git a/test/e2e/volume_plugin_test.go b/test/e2e/volume_plugin_test.go index 6ca55b55468..860c7643d6a 100644 --- a/test/e2e/volume_plugin_test.go +++ b/test/e2e/volume_plugin_test.go @@ -8,9 +8,9 @@ import ( "path/filepath" . "github.com/containers/podman/v5/test/utils" - "github.com/containers/storage/pkg/stringid" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + "go.podman.io/storage/pkg/stringid" ) var _ = Describe("Podman volume plugins", func() { diff --git a/utils/utils.go b/utils/utils.go index 9461124e900..527feef812b 100644 --- a/utils/utils.go +++ b/utils/utils.go @@ -10,11 +10,11 @@ import ( "strings" "time" - "github.com/containers/storage/pkg/archive" - "github.com/containers/storage/pkg/chrootarchive" "github.com/sirupsen/logrus" "github.com/vbauerster/mpb/v8" "github.com/vbauerster/mpb/v8/decor" + "go.podman.io/storage/pkg/archive" + "go.podman.io/storage/pkg/chrootarchive" ) // ExecCmd executes a command with args and returns its output as a string along diff --git a/vendor/github.com/containers/buildah/add.go b/vendor/github.com/containers/buildah/add.go index 03086590904..29f6c3f748a 100644 --- a/vendor/github.com/containers/buildah/add.go +++ b/vendor/github.com/containers/buildah/add.go @@ -23,12 +23,6 @@ import ( "github.com/containers/buildah/define" "github.com/containers/buildah/internal/tmpdir" "github.com/containers/buildah/pkg/chrootuser" - "github.com/containers/common/pkg/retry" - "github.com/containers/image/v5/pkg/tlsclientconfig" - "github.com/containers/image/v5/types" - "github.com/containers/storage/pkg/fileutils" - "github.com/containers/storage/pkg/idtools" - "github.com/containers/storage/pkg/regexp" "github.com/docker/go-connections/tlsconfig" "github.com/hashicorp/go-multierror" "github.com/moby/sys/userns" @@ -36,6 +30,12 @@ import ( v1 "github.com/opencontainers/image-spec/specs-go/v1" "github.com/opencontainers/runtime-spec/specs-go" "github.com/sirupsen/logrus" + "go.podman.io/common/pkg/retry" + "go.podman.io/image/v5/pkg/tlsclientconfig" + "go.podman.io/image/v5/types" + "go.podman.io/storage/pkg/fileutils" + "go.podman.io/storage/pkg/idtools" + "go.podman.io/storage/pkg/regexp" ) // AddAndCopyOptions holds options for add and copy commands. diff --git a/vendor/github.com/containers/buildah/bind/mount.go b/vendor/github.com/containers/buildah/bind/mount.go index 8f18b85f1d7..5153dfc56fe 100644 --- a/vendor/github.com/containers/buildah/bind/mount.go +++ b/vendor/github.com/containers/buildah/bind/mount.go @@ -11,10 +11,10 @@ import ( "syscall" "github.com/containers/buildah/util" - "github.com/containers/storage/pkg/idtools" - "github.com/containers/storage/pkg/mount" "github.com/opencontainers/runtime-spec/specs-go" "github.com/sirupsen/logrus" + "go.podman.io/storage/pkg/idtools" + "go.podman.io/storage/pkg/mount" "golang.org/x/sys/unix" ) diff --git a/vendor/github.com/containers/buildah/buildah.go b/vendor/github.com/containers/buildah/buildah.go index 643b823b077..9de72ca8dc5 100644 --- a/vendor/github.com/containers/buildah/buildah.go +++ b/vendor/github.com/containers/buildah/buildah.go @@ -13,13 +13,13 @@ import ( "github.com/containers/buildah/define" "github.com/containers/buildah/docker" - nettypes "github.com/containers/common/libnetwork/types" - "github.com/containers/image/v5/types" encconfig "github.com/containers/ocicrypt/config" - "github.com/containers/storage" - "github.com/containers/storage/pkg/ioutils" v1 "github.com/opencontainers/image-spec/specs-go/v1" "github.com/sirupsen/logrus" + nettypes "go.podman.io/common/libnetwork/types" + "go.podman.io/image/v5/types" + "go.podman.io/storage" + "go.podman.io/storage/pkg/ioutils" ) const ( diff --git a/vendor/github.com/containers/buildah/chroot/run_common.go b/vendor/github.com/containers/buildah/chroot/run_common.go index 8e94ff73d71..0e50cf0e8e0 100644 --- a/vendor/github.com/containers/buildah/chroot/run_common.go +++ b/vendor/github.com/containers/buildah/chroot/run_common.go @@ -20,11 +20,11 @@ import ( "github.com/containers/buildah/bind" "github.com/containers/buildah/internal/pty" "github.com/containers/buildah/util" - "github.com/containers/storage/pkg/ioutils" - "github.com/containers/storage/pkg/reexec" - "github.com/containers/storage/pkg/unshare" "github.com/opencontainers/runtime-spec/specs-go" "github.com/sirupsen/logrus" + "go.podman.io/storage/pkg/ioutils" + "go.podman.io/storage/pkg/reexec" + "go.podman.io/storage/pkg/unshare" "golang.org/x/sys/unix" "golang.org/x/term" ) diff --git a/vendor/github.com/containers/buildah/chroot/run_freebsd.go b/vendor/github.com/containers/buildah/chroot/run_freebsd.go index 4f2c49bdab4..e87605446dc 100644 --- a/vendor/github.com/containers/buildah/chroot/run_freebsd.go +++ b/vendor/github.com/containers/buildah/chroot/run_freebsd.go @@ -14,11 +14,11 @@ import ( "syscall" "github.com/containers/buildah/pkg/jail" - "github.com/containers/storage/pkg/fileutils" - "github.com/containers/storage/pkg/mount" - "github.com/containers/storage/pkg/unshare" "github.com/opencontainers/runtime-spec/specs-go" "github.com/sirupsen/logrus" + "go.podman.io/storage/pkg/fileutils" + "go.podman.io/storage/pkg/mount" + "go.podman.io/storage/pkg/unshare" "golang.org/x/sys/unix" ) diff --git a/vendor/github.com/containers/buildah/chroot/run_linux.go b/vendor/github.com/containers/buildah/chroot/run_linux.go index 5ca0127aa0e..59c439d0f99 100644 --- a/vendor/github.com/containers/buildah/chroot/run_linux.go +++ b/vendor/github.com/containers/buildah/chroot/run_linux.go @@ -14,12 +14,12 @@ import ( "time" "github.com/containers/buildah/copier" - "github.com/containers/storage/pkg/mount" - "github.com/containers/storage/pkg/unshare" "github.com/moby/sys/capability" "github.com/opencontainers/runc/libcontainer/apparmor" "github.com/opencontainers/runtime-spec/specs-go" "github.com/sirupsen/logrus" + "go.podman.io/storage/pkg/mount" + "go.podman.io/storage/pkg/unshare" "golang.org/x/sys/unix" ) diff --git a/vendor/github.com/containers/buildah/commit.go b/vendor/github.com/containers/buildah/commit.go index c78c012043b..8a053cb4e0e 100644 --- a/vendor/github.com/containers/buildah/commit.go +++ b/vendor/github.com/containers/buildah/commit.go @@ -12,21 +12,21 @@ import ( "github.com/containers/buildah/pkg/blobcache" "github.com/containers/buildah/util" - "github.com/containers/common/libimage" - "github.com/containers/common/libimage/manifests" - "github.com/containers/image/v5/docker" - "github.com/containers/image/v5/docker/reference" - "github.com/containers/image/v5/manifest" - "github.com/containers/image/v5/signature" - is "github.com/containers/image/v5/storage" - "github.com/containers/image/v5/transports" - "github.com/containers/image/v5/types" encconfig "github.com/containers/ocicrypt/config" - "github.com/containers/storage/pkg/archive" - "github.com/containers/storage/pkg/stringid" digest "github.com/opencontainers/go-digest" v1 "github.com/opencontainers/image-spec/specs-go/v1" "github.com/sirupsen/logrus" + "go.podman.io/common/libimage" + "go.podman.io/common/libimage/manifests" + "go.podman.io/image/v5/docker" + "go.podman.io/image/v5/docker/reference" + "go.podman.io/image/v5/manifest" + "go.podman.io/image/v5/signature" + is "go.podman.io/image/v5/storage" + "go.podman.io/image/v5/transports" + "go.podman.io/image/v5/types" + "go.podman.io/storage/pkg/archive" + "go.podman.io/storage/pkg/stringid" ) const ( diff --git a/vendor/github.com/containers/buildah/common.go b/vendor/github.com/containers/buildah/common.go index ed8fc17ed5d..fe734cfc39c 100644 --- a/vendor/github.com/containers/buildah/common.go +++ b/vendor/github.com/containers/buildah/common.go @@ -8,16 +8,16 @@ import ( "time" "github.com/containers/buildah/define" - "github.com/containers/common/pkg/retry" - cp "github.com/containers/image/v5/copy" - "github.com/containers/image/v5/docker" - "github.com/containers/image/v5/signature" - is "github.com/containers/image/v5/storage" - "github.com/containers/image/v5/types" encconfig "github.com/containers/ocicrypt/config" - "github.com/containers/storage" - "github.com/containers/storage/pkg/fileutils" - "github.com/containers/storage/pkg/unshare" + "go.podman.io/common/pkg/retry" + cp "go.podman.io/image/v5/copy" + "go.podman.io/image/v5/docker" + "go.podman.io/image/v5/signature" + is "go.podman.io/image/v5/storage" + "go.podman.io/image/v5/types" + "go.podman.io/storage" + "go.podman.io/storage/pkg/fileutils" + "go.podman.io/storage/pkg/unshare" ) const ( diff --git a/vendor/github.com/containers/buildah/config.go b/vendor/github.com/containers/buildah/config.go index 6e75dfe0937..a5381972265 100644 --- a/vendor/github.com/containers/buildah/config.go +++ b/vendor/github.com/containers/buildah/config.go @@ -14,13 +14,13 @@ import ( "github.com/containers/buildah/define" "github.com/containers/buildah/docker" internalUtil "github.com/containers/buildah/internal/util" - "github.com/containers/image/v5/manifest" - "github.com/containers/image/v5/pkg/compression" - "github.com/containers/image/v5/transports" - "github.com/containers/image/v5/types" - "github.com/containers/storage/pkg/stringid" ociv1 "github.com/opencontainers/image-spec/specs-go/v1" "github.com/sirupsen/logrus" + "go.podman.io/image/v5/manifest" + "go.podman.io/image/v5/pkg/compression" + "go.podman.io/image/v5/transports" + "go.podman.io/image/v5/types" + "go.podman.io/storage/pkg/stringid" ) // unmarshalConvertedConfig obtains the config blob of img valid for the wantedManifestMIMEType format diff --git a/vendor/github.com/containers/buildah/convertcw.go b/vendor/github.com/containers/buildah/convertcw.go index be12b7f848b..0793838b099 100644 --- a/vendor/github.com/containers/buildah/convertcw.go +++ b/vendor/github.com/containers/buildah/convertcw.go @@ -8,13 +8,13 @@ import ( "github.com/containers/buildah/define" "github.com/containers/buildah/internal/mkcw" - "github.com/containers/image/v5/docker/reference" - "github.com/containers/image/v5/types" encconfig "github.com/containers/ocicrypt/config" - "github.com/containers/storage" - "github.com/containers/storage/pkg/archive" "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/storage" + "go.podman.io/storage/pkg/archive" ) // CWConvertImageOptions provides both required and optional bits of diff --git a/vendor/github.com/containers/buildah/copier/copier.go b/vendor/github.com/containers/buildah/copier/copier.go index bd082396a86..6ffe52d86f6 100644 --- a/vendor/github.com/containers/buildah/copier/copier.go +++ b/vendor/github.com/containers/buildah/copier/copier.go @@ -22,12 +22,12 @@ import ( "time" "unicode" - "github.com/containers/image/v5/pkg/compression" - "github.com/containers/storage/pkg/archive" - "github.com/containers/storage/pkg/fileutils" - "github.com/containers/storage/pkg/idtools" - "github.com/containers/storage/pkg/reexec" "github.com/sirupsen/logrus" + "go.podman.io/image/v5/pkg/compression" + "go.podman.io/storage/pkg/archive" + "go.podman.io/storage/pkg/fileutils" + "go.podman.io/storage/pkg/idtools" + "go.podman.io/storage/pkg/reexec" ) const ( diff --git a/vendor/github.com/containers/buildah/copier/xattrs.go b/vendor/github.com/containers/buildah/copier/xattrs.go index f90bb1f5004..2e4b944adbf 100644 --- a/vendor/github.com/containers/buildah/copier/xattrs.go +++ b/vendor/github.com/containers/buildah/copier/xattrs.go @@ -9,8 +9,8 @@ import ( "strings" "syscall" - "github.com/containers/storage/pkg/unshare" "github.com/sirupsen/logrus" + "go.podman.io/storage/pkg/unshare" "golang.org/x/sys/unix" ) diff --git a/vendor/github.com/containers/buildah/define/build.go b/vendor/github.com/containers/buildah/define/build.go index 7ca9d0d9956..0b1d20800da 100644 --- a/vendor/github.com/containers/buildah/define/build.go +++ b/vendor/github.com/containers/buildah/define/build.go @@ -4,12 +4,12 @@ import ( "io" "time" - "github.com/containers/common/libimage/manifests" - nettypes "github.com/containers/common/libnetwork/types" - "github.com/containers/image/v5/docker/reference" - "github.com/containers/image/v5/types" encconfig "github.com/containers/ocicrypt/config" - "github.com/containers/storage/pkg/archive" + "go.podman.io/common/libimage/manifests" + nettypes "go.podman.io/common/libnetwork/types" + "go.podman.io/image/v5/docker/reference" + "go.podman.io/image/v5/types" + "go.podman.io/storage/pkg/archive" "golang.org/x/sync/semaphore" ) diff --git a/vendor/github.com/containers/buildah/define/types.go b/vendor/github.com/containers/buildah/define/types.go index f97ab6669c8..98fd322144e 100644 --- a/vendor/github.com/containers/buildah/define/types.go +++ b/vendor/github.com/containers/buildah/define/types.go @@ -14,14 +14,14 @@ import ( "path/filepath" "strings" - "github.com/containers/image/v5/manifest" - "github.com/containers/storage/pkg/archive" - "github.com/containers/storage/pkg/chrootarchive" - "github.com/containers/storage/pkg/ioutils" - "github.com/containers/storage/types" v1 "github.com/opencontainers/image-spec/specs-go/v1" "github.com/opencontainers/runtime-spec/specs-go" "github.com/sirupsen/logrus" + "go.podman.io/image/v5/manifest" + "go.podman.io/storage/pkg/archive" + "go.podman.io/storage/pkg/chrootarchive" + "go.podman.io/storage/pkg/ioutils" + "go.podman.io/storage/types" ) const ( diff --git a/vendor/github.com/containers/buildah/docker/types.go b/vendor/github.com/containers/buildah/docker/types.go index 9460adb7bbd..997698709d4 100644 --- a/vendor/github.com/containers/buildah/docker/types.go +++ b/vendor/github.com/containers/buildah/docker/types.go @@ -7,8 +7,8 @@ package docker import ( "time" - "github.com/containers/image/v5/pkg/strslice" digest "github.com/opencontainers/go-digest" + "go.podman.io/image/v5/pkg/strslice" ) // github.com/moby/moby/image/rootfs.go diff --git a/vendor/github.com/containers/buildah/image.go b/vendor/github.com/containers/buildah/image.go index 68c0b7d5453..469db661079 100644 --- a/vendor/github.com/containers/buildah/image.go +++ b/vendor/github.com/containers/buildah/image.go @@ -22,20 +22,20 @@ import ( "github.com/containers/buildah/internal/config" "github.com/containers/buildah/internal/mkcw" "github.com/containers/buildah/internal/tmpdir" - "github.com/containers/image/v5/docker/reference" - "github.com/containers/image/v5/image" - "github.com/containers/image/v5/manifest" - is "github.com/containers/image/v5/storage" - "github.com/containers/image/v5/types" - "github.com/containers/storage" - "github.com/containers/storage/pkg/archive" - "github.com/containers/storage/pkg/chrootarchive" - "github.com/containers/storage/pkg/idtools" - "github.com/containers/storage/pkg/ioutils" digest "github.com/opencontainers/go-digest" specs "github.com/opencontainers/image-spec/specs-go" v1 "github.com/opencontainers/image-spec/specs-go/v1" "github.com/sirupsen/logrus" + "go.podman.io/image/v5/docker/reference" + "go.podman.io/image/v5/image" + "go.podman.io/image/v5/manifest" + is "go.podman.io/image/v5/storage" + "go.podman.io/image/v5/types" + "go.podman.io/storage" + "go.podman.io/storage/pkg/archive" + "go.podman.io/storage/pkg/chrootarchive" + "go.podman.io/storage/pkg/idtools" + "go.podman.io/storage/pkg/ioutils" ) const ( diff --git a/vendor/github.com/containers/buildah/imagebuildah/build.go b/vendor/github.com/containers/buildah/imagebuildah/build.go index eb3c5e2409d..9bfc41d1462 100644 --- a/vendor/github.com/containers/buildah/imagebuildah/build.go +++ b/vendor/github.com/containers/buildah/imagebuildah/build.go @@ -26,23 +26,23 @@ import ( internalUtil "github.com/containers/buildah/internal/util" "github.com/containers/buildah/pkg/parse" "github.com/containers/buildah/util" - "github.com/containers/common/libimage" - "github.com/containers/common/pkg/config" - "github.com/containers/image/v5/docker" - "github.com/containers/image/v5/docker/reference" - "github.com/containers/image/v5/image" - "github.com/containers/image/v5/manifest" - "github.com/containers/image/v5/pkg/shortnames" - istorage "github.com/containers/image/v5/storage" - "github.com/containers/image/v5/types" - "github.com/containers/storage" - "github.com/containers/storage/pkg/archive" "github.com/hashicorp/go-multierror" "github.com/mattn/go-shellwords" v1 "github.com/opencontainers/image-spec/specs-go/v1" specs "github.com/opencontainers/runtime-spec/specs-go" "github.com/openshift/imagebuilder" "github.com/sirupsen/logrus" + "go.podman.io/common/libimage" + "go.podman.io/common/pkg/config" + "go.podman.io/image/v5/docker" + "go.podman.io/image/v5/docker/reference" + "go.podman.io/image/v5/image" + "go.podman.io/image/v5/manifest" + "go.podman.io/image/v5/pkg/shortnames" + istorage "go.podman.io/image/v5/storage" + "go.podman.io/image/v5/types" + "go.podman.io/storage" + "go.podman.io/storage/pkg/archive" "golang.org/x/sync/semaphore" ) @@ -564,8 +564,30 @@ func platformsForBaseImages(ctx context.Context, logger *logrus.Logger, dockerfi for _, candidate := range resolved.PullCandidates { ref, err := docker.NewReference(candidate.Value) if err != nil { - logrus.Debugf("parsing image reference %q: %v", candidate.Value.String(), err) - continue + // github.com/containers/common/libimage.Runtime.Pull() will catch + // references that include both a tag and a digest, and drop the + // tag as part of pulling the image. Fall back to doing roughly + // the same here. + var nonDigestedRef reference.Named + if named, err2 := reference.ParseNamed(candidate.Value.String()); err2 == nil { + _, isTagged := named.(reference.NamedTagged) + digested, isDigested := named.(reference.Digested) + if isTagged && isDigested { + if nonDigestedRef, err2 = reference.WithDigest(reference.TrimNamed(named), digested.Digest()); err2 != nil { + nonDigestedRef = nil + } + } + } + if nonDigestedRef == nil { + // not a tagged-and-digested reference, either, so log the original error + logrus.Debugf("parsing image reference %q: %v", candidate.Value.String(), err) + continue + } + ref, err = docker.NewReference(nonDigestedRef) + if err != nil { + logrus.Debugf("re-parsing image reference %q: %v", nonDigestedRef.String(), err) + continue + } } src, err := ref.NewImageSource(ctx, systemContext) if err != nil { diff --git a/vendor/github.com/containers/buildah/imagebuildah/executor.go b/vendor/github.com/containers/buildah/imagebuildah/executor.go index f479eea7398..904849a9141 100644 --- a/vendor/github.com/containers/buildah/imagebuildah/executor.go +++ b/vendor/github.com/containers/buildah/imagebuildah/executor.go @@ -19,23 +19,23 @@ import ( "github.com/containers/buildah/pkg/parse" "github.com/containers/buildah/pkg/sshagent" "github.com/containers/buildah/util" - "github.com/containers/common/libimage" - nettypes "github.com/containers/common/libnetwork/types" - "github.com/containers/common/pkg/config" - "github.com/containers/image/v5/docker/reference" - "github.com/containers/image/v5/manifest" - storageTransport "github.com/containers/image/v5/storage" - "github.com/containers/image/v5/transports" - "github.com/containers/image/v5/transports/alltransports" - "github.com/containers/image/v5/types" encconfig "github.com/containers/ocicrypt/config" - "github.com/containers/storage" - "github.com/containers/storage/pkg/archive" digest "github.com/opencontainers/go-digest" v1 "github.com/opencontainers/image-spec/specs-go/v1" "github.com/openshift/imagebuilder" "github.com/openshift/imagebuilder/dockerfile/parser" "github.com/sirupsen/logrus" + "go.podman.io/common/libimage" + nettypes "go.podman.io/common/libnetwork/types" + "go.podman.io/common/pkg/config" + "go.podman.io/image/v5/docker/reference" + "go.podman.io/image/v5/manifest" + storageTransport "go.podman.io/image/v5/storage" + "go.podman.io/image/v5/transports" + "go.podman.io/image/v5/transports/alltransports" + "go.podman.io/image/v5/types" + "go.podman.io/storage" + "go.podman.io/storage/pkg/archive" "golang.org/x/sync/semaphore" ) diff --git a/vendor/github.com/containers/buildah/imagebuildah/stage_executor.go b/vendor/github.com/containers/buildah/imagebuildah/stage_executor.go index 9a96448f648..00a96bfbcdd 100644 --- a/vendor/github.com/containers/buildah/imagebuildah/stage_executor.go +++ b/vendor/github.com/containers/buildah/imagebuildah/stage_executor.go @@ -24,17 +24,6 @@ import ( "github.com/containers/buildah/pkg/parse" "github.com/containers/buildah/pkg/rusage" "github.com/containers/buildah/util" - config "github.com/containers/common/pkg/config" - cp "github.com/containers/image/v5/copy" - imagedocker "github.com/containers/image/v5/docker" - "github.com/containers/image/v5/docker/reference" - "github.com/containers/image/v5/manifest" - is "github.com/containers/image/v5/storage" - "github.com/containers/image/v5/transports" - "github.com/containers/image/v5/types" - "github.com/containers/storage" - "github.com/containers/storage/pkg/chrootarchive" - "github.com/containers/storage/pkg/unshare" docker "github.com/fsouza/go-dockerclient" buildkitparser "github.com/moby/buildkit/frontend/dockerfile/parser" digest "github.com/opencontainers/go-digest" @@ -44,6 +33,17 @@ import ( "github.com/openshift/imagebuilder/dockerfile/command" "github.com/openshift/imagebuilder/dockerfile/parser" "github.com/sirupsen/logrus" + config "go.podman.io/common/pkg/config" + cp "go.podman.io/image/v5/copy" + imagedocker "go.podman.io/image/v5/docker" + "go.podman.io/image/v5/docker/reference" + "go.podman.io/image/v5/manifest" + is "go.podman.io/image/v5/storage" + "go.podman.io/image/v5/transports" + "go.podman.io/image/v5/types" + "go.podman.io/storage" + "go.podman.io/storage/pkg/chrootarchive" + "go.podman.io/storage/pkg/unshare" ) // StageExecutor bundles up what we need to know when executing one stage of a diff --git a/vendor/github.com/containers/buildah/import.go b/vendor/github.com/containers/buildah/import.go index c66792e1157..d0b5655382f 100644 --- a/vendor/github.com/containers/buildah/import.go +++ b/vendor/github.com/containers/buildah/import.go @@ -8,13 +8,13 @@ import ( "github.com/containers/buildah/define" "github.com/containers/buildah/docker" "github.com/containers/buildah/util" - "github.com/containers/image/v5/image" - "github.com/containers/image/v5/manifest" - is "github.com/containers/image/v5/storage" - "github.com/containers/image/v5/transports" - "github.com/containers/image/v5/types" - "github.com/containers/storage" digest "github.com/opencontainers/go-digest" + "go.podman.io/image/v5/image" + "go.podman.io/image/v5/manifest" + is "go.podman.io/image/v5/storage" + "go.podman.io/image/v5/transports" + "go.podman.io/image/v5/types" + "go.podman.io/storage" ) func importBuilderDataFromImage(ctx context.Context, store storage.Store, systemContext *types.SystemContext, imageID, containerName, containerID string) (*Builder, error) { diff --git a/vendor/github.com/containers/buildah/info.go b/vendor/github.com/containers/buildah/info.go index 332a995e786..56a28429c91 100644 --- a/vendor/github.com/containers/buildah/info.go +++ b/vendor/github.com/containers/buildah/info.go @@ -12,12 +12,12 @@ import ( internalUtil "github.com/containers/buildah/internal/util" putil "github.com/containers/buildah/pkg/util" "github.com/containers/buildah/util" - "github.com/containers/common/pkg/cgroups" - "github.com/containers/storage" - "github.com/containers/storage/pkg/system" - "github.com/containers/storage/pkg/unshare" v1 "github.com/opencontainers/image-spec/specs-go/v1" "github.com/sirupsen/logrus" + "go.podman.io/common/pkg/cgroups" + "go.podman.io/storage" + "go.podman.io/storage/pkg/system" + "go.podman.io/storage/pkg/unshare" ) // InfoData holds the info type, i.e store, host etc and the data for each type diff --git a/vendor/github.com/containers/buildah/internal/config/convert.go b/vendor/github.com/containers/buildah/internal/config/convert.go index f44158c1ba3..3f983ef9320 100644 --- a/vendor/github.com/containers/buildah/internal/config/convert.go +++ b/vendor/github.com/containers/buildah/internal/config/convert.go @@ -4,8 +4,8 @@ import ( "maps" "slices" - "github.com/containers/image/v5/manifest" dockerclient "github.com/fsouza/go-dockerclient" + "go.podman.io/image/v5/manifest" ) // Schema2ConfigFromGoDockerclientConfig converts a go-dockerclient Config diff --git a/vendor/github.com/containers/buildah/internal/config/override.go b/vendor/github.com/containers/buildah/internal/config/override.go index df16c4d50c2..7d391bdafc5 100644 --- a/vendor/github.com/containers/buildah/internal/config/override.go +++ b/vendor/github.com/containers/buildah/internal/config/override.go @@ -7,9 +7,9 @@ import ( "strings" "github.com/containers/buildah/docker" - "github.com/containers/image/v5/manifest" v1 "github.com/opencontainers/image-spec/specs-go/v1" "github.com/openshift/imagebuilder" + "go.podman.io/image/v5/manifest" ) // firstStringElseSecondString takes two strings, and returns the first diff --git a/vendor/github.com/containers/buildah/internal/mkcw/archive.go b/vendor/github.com/containers/buildah/internal/mkcw/archive.go index 97d9393ec94..f462a8fa9f1 100644 --- a/vendor/github.com/containers/buildah/internal/mkcw/archive.go +++ b/vendor/github.com/containers/buildah/internal/mkcw/archive.go @@ -20,14 +20,14 @@ import ( "github.com/containers/buildah/internal/tmpdir" "github.com/containers/buildah/pkg/overlay" "github.com/containers/luksy" - "github.com/containers/storage/pkg/idtools" - "github.com/containers/storage/pkg/ioutils" - "github.com/containers/storage/pkg/mount" - "github.com/containers/storage/pkg/system" "github.com/docker/go-units" digest "github.com/opencontainers/go-digest" v1 "github.com/opencontainers/image-spec/specs-go/v1" "github.com/sirupsen/logrus" + "go.podman.io/storage/pkg/idtools" + "go.podman.io/storage/pkg/ioutils" + "go.podman.io/storage/pkg/mount" + "go.podman.io/storage/pkg/system" ) const minimumImageSize = 10 * 1024 * 1024 diff --git a/vendor/github.com/containers/buildah/internal/mkcw/attest.go b/vendor/github.com/containers/buildah/internal/mkcw/attest.go index 400884a9968..3b7273976d4 100644 --- a/vendor/github.com/containers/buildah/internal/mkcw/attest.go +++ b/vendor/github.com/containers/buildah/internal/mkcw/attest.go @@ -15,8 +15,8 @@ import ( "strings" "github.com/containers/buildah/internal/mkcw/types" - "github.com/containers/storage/pkg/fileutils" "github.com/sirupsen/logrus" + "go.podman.io/storage/pkg/fileutils" ) type ( diff --git a/vendor/github.com/containers/buildah/internal/open/open_linux.go b/vendor/github.com/containers/buildah/internal/open/open_linux.go index 3d9d608b5f6..d93511dcbbc 100644 --- a/vendor/github.com/containers/buildah/internal/open/open_linux.go +++ b/vendor/github.com/containers/buildah/internal/open/open_linux.go @@ -8,8 +8,8 @@ import ( "os" "strings" - "github.com/containers/storage/pkg/reexec" "github.com/sirupsen/logrus" + "go.podman.io/storage/pkg/reexec" "golang.org/x/sys/unix" ) diff --git a/vendor/github.com/containers/buildah/internal/open/open_unix.go b/vendor/github.com/containers/buildah/internal/open/open_unix.go index fd254e8745c..274203d6b4b 100644 --- a/vendor/github.com/containers/buildah/internal/open/open_unix.go +++ b/vendor/github.com/containers/buildah/internal/open/open_unix.go @@ -10,7 +10,7 @@ import ( "os" "syscall" - "github.com/containers/storage/pkg/reexec" + "go.podman.io/storage/pkg/reexec" "golang.org/x/sys/unix" ) diff --git a/vendor/github.com/containers/buildah/internal/parse/parse.go b/vendor/github.com/containers/buildah/internal/parse/parse.go index 8a0fa48539f..bd618cb3edd 100644 --- a/vendor/github.com/containers/buildah/internal/parse/parse.go +++ b/vendor/github.com/containers/buildah/internal/parse/parse.go @@ -5,9 +5,9 @@ import ( "path/filepath" "strings" - "github.com/containers/common/pkg/parse" - "github.com/containers/storage/pkg/fileutils" specs "github.com/opencontainers/runtime-spec/specs-go" + "go.podman.io/common/pkg/parse" + "go.podman.io/storage/pkg/fileutils" ) // ValidateVolumeMountHostDir validates the host path of buildah --volume diff --git a/vendor/github.com/containers/buildah/internal/tmpdir/tmpdir.go b/vendor/github.com/containers/buildah/internal/tmpdir/tmpdir.go index ff966b20f30..27b435d2f9e 100644 --- a/vendor/github.com/containers/buildah/internal/tmpdir/tmpdir.go +++ b/vendor/github.com/containers/buildah/internal/tmpdir/tmpdir.go @@ -4,8 +4,8 @@ import ( "os" "path/filepath" - "github.com/containers/common/pkg/config" "github.com/sirupsen/logrus" + "go.podman.io/common/pkg/config" ) // GetTempDir returns the path of the preferred temporary directory on the host. diff --git a/vendor/github.com/containers/buildah/internal/util/util.go b/vendor/github.com/containers/buildah/internal/util/util.go index 5f74f96a38c..b230d0e3055 100644 --- a/vendor/github.com/containers/buildah/internal/util/util.go +++ b/vendor/github.com/containers/buildah/internal/util/util.go @@ -7,14 +7,14 @@ import ( "path/filepath" "github.com/containers/buildah/define" - "github.com/containers/common/libimage" - lplatform "github.com/containers/common/libimage/platform" - "github.com/containers/image/v5/types" - "github.com/containers/storage" - "github.com/containers/storage/pkg/archive" - "github.com/containers/storage/pkg/chrootarchive" - "github.com/containers/storage/pkg/unshare" v1 "github.com/opencontainers/image-spec/specs-go/v1" + "go.podman.io/common/libimage" + lplatform "go.podman.io/common/libimage/platform" + "go.podman.io/image/v5/types" + "go.podman.io/storage" + "go.podman.io/storage/pkg/archive" + "go.podman.io/storage/pkg/chrootarchive" + "go.podman.io/storage/pkg/unshare" ) // LookupImage returns *Image to corresponding imagename or id diff --git a/vendor/github.com/containers/buildah/internal/volumes/bind_linux.go b/vendor/github.com/containers/buildah/internal/volumes/bind_linux.go index f8723eb080c..dfd5373ca92 100644 --- a/vendor/github.com/containers/buildah/internal/volumes/bind_linux.go +++ b/vendor/github.com/containers/buildah/internal/volumes/bind_linux.go @@ -6,8 +6,8 @@ import ( "os" "github.com/containers/buildah/internal/open" - "github.com/containers/storage/pkg/mount" "github.com/sirupsen/logrus" + "go.podman.io/storage/pkg/mount" "golang.org/x/sys/unix" ) diff --git a/vendor/github.com/containers/buildah/internal/volumes/volumes.go b/vendor/github.com/containers/buildah/internal/volumes/volumes.go index 941d6f9539c..8b4b30cd79e 100644 --- a/vendor/github.com/containers/buildah/internal/volumes/volumes.go +++ b/vendor/github.com/containers/buildah/internal/volumes/volumes.go @@ -19,17 +19,17 @@ import ( internalUtil "github.com/containers/buildah/internal/util" "github.com/containers/buildah/pkg/overlay" "github.com/containers/buildah/util" - "github.com/containers/common/pkg/parse" - "github.com/containers/image/v5/types" - "github.com/containers/storage" - "github.com/containers/storage/pkg/idtools" - "github.com/containers/storage/pkg/lockfile" - "github.com/containers/storage/pkg/mount" - "github.com/containers/storage/pkg/unshare" digest "github.com/opencontainers/go-digest" specs "github.com/opencontainers/runtime-spec/specs-go" selinux "github.com/opencontainers/selinux/go-selinux" "github.com/sirupsen/logrus" + "go.podman.io/common/pkg/parse" + "go.podman.io/image/v5/types" + "go.podman.io/storage" + "go.podman.io/storage/pkg/idtools" + "go.podman.io/storage/pkg/lockfile" + "go.podman.io/storage/pkg/mount" + "go.podman.io/storage/pkg/unshare" ) const ( diff --git a/vendor/github.com/containers/buildah/new.go b/vendor/github.com/containers/buildah/new.go index 431b06b51f4..1f8bb87b8a1 100644 --- a/vendor/github.com/containers/buildah/new.go +++ b/vendor/github.com/containers/buildah/new.go @@ -10,19 +10,19 @@ import ( "strings" "github.com/containers/buildah/define" - "github.com/containers/common/libimage" - "github.com/containers/common/pkg/config" - "github.com/containers/image/v5/image" - "github.com/containers/image/v5/manifest" - "github.com/containers/image/v5/pkg/shortnames" - "github.com/containers/image/v5/transports" - "github.com/containers/image/v5/types" - "github.com/containers/storage" - "github.com/containers/storage/pkg/stringid" digest "github.com/opencontainers/go-digest" v1 "github.com/opencontainers/image-spec/specs-go/v1" "github.com/openshift/imagebuilder" "github.com/sirupsen/logrus" + "go.podman.io/common/libimage" + "go.podman.io/common/pkg/config" + "go.podman.io/image/v5/image" + "go.podman.io/image/v5/manifest" + "go.podman.io/image/v5/pkg/shortnames" + "go.podman.io/image/v5/transports" + "go.podman.io/image/v5/types" + "go.podman.io/storage" + "go.podman.io/storage/pkg/stringid" ) const ( diff --git a/vendor/github.com/containers/buildah/pkg/binfmt/binfmt.go b/vendor/github.com/containers/buildah/pkg/binfmt/binfmt.go index e6f0ac62fc0..45409f80007 100644 --- a/vendor/github.com/containers/buildah/pkg/binfmt/binfmt.go +++ b/vendor/github.com/containers/buildah/pkg/binfmt/binfmt.go @@ -11,8 +11,8 @@ import ( "strings" "syscall" - "github.com/containers/storage/pkg/unshare" "github.com/sirupsen/logrus" + "go.podman.io/storage/pkg/unshare" "golang.org/x/sys/unix" ) diff --git a/vendor/github.com/containers/buildah/pkg/blobcache/blobcache.go b/vendor/github.com/containers/buildah/pkg/blobcache/blobcache.go index fa60619ac62..b2723c1b3e6 100644 --- a/vendor/github.com/containers/buildah/pkg/blobcache/blobcache.go +++ b/vendor/github.com/containers/buildah/pkg/blobcache/blobcache.go @@ -1,8 +1,8 @@ package blobcache import ( - imageBlobCache "github.com/containers/image/v5/pkg/blobcache" - "github.com/containers/image/v5/types" + imageBlobCache "go.podman.io/image/v5/pkg/blobcache" + "go.podman.io/image/v5/types" ) // BlobCache is an object which saves copies of blobs that are written to it while passing them diff --git a/vendor/github.com/containers/buildah/pkg/chrootuser/user_unix.go b/vendor/github.com/containers/buildah/pkg/chrootuser/user_unix.go index 56a65ac0127..ffd4e5f5595 100644 --- a/vendor/github.com/containers/buildah/pkg/chrootuser/user_unix.go +++ b/vendor/github.com/containers/buildah/pkg/chrootuser/user_unix.go @@ -14,7 +14,7 @@ import ( "strings" "sync" - "github.com/containers/storage/pkg/reexec" + "go.podman.io/storage/pkg/reexec" "golang.org/x/sys/unix" ) diff --git a/vendor/github.com/containers/buildah/pkg/cli/build.go b/vendor/github.com/containers/buildah/pkg/cli/build.go index c09a4979171..bdbd1105f84 100644 --- a/vendor/github.com/containers/buildah/pkg/cli/build.go +++ b/vendor/github.com/containers/buildah/pkg/cli/build.go @@ -20,12 +20,12 @@ import ( "github.com/containers/buildah/define" "github.com/containers/buildah/pkg/parse" "github.com/containers/buildah/pkg/util" - "github.com/containers/common/pkg/auth" - "github.com/containers/image/v5/docker/reference" - "github.com/containers/image/v5/types" "github.com/opencontainers/runtime-spec/specs-go" "github.com/sirupsen/logrus" "github.com/spf13/cobra" + "go.podman.io/common/pkg/auth" + "go.podman.io/image/v5/docker/reference" + "go.podman.io/image/v5/types" ) type BuildOptions struct { diff --git a/vendor/github.com/containers/buildah/pkg/cli/common.go b/vendor/github.com/containers/buildah/pkg/cli/common.go index db8cca3f40b..ebeb51e1f73 100644 --- a/vendor/github.com/containers/buildah/pkg/cli/common.go +++ b/vendor/github.com/containers/buildah/pkg/cli/common.go @@ -15,13 +15,13 @@ import ( "github.com/containers/buildah/internal" "github.com/containers/buildah/pkg/completion" "github.com/containers/buildah/pkg/parse" - commonComp "github.com/containers/common/pkg/completion" - "github.com/containers/common/pkg/config" encconfig "github.com/containers/ocicrypt/config" enchelpers "github.com/containers/ocicrypt/helpers" - "github.com/containers/storage/pkg/unshare" "github.com/opencontainers/runtime-spec/specs-go" "github.com/spf13/pflag" + commonComp "go.podman.io/common/pkg/completion" + "go.podman.io/common/pkg/config" + "go.podman.io/storage/pkg/unshare" ) // LayerResults represents the results of the layer flags diff --git a/vendor/github.com/containers/buildah/pkg/overlay/overlay.go b/vendor/github.com/containers/buildah/pkg/overlay/overlay.go index 5bdc10775d6..5607a0b1632 100644 --- a/vendor/github.com/containers/buildah/pkg/overlay/overlay.go +++ b/vendor/github.com/containers/buildah/pkg/overlay/overlay.go @@ -9,12 +9,12 @@ import ( "strings" "syscall" - "github.com/containers/storage/pkg/idtools" - "github.com/containers/storage/pkg/mount" - "github.com/containers/storage/pkg/system" - "github.com/containers/storage/pkg/unshare" "github.com/opencontainers/runtime-spec/specs-go" "github.com/sirupsen/logrus" + "go.podman.io/storage/pkg/idtools" + "go.podman.io/storage/pkg/mount" + "go.podman.io/storage/pkg/system" + "go.podman.io/storage/pkg/unshare" ) // Options for MountWithOptions(). diff --git a/vendor/github.com/containers/buildah/pkg/overlay/overlay_freebsd.go b/vendor/github.com/containers/buildah/pkg/overlay/overlay_freebsd.go index 3a7c6fe1d0d..4dd1fb3346e 100644 --- a/vendor/github.com/containers/buildah/pkg/overlay/overlay_freebsd.go +++ b/vendor/github.com/containers/buildah/pkg/overlay/overlay_freebsd.go @@ -8,7 +8,7 @@ import ( //"syscall" "errors" - //"github.com/containers/storage/pkg/unshare" + //"go.podman.io/storage/pkg/unshare" "github.com/opencontainers/runtime-spec/specs-go" ) diff --git a/vendor/github.com/containers/buildah/pkg/overlay/overlay_linux.go b/vendor/github.com/containers/buildah/pkg/overlay/overlay_linux.go index 8b84d463584..8f594147467 100644 --- a/vendor/github.com/containers/buildah/pkg/overlay/overlay_linux.go +++ b/vendor/github.com/containers/buildah/pkg/overlay/overlay_linux.go @@ -7,9 +7,9 @@ import ( "strings" "syscall" - "github.com/containers/storage/pkg/unshare" "github.com/opencontainers/runtime-spec/specs-go" "github.com/opencontainers/selinux/go-selinux/label" + "go.podman.io/storage/pkg/unshare" ) // MountWithOptions creates ${contentDir}/merge, where ${contentDir} was diff --git a/vendor/github.com/containers/buildah/pkg/parse/parse.go b/vendor/github.com/containers/buildah/pkg/parse/parse.go index d5a852cbbdc..053c0434789 100644 --- a/vendor/github.com/containers/buildah/pkg/parse/parse.go +++ b/vendor/github.com/containers/buildah/pkg/parse/parse.go @@ -23,16 +23,6 @@ import ( "github.com/containers/buildah/internal/sbom" "github.com/containers/buildah/internal/tmpdir" "github.com/containers/buildah/pkg/sshagent" - "github.com/containers/common/libnetwork/etchosts" - "github.com/containers/common/pkg/auth" - "github.com/containers/common/pkg/config" - "github.com/containers/common/pkg/parse" - "github.com/containers/image/v5/docker/reference" - "github.com/containers/image/v5/types" - "github.com/containers/storage/pkg/fileutils" - "github.com/containers/storage/pkg/idtools" - "github.com/containers/storage/pkg/unshare" - storageTypes "github.com/containers/storage/types" securejoin "github.com/cyphar/filepath-securejoin" units "github.com/docker/go-units" specs "github.com/opencontainers/runtime-spec/specs-go" @@ -41,6 +31,16 @@ import ( "github.com/sirupsen/logrus" "github.com/spf13/cobra" "github.com/spf13/pflag" + "go.podman.io/common/libnetwork/etchosts" + "go.podman.io/common/pkg/auth" + "go.podman.io/common/pkg/config" + "go.podman.io/common/pkg/parse" + "go.podman.io/image/v5/docker/reference" + "go.podman.io/image/v5/types" + "go.podman.io/storage/pkg/fileutils" + "go.podman.io/storage/pkg/idtools" + "go.podman.io/storage/pkg/unshare" + storageTypes "go.podman.io/storage/types" "golang.org/x/term" ) diff --git a/vendor/github.com/containers/buildah/pull.go b/vendor/github.com/containers/buildah/pull.go index c8b071cdee1..8fd715794b0 100644 --- a/vendor/github.com/containers/buildah/pull.go +++ b/vendor/github.com/containers/buildah/pull.go @@ -7,11 +7,11 @@ import ( "time" "github.com/containers/buildah/define" - "github.com/containers/common/libimage" - "github.com/containers/common/pkg/config" - "github.com/containers/image/v5/types" encconfig "github.com/containers/ocicrypt/config" - "github.com/containers/storage" + "go.podman.io/common/libimage" + "go.podman.io/common/pkg/config" + "go.podman.io/image/v5/types" + "go.podman.io/storage" ) // PullOptions can be used to alter how an image is copied in from somewhere. diff --git a/vendor/github.com/containers/buildah/push.go b/vendor/github.com/containers/buildah/push.go index 9d9d7a88ba3..8d69ce8ca8b 100644 --- a/vendor/github.com/containers/buildah/push.go +++ b/vendor/github.com/containers/buildah/push.go @@ -7,17 +7,17 @@ import ( "time" "github.com/containers/buildah/pkg/blobcache" - "github.com/containers/common/libimage" - "github.com/containers/image/v5/docker/reference" - "github.com/containers/image/v5/manifest" - "github.com/containers/image/v5/pkg/compression" - "github.com/containers/image/v5/transports" - "github.com/containers/image/v5/types" encconfig "github.com/containers/ocicrypt/config" - "github.com/containers/storage" - "github.com/containers/storage/pkg/archive" digest "github.com/opencontainers/go-digest" "github.com/sirupsen/logrus" + "go.podman.io/common/libimage" + "go.podman.io/image/v5/docker/reference" + "go.podman.io/image/v5/manifest" + "go.podman.io/image/v5/pkg/compression" + "go.podman.io/image/v5/transports" + "go.podman.io/image/v5/types" + "go.podman.io/storage" + "go.podman.io/storage/pkg/archive" ) // cacheLookupReferenceFunc wraps a BlobCache into a diff --git a/vendor/github.com/containers/buildah/run.go b/vendor/github.com/containers/buildah/run.go index 53f0a710899..a5e3a00ad32 100644 --- a/vendor/github.com/containers/buildah/run.go +++ b/vendor/github.com/containers/buildah/run.go @@ -9,12 +9,12 @@ import ( "github.com/containers/buildah/define" "github.com/containers/buildah/internal" "github.com/containers/buildah/pkg/sshagent" - "github.com/containers/common/libnetwork/etchosts" - "github.com/containers/image/v5/types" - "github.com/containers/storage/pkg/idtools" - "github.com/containers/storage/pkg/lockfile" "github.com/opencontainers/runtime-spec/specs-go" "github.com/sirupsen/logrus" + "go.podman.io/common/libnetwork/etchosts" + "go.podman.io/image/v5/types" + "go.podman.io/storage/pkg/idtools" + "go.podman.io/storage/pkg/lockfile" ) const ( diff --git a/vendor/github.com/containers/buildah/run_common.go b/vendor/github.com/containers/buildah/run_common.go index 6ece3c87dcf..0863ec2fb22 100644 --- a/vendor/github.com/containers/buildah/run_common.go +++ b/vendor/github.com/containers/buildah/run_common.go @@ -34,28 +34,28 @@ import ( "github.com/containers/buildah/pkg/overlay" "github.com/containers/buildah/pkg/sshagent" "github.com/containers/buildah/util" - "github.com/containers/common/libnetwork/etchosts" - "github.com/containers/common/libnetwork/network" - "github.com/containers/common/libnetwork/resolvconf" - netTypes "github.com/containers/common/libnetwork/types" - netUtil "github.com/containers/common/libnetwork/util" - "github.com/containers/common/pkg/config" - "github.com/containers/common/pkg/subscriptions" - "github.com/containers/image/v5/types" - "github.com/containers/storage" - "github.com/containers/storage/pkg/fileutils" - "github.com/containers/storage/pkg/idtools" - "github.com/containers/storage/pkg/ioutils" - "github.com/containers/storage/pkg/lockfile" - "github.com/containers/storage/pkg/mount" - "github.com/containers/storage/pkg/reexec" - "github.com/containers/storage/pkg/regexp" - "github.com/containers/storage/pkg/unshare" "github.com/opencontainers/go-digest" "github.com/opencontainers/runtime-spec/specs-go" "github.com/opencontainers/runtime-tools/generate" "github.com/opencontainers/selinux/go-selinux/label" "github.com/sirupsen/logrus" + "go.podman.io/common/libnetwork/etchosts" + "go.podman.io/common/libnetwork/network" + "go.podman.io/common/libnetwork/resolvconf" + netTypes "go.podman.io/common/libnetwork/types" + netUtil "go.podman.io/common/libnetwork/util" + "go.podman.io/common/pkg/config" + "go.podman.io/common/pkg/subscriptions" + "go.podman.io/image/v5/types" + "go.podman.io/storage" + "go.podman.io/storage/pkg/fileutils" + "go.podman.io/storage/pkg/idtools" + "go.podman.io/storage/pkg/ioutils" + "go.podman.io/storage/pkg/lockfile" + "go.podman.io/storage/pkg/mount" + "go.podman.io/storage/pkg/reexec" + "go.podman.io/storage/pkg/regexp" + "go.podman.io/storage/pkg/unshare" "golang.org/x/sys/unix" "golang.org/x/term" ) diff --git a/vendor/github.com/containers/buildah/run_freebsd.go b/vendor/github.com/containers/buildah/run_freebsd.go index 637b96a098d..74771a2664f 100644 --- a/vendor/github.com/containers/buildah/run_freebsd.go +++ b/vendor/github.com/containers/buildah/run_freebsd.go @@ -22,19 +22,19 @@ import ( "github.com/containers/buildah/pkg/parse" butil "github.com/containers/buildah/pkg/util" "github.com/containers/buildah/util" - "github.com/containers/common/libnetwork/etchosts" - "github.com/containers/common/libnetwork/resolvconf" - nettypes "github.com/containers/common/libnetwork/types" - netUtil "github.com/containers/common/libnetwork/util" - "github.com/containers/common/pkg/config" - "github.com/containers/image/v5/types" - "github.com/containers/storage/pkg/idtools" - "github.com/containers/storage/pkg/lockfile" - "github.com/containers/storage/pkg/stringid" "github.com/docker/go-units" "github.com/opencontainers/runtime-spec/specs-go" "github.com/opencontainers/runtime-tools/generate" "github.com/sirupsen/logrus" + "go.podman.io/common/libnetwork/etchosts" + "go.podman.io/common/libnetwork/resolvconf" + nettypes "go.podman.io/common/libnetwork/types" + netUtil "go.podman.io/common/libnetwork/util" + "go.podman.io/common/pkg/config" + "go.podman.io/image/v5/types" + "go.podman.io/storage/pkg/idtools" + "go.podman.io/storage/pkg/lockfile" + "go.podman.io/storage/pkg/stringid" "golang.org/x/sys/unix" ) diff --git a/vendor/github.com/containers/buildah/run_linux.go b/vendor/github.com/containers/buildah/run_linux.go index b5e874595bb..e84cba9696b 100644 --- a/vendor/github.com/containers/buildah/run_linux.go +++ b/vendor/github.com/containers/buildah/run_linux.go @@ -26,29 +26,29 @@ import ( "github.com/containers/buildah/pkg/parse" butil "github.com/containers/buildah/pkg/util" "github.com/containers/buildah/util" - "github.com/containers/common/libnetwork/etchosts" - "github.com/containers/common/libnetwork/pasta" - "github.com/containers/common/libnetwork/resolvconf" - "github.com/containers/common/libnetwork/slirp4netns" - nettypes "github.com/containers/common/libnetwork/types" - netUtil "github.com/containers/common/libnetwork/util" - "github.com/containers/common/pkg/capabilities" - "github.com/containers/common/pkg/chown" - "github.com/containers/common/pkg/config" - "github.com/containers/common/pkg/hooks" - hooksExec "github.com/containers/common/pkg/hooks/exec" - "github.com/containers/image/v5/types" - "github.com/containers/storage/pkg/fileutils" - "github.com/containers/storage/pkg/idtools" - "github.com/containers/storage/pkg/ioutils" - "github.com/containers/storage/pkg/lockfile" - "github.com/containers/storage/pkg/mount" - "github.com/containers/storage/pkg/stringid" - "github.com/containers/storage/pkg/unshare" "github.com/docker/go-units" "github.com/opencontainers/runtime-spec/specs-go" "github.com/opencontainers/runtime-tools/generate" "github.com/sirupsen/logrus" + "go.podman.io/common/libnetwork/etchosts" + "go.podman.io/common/libnetwork/pasta" + "go.podman.io/common/libnetwork/resolvconf" + "go.podman.io/common/libnetwork/slirp4netns" + nettypes "go.podman.io/common/libnetwork/types" + netUtil "go.podman.io/common/libnetwork/util" + "go.podman.io/common/pkg/capabilities" + "go.podman.io/common/pkg/chown" + "go.podman.io/common/pkg/config" + "go.podman.io/common/pkg/hooks" + hooksExec "go.podman.io/common/pkg/hooks/exec" + "go.podman.io/image/v5/types" + "go.podman.io/storage/pkg/fileutils" + "go.podman.io/storage/pkg/idtools" + "go.podman.io/storage/pkg/ioutils" + "go.podman.io/storage/pkg/lockfile" + "go.podman.io/storage/pkg/mount" + "go.podman.io/storage/pkg/stringid" + "go.podman.io/storage/pkg/unshare" "golang.org/x/sys/unix" "tags.cncf.io/container-device-interface/pkg/cdi" "tags.cncf.io/container-device-interface/pkg/parser" diff --git a/vendor/github.com/containers/buildah/run_unix.go b/vendor/github.com/containers/buildah/run_unix.go index 6677d2c8da7..61e18910c64 100644 --- a/vendor/github.com/containers/buildah/run_unix.go +++ b/vendor/github.com/containers/buildah/run_unix.go @@ -6,9 +6,9 @@ import ( "errors" "github.com/containers/buildah/define" - nettypes "github.com/containers/common/libnetwork/types" - "github.com/containers/storage" "github.com/opencontainers/runtime-spec/specs-go" + nettypes "go.podman.io/common/libnetwork/types" + "go.podman.io/storage" ) // ContainerDevices is an alias for a slice of github.com/opencontainers/runc/libcontainer/configs.Device structures. diff --git a/vendor/github.com/containers/buildah/run_unsupported.go b/vendor/github.com/containers/buildah/run_unsupported.go index 66346d29155..5530a465f46 100644 --- a/vendor/github.com/containers/buildah/run_unsupported.go +++ b/vendor/github.com/containers/buildah/run_unsupported.go @@ -5,8 +5,8 @@ package buildah import ( "errors" - nettypes "github.com/containers/common/libnetwork/types" - "github.com/containers/storage" + nettypes "go.podman.io/common/libnetwork/types" + "go.podman.io/storage" ) func setChildProcess() error { diff --git a/vendor/github.com/containers/buildah/seccomp.go b/vendor/github.com/containers/buildah/seccomp.go index b481747428d..f84353ab82d 100644 --- a/vendor/github.com/containers/buildah/seccomp.go +++ b/vendor/github.com/containers/buildah/seccomp.go @@ -6,8 +6,8 @@ import ( "fmt" "os" - "github.com/containers/common/pkg/seccomp" "github.com/opencontainers/runtime-spec/specs-go" + "go.podman.io/common/pkg/seccomp" ) func setupSeccomp(spec *specs.Spec, seccompProfilePath string) error { diff --git a/vendor/github.com/containers/buildah/util.go b/vendor/github.com/containers/buildah/util.go index 75a853452cb..10cd6f597e0 100644 --- a/vendor/github.com/containers/buildah/util.go +++ b/vendor/github.com/containers/buildah/util.go @@ -9,16 +9,16 @@ import ( "sync" "github.com/containers/buildah/copier" - "github.com/containers/image/v5/docker/reference" - "github.com/containers/image/v5/pkg/sysregistriesv2" - "github.com/containers/image/v5/types" - "github.com/containers/storage" - "github.com/containers/storage/pkg/idtools" - "github.com/containers/storage/pkg/reexec" v1 "github.com/opencontainers/image-spec/specs-go/v1" rspec "github.com/opencontainers/runtime-spec/specs-go" "github.com/opencontainers/selinux/go-selinux" "github.com/sirupsen/logrus" + "go.podman.io/image/v5/docker/reference" + "go.podman.io/image/v5/pkg/sysregistriesv2" + "go.podman.io/image/v5/types" + "go.podman.io/storage" + "go.podman.io/storage/pkg/idtools" + "go.podman.io/storage/pkg/reexec" ) // InitReexec is a wrapper for reexec.Init(). It should be called at diff --git a/vendor/github.com/containers/buildah/util/util.go b/vendor/github.com/containers/buildah/util/util.go index 6a3b2fc6bcb..0b2339e16d0 100644 --- a/vendor/github.com/containers/buildah/util/util.go +++ b/vendor/github.com/containers/buildah/util/util.go @@ -13,18 +13,18 @@ import ( "syscall" "github.com/containers/buildah/define" - "github.com/containers/common/libimage" - "github.com/containers/common/pkg/config" - "github.com/containers/image/v5/docker/reference" - "github.com/containers/image/v5/pkg/shortnames" - "github.com/containers/image/v5/signature" - "github.com/containers/image/v5/transports/alltransports" - "github.com/containers/image/v5/types" - "github.com/containers/storage" "github.com/docker/distribution/registry/api/errcode" "github.com/opencontainers/go-digest" specs "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/image/v5/docker/reference" + "go.podman.io/image/v5/pkg/shortnames" + "go.podman.io/image/v5/signature" + "go.podman.io/image/v5/transports/alltransports" + "go.podman.io/image/v5/types" + "go.podman.io/storage" ) const ( diff --git a/vendor/github.com/containers/image/v5/signature/internal/sequoia/gosequoia.c b/vendor/github.com/containers/image/v5/signature/internal/sequoia/gosequoia.c deleted file mode 100644 index d5314016a63..00000000000 --- a/vendor/github.com/containers/image/v5/signature/internal/sequoia/gosequoia.c +++ /dev/null @@ -1,200 +0,0 @@ -/* - * Copying and distribution of this file, with or without modification, - * are permitted in any medium without royalty provided the copyright - * notice and this notice are preserved. This file is offered as-is, - * without any warranty. - */ - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#include "gosequoia.h" - -#if defined(GO_SEQUOIA_ENABLE_DLOPEN) && GO_SEQUOIA_ENABLE_DLOPEN - -#include -#include -#include -#include - -/* If SEQUOIA_SONAME is defined, dlopen handle can be automatically - * set; otherwise, the caller needs to call - * go_sequoia_ensure_library with soname determined at run time. - */ -#ifdef SEQUOIA_SONAME - -static void -ensure_library (void) -{ - if (go_sequoia_ensure_library (SEQUOIA_SONAME, RTLD_LAZY | RTLD_LOCAL) < 0) - abort (); -} - -#if defined(GO_SEQUOIA_ENABLE_PTHREAD) && GO_SEQUOIA_ENABLE_PTHREAD -#include - -static pthread_once_t dlopen_once = PTHREAD_ONCE_INIT; - -#define ENSURE_LIBRARY pthread_once(&dlopen_once, ensure_library) - -#else /* GO_SEQUOIA_ENABLE_PTHREAD */ - -#define ENSURE_LIBRARY do { \ - if (!go_sequoia_dlhandle) \ - ensure_library(); \ - } while (0) - -#endif /* !GO_SEQUOIA_ENABLE_PTHREAD */ - -#else /* SEQUOIA_SONAME */ - -#define ENSURE_LIBRARY do {} while (0) - -#endif /* !SEQUOIA_SONAME */ - -static void *go_sequoia_dlhandle; - -/* Define redirection symbols */ -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wunused-macros" - -#if (2 <= __GNUC__ || (4 <= __clang_major__)) -#define FUNC(ret, name, args, cargs) \ - static __typeof__(name)(*go_sequoia_sym_##name); -#else -#define FUNC(ret, name, args, cargs) \ - static ret(*go_sequoia_sym_##name)args; -#endif -#define VOID_FUNC FUNC -#include "gosequoiafuncs.h" -#undef VOID_FUNC -#undef FUNC - -#pragma GCC diagnostic pop - -/* Define redirection wrapper functions */ -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wunused-macros" - -#define FUNC(ret, name, args, cargs) \ -ret go_##name args \ -{ \ - ENSURE_LIBRARY; \ - assert (go_sequoia_sym_##name); \ - return go_sequoia_sym_##name cargs; \ -} -#define VOID_FUNC(ret, name, args, cargs) \ -ret go_##name args \ -{ \ - ENSURE_LIBRARY; \ - assert (go_sequoia_sym_##name); \ - go_sequoia_sym_##name cargs; \ -} -#include "gosequoiafuncs.h" -#undef VOID_FUNC -#undef FUNC - -#pragma GCC diagnostic pop - -static int -ensure_symbol (const char *name, void **symp) -{ - if (!*symp) - { - void *sym = dlsym (go_sequoia_dlhandle, name); - if (!sym) - return -EINVAL; - *symp = sym; - } - return 0; -} - -int -go_sequoia_ensure_library (const char *soname, int flags) -{ - int err; - - if (!go_sequoia_dlhandle) - { - go_sequoia_dlhandle = dlopen (soname, flags); - if (!go_sequoia_dlhandle) - return -EINVAL; - } - -#define ENSURE_SYMBOL(name) \ - ensure_symbol(#name, (void **)&go_sequoia_sym_##name) - -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wunused-macros" - -#define FUNC(ret, name, args, cargs) \ - err = ENSURE_SYMBOL(name); \ - if (err < 0) \ - { \ - dlclose (go_sequoia_dlhandle); \ - go_sequoia_dlhandle = NULL; \ - return err; \ - } -#define VOID_FUNC FUNC -#include "gosequoiafuncs.h" -#undef VOID_FUNC -#undef FUNC - -#pragma GCC diagnostic pop - -#undef ENSURE_SYMBOL - return 0; -} - -void -go_sequoia_unload_library (void) -{ - if (go_sequoia_dlhandle) - { - dlclose (go_sequoia_dlhandle); - go_sequoia_dlhandle = NULL; - } - -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wunused-macros" - -#define FUNC(ret, name, args, cargs) \ - go_sequoia_sym_##name = NULL; -#define VOID_FUNC FUNC -#include "gosequoiafuncs.h" -#undef VOID_FUNC -#undef FUNC - -#pragma GCC diagnostic pop -} - -unsigned -go_sequoia_is_usable (void) -{ - return go_sequoia_dlhandle != NULL; -} - -#else /* GO_SEQUOIA_ENABLE_DLOPEN */ - -int -go_sequoia_ensure_library (const char *soname, int flags) -{ - (void) soname; - (void) flags; - return 0; -} - -void -go_sequoia_unload_library (void) -{ -} - -unsigned -go_sequoia_is_usable (void) -{ - /* The library is linked at build time, thus always usable */ - return 1; -} - -#endif /* !GO_SEQUOIA_ENABLE_DLOPEN */ diff --git a/vendor/github.com/containers/image/v5/signature/internal/sequoia/gosequoia.h b/vendor/github.com/containers/image/v5/signature/internal/sequoia/gosequoia.h deleted file mode 100644 index 477b985bad4..00000000000 --- a/vendor/github.com/containers/image/v5/signature/internal/sequoia/gosequoia.h +++ /dev/null @@ -1,54 +0,0 @@ -/* - * Copying and distribution of this file, with or without modification, - * are permitted in any medium without royalty provided the copyright - * notice and this notice are preserved. This file is offered as-is, - * without any warranty. - */ - -#ifndef GO_SEQUOIA_H_ -#define GO_SEQUOIA_H_ - -#include - -#if defined(GO_SEQUOIA_ENABLE_DLOPEN) && GO_SEQUOIA_ENABLE_DLOPEN - -#define FUNC(ret, name, args, cargs) \ - ret go_##name args; -#define VOID_FUNC FUNC -#include "gosequoiafuncs.h" -#undef VOID_FUNC -#undef FUNC - -#define GO_SEQUOIA_FUNC(name) go_##name - -#else - -#define GO_SEQUOIA_FUNC(name) name - -#endif /* GO_SEQUOIA_ENABLE_DLOPEN */ - -/* Ensure SONAME to be loaded with dlopen FLAGS, and all the necessary - * symbols are resolved. - * - * Returns 0 on success; negative error code otherwise. - * - * Note that this function is NOT thread-safe; when calling it from - * multi-threaded programs, protect it with a locking mechanism. - */ -int go_sequoia_ensure_library (const char *soname, int flags); - -/* Unload library and reset symbols. - * - * Note that this function is NOT thread-safe; when calling it from - * multi-threaded programs, protect it with a locking mechanism. - */ -void go_sequoia_unload_library (void); - -/* Return 1 if the library is loaded and usable. - * - * Note that this function is NOT thread-safe; when calling it from - * multi-threaded programs, protect it with a locking mechanism. - */ -unsigned go_sequoia_is_usable (void); - -#endif /* GO_SEQUOIA_H_ */ diff --git a/vendor/github.com/containers/image/v5/signature/internal/sequoia/gosequoiafuncs.h b/vendor/github.com/containers/image/v5/signature/internal/sequoia/gosequoiafuncs.h deleted file mode 100644 index 3d7ae5fac80..00000000000 --- a/vendor/github.com/containers/image/v5/signature/internal/sequoia/gosequoiafuncs.h +++ /dev/null @@ -1,21 +0,0 @@ -/* - * This file was automatically generated from sequoia.h, - * which is covered by the following license: - * SPDX-License-Identifier: Apache-2.0 - */ -VOID_FUNC(void, sequoia_error_free, (struct SequoiaError *err_ptr), (err_ptr)) -FUNC(struct SequoiaMechanism *, sequoia_mechanism_new_from_directory, (const char *dir_ptr, struct SequoiaError **err_ptr), (dir_ptr, err_ptr)) -FUNC(struct SequoiaMechanism *, sequoia_mechanism_new_ephemeral, (struct SequoiaError **err_ptr), (err_ptr)) -VOID_FUNC(void, sequoia_mechanism_free, (struct SequoiaMechanism *mechanism_ptr), (mechanism_ptr)) -VOID_FUNC(void, sequoia_signature_free, (struct SequoiaSignature *signature_ptr), (signature_ptr)) -FUNC(const uint8_t *, sequoia_signature_get_data, (const struct SequoiaSignature *signature_ptr, size_t *data_len), (signature_ptr, data_len)) -VOID_FUNC(void, sequoia_verification_result_free, (struct SequoiaVerificationResult *result_ptr), (result_ptr)) -FUNC(const uint8_t *, sequoia_verification_result_get_content, (const struct SequoiaVerificationResult *result_ptr, size_t *data_len), (result_ptr, data_len)) -FUNC(const char *, sequoia_verification_result_get_signer, (const struct SequoiaVerificationResult *result_ptr), (result_ptr)) -FUNC(struct SequoiaSignature *, sequoia_sign, (struct SequoiaMechanism *mechanism_ptr, const char *key_handle_ptr, const char *password_ptr, const uint8_t *data_ptr, size_t data_len, struct SequoiaError **err_ptr), (mechanism_ptr, key_handle_ptr, password_ptr, data_ptr, data_len, err_ptr)) -FUNC(struct SequoiaVerificationResult *, sequoia_verify, (struct SequoiaMechanism *mechanism_ptr, const uint8_t *signature_ptr, size_t signature_len, struct SequoiaError **err_ptr), (mechanism_ptr, signature_ptr, signature_len, err_ptr)) -VOID_FUNC(void, sequoia_import_result_free, (struct SequoiaImportResult *result_ptr), (result_ptr)) -FUNC(size_t, sequoia_import_result_get_count, (const struct SequoiaImportResult *result_ptr), (result_ptr)) -FUNC(const char *, sequoia_import_result_get_content, (const struct SequoiaImportResult *result_ptr, size_t index, struct SequoiaError **err_ptr), (result_ptr, index, err_ptr)) -FUNC(struct SequoiaImportResult *, sequoia_import_keys, (struct SequoiaMechanism *mechanism_ptr, const uint8_t *blob_ptr, size_t blob_len, struct SequoiaError **err_ptr), (mechanism_ptr, blob_ptr, blob_len, err_ptr)) -FUNC(int, sequoia_set_logger_consumer, (void (*consumer)(enum SequoiaLogLevel, const char *), struct SequoiaError **err_ptr), (consumer, err_ptr)) diff --git a/vendor/github.com/containers/image/v5/signature/internal/sequoia/sequoia.go b/vendor/github.com/containers/image/v5/signature/internal/sequoia/sequoia.go deleted file mode 100644 index 361c1a6c7fd..00000000000 --- a/vendor/github.com/containers/image/v5/signature/internal/sequoia/sequoia.go +++ /dev/null @@ -1,223 +0,0 @@ -//go:build containers_image_sequoia - -package sequoia - -// #cgo CFLAGS: -I. -DGO_SEQUOIA_ENABLE_DLOPEN=1 -// #include "gosequoia.h" -// #include -// #include -// typedef void (*sequoia_logger_consumer_t) (enum SequoiaLogLevel level, char *message); -// extern void sequoia_logrus_logger (enum SequoiaLogLevel level, char *message); -import "C" - -import ( - "errors" - "fmt" - "path/filepath" - "runtime" - "sync" - "unsafe" - - "github.com/sirupsen/logrus" -) - -// sequoiaLibraryDir is the path to the directory where libpodman_sequoia is installed, -// if it is not in the platform’s default library path. -// You can override this at build time with -// -ldflags '-X github.com/containers/image/v5/signature/sequoia.sequoiaLibraryDir=$your_path' -var sequoiaLibraryDir = "" - -type SigningMechanism struct { - mechanism *C.SequoiaMechanism -} - -// NewMechanismFromDirectory initializes a mechanism using (user-managed) Sequoia state -// in dir, which can be "" to indicate the default (using $SEQUOIA_HOME or the default home directory location). -func NewMechanismFromDirectory( - dir string, -) (*SigningMechanism, error) { - var cerr *C.SequoiaError - var cDir *C.char - if dir != "" { - cDir = C.CString(dir) - defer C.free(unsafe.Pointer(cDir)) - } - cMechanism := C.go_sequoia_mechanism_new_from_directory(cDir, &cerr) - if cMechanism == nil { - defer C.go_sequoia_error_free(cerr) - return nil, errors.New(C.GoString(cerr.message)) - } - return &SigningMechanism{ - mechanism: cMechanism, - }, nil -} - -func NewEphemeralMechanism() (*SigningMechanism, error) { - var cerr *C.SequoiaError - cMechanism := C.go_sequoia_mechanism_new_ephemeral(&cerr) - if cMechanism == nil { - defer C.go_sequoia_error_free(cerr) - return nil, errors.New(C.GoString(cerr.message)) - } - return &SigningMechanism{ - mechanism: cMechanism, - }, nil -} - -func (m *SigningMechanism) SignWithPassphrase( - input []byte, - keyIdentity string, - passphrase string, -) ([]byte, error) { - var cerr *C.SequoiaError - var cPassphrase *C.char - if passphrase == "" { - cPassphrase = nil - } else { - cPassphrase = C.CString(passphrase) - defer C.free(unsafe.Pointer(cPassphrase)) - } - cKeyIdentity := C.CString(keyIdentity) - defer C.free(unsafe.Pointer(cKeyIdentity)) - sig := C.go_sequoia_sign( - m.mechanism, - cKeyIdentity, - cPassphrase, - (*C.uchar)(unsafe.Pointer(unsafe.SliceData(input))), - C.size_t(len(input)), - &cerr, - ) - if sig == nil { - defer C.go_sequoia_error_free(cerr) - return nil, errors.New(C.GoString(cerr.message)) - } - defer C.go_sequoia_signature_free(sig) - var size C.size_t - cData := C.go_sequoia_signature_get_data(sig, &size) - if size > C.size_t(C.INT_MAX) { - return nil, errors.New("overflow") // Coverage: This should not reasonably happen, and we don’t want to generate gigabytes of input to test this. - } - return C.GoBytes(unsafe.Pointer(cData), C.int(size)), nil -} - -func (m *SigningMechanism) Sign( - input []byte, - keyIdentity string, -) ([]byte, error) { - return m.SignWithPassphrase(input, keyIdentity, "") -} - -func (m *SigningMechanism) Verify( - unverifiedSignature []byte, -) (contents []byte, keyIdentity string, err error) { - var cerr *C.SequoiaError - result := C.go_sequoia_verify( - m.mechanism, - (*C.uchar)(unsafe.Pointer(unsafe.SliceData(unverifiedSignature))), - C.size_t(len(unverifiedSignature)), - &cerr, - ) - if result == nil { - defer C.go_sequoia_error_free(cerr) - return nil, "", errors.New(C.GoString(cerr.message)) - } - defer C.go_sequoia_verification_result_free(result) - var size C.size_t - cContent := C.go_sequoia_verification_result_get_content(result, &size) - if size > C.size_t(C.INT_MAX) { - return nil, "", errors.New("overflow") // Coverage: This should not reasonably happen, and we don’t want to generate gigabytes of input to test this. - } - contents = C.GoBytes(unsafe.Pointer(cContent), C.int(size)) - cSigner := C.go_sequoia_verification_result_get_signer(result) - keyIdentity = C.GoString(cSigner) - return contents, keyIdentity, nil -} - -func (m *SigningMechanism) ImportKeys(blob []byte) ([]string, error) { - var cerr *C.SequoiaError - result := C.go_sequoia_import_keys( - m.mechanism, - (*C.uchar)(unsafe.Pointer(unsafe.SliceData(blob))), - C.size_t(len(blob)), - &cerr, - ) - if result == nil { - defer C.go_sequoia_error_free(cerr) - return nil, errors.New(C.GoString(cerr.message)) - } - defer C.go_sequoia_import_result_free(result) - - keyIdentities := []string{} - count := C.go_sequoia_import_result_get_count(result) - for i := C.size_t(0); i < count; i++ { - var cerr *C.SequoiaError - cKeyIdentity := C.go_sequoia_import_result_get_content(result, i, &cerr) - if cerr != nil { - defer C.go_sequoia_error_free(cerr) // Coverage: this can fail only if i is out of range. - return nil, errors.New(C.GoString(cerr.message)) - } - keyIdentities = append(keyIdentities, C.GoString(cKeyIdentity)) - } - - return keyIdentities, nil -} - -func (m *SigningMechanism) Close() error { - C.go_sequoia_mechanism_free(m.mechanism) - return nil -} - -//export sequoia_logrus_logger -func sequoia_logrus_logger(level C.enum_SequoiaLogLevel, message *C.char) { - var logrusLevel logrus.Level - switch level { // Coverage: We are not in control of whether / how the Rust code chooses to log things. - case C.SEQUOIA_LOG_LEVEL_ERROR: - logrusLevel = logrus.ErrorLevel - case C.SEQUOIA_LOG_LEVEL_WARN: - logrusLevel = logrus.WarnLevel - case C.SEQUOIA_LOG_LEVEL_INFO: - logrusLevel = logrus.InfoLevel - case C.SEQUOIA_LOG_LEVEL_DEBUG: - logrusLevel = logrus.DebugLevel - case C.SEQUOIA_LOG_LEVEL_TRACE: - logrusLevel = logrus.TraceLevel - case C.SEQUOIA_LOG_LEVEL_UNKNOWN: - fallthrough - default: - logrusLevel = logrus.ErrorLevel // Should never happen - } - logrus.StandardLogger().Log(logrusLevel, C.GoString(message)) -} - -// initOnce should only be called by Init. -func initOnce() error { - var soName string - switch runtime.GOOS { - case "linux": - soName = "libpodman_sequoia.so.0" - case "darwin": - soName = "libpodman_sequoia.dylib" - default: - return fmt.Errorf("Unhandled OS %q in sequoia initialization", runtime.GOOS) // Coverage: This is ~by definition not reached in tests. - } - if sequoiaLibraryDir != "" { - soName = filepath.Join(sequoiaLibraryDir, soName) - } - cSOName := C.CString(soName) - defer C.free(unsafe.Pointer(cSOName)) - if C.go_sequoia_ensure_library(cSOName, - C.RTLD_NOW|C.RTLD_GLOBAL) < 0 { - return fmt.Errorf("unable to load %q", soName) // Coverage: This is impractical to test in-process, with the static go_sequoia_dlhandle. - } - - var cerr *C.SequoiaError - if C.go_sequoia_set_logger_consumer(C.sequoia_logger_consumer_t(C.sequoia_logrus_logger), &cerr) != 0 { - defer C.go_sequoia_error_free(cerr) // Coverage: This is impractical to test in-process, with the static go_sequoia_dlhandle. - return fmt.Errorf("initializing logging: %s", C.GoString(cerr.message)) - } - return nil -} - -// Init ensures the libpodman_sequoia library is available. -// It is safe to call from arbitrary goroutines. -var Init = sync.OnceValue(initOnce) diff --git a/vendor/github.com/containers/image/v5/signature/internal/sequoia/sequoia.h b/vendor/github.com/containers/image/v5/signature/internal/sequoia/sequoia.h deleted file mode 100644 index e0e21892676..00000000000 --- a/vendor/github.com/containers/image/v5/signature/internal/sequoia/sequoia.h +++ /dev/null @@ -1,85 +0,0 @@ -// SPDX-License-Identifier: Apache-2.0 - -#pragma once - -#include -#include -#include -#include - -typedef enum SequoiaErrorKind { - SEQUOIA_ERROR_KIND_UNKNOWN, - SEQUOIA_ERROR_KIND_INVALID_ARGUMENT, - SEQUOIA_ERROR_KIND_IO_ERROR, -} SequoiaErrorKind; - -typedef enum SequoiaLogLevel { - SEQUOIA_LOG_LEVEL_UNKNOWN, - SEQUOIA_LOG_LEVEL_ERROR, - SEQUOIA_LOG_LEVEL_WARN, - SEQUOIA_LOG_LEVEL_INFO, - SEQUOIA_LOG_LEVEL_DEBUG, - SEQUOIA_LOG_LEVEL_TRACE, -} SequoiaLogLevel; - -typedef struct SequoiaImportResult SequoiaImportResult; - -typedef struct SequoiaMechanism SequoiaMechanism; - -typedef struct SequoiaSignature SequoiaSignature; - -typedef struct SequoiaVerificationResult SequoiaVerificationResult; - -typedef struct SequoiaError { - enum SequoiaErrorKind kind; - char *message; -} SequoiaError; - -void sequoia_error_free(struct SequoiaError *err_ptr); - -struct SequoiaMechanism *sequoia_mechanism_new_from_directory(const char *dir_ptr, - struct SequoiaError **err_ptr); - -struct SequoiaMechanism *sequoia_mechanism_new_ephemeral(struct SequoiaError **err_ptr); - -void sequoia_mechanism_free(struct SequoiaMechanism *mechanism_ptr); - -void sequoia_signature_free(struct SequoiaSignature *signature_ptr); - -const uint8_t *sequoia_signature_get_data(const struct SequoiaSignature *signature_ptr, - size_t *data_len); - -void sequoia_verification_result_free(struct SequoiaVerificationResult *result_ptr); - -const uint8_t *sequoia_verification_result_get_content(const struct SequoiaVerificationResult *result_ptr, - size_t *data_len); - -const char *sequoia_verification_result_get_signer(const struct SequoiaVerificationResult *result_ptr); - -struct SequoiaSignature *sequoia_sign(struct SequoiaMechanism *mechanism_ptr, - const char *key_handle_ptr, - const char *password_ptr, - const uint8_t *data_ptr, - size_t data_len, - struct SequoiaError **err_ptr); - -struct SequoiaVerificationResult *sequoia_verify(struct SequoiaMechanism *mechanism_ptr, - const uint8_t *signature_ptr, - size_t signature_len, - struct SequoiaError **err_ptr); - -void sequoia_import_result_free(struct SequoiaImportResult *result_ptr); - -size_t sequoia_import_result_get_count(const struct SequoiaImportResult *result_ptr); - -const char *sequoia_import_result_get_content(const struct SequoiaImportResult *result_ptr, - size_t index, - struct SequoiaError **err_ptr); - -struct SequoiaImportResult *sequoia_import_keys(struct SequoiaMechanism *mechanism_ptr, - const uint8_t *blob_ptr, - size_t blob_len, - struct SequoiaError **err_ptr); - -int sequoia_set_logger_consumer(void (*consumer)(enum SequoiaLogLevel level, const char *message), - struct SequoiaError **err_ptr); diff --git a/vendor/github.com/containers/image/v5/signature/mechanism_gpgme_only.go b/vendor/github.com/containers/image/v5/signature/mechanism_gpgme_only.go deleted file mode 100644 index 0f971ac6a46..00000000000 --- a/vendor/github.com/containers/image/v5/signature/mechanism_gpgme_only.go +++ /dev/null @@ -1,64 +0,0 @@ -//go:build !containers_image_openpgp && !containers_image_sequoia - -package signature - -import ( - "os" - - "github.com/proglottis/gpgme" -) - -// newEphemeralGPGSigningMechanism returns a new GPG/OpenPGP signing mechanism which -// recognizes _only_ public keys from the supplied blobs, and returns the identities -// of these keys. -// The caller must call .Close() on the returned SigningMechanism. -func newEphemeralGPGSigningMechanism(blobs [][]byte) (signingMechanismWithPassphrase, []string, error) { - dir, err := os.MkdirTemp("", "containers-ephemeral-gpg-") - if err != nil { - return nil, nil, err - } - removeDir := true - defer func() { - if removeDir { - os.RemoveAll(dir) - } - }() - ctx, err := newGPGMEContext(dir) - if err != nil { - return nil, nil, err - } - keyIdentities := []string{} - for _, blob := range blobs { - ki, err := importKeysFromBytes(ctx, blob) - if err != nil { - return nil, nil, err - } - keyIdentities = append(keyIdentities, ki...) - } - - mech := newGPGMESigningMechanism(ctx, dir) - removeDir = false - return mech, keyIdentities, nil -} - -// importKeysFromBytes imports public keys from the supplied blob and returns their identities. -// The blob is assumed to have an appropriate format (the caller is expected to know which one). -// NOTE: This may modify long-term state (e.g. key storage in a directory underlying the mechanism); -// but we do not make this public, it can only be used through newEphemeralGPGSigningMechanism. -func importKeysFromBytes(ctx *gpgme.Context, blob []byte) ([]string, error) { - inputData, err := gpgme.NewDataBytes(blob) - if err != nil { - return nil, err - } - res, err := ctx.Import(inputData) - if err != nil { - return nil, err - } - keyIdentities := []string{} - for _, i := range res.Imports { - if i.Result == nil { - keyIdentities = append(keyIdentities, i.Fingerprint) - } - } - return keyIdentities, nil -} diff --git a/vendor/github.com/containers/image/v5/signature/mechanism_sequoia.go b/vendor/github.com/containers/image/v5/signature/mechanism_sequoia.go deleted file mode 100644 index fea5ada67ee..00000000000 --- a/vendor/github.com/containers/image/v5/signature/mechanism_sequoia.go +++ /dev/null @@ -1,84 +0,0 @@ -//go:build containers_image_sequoia - -package signature - -import ( - "github.com/containers/image/v5/signature/internal/sequoia" -) - -// A GPG/OpenPGP signing mechanism, implemented using Sequoia and only supporting verification. -// Legacy users who reach newGPGSigningMechanismInDirectory will use GPGME. -// Signing using Sequoia is preferable, but should happen via signature/simplesequoia.NewSigner, not using -// the legacy mechanism API. -type sequoiaEphemeralSigningMechanism struct { - inner *sequoia.SigningMechanism -} - -// newEphemeralGPGSigningMechanism returns a new GPG/OpenPGP signing mechanism which -// recognizes _only_ public keys from the supplied blobs, and returns the identities -// of these keys. -// The caller must call .Close() on the returned SigningMechanism. -func newEphemeralGPGSigningMechanism(blobs [][]byte) (signingMechanismWithPassphrase, []string, error) { - if err := sequoia.Init(); err != nil { - return nil, nil, err // Coverage: This is impractical to test in-process, with the static go_sequoia_dlhandle. - } - - mech, err := sequoia.NewEphemeralMechanism() - if err != nil { - return nil, nil, err - } - keyIdentities := []string{} - for _, blob := range blobs { - ki, err := mech.ImportKeys(blob) - if err != nil { - return nil, nil, err - } - keyIdentities = append(keyIdentities, ki...) - } - - return &sequoiaEphemeralSigningMechanism{ - inner: mech, - }, keyIdentities, nil -} - -func (m *sequoiaEphemeralSigningMechanism) Close() error { - return m.inner.Close() -} - -// SupportsSigning returns nil if the mechanism supports signing, or a SigningNotSupportedError. -func (m *sequoiaEphemeralSigningMechanism) SupportsSigning() error { - // This code is externally reachable via NewEphemeralGPGSigningMechanism(), but that API provides no way to - // import or generate a key. - return SigningNotSupportedError("caller error: Attempt to sign using a mechanism created via NewEphemeralGPGSigningMechanism().") -} - -// Sign creates a (non-detached) signature of input using keyIdentity and passphrase. -// Fails with a SigningNotSupportedError if the mechanism does not support signing. -func (m *sequoiaEphemeralSigningMechanism) SignWithPassphrase(input []byte, keyIdentity string, passphrase string) ([]byte, error) { - // This code is externally reachable via NewEphemeralGPGSigningMechanism(), but that API provides no way to - // import or generate a key. - return nil, SigningNotSupportedError("caller error: Attempt to sign using a mechanism created via NewEphemeralGPGSigningMechanism().") -} - -// Sign creates a (non-detached) signature of input using keyIdentity. -// Fails with a SigningNotSupportedError if the mechanism does not support signing. -func (m *sequoiaEphemeralSigningMechanism) Sign(input []byte, keyIdentity string) ([]byte, error) { - return m.SignWithPassphrase(input, keyIdentity, "") -} - -// Verify parses unverifiedSignature and returns the content and the signer's identity. -// For mechanisms created using NewEphemeralGPGSigningMechanism, the returned key identity -// is expected to be one of the values returned by NewEphemeralGPGSigningMechanism, -// or the mechanism should implement signingMechanismWithVerificationIdentityLookup. -func (m *sequoiaEphemeralSigningMechanism) Verify(unverifiedSignature []byte) (contents []byte, keyIdentity string, err error) { - return m.inner.Verify(unverifiedSignature) -} - -// UntrustedSignatureContents returns UNTRUSTED contents of the signature WITHOUT ANY VERIFICATION, -// along with a short identifier of the key used for signing. -// WARNING: The short key identifier (which corresponds to "Key ID" for OpenPGP keys) -// is NOT the same as a "key identity" used in other calls to this interface, and -// the values may have no recognizable relationship if the public key is not available. -func (m *sequoiaEphemeralSigningMechanism) UntrustedSignatureContents(untrustedSignature []byte) (untrustedContents []byte, shortKeyIdentifier string, err error) { - return gpgUntrustedSignatureContents(untrustedSignature) -} diff --git a/vendor/github.com/containers/libhvee/pkg/hypervctl/vhd.go b/vendor/github.com/containers/libhvee/pkg/hypervctl/vhd.go index c7310be9525..85b7399098e 100644 --- a/vendor/github.com/containers/libhvee/pkg/hypervctl/vhd.go +++ b/vendor/github.com/containers/libhvee/pkg/hypervctl/vhd.go @@ -6,8 +6,8 @@ import ( "strconv" "strings" - "github.com/containers/common/pkg/strongunits" "github.com/containers/libhvee/pkg/wmiext" + "go.podman.io/common/pkg/strongunits" ) // ResizeDisk takes a diskPath and strongly typed new size and uses powershell diff --git a/vendor/github.com/containers/libhvee/pkg/hypervctl/vm.go b/vendor/github.com/containers/libhvee/pkg/hypervctl/vm.go index 7fcae23affa..79467958737 100644 --- a/vendor/github.com/containers/libhvee/pkg/hypervctl/vm.go +++ b/vendor/github.com/containers/libhvee/pkg/hypervctl/vm.go @@ -218,7 +218,7 @@ func waitVMResult(res int32, service *wmiext.Service, job *wmiext.Instance, erro if err != nil { desc, _ := job.GetAsString("ErrorDescription") - desc = strings.Replace(desc, "\n", " ", -1) + desc = strings.ReplaceAll(desc, "\n", " ") return fmt.Errorf("%s: %w (%s)", errorMsg, err, desc) } @@ -430,7 +430,7 @@ func (vmm *VirtualMachineManager) NewVirtualMachine(name string, config *Hardwar return err } - if err := NewDriveSettingsBuilder(systemSettings). + builder := NewDriveSettingsBuilder(systemSettings). AddScsiController(). AddSyntheticDiskDrive(0). DefineVirtualHardDisk(config.DiskPath, func(vhdss *VirtualHardDiskStorageSettings) { @@ -438,15 +438,24 @@ func (vmm *VirtualMachineManager) NewVirtualMachine(name string, config *Hardwar // vhdss.IOPSLimit = 5000 }). Finish(). // disk - Finish(). // drive - //AddSyntheticDvdDrive(1). - //DefineVirtualDvdDisk(isoFile). - //Finish(). // disk - //Finish(). // drive + Finish() // drive + + if config.DVDDiskPath != "" { + // Add a DVD drive if the DVDDiskPath is set + // This is useful for cloud-init or other bootable media + builder = builder. + AddSyntheticDvdDrive(1). + DefineVirtualDvdDisk(config.DVDDiskPath). + Finish(). // disk + Finish() // drive + } + + if err := builder. Finish(). // controller Complete(); err != nil { return err } + // Add default network connection if config.Network { if err := NewNetworkSettingsBuilder(systemSettings). diff --git a/vendor/github.com/containers/libhvee/pkg/hypervctl/vm_config.go b/vendor/github.com/containers/libhvee/pkg/hypervctl/vm_config.go index 4ea14d660a1..7f7c4bbdba6 100644 --- a/vendor/github.com/containers/libhvee/pkg/hypervctl/vm_config.go +++ b/vendor/github.com/containers/libhvee/pkg/hypervctl/vm_config.go @@ -101,6 +101,9 @@ type HardwareConfig struct { // Network is bool to add a Network Connection to the // default network switch in Microsoft HyperV Network bool + // DVDDiskPath is the path to the disk image + // that will be used as a DVD drive in the VM (e.g. for cloud-init) + DVDDiskPath string } type Statuses struct { diff --git a/vendor/github.com/containers/libhvee/pkg/wmiext/array.go b/vendor/github.com/containers/libhvee/pkg/wmiext/array.go index 3f059360cb7..825d0bb45d0 100644 --- a/vendor/github.com/containers/libhvee/pkg/wmiext/array.go +++ b/vendor/github.com/containers/libhvee/pkg/wmiext/array.go @@ -41,7 +41,7 @@ func safeArrayCreateVector(variantType ole.VT, lowerBound int32, length uint32) if ret == 0 { // NULL return value err = fmt.Errorf("could not create safe array") } - safearray = (*ole.SafeArray)(unsafe.Pointer(ret)) + safearray = (*ole.SafeArray)(unsafe.Pointer(ret)) //nolint:govet return } @@ -148,7 +148,10 @@ func safeArrayGetElement(safearray *ole.SafeArray, index int64, element unsafe.P } func isVariantValConvertible(variant ole.VARIANT) bool { - return !(variant.VT == ole.VT_RECORD || variant.VT == ole.VT_VARIANT) + if variant.VT == ole.VT_RECORD || variant.VT == ole.VT_VARIANT { + return false + } + return true } func safeArrayGetAsVariantVal(safeArray *ole.SafeArray, index int64, variant ole.VARIANT) (int64, error) { diff --git a/vendor/github.com/containers/libhvee/pkg/wmiext/conversion.go b/vendor/github.com/containers/libhvee/pkg/wmiext/conversion.go index 9dc96906065..ad4c595aca1 100644 --- a/vendor/github.com/containers/libhvee/pkg/wmiext/conversion.go +++ b/vendor/github.com/containers/libhvee/pkg/wmiext/conversion.go @@ -347,14 +347,14 @@ func convertTimeToDataTime(time *time.Time) ole.VARIANT { } func convertDurationToDateTime(duration time.Duration) ole.VARIANT { - const daySeconds = time.Second * 86400 + const dayTime = time.Second * 86400 if duration == 0 { return ole.NewVariant(ole.VT_NULL, 0) } - days := duration / daySeconds - duration = duration % daySeconds + days := duration / dayTime + duration = duration % dayTime hours := duration / time.Hour duration = duration % time.Hour @@ -435,7 +435,7 @@ func parseIntervalTime(interval string) (time.Time, error) { return time.Time{}, err } - var stamp uint64 = secs + var stamp = secs stamp += days * 86400 stamp += hours * 3600 stamp += mins * 60 diff --git a/vendor/github.com/containers/psgo/internal/host/host_nocgo.go b/vendor/github.com/containers/psgo/internal/host/host_nocgo.go index 6ff33741517..89e85e009d3 100644 --- a/vendor/github.com/containers/psgo/internal/host/host_nocgo.go +++ b/vendor/github.com/containers/psgo/internal/host/host_nocgo.go @@ -1,3 +1,4 @@ +//go:build !cgo // +build !cgo // Copyright 2018 psgo authors @@ -21,7 +22,7 @@ package host import ( "encoding/binary" "fmt" - "io/ioutil" + "os" "unsafe" ) @@ -46,7 +47,7 @@ const ( func getFromAuxv(what uint, whatName string) (uint, error) { dataLen := int(unsafe.Sizeof(int(0))) - p, err := ioutil.ReadFile("/proc/self/auxv") + p, err := os.ReadFile("/proc/self/auxv") if err != nil { return 0, err } diff --git a/vendor/github.com/containers/psgo/internal/proc/attr.go b/vendor/github.com/containers/psgo/internal/proc/attr.go index 9ef694bdccd..c94f71cd8c2 100644 --- a/vendor/github.com/containers/psgo/internal/proc/attr.go +++ b/vendor/github.com/containers/psgo/internal/proc/attr.go @@ -15,19 +15,21 @@ package proc import ( + "errors" "fmt" - "io/ioutil" "os" "strings" + + "golang.org/x/sys/unix" ) // ParseAttrCurrent returns the contents of /proc/$pid/attr/current of "?" if // labeling is not supported on the host. func ParseAttrCurrent(pid string) (string, error) { - data, err := ioutil.ReadFile(fmt.Sprintf("/proc/%s/attr/current", pid)) + data, err := os.ReadFile(fmt.Sprintf("/proc/%s/attr/current", pid)) if err != nil { _, err = os.Stat(fmt.Sprintf("/proc/%s", pid)) - if os.IsNotExist(err) { + if errors.Is(err, os.ErrNotExist) || errors.Is(err, unix.ESRCH) { // PID doesn't exist return "", err } diff --git a/vendor/github.com/containers/psgo/internal/proc/cmdline.go b/vendor/github.com/containers/psgo/internal/proc/cmdline.go index 66914954373..0143589d8b8 100644 --- a/vendor/github.com/containers/psgo/internal/proc/cmdline.go +++ b/vendor/github.com/containers/psgo/internal/proc/cmdline.go @@ -17,12 +17,12 @@ package proc import ( "bytes" "fmt" - "io/ioutil" + "os" ) // ParseCmdLine parses a /proc/$pid/cmdline file and returns a string slice. func ParseCmdLine(pid string) ([]string, error) { - data, err := ioutil.ReadFile(fmt.Sprintf("/proc/%s/cmdline", pid)) + data, err := os.ReadFile(fmt.Sprintf("/proc/%s/cmdline", pid)) if err != nil { return nil, err } diff --git a/vendor/github.com/containers/psgo/internal/proc/ns.go b/vendor/github.com/containers/psgo/internal/proc/ns.go index 9e77b865b39..1983512f864 100644 --- a/vendor/github.com/containers/psgo/internal/proc/ns.go +++ b/vendor/github.com/containers/psgo/internal/proc/ns.go @@ -20,7 +20,7 @@ import ( "io" "os" - "github.com/containers/storage/pkg/idtools" + "go.podman.io/storage/pkg/idtools" ) // ParsePIDNamespace returns the content of /proc/$pid/ns/pid. diff --git a/vendor/github.com/containers/psgo/internal/proc/stat.go b/vendor/github.com/containers/psgo/internal/proc/stat.go index 5e0bafb2b53..57bc8d62091 100644 --- a/vendor/github.com/containers/psgo/internal/proc/stat.go +++ b/vendor/github.com/containers/psgo/internal/proc/stat.go @@ -17,7 +17,7 @@ package proc import ( "errors" "fmt" - "io/ioutil" + "os" "strings" ) @@ -114,7 +114,7 @@ type Stat struct { // readStat is used for mocking in unit tests. var readStat = func(path string) (string, error) { - rawData, err := ioutil.ReadFile(path) + rawData, err := os.ReadFile(path) if err != nil { return "", err } diff --git a/vendor/github.com/containers/psgo/internal/proc/status.go b/vendor/github.com/containers/psgo/internal/proc/status.go index 1b60974a05d..59e4ae94375 100644 --- a/vendor/github.com/containers/psgo/internal/proc/status.go +++ b/vendor/github.com/containers/psgo/internal/proc/status.go @@ -22,7 +22,7 @@ import ( "strings" "sync" - "github.com/containers/storage/pkg/idtools" + "go.podman.io/storage/pkg/idtools" ) // Status is a direct translation of a `/proc/[pid]/status`, which provides much diff --git a/vendor/github.com/containers/psgo/internal/process/process.go b/vendor/github.com/containers/psgo/internal/process/process.go index 71503961090..0516466e1dc 100644 --- a/vendor/github.com/containers/psgo/internal/process/process.go +++ b/vendor/github.com/containers/psgo/internal/process/process.go @@ -23,7 +23,8 @@ import ( "github.com/containers/psgo/internal/host" "github.com/containers/psgo/internal/proc" - "github.com/opencontainers/runc/libcontainer/user" + "github.com/moby/sys/user" + "golang.org/x/sys/unix" ) // Process includes process-related from the /proc FS. @@ -108,7 +109,7 @@ func FromPIDs(pids []string, joinUserNS bool) ([]*Process, error) { for _, pid := range pids { p, err := New(pid, joinUserNS) if err != nil { - if errors.Is(err, os.ErrNotExist) { + if errors.Is(err, os.ErrNotExist) || errors.Is(err, unix.ESRCH) { // proc parsing is racy // Let's ignore "does not exist" errors continue diff --git a/vendor/github.com/containers/psgo/psgo.go b/vendor/github.com/containers/psgo/psgo.go index 5c2c4d0b0b6..696b9f74585 100644 --- a/vendor/github.com/containers/psgo/psgo.go +++ b/vendor/github.com/containers/psgo/psgo.go @@ -29,7 +29,6 @@ package psgo import ( "errors" "fmt" - "io/ioutil" "os" "runtime" "sort" @@ -41,7 +40,7 @@ import ( "github.com/containers/psgo/internal/dev" "github.com/containers/psgo/internal/proc" "github.com/containers/psgo/internal/process" - "github.com/containers/storage/pkg/idtools" + "go.podman.io/storage/pkg/idtools" "golang.org/x/sys/unix" ) @@ -110,7 +109,7 @@ func findID(idStr string, mapping []idtools.IDMap, lookupFunc func(uid string) ( } // User not found, read the overflow - overflow, err := ioutil.ReadFile(overflowFile) + overflow, err := os.ReadFile(overflowFile) if err != nil { return "", err } @@ -477,7 +476,7 @@ func JoinNamespaceAndProcessInfoByPidsWithOptions(pids []string, descriptors []s for _, pid := range pids { ns, err := proc.ParsePIDNamespace(pid) if err != nil { - if errors.Is(err, os.ErrNotExist) { + if errors.Is(err, os.ErrNotExist) || errors.Is(err, unix.ESRCH) { // catch race conditions continue } @@ -492,7 +491,7 @@ func JoinNamespaceAndProcessInfoByPidsWithOptions(pids []string, descriptors []s data := [][]string{} for i, pid := range pidList { pidData, err := JoinNamespaceAndProcessInfoWithOptions(pid, descriptors, options) - if errors.Is(err, os.ErrNotExist) { + if errors.Is(err, os.ErrNotExist) || errors.Is(err, unix.ESRCH) { // catch race conditions continue } diff --git a/vendor/github.com/containers/storage/drivers/register/register_vfs.go b/vendor/github.com/containers/storage/drivers/register/register_vfs.go deleted file mode 100644 index 691ce859291..00000000000 --- a/vendor/github.com/containers/storage/drivers/register/register_vfs.go +++ /dev/null @@ -1,6 +0,0 @@ -package register - -import ( - // register vfs - _ "github.com/containers/storage/drivers/vfs" -) diff --git a/vendor/github.com/opencontainers/runc/libcontainer/user/lookup_deprecated.go b/vendor/github.com/opencontainers/runc/libcontainer/user/lookup_deprecated.go deleted file mode 100644 index c6cd4434551..00000000000 --- a/vendor/github.com/opencontainers/runc/libcontainer/user/lookup_deprecated.go +++ /dev/null @@ -1,81 +0,0 @@ -package user - -import ( - "io" - - "github.com/moby/sys/user" -) - -// LookupUser looks up a user by their username in /etc/passwd. If the user -// cannot be found (or there is no /etc/passwd file on the filesystem), then -// LookupUser returns an error. -func LookupUser(username string) (user.User, error) { - return user.LookupUser(username) -} - -// LookupUid looks up a user by their user id in /etc/passwd. If the user cannot -// be found (or there is no /etc/passwd file on the filesystem), then LookupId -// returns an error. -func LookupUid(uid int) (user.User, error) { //nolint:revive // ignore var-naming: func LookupUid should be LookupUID - return user.LookupUid(uid) -} - -// LookupGroup looks up a group by its name in /etc/group. If the group cannot -// be found (or there is no /etc/group file on the filesystem), then LookupGroup -// returns an error. -func LookupGroup(groupname string) (user.Group, error) { - return user.LookupGroup(groupname) -} - -// LookupGid looks up a group by its group id in /etc/group. If the group cannot -// be found (or there is no /etc/group file on the filesystem), then LookupGid -// returns an error. -func LookupGid(gid int) (user.Group, error) { - return user.LookupGid(gid) -} - -func GetPasswdPath() (string, error) { - return user.GetPasswdPath() -} - -func GetPasswd() (io.ReadCloser, error) { - return user.GetPasswd() -} - -func GetGroupPath() (string, error) { - return user.GetGroupPath() -} - -func GetGroup() (io.ReadCloser, error) { - return user.GetGroup() -} - -// CurrentUser looks up the current user by their user id in /etc/passwd. If the -// user cannot be found (or there is no /etc/passwd file on the filesystem), -// then CurrentUser returns an error. -func CurrentUser() (user.User, error) { - return user.CurrentUser() -} - -// CurrentGroup looks up the current user's group by their primary group id's -// entry in /etc/passwd. If the group cannot be found (or there is no -// /etc/group file on the filesystem), then CurrentGroup returns an error. -func CurrentGroup() (user.Group, error) { - return user.CurrentGroup() -} - -func CurrentUserSubUIDs() ([]user.SubID, error) { - return user.CurrentUserSubUIDs() -} - -func CurrentUserSubGIDs() ([]user.SubID, error) { - return user.CurrentUserSubGIDs() -} - -func CurrentProcessUIDMap() ([]user.IDMap, error) { - return user.CurrentProcessUIDMap() -} - -func CurrentProcessGIDMap() ([]user.IDMap, error) { - return user.CurrentProcessGIDMap() -} diff --git a/vendor/github.com/opencontainers/runc/libcontainer/user/user_deprecated.go b/vendor/github.com/opencontainers/runc/libcontainer/user/user_deprecated.go deleted file mode 100644 index 3c29f3d1d86..00000000000 --- a/vendor/github.com/opencontainers/runc/libcontainer/user/user_deprecated.go +++ /dev/null @@ -1,146 +0,0 @@ -// Package user is an alias for [github.com/moby/sys/user]. -// -// Deprecated: use [github.com/moby/sys/user]. -package user - -import ( - "io" - - "github.com/moby/sys/user" -) - -var ( - // ErrNoPasswdEntries is returned if no matching entries were found in /etc/group. - ErrNoPasswdEntries = user.ErrNoPasswdEntries - // ErrNoGroupEntries is returned if no matching entries were found in /etc/passwd. - ErrNoGroupEntries = user.ErrNoGroupEntries - // ErrRange is returned if a UID or GID is outside of the valid range. - ErrRange = user.ErrRange -) - -type ( - User = user.User - - Group = user.Group - - // SubID represents an entry in /etc/sub{u,g}id. - SubID = user.SubID - - // IDMap represents an entry in /proc/PID/{u,g}id_map. - IDMap = user.IDMap - - ExecUser = user.ExecUser -) - -func ParsePasswdFile(path string) ([]user.User, error) { - return user.ParsePasswdFile(path) -} - -func ParsePasswd(passwd io.Reader) ([]user.User, error) { - return user.ParsePasswd(passwd) -} - -func ParsePasswdFileFilter(path string, filter func(user.User) bool) ([]user.User, error) { - return user.ParsePasswdFileFilter(path, filter) -} - -func ParsePasswdFilter(r io.Reader, filter func(user.User) bool) ([]user.User, error) { - return user.ParsePasswdFilter(r, filter) -} - -func ParseGroupFile(path string) ([]user.Group, error) { - return user.ParseGroupFile(path) -} - -func ParseGroup(group io.Reader) ([]user.Group, error) { - return user.ParseGroup(group) -} - -func ParseGroupFileFilter(path string, filter func(user.Group) bool) ([]user.Group, error) { - return user.ParseGroupFileFilter(path, filter) -} - -func ParseGroupFilter(r io.Reader, filter func(user.Group) bool) ([]user.Group, error) { - return user.ParseGroupFilter(r, filter) -} - -// GetExecUserPath is a wrapper for GetExecUser. It reads data from each of the -// given file paths and uses that data as the arguments to GetExecUser. If the -// files cannot be opened for any reason, the error is ignored and a nil -// io.Reader is passed instead. -func GetExecUserPath(userSpec string, defaults *user.ExecUser, passwdPath, groupPath string) (*user.ExecUser, error) { - return user.GetExecUserPath(userSpec, defaults, passwdPath, groupPath) -} - -// GetExecUser parses a user specification string (using the passwd and group -// readers as sources for /etc/passwd and /etc/group data, respectively). In -// the case of blank fields or missing data from the sources, the values in -// defaults is used. -// -// GetExecUser will return an error if a user or group literal could not be -// found in any entry in passwd and group respectively. -// -// Examples of valid user specifications are: -// - "" -// - "user" -// - "uid" -// - "user:group" -// - "uid:gid -// - "user:gid" -// - "uid:group" -// -// It should be noted that if you specify a numeric user or group id, they will -// not be evaluated as usernames (only the metadata will be filled). So attempting -// to parse a user with user.Name = "1337" will produce the user with a UID of -// 1337. -func GetExecUser(userSpec string, defaults *user.ExecUser, passwd, group io.Reader) (*user.ExecUser, error) { - return user.GetExecUser(userSpec, defaults, passwd, group) -} - -// GetAdditionalGroups looks up a list of groups by name or group id -// against the given /etc/group formatted data. If a group name cannot -// be found, an error will be returned. If a group id cannot be found, -// or the given group data is nil, the id will be returned as-is -// provided it is in the legal range. -func GetAdditionalGroups(additionalGroups []string, group io.Reader) ([]int, error) { - return user.GetAdditionalGroups(additionalGroups, group) -} - -// GetAdditionalGroupsPath is a wrapper around GetAdditionalGroups -// that opens the groupPath given and gives it as an argument to -// GetAdditionalGroups. -func GetAdditionalGroupsPath(additionalGroups []string, groupPath string) ([]int, error) { - return user.GetAdditionalGroupsPath(additionalGroups, groupPath) -} - -func ParseSubIDFile(path string) ([]user.SubID, error) { - return user.ParseSubIDFile(path) -} - -func ParseSubID(subid io.Reader) ([]user.SubID, error) { - return user.ParseSubID(subid) -} - -func ParseSubIDFileFilter(path string, filter func(user.SubID) bool) ([]user.SubID, error) { - return user.ParseSubIDFileFilter(path, filter) -} - -func ParseSubIDFilter(r io.Reader, filter func(user.SubID) bool) ([]user.SubID, error) { - return user.ParseSubIDFilter(r, filter) -} - -func ParseIDMapFile(path string) ([]user.IDMap, error) { - return user.ParseIDMapFile(path) -} - -func ParseIDMap(r io.Reader) ([]user.IDMap, error) { - return user.ParseIDMap(r) -} - -func ParseIDMapFileFilter(path string, filter func(user.IDMap) bool) ([]user.IDMap, error) { - return user.ParseIDMapFileFilter(path, filter) -} - -func ParseIDMapFilter(r io.Reader, filter func(user.IDMap) bool) ([]user.IDMap, error) { - return user.ParseIDMapFilter(r, filter) -} diff --git a/vendor/github.com/openshift/imagebuilder/.travis.yml b/vendor/github.com/openshift/imagebuilder/.travis.yml index 375c3922405..6d65aa2c2cd 100644 --- a/vendor/github.com/openshift/imagebuilder/.travis.yml +++ b/vendor/github.com/openshift/imagebuilder/.travis.yml @@ -21,12 +21,14 @@ before_install: - sudo apt-get update -q -y - sudo apt-get -y -o Dpkg::Options::="--force-confnew" install docker-ce - sudo systemctl enable --now docker.service && sudo systemctl enable --now docker.socket - - docker pull busybox - - docker pull centos:7 - - docker pull alpine + - docker pull mirror.gcr.io/alpine + - docker pull mirror.gcr.io/busybox + - docker pull public.ecr.aws/docker/library/centos:7 + - docker pull mirror.gcr.io/debian - docker pull registry.fedoraproject.org/fedora-minimal - docker pull registry.fedoraproject.org/fedora-minimal:42-x86_64 - docker pull registry.fedoraproject.org/fedora-minimal:42-aarch64 + - docker pull mirror.gcr.io/golang:1.24 - chmod -R go-w ./dockerclient/testdata script: diff --git a/vendor/github.com/openshift/imagebuilder/README.md b/vendor/github.com/openshift/imagebuilder/README.md index 9771c64a275..e83449b2932 100644 --- a/vendor/github.com/openshift/imagebuilder/README.md +++ b/vendor/github.com/openshift/imagebuilder/README.md @@ -102,12 +102,15 @@ Example of usage from OpenShift's experimental `dockerbuild` [command with mount ## Run conformance tests (very slow): ``` -docker rmi busybox; docker pull busybox -docker rmi alpine; docker pull alpine -docker rmi centos:7; docker pull centos:7 +docker rmi mirror.gcr.io/alpine; docker pull mirror.gcr.io/alpine +docker rmi mirror.gcr.io/busybox; docker pull mirror.gcr.io/busybox +docker rmi public.ecr.aws/docker/library/centos:7; docker pull public.ecr.aws/docker/library/centos:7 +docker rmi mirror.gcr.io/debian; docker pull mirror.gcr.io/debian docker rmi registry.fedoraproject.org/fedora-minimal; docker pull registry.fedoraproject.org/fedora-minimal docker rmi registry.fedoraproject.org/fedora-minimal:42-x86_64; docker pull registry.fedoraproject.org/fedora-minimal:42-x86_64 docker rmi registry.fedoraproject.org/fedora-minimal:42-aarch64; docker pull registry.fedoraproject.org/fedora-minimal:42-aarch64 +docker rmi mirror.gcr.io/golang:1.24; docker pull mirror.gcr.io/golang:1.24 +docker rmi mirror.gcr.io/nginx; docker pull mirror.gcr.io/nginx chmod -R go-w ./dockerclient/testdata go test ./dockerclient -tags conformance -timeout 30m ``` diff --git a/vendor/github.com/openshift/imagebuilder/dispatchers.go b/vendor/github.com/openshift/imagebuilder/dispatchers.go index d26601ed828..89edefac0f5 100644 --- a/vendor/github.com/openshift/imagebuilder/dispatchers.go +++ b/vendor/github.com/openshift/imagebuilder/dispatchers.go @@ -20,10 +20,10 @@ import ( "github.com/containerd/errdefs" "github.com/containerd/platforms" - "github.com/containers/storage/pkg/regexp" "github.com/openshift/imagebuilder/internal" "github.com/openshift/imagebuilder/signal" "github.com/openshift/imagebuilder/strslice" + "go.podman.io/storage/pkg/regexp" buildkitcommand "github.com/moby/buildkit/frontend/dockerfile/command" buildkitparser "github.com/moby/buildkit/frontend/dockerfile/parser" diff --git a/vendor/github.com/openshift/imagebuilder/dockerfile/parser/parser.go b/vendor/github.com/openshift/imagebuilder/dockerfile/parser/parser.go index 5e4f4a04bb2..e1d4a21fa13 100644 --- a/vendor/github.com/openshift/imagebuilder/dockerfile/parser/parser.go +++ b/vendor/github.com/openshift/imagebuilder/dockerfile/parser/parser.go @@ -13,12 +13,12 @@ import ( "strings" "unicode" - sRegexp "github.com/containers/storage/pkg/regexp" - "github.com/containers/storage/pkg/system" buildkitparser "github.com/moby/buildkit/frontend/dockerfile/parser" buildkitshell "github.com/moby/buildkit/frontend/dockerfile/shell" "github.com/openshift/imagebuilder/dockerfile/command" "github.com/openshift/imagebuilder/internal" + sRegexp "go.podman.io/storage/pkg/regexp" + "go.podman.io/storage/pkg/system" ) // Node is a structure used to represent a parse tree. diff --git a/vendor/github.com/openshift/imagebuilder/evaluator.go b/vendor/github.com/openshift/imagebuilder/evaluator.go index 7bea4f48cf7..9ecdd9852af 100644 --- a/vendor/github.com/openshift/imagebuilder/evaluator.go +++ b/vendor/github.com/openshift/imagebuilder/evaluator.go @@ -5,9 +5,9 @@ import ( "io" "strings" + buildkitparser "github.com/moby/buildkit/frontend/dockerfile/parser" "github.com/openshift/imagebuilder/dockerfile/command" "github.com/openshift/imagebuilder/dockerfile/parser" - buildkitparser "github.com/moby/buildkit/frontend/dockerfile/parser" ) // ParseDockerfile parses the provided stream as a canonical Dockerfile @@ -35,10 +35,14 @@ var replaceEnvAllowed = map[string]bool{ // Certain commands are allowed to have their args split into more // words after env var replacements. Meaning: -// ENV foo="123 456" -// EXPOSE $foo +// +// ENV foo="123 456" +// EXPOSE $foo +// // should result in the same thing as: -// EXPOSE 123 456 +// +// EXPOSE 123 456 +// // and not treat "123 456" as a single word. // Note that: EXPOSE "$foo" and EXPOSE $foo are not the same thing. // Quotes will cause it to still be treated as single word. @@ -56,7 +60,7 @@ type Step struct { Flags []string Attrs map[string]bool Message string - Heredocs []buildkitparser.Heredoc + Heredocs []buildkitparser.Heredoc Original string } diff --git a/vendor/github.com/openshift/imagebuilder/imagebuilder.spec b/vendor/github.com/openshift/imagebuilder/imagebuilder.spec index 197770b7acc..277209e6c22 100644 --- a/vendor/github.com/openshift/imagebuilder/imagebuilder.spec +++ b/vendor/github.com/openshift/imagebuilder/imagebuilder.spec @@ -12,7 +12,7 @@ # %global golang_version 1.19 -%{!?version: %global version 1.2.16} +%{!?version: %global version 1.2.17} %{!?release: %global release 1} %global package_name imagebuilder %global product_name Container Image Builder diff --git a/vendor/github.com/ulikunitz/xz/TODO.md b/vendor/github.com/ulikunitz/xz/TODO.md index 2830c386069..8f9650c13da 100644 --- a/vendor/github.com/ulikunitz/xz/TODO.md +++ b/vendor/github.com/ulikunitz/xz/TODO.md @@ -1,9 +1,5 @@ # TODO list -## Release v0.5.x - -1. Support check flag in gxz command. - ## Release v0.6 1. Review encoder and check for lzma improvements under xz. @@ -86,6 +82,13 @@ ## Log +## 2025-08-28 + +Release v0.5.14 addresses the security vulnerability CVE-2025-58058. If you put +bytes in from of a LZMA stream, the header might not be read correctly and +memory for the dictionary buffer allocated. I have implemented mitigations for +the problem. + ### 2025-08-20 Release v0.5.13 addressed issue #61 regarding handling of multiple WriteClosers diff --git a/vendor/github.com/ulikunitz/xz/lzma/header.go b/vendor/github.com/ulikunitz/xz/lzma/header.go index 1ae7d80cab1..34aa097e15b 100644 --- a/vendor/github.com/ulikunitz/xz/lzma/header.go +++ b/vendor/github.com/ulikunitz/xz/lzma/header.go @@ -60,36 +60,36 @@ const noHeaderSize uint64 = 1<<64 - 1 // HeaderLen provides the length of the LZMA file header. const HeaderLen = 13 -// header represents the header of an LZMA file. -type header struct { - properties Properties - dictCap int - // uncompressed size; negative value if no size is given - size int64 +// Header represents the Header of an LZMA file. +type Header struct { + Properties Properties + DictSize uint32 + // uncompressed Size; negative value if no Size is given + Size int64 } // marshalBinary marshals the header. -func (h *header) marshalBinary() (data []byte, err error) { - if err = h.properties.verify(); err != nil { +func (h *Header) marshalBinary() (data []byte, err error) { + if err = h.Properties.verify(); err != nil { return nil, err } - if !(0 <= h.dictCap && int64(h.dictCap) <= MaxDictCap) { + if !(h.DictSize <= MaxDictCap) { return nil, fmt.Errorf("lzma: DictCap %d out of range", - h.dictCap) + h.DictSize) } data = make([]byte, 13) // property byte - data[0] = h.properties.Code() + data[0] = h.Properties.Code() // dictionary capacity - putUint32LE(data[1:5], uint32(h.dictCap)) + putUint32LE(data[1:5], uint32(h.DictSize)) // uncompressed size var s uint64 - if h.size > 0 { - s = uint64(h.size) + if h.Size > 0 { + s = uint64(h.Size) } else { s = noHeaderSize } @@ -99,20 +99,20 @@ func (h *header) marshalBinary() (data []byte, err error) { } // unmarshalBinary unmarshals the header. -func (h *header) unmarshalBinary(data []byte) error { +func (h *Header) unmarshalBinary(data []byte) error { if len(data) != HeaderLen { return errors.New("lzma.unmarshalBinary: data has wrong length") } // properties var err error - if h.properties, err = PropertiesForCode(data[0]); err != nil { + if h.Properties, err = PropertiesForCode(data[0]); err != nil { return err } // dictionary capacity - h.dictCap = int(uint32LE(data[1:])) - if h.dictCap < 0 { + h.DictSize = uint32LE(data[1:]) + if int(h.DictSize) < 0 { return errors.New( "LZMA header: dictionary capacity exceeds maximum " + "integer") @@ -121,10 +121,10 @@ func (h *header) unmarshalBinary(data []byte) error { // uncompressed size s := uint64LE(data[5:]) if s == noHeaderSize { - h.size = -1 + h.Size = -1 } else { - h.size = int64(s) - if h.size < 0 { + h.Size = int64(s) + if h.Size < 0 { return errors.New( "LZMA header: uncompressed size " + "out of int64 range") @@ -134,9 +134,9 @@ func (h *header) unmarshalBinary(data []byte) error { return nil } -// validDictCap checks whether the dictionary capacity is correct. This +// validDictSize checks whether the dictionary capacity is correct. This // is used to weed out wrong file headers. -func validDictCap(dictcap int) bool { +func validDictSize(dictcap int) bool { if int64(dictcap) == MaxDictCap { return true } @@ -155,13 +155,16 @@ func validDictCap(dictcap int) bool { // dictionary sizes of 2^n or 2^n+2^(n-1) with n >= 10 or 2^32-1. If // there is an explicit size it must not exceed 256 GiB. The length of // the data argument must be HeaderLen. +// +// This function should be disregarded because there is no guarantee that LZMA +// files follow the constraints. func ValidHeader(data []byte) bool { - var h header + var h Header if err := h.unmarshalBinary(data); err != nil { return false } - if !validDictCap(h.dictCap) { + if !validDictSize(int(h.DictSize)) { return false } - return h.size < 0 || h.size <= 1<<38 + return h.Size < 0 || h.Size <= 1<<38 } diff --git a/vendor/github.com/ulikunitz/xz/lzma/reader.go b/vendor/github.com/ulikunitz/xz/lzma/reader.go index ae911c38931..eef6bea76b8 100644 --- a/vendor/github.com/ulikunitz/xz/lzma/reader.go +++ b/vendor/github.com/ulikunitz/xz/lzma/reader.go @@ -6,25 +6,32 @@ // Reader and Writer support the classic LZMA format. Reader2 and // Writer2 support the decoding and encoding of LZMA2 streams. // -// The package is written completely in Go and doesn't rely on any external +// The package is written completely in Go and does not rely on any external // library. package lzma import ( "errors" + "fmt" "io" ) // ReaderConfig stores the parameters for the reader of the classic LZMA // format. type ReaderConfig struct { + // Since v0.5.14 this parameter sets an upper limit for a .lzma file's + // dictionary size. This helps to mitigate problems with mangled + // headers. DictCap int } // fill converts the zero values of the configuration to the default values. func (c *ReaderConfig) fill() { if c.DictCap == 0 { - c.DictCap = 8 * 1024 * 1024 + // set an upper limit of 2 GiB-1 for dictionary capacity + // to address the zero prefix security issue. + c.DictCap = (1 << 31) - 1 + // original: c.DictCap = 8 * 1024 * 1024 } } @@ -39,10 +46,33 @@ func (c *ReaderConfig) Verify() error { } // Reader provides a reader for LZMA files or streams. +// +// # Security concerns +// +// Note that LZMA format doesn't support a magic marker in the header. So +// [NewReader] cannot determine whether it reads the actual header. For instance +// the LZMA stream might have a zero byte in front of the reader, leading to +// larger dictionary sizes and file sizes. The code will detect later that there +// are problems with the stream, but the dictionary has already been allocated +// and this might consume a lot of memory. +// +// Version 0.5.14 introduces built-in mitigations: +// +// - The [ReaderConfig] DictCap field is now interpreted as a limit for the +// dictionary size. +// - The default is 2 Gigabytes minus 1 byte (2^31-1 bytes). +// - Users can check with the [Reader.Header] method what the actual values are in +// their LZMA files and set a smaller limit using [ReaderConfig]. +// - The dictionary size doesn't exceed the larger of the file size and +// the minimum dictionary size. This is another measure to prevent huge +// memory allocations for the dictionary. +// - The code supports stream sizes only up to a pebibyte (1024^5). type Reader struct { - lzma io.Reader - h header - d *decoder + lzma io.Reader + header Header + // headerOrig stores the original header read from the stream. + headerOrig Header + d *decoder } // NewReader creates a new reader for an LZMA stream using the classic @@ -51,8 +81,37 @@ func NewReader(lzma io.Reader) (r *Reader, err error) { return ReaderConfig{}.NewReader(lzma) } +// ErrDictSize reports about an error of the dictionary size. +type ErrDictSize struct { + ConfigDictCap int + HeaderDictSize uint32 + Message string +} + +// Error returns the error message. +func (e *ErrDictSize) Error() string { + return e.Message +} + +func newErrDictSize(messageformat string, + configDictCap int, headerDictSize uint32, + args ...interface{}) *ErrDictSize { + newArgs := make([]interface{}, len(args)+2) + newArgs[0] = configDictCap + newArgs[1] = headerDictSize + copy(newArgs[2:], args) + return &ErrDictSize{ + ConfigDictCap: configDictCap, + HeaderDictSize: headerDictSize, + Message: fmt.Sprintf(messageformat, newArgs...), + } +} + +// We support only files not larger than 1 << 50 bytes (a pebibyte, 1024^5). +const maxStreamSize = 1 << 50 + // NewReader creates a new reader for an LZMA stream in the classic -// format. The function reads and verifies the the header of the LZMA +// format. The function reads and verifies the header of the LZMA // stream. func (c ReaderConfig) NewReader(lzma io.Reader) (r *Reader, err error) { if err = c.Verify(); err != nil { @@ -66,29 +125,63 @@ func (c ReaderConfig) NewReader(lzma io.Reader) (r *Reader, err error) { return nil, err } r = &Reader{lzma: lzma} - if err = r.h.unmarshalBinary(data); err != nil { + if err = r.header.unmarshalBinary(data); err != nil { return nil, err } - if r.h.dictCap < MinDictCap { - r.h.dictCap = MinDictCap + r.headerOrig = r.header + dictSize := int64(r.header.DictSize) + if int64(c.DictCap) < dictSize { + return nil, newErrDictSize( + "lzma: header dictionary size %[2]d exceeds configured dictionary capacity %[1]d", + c.DictCap, uint32(dictSize), + ) + } + if dictSize < MinDictCap { + dictSize = MinDictCap + } + // original code: disabled this because there is no point in increasing + // the dictionary above what is stated in the file. + /* + if int64(c.DictCap) > int64(dictSize) { + dictSize = int64(c.DictCap) + } + */ + size := r.header.Size + if size >= 0 && size < dictSize { + dictSize = size } - dictCap := r.h.dictCap - if c.DictCap > dictCap { - dictCap = c.DictCap + // Protect against modified or malicious headers. + if size > maxStreamSize { + return nil, fmt.Errorf( + "lzma: stream size %d exceeds a pebibyte (1024^5)", + size) } + if dictSize < MinDictCap { + dictSize = MinDictCap + } + + r.header.DictSize = uint32(dictSize) - state := newState(r.h.properties) - dict, err := newDecoderDict(dictCap) + state := newState(r.header.Properties) + dict, err := newDecoderDict(int(dictSize)) if err != nil { return nil, err } - r.d, err = newDecoder(ByteReader(lzma), state, dict, r.h.size) + r.d, err = newDecoder(ByteReader(lzma), state, dict, r.header.Size) if err != nil { return nil, err } return r, nil } +// Header returns the header as read from the LZMA stream. It is intended to +// allow the user to understand what parameters are typically provided in the +// headers of the LZMA files and set the DictCap field in [ReaderConfig] +// accordingly. +func (r *Reader) Header() (h Header, ok bool) { + return r.headerOrig, r.d != nil +} + // EOSMarker indicates that an EOS marker has been encountered. func (r *Reader) EOSMarker() bool { return r.d.eosMarker diff --git a/vendor/github.com/ulikunitz/xz/lzma/writer.go b/vendor/github.com/ulikunitz/xz/lzma/writer.go index e8f89811d3e..f73bb73f286 100644 --- a/vendor/github.com/ulikunitz/xz/lzma/writer.go +++ b/vendor/github.com/ulikunitz/xz/lzma/writer.go @@ -96,21 +96,21 @@ func (c *WriterConfig) Verify() error { } // header returns the header structure for this configuration. -func (c *WriterConfig) header() header { - h := header{ - properties: *c.Properties, - dictCap: c.DictCap, - size: -1, +func (c *WriterConfig) header() Header { + h := Header{ + Properties: *c.Properties, + DictSize: uint32(c.DictCap), + Size: -1, } if c.SizeInHeader { - h.size = c.Size + h.Size = c.Size } return h } // Writer writes an LZMA stream in the classic format. type Writer struct { - h header + h Header bw io.ByteWriter buf *bufio.Writer e *encoder @@ -130,12 +130,12 @@ func (c WriterConfig) NewWriter(lzma io.Writer) (w *Writer, err error) { w.buf = bufio.NewWriter(lzma) w.bw = w.buf } - state := newState(w.h.properties) - m, err := c.Matcher.new(w.h.dictCap) + state := newState(w.h.Properties) + m, err := c.Matcher.new(int(w.h.DictSize)) if err != nil { return nil, err } - dict, err := newEncoderDict(w.h.dictCap, c.BufSize, m) + dict, err := newEncoderDict(int(w.h.DictSize), c.BufSize, m) if err != nil { return nil, err } @@ -171,8 +171,8 @@ func (w *Writer) writeHeader() error { // Write puts data into the Writer. func (w *Writer) Write(p []byte) (n int, err error) { - if w.h.size >= 0 { - m := w.h.size + if w.h.Size >= 0 { + m := w.h.Size m -= w.e.Compressed() + int64(w.e.dict.Buffered()) if m < 0 { m = 0 @@ -192,9 +192,9 @@ func (w *Writer) Write(p []byte) (n int, err error) { // Close closes the writer stream. It ensures that all data from the // buffer will be compressed and the LZMA stream will be finished. func (w *Writer) Close() error { - if w.h.size >= 0 { + if w.h.Size >= 0 { n := w.e.Compressed() + int64(w.e.dict.Buffered()) - if n != w.h.size { + if n != w.h.Size { return errSize } } diff --git a/vendor/go.podman.io/common/LICENSE b/vendor/go.podman.io/common/LICENSE new file mode 100644 index 00000000000..8dada3edaf5 --- /dev/null +++ b/vendor/go.podman.io/common/LICENSE @@ -0,0 +1,201 @@ + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "{}" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright {yyyy} {name of copyright owner} + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/vendor/github.com/containers/common/internal/attributedstring/slice.go b/vendor/go.podman.io/common/internal/attributedstring/slice.go similarity index 100% rename from vendor/github.com/containers/common/internal/attributedstring/slice.go rename to vendor/go.podman.io/common/internal/attributedstring/slice.go diff --git a/vendor/github.com/containers/common/internal/deepcopy.go b/vendor/go.podman.io/common/internal/deepcopy.go similarity index 100% rename from vendor/github.com/containers/common/internal/deepcopy.go rename to vendor/go.podman.io/common/internal/deepcopy.go diff --git a/vendor/github.com/containers/common/libimage/copier.go b/vendor/go.podman.io/common/libimage/copier.go similarity index 97% rename from vendor/github.com/containers/common/libimage/copier.go rename to vendor/go.podman.io/common/libimage/copier.go index d2b46462ca3..e81dfaf0f83 100644 --- a/vendor/github.com/containers/common/libimage/copier.go +++ b/vendor/go.podman.io/common/libimage/copier.go @@ -12,20 +12,20 @@ import ( "strings" "time" - "github.com/containers/common/libimage/platform" - "github.com/containers/common/pkg/config" - "github.com/containers/common/pkg/retry" - "github.com/containers/image/v5/copy" - "github.com/containers/image/v5/docker/reference" - "github.com/containers/image/v5/pkg/compression" - "github.com/containers/image/v5/signature" - "github.com/containers/image/v5/signature/signer" - storageTransport "github.com/containers/image/v5/storage" - "github.com/containers/image/v5/transports" - "github.com/containers/image/v5/types" encconfig "github.com/containers/ocicrypt/config" - "github.com/containers/storage" "github.com/sirupsen/logrus" + "go.podman.io/common/libimage/platform" + "go.podman.io/common/pkg/config" + "go.podman.io/common/pkg/retry" + "go.podman.io/image/v5/copy" + "go.podman.io/image/v5/docker/reference" + "go.podman.io/image/v5/pkg/compression" + "go.podman.io/image/v5/signature" + "go.podman.io/image/v5/signature/signer" + storageTransport "go.podman.io/image/v5/storage" + "go.podman.io/image/v5/transports" + "go.podman.io/image/v5/types" + "go.podman.io/storage" ) const ( diff --git a/vendor/github.com/containers/common/libimage/define/manifests.go b/vendor/go.podman.io/common/libimage/define/manifests.go similarity index 97% rename from vendor/github.com/containers/common/libimage/define/manifests.go rename to vendor/go.podman.io/common/libimage/define/manifests.go index c59a58f70fe..325d03e3211 100644 --- a/vendor/github.com/containers/common/libimage/define/manifests.go +++ b/vendor/go.podman.io/common/libimage/define/manifests.go @@ -1,7 +1,7 @@ package define import ( - "github.com/containers/image/v5/manifest" + "go.podman.io/image/v5/manifest" ) // ManifestListDescriptor describes a manifest that is mentioned in an diff --git a/vendor/github.com/containers/common/libimage/define/platform.go b/vendor/go.podman.io/common/libimage/define/platform.go similarity index 100% rename from vendor/github.com/containers/common/libimage/define/platform.go rename to vendor/go.podman.io/common/libimage/define/platform.go diff --git a/vendor/github.com/containers/common/libimage/define/search.go b/vendor/go.podman.io/common/libimage/define/search.go similarity index 100% rename from vendor/github.com/containers/common/libimage/define/search.go rename to vendor/go.podman.io/common/libimage/define/search.go diff --git a/vendor/github.com/containers/common/libimage/disk_usage.go b/vendor/go.podman.io/common/libimage/disk_usage.go similarity index 99% rename from vendor/github.com/containers/common/libimage/disk_usage.go rename to vendor/go.podman.io/common/libimage/disk_usage.go index 581c23a86f0..49002445bb2 100644 --- a/vendor/github.com/containers/common/libimage/disk_usage.go +++ b/vendor/go.podman.io/common/libimage/disk_usage.go @@ -6,8 +6,8 @@ import ( "context" "time" - "github.com/containers/storage" "github.com/sirupsen/logrus" + "go.podman.io/storage" ) // ImageDiskUsage reports the total size of an image. That is the size diff --git a/vendor/github.com/containers/common/libimage/events.go b/vendor/go.podman.io/common/libimage/events.go similarity index 100% rename from vendor/github.com/containers/common/libimage/events.go rename to vendor/go.podman.io/common/libimage/events.go diff --git a/vendor/github.com/containers/common/libimage/filter/filter.go b/vendor/go.podman.io/common/libimage/filter/filter.go similarity index 94% rename from vendor/github.com/containers/common/libimage/filter/filter.go rename to vendor/go.podman.io/common/libimage/filter/filter.go index 098d2998dd6..2f3f03baa4a 100644 --- a/vendor/github.com/containers/common/libimage/filter/filter.go +++ b/vendor/go.podman.io/common/libimage/filter/filter.go @@ -5,8 +5,8 @@ import ( "strconv" "strings" - "github.com/containers/common/libimage/define" - "github.com/containers/image/v5/types" + "go.podman.io/common/libimage/define" + "go.podman.io/image/v5/types" ) // SearchFilter allows filtering images while searching. diff --git a/vendor/github.com/containers/common/libimage/filters.go b/vendor/go.podman.io/common/libimage/filters.go similarity index 99% rename from vendor/github.com/containers/common/libimage/filters.go rename to vendor/go.podman.io/common/libimage/filters.go index b8bcecc8683..cf239b48f54 100644 --- a/vendor/github.com/containers/common/libimage/filters.go +++ b/vendor/go.podman.io/common/libimage/filters.go @@ -11,10 +11,10 @@ import ( "strings" "time" - filtersPkg "github.com/containers/common/pkg/filters" - "github.com/containers/common/pkg/timetype" - "github.com/containers/image/v5/docker/reference" "github.com/sirupsen/logrus" + filtersPkg "go.podman.io/common/pkg/filters" + "go.podman.io/common/pkg/timetype" + "go.podman.io/image/v5/docker/reference" ) // filterFunc is a prototype for a positive image filter. Returning `true` diff --git a/vendor/github.com/containers/common/libimage/history.go b/vendor/go.podman.io/common/libimage/history.go similarity index 100% rename from vendor/github.com/containers/common/libimage/history.go rename to vendor/go.podman.io/common/libimage/history.go diff --git a/vendor/github.com/containers/common/libimage/image.go b/vendor/go.podman.io/common/libimage/image.go similarity index 99% rename from vendor/github.com/containers/common/libimage/image.go rename to vendor/go.podman.io/common/libimage/image.go index c346d5dd1bb..1665c0494ee 100644 --- a/vendor/github.com/containers/common/libimage/image.go +++ b/vendor/go.podman.io/common/libimage/image.go @@ -12,17 +12,17 @@ import ( "time" "github.com/containerd/platforms" - "github.com/containers/common/libimage/platform" - "github.com/containers/image/v5/docker/reference" - "github.com/containers/image/v5/image" - "github.com/containers/image/v5/manifest" - storageTransport "github.com/containers/image/v5/storage" - "github.com/containers/image/v5/types" - "github.com/containers/storage" "github.com/hashicorp/go-multierror" "github.com/opencontainers/go-digest" ociv1 "github.com/opencontainers/image-spec/specs-go/v1" "github.com/sirupsen/logrus" + "go.podman.io/common/libimage/platform" + "go.podman.io/image/v5/docker/reference" + "go.podman.io/image/v5/image" + "go.podman.io/image/v5/manifest" + storageTransport "go.podman.io/image/v5/storage" + "go.podman.io/image/v5/types" + "go.podman.io/storage" ) // Image represents an image in the containers storage and allows for further diff --git a/vendor/github.com/containers/common/libimage/image_config.go b/vendor/go.podman.io/common/libimage/image_config.go similarity index 99% rename from vendor/github.com/containers/common/libimage/image_config.go rename to vendor/go.podman.io/common/libimage/image_config.go index cd4ed3c4e11..550f0cd71c0 100644 --- a/vendor/github.com/containers/common/libimage/image_config.go +++ b/vendor/go.podman.io/common/libimage/image_config.go @@ -8,8 +8,8 @@ import ( "strconv" "strings" - "github.com/containers/common/pkg/signal" ociv1 "github.com/opencontainers/image-spec/specs-go/v1" + "go.podman.io/common/pkg/signal" ) // ImageConfig is a wrapper around the OCIv1 Image Configuration struct exported diff --git a/vendor/github.com/containers/common/libimage/image_tree.go b/vendor/go.podman.io/common/libimage/image_tree.go similarity index 100% rename from vendor/github.com/containers/common/libimage/image_tree.go rename to vendor/go.podman.io/common/libimage/image_tree.go diff --git a/vendor/github.com/containers/common/libimage/import.go b/vendor/go.podman.io/common/libimage/import.go similarity index 94% rename from vendor/github.com/containers/common/libimage/import.go rename to vendor/go.podman.io/common/libimage/import.go index a03f288533c..54a77e4e95d 100644 --- a/vendor/github.com/containers/common/libimage/import.go +++ b/vendor/go.podman.io/common/libimage/import.go @@ -9,11 +9,11 @@ import ( "net/url" "os" - "github.com/containers/common/pkg/download" - storageTransport "github.com/containers/image/v5/storage" - tarballTransport "github.com/containers/image/v5/tarball" v1 "github.com/opencontainers/image-spec/specs-go/v1" "github.com/sirupsen/logrus" + "go.podman.io/common/pkg/download" + storageTransport "go.podman.io/image/v5/storage" + tarballTransport "go.podman.io/image/v5/tarball" ) // ImportOptions allow for customizing image imports. diff --git a/vendor/github.com/containers/common/libimage/inspect.go b/vendor/go.podman.io/common/libimage/inspect.go similarity index 98% rename from vendor/github.com/containers/common/libimage/inspect.go rename to vendor/go.podman.io/common/libimage/inspect.go index ddec7015a39..d1e4509472b 100644 --- a/vendor/github.com/containers/common/libimage/inspect.go +++ b/vendor/go.podman.io/common/libimage/inspect.go @@ -6,12 +6,12 @@ import ( "context" "time" - "github.com/containers/image/v5/image" - "github.com/containers/image/v5/manifest" - "github.com/containers/image/v5/types" "github.com/opencontainers/go-digest" ociv1 "github.com/opencontainers/image-spec/specs-go/v1" "github.com/sirupsen/logrus" + "go.podman.io/image/v5/image" + "go.podman.io/image/v5/manifest" + "go.podman.io/image/v5/types" ) // ImageData contains the inspected data of an image. diff --git a/vendor/github.com/containers/common/libimage/layer_tree.go b/vendor/go.podman.io/common/libimage/layer_tree.go similarity index 99% rename from vendor/github.com/containers/common/libimage/layer_tree.go rename to vendor/go.podman.io/common/libimage/layer_tree.go index a8ee82cb51a..0dc7dce00fa 100644 --- a/vendor/github.com/containers/common/libimage/layer_tree.go +++ b/vendor/go.podman.io/common/libimage/layer_tree.go @@ -6,11 +6,11 @@ import ( "context" "errors" - "github.com/containers/storage" - storageTypes "github.com/containers/storage/types" digest "github.com/opencontainers/go-digest" ociv1 "github.com/opencontainers/image-spec/specs-go/v1" "github.com/sirupsen/logrus" + "go.podman.io/storage" + storageTypes "go.podman.io/storage/types" ) // layerTree is an internal representation of local layers. diff --git a/vendor/github.com/containers/common/libimage/load.go b/vendor/go.podman.io/common/libimage/load.go similarity index 93% rename from vendor/github.com/containers/common/libimage/load.go rename to vendor/go.podman.io/common/libimage/load.go index 2f69fd639ba..598bf39cdc1 100644 --- a/vendor/github.com/containers/common/libimage/load.go +++ b/vendor/go.podman.io/common/libimage/load.go @@ -8,14 +8,14 @@ import ( "fmt" "time" - dirTransport "github.com/containers/image/v5/directory" - dockerArchiveTransport "github.com/containers/image/v5/docker/archive" - ociArchiveTransport "github.com/containers/image/v5/oci/archive" - ociTransport "github.com/containers/image/v5/oci/layout" - "github.com/containers/image/v5/transports" - "github.com/containers/image/v5/types" - "github.com/containers/storage/pkg/fileutils" "github.com/sirupsen/logrus" + dirTransport "go.podman.io/image/v5/directory" + dockerArchiveTransport "go.podman.io/image/v5/docker/archive" + ociArchiveTransport "go.podman.io/image/v5/oci/archive" + ociTransport "go.podman.io/image/v5/oci/layout" + "go.podman.io/image/v5/transports" + "go.podman.io/image/v5/types" + "go.podman.io/storage/pkg/fileutils" ) type LoadOptions struct { diff --git a/vendor/github.com/containers/common/libimage/manifest_list.go b/vendor/go.podman.io/common/libimage/manifest_list.go similarity index 97% rename from vendor/github.com/containers/common/libimage/manifest_list.go rename to vendor/go.podman.io/common/libimage/manifest_list.go index f7b2b05f05b..18d34d1f063 100644 --- a/vendor/github.com/containers/common/libimage/manifest_list.go +++ b/vendor/go.podman.io/common/libimage/manifest_list.go @@ -12,24 +12,24 @@ import ( "slices" "time" - "github.com/containers/common/libimage/define" - "github.com/containers/common/libimage/manifests" - manifesterrors "github.com/containers/common/pkg/manifests" - "github.com/containers/common/pkg/supplemented" - imageCopy "github.com/containers/image/v5/copy" - "github.com/containers/image/v5/docker" - "github.com/containers/image/v5/image" - "github.com/containers/image/v5/manifest" - "github.com/containers/image/v5/oci/layout" - "github.com/containers/image/v5/signature" - "github.com/containers/image/v5/transports/alltransports" - "github.com/containers/image/v5/types" - "github.com/containers/storage" structcopier "github.com/jinzhu/copier" "github.com/opencontainers/go-digest" imgspec "github.com/opencontainers/image-spec/specs-go" imgspecv1 "github.com/opencontainers/image-spec/specs-go/v1" "github.com/sirupsen/logrus" + "go.podman.io/common/libimage/define" + "go.podman.io/common/libimage/manifests" + manifesterrors "go.podman.io/common/pkg/manifests" + "go.podman.io/common/pkg/supplemented" + imageCopy "go.podman.io/image/v5/copy" + "go.podman.io/image/v5/docker" + "go.podman.io/image/v5/image" + "go.podman.io/image/v5/manifest" + "go.podman.io/image/v5/oci/layout" + "go.podman.io/image/v5/signature" + "go.podman.io/image/v5/transports/alltransports" + "go.podman.io/image/v5/types" + "go.podman.io/storage" ) // NOTE: the abstractions and APIs here are a first step to further merge diff --git a/vendor/github.com/containers/common/libimage/manifests/copy.go b/vendor/go.podman.io/common/libimage/manifests/copy.go similarity index 87% rename from vendor/github.com/containers/common/libimage/manifests/copy.go rename to vendor/go.podman.io/common/libimage/manifests/copy.go index 578b64ca838..3e4db42114a 100644 --- a/vendor/github.com/containers/common/libimage/manifests/copy.go +++ b/vendor/go.podman.io/common/libimage/manifests/copy.go @@ -1,7 +1,7 @@ package manifests import ( - "github.com/containers/image/v5/signature" + "go.podman.io/image/v5/signature" ) // storageAllowedPolicyScopes overrides the policy for local storage diff --git a/vendor/github.com/containers/common/libimage/manifests/manifests.go b/vendor/go.podman.io/common/libimage/manifests/manifests.go similarity index 97% rename from vendor/github.com/containers/common/libimage/manifests/manifests.go rename to vendor/go.podman.io/common/libimage/manifests/manifests.go index f0bfafbf736..192b5580eeb 100644 --- a/vendor/github.com/containers/common/libimage/manifests/manifests.go +++ b/vendor/go.podman.io/common/libimage/manifests/manifests.go @@ -17,30 +17,30 @@ import ( "strings" "time" - "github.com/containers/common/internal" - "github.com/containers/common/pkg/manifests" - "github.com/containers/common/pkg/retry" - "github.com/containers/common/pkg/supplemented" - cp "github.com/containers/image/v5/copy" - "github.com/containers/image/v5/docker/reference" - "github.com/containers/image/v5/image" - "github.com/containers/image/v5/manifest" - ocilayout "github.com/containers/image/v5/oci/layout" - "github.com/containers/image/v5/pkg/compression" - "github.com/containers/image/v5/signature" - "github.com/containers/image/v5/signature/signer" - is "github.com/containers/image/v5/storage" - "github.com/containers/image/v5/transports" - "github.com/containers/image/v5/transports/alltransports" - "github.com/containers/image/v5/types" - "github.com/containers/storage" - "github.com/containers/storage/pkg/fileutils" - "github.com/containers/storage/pkg/ioutils" - "github.com/containers/storage/pkg/lockfile" digest "github.com/opencontainers/go-digest" imgspec "github.com/opencontainers/image-spec/specs-go" v1 "github.com/opencontainers/image-spec/specs-go/v1" "github.com/sirupsen/logrus" + "go.podman.io/common/internal" + "go.podman.io/common/pkg/manifests" + "go.podman.io/common/pkg/retry" + "go.podman.io/common/pkg/supplemented" + cp "go.podman.io/image/v5/copy" + "go.podman.io/image/v5/docker/reference" + "go.podman.io/image/v5/image" + "go.podman.io/image/v5/manifest" + ocilayout "go.podman.io/image/v5/oci/layout" + "go.podman.io/image/v5/pkg/compression" + "go.podman.io/image/v5/signature" + "go.podman.io/image/v5/signature/signer" + is "go.podman.io/image/v5/storage" + "go.podman.io/image/v5/transports" + "go.podman.io/image/v5/transports/alltransports" + "go.podman.io/image/v5/types" + "go.podman.io/storage" + "go.podman.io/storage/pkg/fileutils" + "go.podman.io/storage/pkg/ioutils" + "go.podman.io/storage/pkg/lockfile" ) const ( diff --git a/vendor/github.com/containers/common/libimage/normalize.go b/vendor/go.podman.io/common/libimage/normalize.go similarity index 98% rename from vendor/github.com/containers/common/libimage/normalize.go rename to vendor/go.podman.io/common/libimage/normalize.go index 1dab82fe275..393b390a751 100644 --- a/vendor/github.com/containers/common/libimage/normalize.go +++ b/vendor/go.podman.io/common/libimage/normalize.go @@ -6,8 +6,8 @@ import ( "fmt" "strings" - "github.com/containers/image/v5/docker/reference" "github.com/sirupsen/logrus" + "go.podman.io/image/v5/docker/reference" ) // NormalizeName normalizes the provided name according to the conventions by diff --git a/vendor/github.com/containers/common/libimage/oci.go b/vendor/go.podman.io/common/libimage/oci.go similarity index 100% rename from vendor/github.com/containers/common/libimage/oci.go rename to vendor/go.podman.io/common/libimage/oci.go diff --git a/vendor/github.com/containers/common/libimage/platform.go b/vendor/go.podman.io/common/libimage/platform.go similarity index 91% rename from vendor/github.com/containers/common/libimage/platform.go rename to vendor/go.podman.io/common/libimage/platform.go index bf8b054b14f..6be272c43f5 100644 --- a/vendor/github.com/containers/common/libimage/platform.go +++ b/vendor/go.podman.io/common/libimage/platform.go @@ -3,8 +3,8 @@ package libimage import ( - "github.com/containers/common/libimage/define" - "github.com/containers/common/libimage/platform" + "go.podman.io/common/libimage/define" + "go.podman.io/common/libimage/platform" ) // PlatformPolicy controls the behavior of image-platform matching. diff --git a/vendor/github.com/containers/common/libimage/platform/platform.go b/vendor/go.podman.io/common/libimage/platform/platform.go similarity index 100% rename from vendor/github.com/containers/common/libimage/platform/platform.go rename to vendor/go.podman.io/common/libimage/platform/platform.go diff --git a/vendor/github.com/containers/common/libimage/pull.go b/vendor/go.podman.io/common/libimage/pull.go similarity index 97% rename from vendor/github.com/containers/common/libimage/pull.go rename to vendor/go.podman.io/common/libimage/pull.go index 522bebe4131..32a391fea68 100644 --- a/vendor/github.com/containers/common/libimage/pull.go +++ b/vendor/go.podman.io/common/libimage/pull.go @@ -12,20 +12,20 @@ import ( "strings" "time" - "github.com/containers/common/pkg/config" - registryTransport "github.com/containers/image/v5/docker" - dockerArchiveTransport "github.com/containers/image/v5/docker/archive" - dockerDaemonTransport "github.com/containers/image/v5/docker/daemon" - "github.com/containers/image/v5/docker/reference" - ociArchiveTransport "github.com/containers/image/v5/oci/archive" - ociTransport "github.com/containers/image/v5/oci/layout" - "github.com/containers/image/v5/pkg/shortnames" - storageTransport "github.com/containers/image/v5/storage" - "github.com/containers/image/v5/transports/alltransports" - "github.com/containers/image/v5/types" - "github.com/containers/storage" ociSpec "github.com/opencontainers/image-spec/specs-go/v1" "github.com/sirupsen/logrus" + "go.podman.io/common/pkg/config" + registryTransport "go.podman.io/image/v5/docker" + dockerArchiveTransport "go.podman.io/image/v5/docker/archive" + dockerDaemonTransport "go.podman.io/image/v5/docker/daemon" + "go.podman.io/image/v5/docker/reference" + ociArchiveTransport "go.podman.io/image/v5/oci/archive" + ociTransport "go.podman.io/image/v5/oci/layout" + "go.podman.io/image/v5/pkg/shortnames" + storageTransport "go.podman.io/image/v5/storage" + "go.podman.io/image/v5/transports/alltransports" + "go.podman.io/image/v5/types" + "go.podman.io/storage" ) // PullOptions allows for customizing image pulls. diff --git a/vendor/github.com/containers/common/libimage/push.go b/vendor/go.podman.io/common/libimage/push.go similarity index 90% rename from vendor/github.com/containers/common/libimage/push.go rename to vendor/go.podman.io/common/libimage/push.go index a4fddd46437..e0e7d1866c1 100644 --- a/vendor/github.com/containers/common/libimage/push.go +++ b/vendor/go.podman.io/common/libimage/push.go @@ -7,14 +7,14 @@ import ( "fmt" "time" - "github.com/containers/common/pkg/config" - dockerArchiveTransport "github.com/containers/image/v5/docker/archive" - dockerDaemonTransport "github.com/containers/image/v5/docker/daemon" - "github.com/containers/image/v5/docker/reference" - "github.com/containers/image/v5/manifest" - compressiontypes "github.com/containers/image/v5/pkg/compression/types" - "github.com/containers/image/v5/transports/alltransports" "github.com/sirupsen/logrus" + "go.podman.io/common/pkg/config" + dockerArchiveTransport "go.podman.io/image/v5/docker/archive" + dockerDaemonTransport "go.podman.io/image/v5/docker/daemon" + "go.podman.io/image/v5/docker/reference" + "go.podman.io/image/v5/manifest" + compressiontypes "go.podman.io/image/v5/pkg/compression/types" + "go.podman.io/image/v5/transports/alltransports" ) // PushOptions allows for customizing image pushes. diff --git a/vendor/github.com/containers/common/libimage/runtime.go b/vendor/go.podman.io/common/libimage/runtime.go similarity index 98% rename from vendor/github.com/containers/common/libimage/runtime.go rename to vendor/go.podman.io/common/libimage/runtime.go index 4eb1652c98d..9aa9c39720d 100644 --- a/vendor/github.com/containers/common/libimage/runtime.go +++ b/vendor/go.podman.io/common/libimage/runtime.go @@ -9,19 +9,19 @@ import ( "os" "strings" - "github.com/containers/common/libimage/define" - "github.com/containers/common/libimage/platform" - "github.com/containers/common/pkg/config" - "github.com/containers/image/v5/docker/reference" - "github.com/containers/image/v5/pkg/shortnames" - storageTransport "github.com/containers/image/v5/storage" - "github.com/containers/image/v5/transports/alltransports" - "github.com/containers/image/v5/types" - "github.com/containers/storage" deepcopy "github.com/jinzhu/copier" jsoniter "github.com/json-iterator/go" "github.com/opencontainers/go-digest" "github.com/sirupsen/logrus" + "go.podman.io/common/libimage/define" + "go.podman.io/common/libimage/platform" + "go.podman.io/common/pkg/config" + "go.podman.io/image/v5/docker/reference" + "go.podman.io/image/v5/pkg/shortnames" + storageTransport "go.podman.io/image/v5/storage" + "go.podman.io/image/v5/transports/alltransports" + "go.podman.io/image/v5/types" + "go.podman.io/storage" ) // Faster than the standard library, see https://github.com/json-iterator/go. diff --git a/vendor/github.com/containers/common/libimage/save.go b/vendor/go.podman.io/common/libimage/save.go similarity index 94% rename from vendor/github.com/containers/common/libimage/save.go rename to vendor/go.podman.io/common/libimage/save.go index 46529d10f34..84305867845 100644 --- a/vendor/github.com/containers/common/libimage/save.go +++ b/vendor/go.podman.io/common/libimage/save.go @@ -9,15 +9,15 @@ import ( "strings" "time" - dirTransport "github.com/containers/image/v5/directory" - dockerArchiveTransport "github.com/containers/image/v5/docker/archive" - "github.com/containers/image/v5/docker/reference" - "github.com/containers/image/v5/manifest" - ociArchiveTransport "github.com/containers/image/v5/oci/archive" - ociTransport "github.com/containers/image/v5/oci/layout" - "github.com/containers/image/v5/types" ociv1 "github.com/opencontainers/image-spec/specs-go/v1" "github.com/sirupsen/logrus" + dirTransport "go.podman.io/image/v5/directory" + dockerArchiveTransport "go.podman.io/image/v5/docker/archive" + "go.podman.io/image/v5/docker/reference" + "go.podman.io/image/v5/manifest" + ociArchiveTransport "go.podman.io/image/v5/oci/archive" + ociTransport "go.podman.io/image/v5/oci/layout" + "go.podman.io/image/v5/types" ) // SaveOptions allow for customizing saving images. diff --git a/vendor/github.com/containers/common/libimage/search.go b/vendor/go.podman.io/common/libimage/search.go similarity index 97% rename from vendor/github.com/containers/common/libimage/search.go rename to vendor/go.podman.io/common/libimage/search.go index 2745b52bb35..513852ec85c 100644 --- a/vendor/github.com/containers/common/libimage/search.go +++ b/vendor/go.podman.io/common/libimage/search.go @@ -8,13 +8,13 @@ import ( "strings" "sync" - "github.com/containers/common/libimage/filter" - registryTransport "github.com/containers/image/v5/docker" - "github.com/containers/image/v5/pkg/sysregistriesv2" - "github.com/containers/image/v5/transports/alltransports" - "github.com/containers/image/v5/types" "github.com/hashicorp/go-multierror" "github.com/sirupsen/logrus" + "go.podman.io/common/libimage/filter" + registryTransport "go.podman.io/image/v5/docker" + "go.podman.io/image/v5/pkg/sysregistriesv2" + "go.podman.io/image/v5/transports/alltransports" + "go.podman.io/image/v5/types" "golang.org/x/sync/semaphore" ) diff --git a/vendor/github.com/containers/common/libimage/types.go b/vendor/go.podman.io/common/libimage/types.go similarity index 85% rename from vendor/github.com/containers/common/libimage/types.go rename to vendor/go.podman.io/common/libimage/types.go index 348375d8923..ac7f1040ade 100644 --- a/vendor/github.com/containers/common/libimage/types.go +++ b/vendor/go.podman.io/common/libimage/types.go @@ -1,6 +1,6 @@ package libimage -import "github.com/containers/common/libimage/manifests" +import "go.podman.io/common/libimage/manifests" // LookupReferenceFunc return an image reference based on the specified one. // The returned reference can return custom ImageSource or ImageDestination diff --git a/vendor/github.com/containers/common/libnetwork/cni/README.md b/vendor/go.podman.io/common/libnetwork/cni/README.md similarity index 100% rename from vendor/github.com/containers/common/libnetwork/cni/README.md rename to vendor/go.podman.io/common/libnetwork/cni/README.md diff --git a/vendor/github.com/containers/common/libnetwork/cni/cni_conversion.go b/vendor/go.podman.io/common/libnetwork/cni/cni_conversion.go similarity index 98% rename from vendor/github.com/containers/common/libnetwork/cni/cni_conversion.go rename to vendor/go.podman.io/common/libnetwork/cni/cni_conversion.go index 15fd1bf4e38..853f2c1daf6 100644 --- a/vendor/github.com/containers/common/libnetwork/cni/cni_conversion.go +++ b/vendor/go.podman.io/common/libnetwork/cni/cni_conversion.go @@ -15,10 +15,10 @@ import ( "time" "github.com/containernetworking/cni/libcni" - internalutil "github.com/containers/common/libnetwork/internal/util" - "github.com/containers/common/libnetwork/types" - "github.com/containers/common/libnetwork/util" "github.com/sirupsen/logrus" + internalutil "go.podman.io/common/libnetwork/internal/util" + "go.podman.io/common/libnetwork/types" + "go.podman.io/common/libnetwork/util" "golang.org/x/sys/unix" ) diff --git a/vendor/github.com/containers/common/libnetwork/cni/cni_exec.go b/vendor/go.podman.io/common/libnetwork/cni/cni_exec.go similarity index 98% rename from vendor/github.com/containers/common/libnetwork/cni/cni_exec.go rename to vendor/go.podman.io/common/libnetwork/cni/cni_exec.go index 9ccf4eff4f6..e4c47f5d73a 100644 --- a/vendor/github.com/containers/common/libnetwork/cni/cni_exec.go +++ b/vendor/go.podman.io/common/libnetwork/cni/cni_exec.go @@ -32,7 +32,7 @@ import ( "github.com/containernetworking/cni/pkg/invoke" "github.com/containernetworking/cni/pkg/version" - "github.com/containers/storage/pkg/unshare" + "go.podman.io/storage/pkg/unshare" ) type cniExec struct { diff --git a/vendor/github.com/containers/common/libnetwork/cni/cni_types.go b/vendor/go.podman.io/common/libnetwork/cni/cni_types.go similarity index 98% rename from vendor/github.com/containers/common/libnetwork/cni/cni_types.go rename to vendor/go.podman.io/common/libnetwork/cni/cni_types.go index 81206acf756..f5cb69b7b0c 100644 --- a/vendor/github.com/containers/common/libnetwork/cni/cni_types.go +++ b/vendor/go.podman.io/common/libnetwork/cni/cni_types.go @@ -6,8 +6,8 @@ import ( "net" "path/filepath" - "github.com/containers/common/libnetwork/types" - "github.com/containers/storage/pkg/fileutils" + "go.podman.io/common/libnetwork/types" + "go.podman.io/storage/pkg/fileutils" ) const ( diff --git a/vendor/github.com/containers/common/libnetwork/cni/config.go b/vendor/go.podman.io/common/libnetwork/cni/config.go similarity index 98% rename from vendor/github.com/containers/common/libnetwork/cni/config.go rename to vendor/go.podman.io/common/libnetwork/cni/config.go index 9b45c1589c5..a8060bd7237 100644 --- a/vendor/github.com/containers/common/libnetwork/cni/config.go +++ b/vendor/go.podman.io/common/libnetwork/cni/config.go @@ -9,9 +9,9 @@ import ( "os" "slices" - internalutil "github.com/containers/common/libnetwork/internal/util" - "github.com/containers/common/libnetwork/types" "github.com/sirupsen/logrus" + internalutil "go.podman.io/common/libnetwork/internal/util" + "go.podman.io/common/libnetwork/types" ) func (n *cniNetwork) NetworkUpdate(_ string, _ types.NetworkUpdateOptions) error { diff --git a/vendor/github.com/containers/common/libnetwork/cni/config_freebsd.go b/vendor/go.podman.io/common/libnetwork/cni/config_freebsd.go similarity index 100% rename from vendor/github.com/containers/common/libnetwork/cni/config_freebsd.go rename to vendor/go.podman.io/common/libnetwork/cni/config_freebsd.go diff --git a/vendor/github.com/containers/common/libnetwork/cni/config_linux.go b/vendor/go.podman.io/common/libnetwork/cni/config_linux.go similarity index 100% rename from vendor/github.com/containers/common/libnetwork/cni/config_linux.go rename to vendor/go.podman.io/common/libnetwork/cni/config_linux.go diff --git a/vendor/github.com/containers/common/libnetwork/cni/network.go b/vendor/go.podman.io/common/libnetwork/cni/network.go similarity index 96% rename from vendor/github.com/containers/common/libnetwork/cni/network.go rename to vendor/go.podman.io/common/libnetwork/cni/network.go index ab3a05b5550..0567c6af83a 100644 --- a/vendor/github.com/containers/common/libnetwork/cni/network.go +++ b/vendor/go.podman.io/common/libnetwork/cni/network.go @@ -15,14 +15,14 @@ import ( "time" "github.com/containernetworking/cni/libcni" - "github.com/containers/common/libnetwork/internal/rootlessnetns" - "github.com/containers/common/libnetwork/types" - "github.com/containers/common/pkg/config" - "github.com/containers/common/pkg/version" - "github.com/containers/storage/pkg/fileutils" - "github.com/containers/storage/pkg/lockfile" - "github.com/containers/storage/pkg/unshare" "github.com/sirupsen/logrus" + "go.podman.io/common/libnetwork/internal/rootlessnetns" + "go.podman.io/common/libnetwork/types" + "go.podman.io/common/pkg/config" + "go.podman.io/common/pkg/version" + "go.podman.io/storage/pkg/fileutils" + "go.podman.io/storage/pkg/lockfile" + "go.podman.io/storage/pkg/unshare" ) const defaultRootLockPath = "/run/lock/podman-cni.lock" diff --git a/vendor/github.com/containers/common/libnetwork/cni/run.go b/vendor/go.podman.io/common/libnetwork/cni/run.go similarity index 98% rename from vendor/github.com/containers/common/libnetwork/cni/run.go rename to vendor/go.podman.io/common/libnetwork/cni/run.go index 68a42945c0f..ef2b158f10e 100644 --- a/vendor/github.com/containers/common/libnetwork/cni/run.go +++ b/vendor/go.podman.io/common/libnetwork/cni/run.go @@ -12,10 +12,10 @@ import ( "github.com/containernetworking/cni/libcni" cnitypes "github.com/containernetworking/cni/pkg/types" types040 "github.com/containernetworking/cni/pkg/types/040" - "github.com/containers/common/libnetwork/internal/util" - "github.com/containers/common/libnetwork/types" "github.com/hashicorp/go-multierror" "github.com/sirupsen/logrus" + "go.podman.io/common/libnetwork/internal/util" + "go.podman.io/common/libnetwork/types" ) // Setup will setup the container network namespace. It returns diff --git a/vendor/github.com/containers/common/libnetwork/cni/run_freebsd.go b/vendor/go.podman.io/common/libnetwork/cni/run_freebsd.go similarity index 100% rename from vendor/github.com/containers/common/libnetwork/cni/run_freebsd.go rename to vendor/go.podman.io/common/libnetwork/cni/run_freebsd.go diff --git a/vendor/github.com/containers/common/libnetwork/cni/run_linux.go b/vendor/go.podman.io/common/libnetwork/cni/run_linux.go similarity index 100% rename from vendor/github.com/containers/common/libnetwork/cni/run_linux.go rename to vendor/go.podman.io/common/libnetwork/cni/run_linux.go diff --git a/vendor/github.com/containers/common/libnetwork/etchosts/hosts.go b/vendor/go.podman.io/common/libnetwork/etchosts/hosts.go similarity index 99% rename from vendor/github.com/containers/common/libnetwork/etchosts/hosts.go rename to vendor/go.podman.io/common/libnetwork/etchosts/hosts.go index 8a7cc534e60..41def42c3b7 100644 --- a/vendor/github.com/containers/common/libnetwork/etchosts/hosts.go +++ b/vendor/go.podman.io/common/libnetwork/etchosts/hosts.go @@ -9,7 +9,7 @@ import ( "slices" "strings" - "github.com/containers/common/pkg/config" + "go.podman.io/common/pkg/config" ) const ( diff --git a/vendor/github.com/containers/common/libnetwork/etchosts/ip.go b/vendor/go.podman.io/common/libnetwork/etchosts/ip.go similarity index 94% rename from vendor/github.com/containers/common/libnetwork/etchosts/ip.go rename to vendor/go.podman.io/common/libnetwork/etchosts/ip.go index f11147f2de0..18a20792955 100644 --- a/vendor/github.com/containers/common/libnetwork/etchosts/ip.go +++ b/vendor/go.podman.io/common/libnetwork/etchosts/ip.go @@ -4,12 +4,12 @@ import ( "net" "sync" - "github.com/containers/common/libnetwork/types" - "github.com/containers/common/libnetwork/util" - "github.com/containers/common/pkg/config" - "github.com/containers/common/pkg/machine" - "github.com/containers/storage/pkg/unshare" "github.com/sirupsen/logrus" + "go.podman.io/common/libnetwork/types" + "go.podman.io/common/libnetwork/util" + "go.podman.io/common/pkg/config" + "go.podman.io/common/pkg/machine" + "go.podman.io/storage/pkg/unshare" ) // HostContainersInternalOptions contains the options for GetHostContainersInternalIP() diff --git a/vendor/github.com/containers/common/libnetwork/etchosts/util.go b/vendor/go.podman.io/common/libnetwork/etchosts/util.go similarity index 95% rename from vendor/github.com/containers/common/libnetwork/etchosts/util.go rename to vendor/go.podman.io/common/libnetwork/etchosts/util.go index d78284594bb..b7b8422cbb6 100644 --- a/vendor/github.com/containers/common/libnetwork/etchosts/util.go +++ b/vendor/go.podman.io/common/libnetwork/etchosts/util.go @@ -3,8 +3,8 @@ package etchosts import ( "fmt" - "github.com/containers/common/pkg/config" securejoin "github.com/cyphar/filepath-securejoin" + "go.podman.io/common/pkg/config" ) // GetBaseHostFile return the hosts file which should be used as base. diff --git a/vendor/github.com/containers/common/libnetwork/internal/rootlessnetns/netns.go b/vendor/go.podman.io/common/libnetwork/internal/rootlessnetns/netns.go similarity index 100% rename from vendor/github.com/containers/common/libnetwork/internal/rootlessnetns/netns.go rename to vendor/go.podman.io/common/libnetwork/internal/rootlessnetns/netns.go diff --git a/vendor/github.com/containers/common/libnetwork/internal/rootlessnetns/netns_freebsd.go b/vendor/go.podman.io/common/libnetwork/internal/rootlessnetns/netns_freebsd.go similarity index 81% rename from vendor/github.com/containers/common/libnetwork/internal/rootlessnetns/netns_freebsd.go rename to vendor/go.podman.io/common/libnetwork/internal/rootlessnetns/netns_freebsd.go index 27ef1f4c28b..03322dc52b4 100644 --- a/vendor/github.com/containers/common/libnetwork/internal/rootlessnetns/netns_freebsd.go +++ b/vendor/go.podman.io/common/libnetwork/internal/rootlessnetns/netns_freebsd.go @@ -3,9 +3,9 @@ package rootlessnetns import ( "errors" - "github.com/containers/common/libnetwork/types" - "github.com/containers/common/pkg/config" - "github.com/containers/storage/pkg/lockfile" + "go.podman.io/common/libnetwork/types" + "go.podman.io/common/pkg/config" + "go.podman.io/storage/pkg/lockfile" ) var ErrNotSupported = errors.New("rootless netns only supported on linux") diff --git a/vendor/github.com/containers/common/libnetwork/internal/rootlessnetns/netns_linux.go b/vendor/go.podman.io/common/libnetwork/internal/rootlessnetns/netns_linux.go similarity index 97% rename from vendor/github.com/containers/common/libnetwork/internal/rootlessnetns/netns_linux.go rename to vendor/go.podman.io/common/libnetwork/internal/rootlessnetns/netns_linux.go index ae8517af1e3..f80f42f512c 100644 --- a/vendor/github.com/containers/common/libnetwork/internal/rootlessnetns/netns_linux.go +++ b/vendor/go.podman.io/common/libnetwork/internal/rootlessnetns/netns_linux.go @@ -12,20 +12,20 @@ import ( "strings" "github.com/containernetworking/plugins/pkg/ns" - "github.com/containers/common/libnetwork/pasta" - "github.com/containers/common/libnetwork/resolvconf" - "github.com/containers/common/libnetwork/slirp4netns" - "github.com/containers/common/libnetwork/types" - "github.com/containers/common/pkg/config" - "github.com/containers/common/pkg/netns" - "github.com/containers/common/pkg/systemd" - "github.com/containers/storage/pkg/fileutils" - "github.com/containers/storage/pkg/homedir" - "github.com/containers/storage/pkg/lockfile" "github.com/hashicorp/go-multierror" "github.com/opencontainers/runtime-spec/specs-go" "github.com/opencontainers/selinux/go-selinux/label" "github.com/sirupsen/logrus" + "go.podman.io/common/libnetwork/pasta" + "go.podman.io/common/libnetwork/resolvconf" + "go.podman.io/common/libnetwork/slirp4netns" + "go.podman.io/common/libnetwork/types" + "go.podman.io/common/pkg/config" + "go.podman.io/common/pkg/netns" + "go.podman.io/common/pkg/systemd" + "go.podman.io/storage/pkg/fileutils" + "go.podman.io/storage/pkg/homedir" + "go.podman.io/storage/pkg/lockfile" "golang.org/x/sys/unix" ) diff --git a/vendor/github.com/containers/common/libnetwork/internal/util/bridge.go b/vendor/go.podman.io/common/libnetwork/internal/util/bridge.go similarity index 93% rename from vendor/github.com/containers/common/libnetwork/internal/util/bridge.go rename to vendor/go.podman.io/common/libnetwork/internal/util/bridge.go index e69c388290d..f245fb016c6 100644 --- a/vendor/github.com/containers/common/libnetwork/internal/util/bridge.go +++ b/vendor/go.podman.io/common/libnetwork/internal/util/bridge.go @@ -5,9 +5,9 @@ import ( "net" "slices" - "github.com/containers/common/libnetwork/types" - "github.com/containers/common/libnetwork/util" - "github.com/containers/common/pkg/config" + "go.podman.io/common/libnetwork/types" + "go.podman.io/common/libnetwork/util" + "go.podman.io/common/pkg/config" ) func CreateBridge(n NetUtil, network *types.Network, usedNetworks []*net.IPNet, subnetPools []config.SubnetPool, checkBridgeConflict bool) error { diff --git a/vendor/github.com/containers/common/libnetwork/internal/util/create.go b/vendor/go.podman.io/common/libnetwork/internal/util/create.go similarity index 96% rename from vendor/github.com/containers/common/libnetwork/internal/util/create.go rename to vendor/go.podman.io/common/libnetwork/internal/util/create.go index 42609d1ba71..5096987dd09 100644 --- a/vendor/github.com/containers/common/libnetwork/internal/util/create.go +++ b/vendor/go.podman.io/common/libnetwork/internal/util/create.go @@ -3,8 +3,8 @@ package util import ( "fmt" - "github.com/containers/common/libnetwork/types" "github.com/sirupsen/logrus" + "go.podman.io/common/libnetwork/types" ) func CommonNetworkCreate(n NetUtil, network *types.Network) error { diff --git a/vendor/github.com/containers/common/libnetwork/internal/util/interface.go b/vendor/go.podman.io/common/libnetwork/internal/util/interface.go similarity index 92% rename from vendor/github.com/containers/common/libnetwork/internal/util/interface.go rename to vendor/go.podman.io/common/libnetwork/internal/util/interface.go index 9b66e66a3e4..fced72b7d5e 100644 --- a/vendor/github.com/containers/common/libnetwork/internal/util/interface.go +++ b/vendor/go.podman.io/common/libnetwork/internal/util/interface.go @@ -1,6 +1,6 @@ package util -import "github.com/containers/common/libnetwork/types" +import "go.podman.io/common/libnetwork/types" // This is a helper package to allow code sharing between the different // network interfaces. diff --git a/vendor/github.com/containers/common/libnetwork/internal/util/interfaces.go b/vendor/go.podman.io/common/libnetwork/internal/util/interfaces.go similarity index 100% rename from vendor/github.com/containers/common/libnetwork/internal/util/interfaces.go rename to vendor/go.podman.io/common/libnetwork/internal/util/interfaces.go diff --git a/vendor/github.com/containers/common/libnetwork/internal/util/ip.go b/vendor/go.podman.io/common/libnetwork/internal/util/ip.go similarity index 100% rename from vendor/github.com/containers/common/libnetwork/internal/util/ip.go rename to vendor/go.podman.io/common/libnetwork/internal/util/ip.go diff --git a/vendor/github.com/containers/common/libnetwork/internal/util/parse.go b/vendor/go.podman.io/common/libnetwork/internal/util/parse.go similarity index 100% rename from vendor/github.com/containers/common/libnetwork/internal/util/parse.go rename to vendor/go.podman.io/common/libnetwork/internal/util/parse.go diff --git a/vendor/github.com/containers/common/libnetwork/internal/util/util.go b/vendor/go.podman.io/common/libnetwork/internal/util/util.go similarity index 97% rename from vendor/github.com/containers/common/libnetwork/internal/util/util.go rename to vendor/go.podman.io/common/libnetwork/internal/util/util.go index 260e74d06ee..f52635768d1 100644 --- a/vendor/github.com/containers/common/libnetwork/internal/util/util.go +++ b/vendor/go.podman.io/common/libnetwork/internal/util/util.go @@ -6,9 +6,9 @@ import ( "net" "slices" - "github.com/containers/common/libnetwork/types" - "github.com/containers/common/pkg/config" "github.com/sirupsen/logrus" + "go.podman.io/common/libnetwork/types" + "go.podman.io/common/pkg/config" ) // GetBridgeInterfaceNames returns all bridge interface names diff --git a/vendor/github.com/containers/common/libnetwork/internal/util/validate.go b/vendor/go.podman.io/common/libnetwork/internal/util/validate.go similarity index 98% rename from vendor/github.com/containers/common/libnetwork/internal/util/validate.go rename to vendor/go.podman.io/common/libnetwork/internal/util/validate.go index 28e67000459..dc24e7b6132 100644 --- a/vendor/github.com/containers/common/libnetwork/internal/util/validate.go +++ b/vendor/go.podman.io/common/libnetwork/internal/util/validate.go @@ -7,8 +7,8 @@ import ( "strings" "unicode" - "github.com/containers/common/libnetwork/types" - "github.com/containers/common/libnetwork/util" + "go.podman.io/common/libnetwork/types" + "go.podman.io/common/libnetwork/util" ) // ValidateSubnet will validate a given Subnet. It checks if the diff --git a/vendor/github.com/containers/common/libnetwork/netavark/config.go b/vendor/go.podman.io/common/libnetwork/netavark/config.go similarity index 98% rename from vendor/github.com/containers/common/libnetwork/netavark/config.go rename to vendor/go.podman.io/common/libnetwork/netavark/config.go index 97de461688b..781670703d0 100644 --- a/vendor/github.com/containers/common/libnetwork/netavark/config.go +++ b/vendor/go.podman.io/common/libnetwork/netavark/config.go @@ -14,9 +14,9 @@ import ( "strconv" "time" - internalutil "github.com/containers/common/libnetwork/internal/util" - "github.com/containers/common/libnetwork/types" - "github.com/containers/storage/pkg/stringid" + internalutil "go.podman.io/common/libnetwork/internal/util" + "go.podman.io/common/libnetwork/types" + "go.podman.io/storage/pkg/stringid" ) func sliceRemoveDuplicates(strList []string) []string { diff --git a/vendor/github.com/containers/common/libnetwork/netavark/const.go b/vendor/go.podman.io/common/libnetwork/netavark/const.go similarity index 100% rename from vendor/github.com/containers/common/libnetwork/netavark/const.go rename to vendor/go.podman.io/common/libnetwork/netavark/const.go diff --git a/vendor/github.com/containers/common/libnetwork/netavark/exec.go b/vendor/go.podman.io/common/libnetwork/netavark/exec.go similarity index 100% rename from vendor/github.com/containers/common/libnetwork/netavark/exec.go rename to vendor/go.podman.io/common/libnetwork/netavark/exec.go diff --git a/vendor/github.com/containers/common/libnetwork/netavark/ipam.go b/vendor/go.podman.io/common/libnetwork/netavark/ipam.go similarity index 99% rename from vendor/github.com/containers/common/libnetwork/netavark/ipam.go rename to vendor/go.podman.io/common/libnetwork/netavark/ipam.go index 54c6603e8f2..6192035365f 100644 --- a/vendor/github.com/containers/common/libnetwork/netavark/ipam.go +++ b/vendor/go.podman.io/common/libnetwork/netavark/ipam.go @@ -8,10 +8,10 @@ import ( "fmt" "net" - "github.com/containers/common/libnetwork/types" - "github.com/containers/common/libnetwork/util" "go.etcd.io/bbolt" boltErrors "go.etcd.io/bbolt/errors" + "go.podman.io/common/libnetwork/types" + "go.podman.io/common/libnetwork/util" ) // IPAM boltdb structure diff --git a/vendor/github.com/containers/common/libnetwork/netavark/network.go b/vendor/go.podman.io/common/libnetwork/netavark/network.go similarity index 97% rename from vendor/github.com/containers/common/libnetwork/netavark/network.go rename to vendor/go.podman.io/common/libnetwork/netavark/network.go index cf8b0d490e7..62f8a662a3a 100644 --- a/vendor/github.com/containers/common/libnetwork/netavark/network.go +++ b/vendor/go.podman.io/common/libnetwork/netavark/network.go @@ -11,14 +11,14 @@ import ( "strings" "time" - "github.com/containers/common/libnetwork/internal/rootlessnetns" - "github.com/containers/common/libnetwork/internal/util" - "github.com/containers/common/libnetwork/types" - "github.com/containers/common/pkg/config" - "github.com/containers/common/pkg/version" - "github.com/containers/storage/pkg/lockfile" - "github.com/containers/storage/pkg/unshare" "github.com/sirupsen/logrus" + "go.podman.io/common/libnetwork/internal/rootlessnetns" + "go.podman.io/common/libnetwork/internal/util" + "go.podman.io/common/libnetwork/types" + "go.podman.io/common/pkg/config" + "go.podman.io/common/pkg/version" + "go.podman.io/storage/pkg/lockfile" + "go.podman.io/storage/pkg/unshare" ) type netavarkNetwork struct { diff --git a/vendor/github.com/containers/common/libnetwork/netavark/run.go b/vendor/go.podman.io/common/libnetwork/netavark/run.go similarity index 98% rename from vendor/github.com/containers/common/libnetwork/netavark/run.go rename to vendor/go.podman.io/common/libnetwork/netavark/run.go index 89f7892ada6..a57f2761af6 100644 --- a/vendor/github.com/containers/common/libnetwork/netavark/run.go +++ b/vendor/go.podman.io/common/libnetwork/netavark/run.go @@ -9,9 +9,9 @@ import ( "strconv" "strings" - "github.com/containers/common/libnetwork/internal/util" - "github.com/containers/common/libnetwork/types" "github.com/sirupsen/logrus" + "go.podman.io/common/libnetwork/internal/util" + "go.podman.io/common/libnetwork/types" ) type netavarkOptions struct { diff --git a/vendor/github.com/containers/common/libnetwork/network/interface.go b/vendor/go.podman.io/common/libnetwork/network/interface.go similarity index 94% rename from vendor/github.com/containers/common/libnetwork/network/interface.go rename to vendor/go.podman.io/common/libnetwork/network/interface.go index 51c1ae7186c..4c9d97fbdd6 100644 --- a/vendor/github.com/containers/common/libnetwork/network/interface.go +++ b/vendor/go.podman.io/common/libnetwork/network/interface.go @@ -8,13 +8,13 @@ import ( "os" "path/filepath" - "github.com/containers/common/libnetwork/netavark" - "github.com/containers/common/libnetwork/types" - "github.com/containers/common/pkg/config" - "github.com/containers/storage" - "github.com/containers/storage/pkg/ioutils" - "github.com/containers/storage/pkg/unshare" "github.com/sirupsen/logrus" + "go.podman.io/common/libnetwork/netavark" + "go.podman.io/common/libnetwork/types" + "go.podman.io/common/pkg/config" + "go.podman.io/storage" + "go.podman.io/storage/pkg/ioutils" + "go.podman.io/storage/pkg/unshare" ) const ( diff --git a/vendor/github.com/containers/common/libnetwork/network/interface_cni.go b/vendor/go.podman.io/common/libnetwork/network/interface_cni.go similarity index 89% rename from vendor/github.com/containers/common/libnetwork/network/interface_cni.go rename to vendor/go.podman.io/common/libnetwork/network/interface_cni.go index 3de3a3045e9..0ef4dbdd4cf 100644 --- a/vendor/github.com/containers/common/libnetwork/network/interface_cni.go +++ b/vendor/go.podman.io/common/libnetwork/network/interface_cni.go @@ -8,13 +8,13 @@ import ( "os" "path/filepath" - "github.com/containers/common/libnetwork/cni" - "github.com/containers/common/libnetwork/types" - "github.com/containers/common/pkg/config" - "github.com/containers/common/pkg/machine" - "github.com/containers/storage" - "github.com/containers/storage/pkg/homedir" - "github.com/containers/storage/pkg/unshare" + "go.podman.io/common/libnetwork/cni" + "go.podman.io/common/libnetwork/types" + "go.podman.io/common/pkg/config" + "go.podman.io/common/pkg/machine" + "go.podman.io/storage" + "go.podman.io/storage/pkg/homedir" + "go.podman.io/storage/pkg/unshare" ) const ( diff --git a/vendor/github.com/containers/common/libnetwork/network/interface_cni_unsupported.go b/vendor/go.podman.io/common/libnetwork/network/interface_cni_unsupported.go similarity index 85% rename from vendor/github.com/containers/common/libnetwork/network/interface_cni_unsupported.go rename to vendor/go.podman.io/common/libnetwork/network/interface_cni_unsupported.go index d0645dc5067..5d94fb8cadc 100644 --- a/vendor/github.com/containers/common/libnetwork/network/interface_cni_unsupported.go +++ b/vendor/go.podman.io/common/libnetwork/network/interface_cni_unsupported.go @@ -5,9 +5,9 @@ package network import ( "fmt" - "github.com/containers/common/libnetwork/types" - "github.com/containers/common/pkg/config" - "github.com/containers/storage" + "go.podman.io/common/libnetwork/types" + "go.podman.io/common/pkg/config" + "go.podman.io/storage" ) const ( diff --git a/vendor/github.com/containers/common/libnetwork/network/interface_freebsd.go b/vendor/go.podman.io/common/libnetwork/network/interface_freebsd.go similarity index 100% rename from vendor/github.com/containers/common/libnetwork/network/interface_freebsd.go rename to vendor/go.podman.io/common/libnetwork/network/interface_freebsd.go diff --git a/vendor/github.com/containers/common/libnetwork/network/interface_linux.go b/vendor/go.podman.io/common/libnetwork/network/interface_linux.go similarity index 100% rename from vendor/github.com/containers/common/libnetwork/network/interface_linux.go rename to vendor/go.podman.io/common/libnetwork/network/interface_linux.go diff --git a/vendor/github.com/containers/common/libnetwork/pasta/pasta_linux.go b/vendor/go.podman.io/common/libnetwork/pasta/pasta_linux.go similarity index 98% rename from vendor/github.com/containers/common/libnetwork/pasta/pasta_linux.go rename to vendor/go.podman.io/common/libnetwork/pasta/pasta_linux.go index 33fbc35e6c9..6c3b4bf1948 100644 --- a/vendor/github.com/containers/common/libnetwork/pasta/pasta_linux.go +++ b/vendor/go.podman.io/common/libnetwork/pasta/pasta_linux.go @@ -19,10 +19,10 @@ import ( "strings" "github.com/containernetworking/plugins/pkg/ns" - "github.com/containers/common/libnetwork/types" - "github.com/containers/common/libnetwork/util" - "github.com/containers/common/pkg/config" "github.com/sirupsen/logrus" + "go.podman.io/common/libnetwork/types" + "go.podman.io/common/libnetwork/util" + "go.podman.io/common/pkg/config" ) const ( diff --git a/vendor/github.com/containers/common/libnetwork/pasta/types.go b/vendor/go.podman.io/common/libnetwork/pasta/types.go similarity index 100% rename from vendor/github.com/containers/common/libnetwork/pasta/types.go rename to vendor/go.podman.io/common/libnetwork/pasta/types.go diff --git a/vendor/github.com/containers/common/libnetwork/resolvconf/resolv.go b/vendor/go.podman.io/common/libnetwork/resolvconf/resolv.go similarity index 99% rename from vendor/github.com/containers/common/libnetwork/resolvconf/resolv.go rename to vendor/go.podman.io/common/libnetwork/resolvconf/resolv.go index 8e47078e055..35b01b60673 100644 --- a/vendor/github.com/containers/common/libnetwork/resolvconf/resolv.go +++ b/vendor/go.podman.io/common/libnetwork/resolvconf/resolv.go @@ -8,9 +8,9 @@ import ( "slices" "strings" - "github.com/containers/storage/pkg/fileutils" "github.com/opencontainers/runtime-spec/specs-go" "github.com/sirupsen/logrus" + "go.podman.io/storage/pkg/fileutils" ) const ( diff --git a/vendor/github.com/containers/common/libnetwork/resolvconf/resolvconf.go b/vendor/go.podman.io/common/libnetwork/resolvconf/resolvconf.go similarity index 99% rename from vendor/github.com/containers/common/libnetwork/resolvconf/resolvconf.go rename to vendor/go.podman.io/common/libnetwork/resolvconf/resolvconf.go index 97cf48cfd58..5724dfcc2ea 100644 --- a/vendor/github.com/containers/common/libnetwork/resolvconf/resolvconf.go +++ b/vendor/go.podman.io/common/libnetwork/resolvconf/resolvconf.go @@ -7,8 +7,8 @@ import ( "os" "strings" - "github.com/containers/storage/pkg/regexp" "github.com/sirupsen/logrus" + "go.podman.io/storage/pkg/regexp" ) const ( diff --git a/vendor/github.com/containers/common/libnetwork/slirp4netns/const.go b/vendor/go.podman.io/common/libnetwork/slirp4netns/const.go similarity index 100% rename from vendor/github.com/containers/common/libnetwork/slirp4netns/const.go rename to vendor/go.podman.io/common/libnetwork/slirp4netns/const.go diff --git a/vendor/github.com/containers/common/libnetwork/slirp4netns/slirp4netns.go b/vendor/go.podman.io/common/libnetwork/slirp4netns/slirp4netns.go similarity index 99% rename from vendor/github.com/containers/common/libnetwork/slirp4netns/slirp4netns.go rename to vendor/go.podman.io/common/libnetwork/slirp4netns/slirp4netns.go index afb54f60d69..7f2063d962d 100644 --- a/vendor/github.com/containers/common/libnetwork/slirp4netns/slirp4netns.go +++ b/vendor/go.podman.io/common/libnetwork/slirp4netns/slirp4netns.go @@ -19,12 +19,12 @@ import ( "time" "github.com/containernetworking/plugins/pkg/ns" - "github.com/containers/common/libnetwork/types" - "github.com/containers/common/pkg/config" - "github.com/containers/common/pkg/rootlessport" - "github.com/containers/common/pkg/servicereaper" - "github.com/containers/common/pkg/util" "github.com/sirupsen/logrus" + "go.podman.io/common/libnetwork/types" + "go.podman.io/common/pkg/config" + "go.podman.io/common/pkg/rootlessport" + "go.podman.io/common/pkg/servicereaper" + "go.podman.io/common/pkg/util" ) type slirpFeatures struct { diff --git a/vendor/github.com/containers/common/libnetwork/types/const.go b/vendor/go.podman.io/common/libnetwork/types/const.go similarity index 100% rename from vendor/github.com/containers/common/libnetwork/types/const.go rename to vendor/go.podman.io/common/libnetwork/types/const.go diff --git a/vendor/github.com/containers/common/libnetwork/types/define.go b/vendor/go.podman.io/common/libnetwork/types/define.go similarity index 96% rename from vendor/github.com/containers/common/libnetwork/types/define.go rename to vendor/go.podman.io/common/libnetwork/types/define.go index e5929c3e876..c55df60a01d 100644 --- a/vendor/github.com/containers/common/libnetwork/types/define.go +++ b/vendor/go.podman.io/common/libnetwork/types/define.go @@ -4,7 +4,7 @@ import ( "errors" "fmt" - "github.com/containers/storage/pkg/regexp" + "go.podman.io/storage/pkg/regexp" ) var ( diff --git a/vendor/github.com/containers/common/libnetwork/types/network.go b/vendor/go.podman.io/common/libnetwork/types/network.go similarity index 100% rename from vendor/github.com/containers/common/libnetwork/types/network.go rename to vendor/go.podman.io/common/libnetwork/types/network.go diff --git a/vendor/github.com/containers/common/libnetwork/util/filters.go b/vendor/go.podman.io/common/libnetwork/util/filters.go similarity index 94% rename from vendor/github.com/containers/common/libnetwork/util/filters.go rename to vendor/go.podman.io/common/libnetwork/util/filters.go index 41281e7488f..040fa6f03d0 100644 --- a/vendor/github.com/containers/common/libnetwork/util/filters.go +++ b/vendor/go.podman.io/common/libnetwork/util/filters.go @@ -5,9 +5,9 @@ import ( "slices" "strings" - "github.com/containers/common/libnetwork/types" - "github.com/containers/common/pkg/filters" - "github.com/containers/common/pkg/util" + "go.podman.io/common/libnetwork/types" + "go.podman.io/common/pkg/filters" + "go.podman.io/common/pkg/util" ) func GenerateNetworkFilters(f map[string][]string) ([]types.FilterFunc, error) { diff --git a/vendor/github.com/containers/common/libnetwork/util/ip.go b/vendor/go.podman.io/common/libnetwork/util/ip.go similarity index 100% rename from vendor/github.com/containers/common/libnetwork/util/ip.go rename to vendor/go.podman.io/common/libnetwork/util/ip.go diff --git a/vendor/github.com/containers/common/libnetwork/util/ip_calc.go b/vendor/go.podman.io/common/libnetwork/util/ip_calc.go similarity index 100% rename from vendor/github.com/containers/common/libnetwork/util/ip_calc.go rename to vendor/go.podman.io/common/libnetwork/util/ip_calc.go diff --git a/vendor/github.com/containers/common/pkg/apparmor/apparmor.go b/vendor/go.podman.io/common/pkg/apparmor/apparmor.go similarity index 93% rename from vendor/github.com/containers/common/pkg/apparmor/apparmor.go rename to vendor/go.podman.io/common/pkg/apparmor/apparmor.go index 146280df2f7..bc776824f65 100644 --- a/vendor/github.com/containers/common/pkg/apparmor/apparmor.go +++ b/vendor/go.podman.io/common/pkg/apparmor/apparmor.go @@ -3,7 +3,7 @@ package apparmor import ( "errors" - "github.com/containers/common/version" + "go.podman.io/common/version" ) const ( diff --git a/vendor/github.com/containers/common/pkg/apparmor/apparmor_linux.go b/vendor/go.podman.io/common/pkg/apparmor/apparmor_linux.go similarity index 98% rename from vendor/github.com/containers/common/pkg/apparmor/apparmor_linux.go rename to vendor/go.podman.io/common/pkg/apparmor/apparmor_linux.go index bc97a2804a3..9b0c7666532 100644 --- a/vendor/github.com/containers/common/pkg/apparmor/apparmor_linux.go +++ b/vendor/go.podman.io/common/pkg/apparmor/apparmor_linux.go @@ -15,11 +15,11 @@ import ( "strings" "text/template" - "github.com/containers/common/pkg/apparmor/internal/supported" - "github.com/containers/storage/pkg/fileutils" - "github.com/containers/storage/pkg/unshare" runcaa "github.com/opencontainers/runc/libcontainer/apparmor" "github.com/sirupsen/logrus" + "go.podman.io/common/pkg/apparmor/internal/supported" + "go.podman.io/storage/pkg/fileutils" + "go.podman.io/storage/pkg/unshare" ) // profileDirectory is the file store for apparmor profiles and macros. diff --git a/vendor/github.com/containers/common/pkg/apparmor/apparmor_linux_template.go b/vendor/go.podman.io/common/pkg/apparmor/apparmor_linux_template.go similarity index 100% rename from vendor/github.com/containers/common/pkg/apparmor/apparmor_linux_template.go rename to vendor/go.podman.io/common/pkg/apparmor/apparmor_linux_template.go diff --git a/vendor/github.com/containers/common/pkg/apparmor/apparmor_unsupported.go b/vendor/go.podman.io/common/pkg/apparmor/apparmor_unsupported.go similarity index 100% rename from vendor/github.com/containers/common/pkg/apparmor/apparmor_unsupported.go rename to vendor/go.podman.io/common/pkg/apparmor/apparmor_unsupported.go diff --git a/vendor/github.com/containers/common/pkg/apparmor/internal/supported/supported.go b/vendor/go.podman.io/common/pkg/apparmor/internal/supported/supported.go similarity index 98% rename from vendor/github.com/containers/common/pkg/apparmor/internal/supported/supported.go rename to vendor/go.podman.io/common/pkg/apparmor/internal/supported/supported.go index 1ee44156d8e..bbac737173b 100644 --- a/vendor/github.com/containers/common/pkg/apparmor/internal/supported/supported.go +++ b/vendor/go.podman.io/common/pkg/apparmor/internal/supported/supported.go @@ -8,9 +8,9 @@ import ( "path/filepath" "sync" - "github.com/containers/storage/pkg/unshare" runcaa "github.com/opencontainers/runc/libcontainer/apparmor" "github.com/sirupsen/logrus" + "go.podman.io/storage/pkg/unshare" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 -generate diff --git a/vendor/github.com/containers/common/pkg/auth/auth.go b/vendor/go.podman.io/common/pkg/auth/auth.go similarity index 97% rename from vendor/github.com/containers/common/pkg/auth/auth.go rename to vendor/go.podman.io/common/pkg/auth/auth.go index 4bcd490db37..44e09ebe9e8 100644 --- a/vendor/github.com/containers/common/pkg/auth/auth.go +++ b/vendor/go.podman.io/common/pkg/auth/auth.go @@ -10,15 +10,15 @@ import ( "path/filepath" "strings" - passwd "github.com/containers/common/pkg/password" - "github.com/containers/image/v5/docker" - "github.com/containers/image/v5/docker/reference" - "github.com/containers/image/v5/pkg/docker/config" - "github.com/containers/image/v5/pkg/sysregistriesv2" - "github.com/containers/image/v5/types" - "github.com/containers/storage/pkg/fileutils" - "github.com/containers/storage/pkg/homedir" "github.com/sirupsen/logrus" + passwd "go.podman.io/common/pkg/password" + "go.podman.io/image/v5/docker" + "go.podman.io/image/v5/docker/reference" + "go.podman.io/image/v5/pkg/docker/config" + "go.podman.io/image/v5/pkg/sysregistriesv2" + "go.podman.io/image/v5/types" + "go.podman.io/storage/pkg/fileutils" + "go.podman.io/storage/pkg/homedir" ) // ErrNewCredentialsInvalid means that the new user-provided credentials are diff --git a/vendor/github.com/containers/common/pkg/auth/cli.go b/vendor/go.podman.io/common/pkg/auth/cli.go similarity index 98% rename from vendor/github.com/containers/common/pkg/auth/cli.go rename to vendor/go.podman.io/common/pkg/auth/cli.go index 60e02e51e6d..1e282429909 100644 --- a/vendor/github.com/containers/common/pkg/auth/cli.go +++ b/vendor/go.podman.io/common/pkg/auth/cli.go @@ -3,8 +3,8 @@ package auth import ( "io" - "github.com/containers/common/pkg/completion" "github.com/spf13/pflag" + "go.podman.io/common/pkg/completion" ) // LoginOptions represents common flags in login diff --git a/vendor/github.com/containers/common/pkg/capabilities/capabilities.go b/vendor/go.podman.io/common/pkg/capabilities/capabilities.go similarity index 100% rename from vendor/github.com/containers/common/pkg/capabilities/capabilities.go rename to vendor/go.podman.io/common/pkg/capabilities/capabilities.go diff --git a/vendor/github.com/containers/common/pkg/cgroups/blkio_linux.go b/vendor/go.podman.io/common/pkg/cgroups/blkio_linux.go similarity index 100% rename from vendor/github.com/containers/common/pkg/cgroups/blkio_linux.go rename to vendor/go.podman.io/common/pkg/cgroups/blkio_linux.go diff --git a/vendor/github.com/containers/common/pkg/cgroups/cgroups_linux.go b/vendor/go.podman.io/common/pkg/cgroups/cgroups_linux.go similarity index 99% rename from vendor/github.com/containers/common/pkg/cgroups/cgroups_linux.go rename to vendor/go.podman.io/common/pkg/cgroups/cgroups_linux.go index 6b09dc14a32..b98a5986da1 100644 --- a/vendor/github.com/containers/common/pkg/cgroups/cgroups_linux.go +++ b/vendor/go.podman.io/common/pkg/cgroups/cgroups_linux.go @@ -19,13 +19,13 @@ import ( "syscall" "time" - "github.com/containers/storage/pkg/fileutils" - "github.com/containers/storage/pkg/unshare" systemdDbus "github.com/coreos/go-systemd/v22/dbus" "github.com/godbus/dbus/v5" "github.com/opencontainers/cgroups" "github.com/opencontainers/cgroups/fs2" "github.com/sirupsen/logrus" + "go.podman.io/storage/pkg/fileutils" + "go.podman.io/storage/pkg/unshare" "golang.org/x/sys/unix" ) diff --git a/vendor/github.com/containers/common/pkg/cgroups/cgroups_unsupported.go b/vendor/go.podman.io/common/pkg/cgroups/cgroups_unsupported.go similarity index 100% rename from vendor/github.com/containers/common/pkg/cgroups/cgroups_unsupported.go rename to vendor/go.podman.io/common/pkg/cgroups/cgroups_unsupported.go diff --git a/vendor/github.com/containers/common/pkg/cgroups/cpu_linux.go b/vendor/go.podman.io/common/pkg/cgroups/cpu_linux.go similarity index 100% rename from vendor/github.com/containers/common/pkg/cgroups/cpu_linux.go rename to vendor/go.podman.io/common/pkg/cgroups/cpu_linux.go diff --git a/vendor/github.com/containers/common/pkg/cgroups/cpuset_linux.go b/vendor/go.podman.io/common/pkg/cgroups/cpuset_linux.go similarity index 100% rename from vendor/github.com/containers/common/pkg/cgroups/cpuset_linux.go rename to vendor/go.podman.io/common/pkg/cgroups/cpuset_linux.go diff --git a/vendor/github.com/containers/common/pkg/cgroups/memory_linux.go b/vendor/go.podman.io/common/pkg/cgroups/memory_linux.go similarity index 100% rename from vendor/github.com/containers/common/pkg/cgroups/memory_linux.go rename to vendor/go.podman.io/common/pkg/cgroups/memory_linux.go diff --git a/vendor/github.com/containers/common/pkg/cgroups/pids_linux.go b/vendor/go.podman.io/common/pkg/cgroups/pids_linux.go similarity index 100% rename from vendor/github.com/containers/common/pkg/cgroups/pids_linux.go rename to vendor/go.podman.io/common/pkg/cgroups/pids_linux.go diff --git a/vendor/github.com/containers/common/pkg/cgroups/systemd_linux.go b/vendor/go.podman.io/common/pkg/cgroups/systemd_linux.go similarity index 100% rename from vendor/github.com/containers/common/pkg/cgroups/systemd_linux.go rename to vendor/go.podman.io/common/pkg/cgroups/systemd_linux.go diff --git a/vendor/github.com/containers/common/pkg/cgroups/utils_linux.go b/vendor/go.podman.io/common/pkg/cgroups/utils_linux.go similarity index 99% rename from vendor/github.com/containers/common/pkg/cgroups/utils_linux.go rename to vendor/go.podman.io/common/pkg/cgroups/utils_linux.go index 505ac1b29f5..2eca3ee6593 100644 --- a/vendor/github.com/containers/common/pkg/cgroups/utils_linux.go +++ b/vendor/go.podman.io/common/pkg/cgroups/utils_linux.go @@ -13,9 +13,9 @@ import ( "strings" "sync" - "github.com/containers/storage/pkg/fileutils" "github.com/opencontainers/cgroups" "github.com/sirupsen/logrus" + "go.podman.io/storage/pkg/fileutils" "golang.org/x/sys/unix" ) diff --git a/vendor/github.com/containers/common/pkg/cgroupv2/cgroups_linux.go b/vendor/go.podman.io/common/pkg/cgroupv2/cgroups_linux.go similarity index 100% rename from vendor/github.com/containers/common/pkg/cgroupv2/cgroups_linux.go rename to vendor/go.podman.io/common/pkg/cgroupv2/cgroups_linux.go diff --git a/vendor/github.com/containers/common/pkg/cgroupv2/cgroups_unsupported.go b/vendor/go.podman.io/common/pkg/cgroupv2/cgroups_unsupported.go similarity index 100% rename from vendor/github.com/containers/common/pkg/cgroupv2/cgroups_unsupported.go rename to vendor/go.podman.io/common/pkg/cgroupv2/cgroups_unsupported.go diff --git a/vendor/github.com/containers/common/pkg/chown/chown.go b/vendor/go.podman.io/common/pkg/chown/chown.go similarity index 96% rename from vendor/github.com/containers/common/pkg/chown/chown.go rename to vendor/go.podman.io/common/pkg/chown/chown.go index fb7d67f33c0..b254e105e37 100644 --- a/vendor/github.com/containers/common/pkg/chown/chown.go +++ b/vendor/go.podman.io/common/pkg/chown/chown.go @@ -5,7 +5,7 @@ import ( "os/user" "path/filepath" - "github.com/containers/storage/pkg/homedir" + "go.podman.io/storage/pkg/homedir" ) // DangerousHostPath validates if a host path is dangerous and should not be modified diff --git a/vendor/github.com/containers/common/pkg/chown/chown_unix.go b/vendor/go.podman.io/common/pkg/chown/chown_unix.go similarity index 100% rename from vendor/github.com/containers/common/pkg/chown/chown_unix.go rename to vendor/go.podman.io/common/pkg/chown/chown_unix.go diff --git a/vendor/github.com/containers/common/pkg/chown/chown_windows.go b/vendor/go.podman.io/common/pkg/chown/chown_windows.go similarity index 100% rename from vendor/github.com/containers/common/pkg/chown/chown_windows.go rename to vendor/go.podman.io/common/pkg/chown/chown_windows.go diff --git a/vendor/github.com/containers/common/pkg/completion/completion.go b/vendor/go.podman.io/common/pkg/completion/completion.go similarity index 99% rename from vendor/github.com/containers/common/pkg/completion/completion.go rename to vendor/go.podman.io/common/pkg/completion/completion.go index 908d568fff6..9d5640f94e2 100644 --- a/vendor/github.com/containers/common/pkg/completion/completion.go +++ b/vendor/go.podman.io/common/pkg/completion/completion.go @@ -6,8 +6,8 @@ import ( "strings" "unicode" - "github.com/containers/common/pkg/capabilities" "github.com/spf13/cobra" + "go.podman.io/common/pkg/capabilities" ) // FlagCompletions - hold flag completion functions to be applied later with CompleteCommandFlags() diff --git a/vendor/github.com/containers/common/pkg/config/config.go b/vendor/go.podman.io/common/pkg/config/config.go similarity index 99% rename from vendor/github.com/containers/common/pkg/config/config.go rename to vendor/go.podman.io/common/pkg/config/config.go index 3ff319cda0e..f6ec67a6d90 100644 --- a/vendor/github.com/containers/common/pkg/config/config.go +++ b/vendor/go.podman.io/common/pkg/config/config.go @@ -10,14 +10,14 @@ import ( "slices" "strings" - "github.com/containers/common/internal/attributedstring" - "github.com/containers/common/libnetwork/types" - "github.com/containers/storage/pkg/fileutils" - "github.com/containers/storage/pkg/homedir" - "github.com/containers/storage/pkg/unshare" units "github.com/docker/go-units" selinux "github.com/opencontainers/selinux/go-selinux" "github.com/sirupsen/logrus" + "go.podman.io/common/internal/attributedstring" + "go.podman.io/common/libnetwork/types" + "go.podman.io/storage/pkg/fileutils" + "go.podman.io/storage/pkg/homedir" + "go.podman.io/storage/pkg/unshare" ) const ( diff --git a/vendor/github.com/containers/common/pkg/config/config_bsd.go b/vendor/go.podman.io/common/pkg/config/config_bsd.go similarity index 100% rename from vendor/github.com/containers/common/pkg/config/config_bsd.go rename to vendor/go.podman.io/common/pkg/config/config_bsd.go diff --git a/vendor/github.com/containers/common/pkg/config/config_darwin.go b/vendor/go.podman.io/common/pkg/config/config_darwin.go similarity index 100% rename from vendor/github.com/containers/common/pkg/config/config_darwin.go rename to vendor/go.podman.io/common/pkg/config/config_darwin.go diff --git a/vendor/github.com/containers/common/pkg/config/config_linux.go b/vendor/go.podman.io/common/pkg/config/config_linux.go similarity index 96% rename from vendor/github.com/containers/common/pkg/config/config_linux.go rename to vendor/go.podman.io/common/pkg/config/config_linux.go index fc794cbd6a3..40798183767 100644 --- a/vendor/github.com/containers/common/pkg/config/config_linux.go +++ b/vendor/go.podman.io/common/pkg/config/config_linux.go @@ -1,8 +1,8 @@ package config import ( - "github.com/containers/common/pkg/capabilities" selinux "github.com/opencontainers/selinux/go-selinux" + "go.podman.io/common/pkg/capabilities" ) const ( diff --git a/vendor/github.com/containers/common/pkg/config/config_local.go b/vendor/go.podman.io/common/pkg/config/config_local.go similarity index 98% rename from vendor/github.com/containers/common/pkg/config/config_local.go rename to vendor/go.podman.io/common/pkg/config/config_local.go index 54fc238a242..653978c878d 100644 --- a/vendor/github.com/containers/common/pkg/config/config_local.go +++ b/vendor/go.podman.io/common/pkg/config/config_local.go @@ -9,8 +9,8 @@ import ( "strconv" "strings" - "github.com/containers/storage/pkg/fileutils" units "github.com/docker/go-units" + "go.podman.io/storage/pkg/fileutils" "tags.cncf.io/container-device-interface/pkg/parser" ) diff --git a/vendor/github.com/containers/common/pkg/config/config_remote.go b/vendor/go.podman.io/common/pkg/config/config_remote.go similarity index 100% rename from vendor/github.com/containers/common/pkg/config/config_remote.go rename to vendor/go.podman.io/common/pkg/config/config_remote.go diff --git a/vendor/github.com/containers/common/pkg/config/config_unix.go b/vendor/go.podman.io/common/pkg/config/config_unix.go similarity index 95% rename from vendor/github.com/containers/common/pkg/config/config_unix.go rename to vendor/go.podman.io/common/pkg/config/config_unix.go index 1481086ae5e..f74854383fa 100644 --- a/vendor/github.com/containers/common/pkg/config/config_unix.go +++ b/vendor/go.podman.io/common/pkg/config/config_unix.go @@ -6,7 +6,7 @@ import ( "os" "path/filepath" - "github.com/containers/storage/pkg/unshare" + "go.podman.io/storage/pkg/unshare" ) // _configPath is the path to the containers/containers.conf diff --git a/vendor/github.com/containers/common/pkg/config/config_unsupported.go b/vendor/go.podman.io/common/pkg/config/config_unsupported.go similarity index 100% rename from vendor/github.com/containers/common/pkg/config/config_unsupported.go rename to vendor/go.podman.io/common/pkg/config/config_unsupported.go diff --git a/vendor/github.com/containers/common/pkg/config/config_windows.go b/vendor/go.podman.io/common/pkg/config/config_windows.go similarity index 100% rename from vendor/github.com/containers/common/pkg/config/config_windows.go rename to vendor/go.podman.io/common/pkg/config/config_windows.go diff --git a/vendor/github.com/containers/common/pkg/config/connections.go b/vendor/go.podman.io/common/pkg/config/connections.go similarity index 98% rename from vendor/github.com/containers/common/pkg/config/connections.go rename to vendor/go.podman.io/common/pkg/config/connections.go index d7c2c7d8a56..e879faef73a 100644 --- a/vendor/github.com/containers/common/pkg/config/connections.go +++ b/vendor/go.podman.io/common/pkg/config/connections.go @@ -8,8 +8,8 @@ import ( "os" "path/filepath" - "github.com/containers/storage/pkg/ioutils" - "github.com/containers/storage/pkg/lockfile" + "go.podman.io/storage/pkg/ioutils" + "go.podman.io/storage/pkg/lockfile" ) const connectionsFile = "podman-connections.json" diff --git a/vendor/github.com/containers/common/pkg/config/containers.conf b/vendor/go.podman.io/common/pkg/config/containers.conf similarity index 100% rename from vendor/github.com/containers/common/pkg/config/containers.conf rename to vendor/go.podman.io/common/pkg/config/containers.conf diff --git a/vendor/github.com/containers/common/pkg/config/containers.conf-freebsd b/vendor/go.podman.io/common/pkg/config/containers.conf-freebsd similarity index 100% rename from vendor/github.com/containers/common/pkg/config/containers.conf-freebsd rename to vendor/go.podman.io/common/pkg/config/containers.conf-freebsd diff --git a/vendor/github.com/containers/common/pkg/config/db_backend.go b/vendor/go.podman.io/common/pkg/config/db_backend.go similarity index 100% rename from vendor/github.com/containers/common/pkg/config/db_backend.go rename to vendor/go.podman.io/common/pkg/config/db_backend.go diff --git a/vendor/github.com/containers/common/pkg/config/default.go b/vendor/go.podman.io/common/pkg/config/default.go similarity index 98% rename from vendor/github.com/containers/common/pkg/config/default.go rename to vendor/go.podman.io/common/pkg/config/default.go index a8b44b162bd..b48797a1c46 100644 --- a/vendor/github.com/containers/common/pkg/config/default.go +++ b/vendor/go.podman.io/common/pkg/config/default.go @@ -10,16 +10,16 @@ import ( "strings" "sync" - "github.com/containers/common/internal/attributedstring" - nettypes "github.com/containers/common/libnetwork/types" - "github.com/containers/common/pkg/apparmor" - "github.com/containers/common/pkg/cgroupv2" - "github.com/containers/storage/pkg/fileutils" - "github.com/containers/storage/pkg/homedir" - "github.com/containers/storage/pkg/unshare" - "github.com/containers/storage/types" "github.com/opencontainers/selinux/go-selinux" "github.com/sirupsen/logrus" + "go.podman.io/common/internal/attributedstring" + nettypes "go.podman.io/common/libnetwork/types" + "go.podman.io/common/pkg/apparmor" + "go.podman.io/common/pkg/cgroupv2" + "go.podman.io/storage/pkg/fileutils" + "go.podman.io/storage/pkg/homedir" + "go.podman.io/storage/pkg/unshare" + "go.podman.io/storage/types" ) const ( diff --git a/vendor/github.com/containers/common/pkg/config/default_bsd.go b/vendor/go.podman.io/common/pkg/config/default_bsd.go similarity index 100% rename from vendor/github.com/containers/common/pkg/config/default_bsd.go rename to vendor/go.podman.io/common/pkg/config/default_bsd.go diff --git a/vendor/github.com/containers/common/pkg/config/default_common.go b/vendor/go.podman.io/common/pkg/config/default_common.go similarity index 100% rename from vendor/github.com/containers/common/pkg/config/default_common.go rename to vendor/go.podman.io/common/pkg/config/default_common.go diff --git a/vendor/github.com/containers/common/pkg/config/default_darwin.go b/vendor/go.podman.io/common/pkg/config/default_darwin.go similarity index 100% rename from vendor/github.com/containers/common/pkg/config/default_darwin.go rename to vendor/go.podman.io/common/pkg/config/default_darwin.go diff --git a/vendor/github.com/containers/common/pkg/config/default_linux.go b/vendor/go.podman.io/common/pkg/config/default_linux.go similarity index 100% rename from vendor/github.com/containers/common/pkg/config/default_linux.go rename to vendor/go.podman.io/common/pkg/config/default_linux.go diff --git a/vendor/github.com/containers/common/pkg/config/default_unsupported.go b/vendor/go.podman.io/common/pkg/config/default_unsupported.go similarity index 100% rename from vendor/github.com/containers/common/pkg/config/default_unsupported.go rename to vendor/go.podman.io/common/pkg/config/default_unsupported.go diff --git a/vendor/github.com/containers/common/pkg/config/default_windows.go b/vendor/go.podman.io/common/pkg/config/default_windows.go similarity index 97% rename from vendor/github.com/containers/common/pkg/config/default_windows.go rename to vendor/go.podman.io/common/pkg/config/default_windows.go index 610aa122bf0..d57e775b5aa 100644 --- a/vendor/github.com/containers/common/pkg/config/default_windows.go +++ b/vendor/go.podman.io/common/pkg/config/default_windows.go @@ -6,7 +6,7 @@ import ( "path/filepath" "strings" - "github.com/containers/storage/pkg/homedir" + "go.podman.io/storage/pkg/homedir" ) // isCgroup2UnifiedMode returns whether we are running in cgroup2 mode. diff --git a/vendor/github.com/containers/common/pkg/config/modules.go b/vendor/go.podman.io/common/pkg/config/modules.go similarity index 97% rename from vendor/github.com/containers/common/pkg/config/modules.go rename to vendor/go.podman.io/common/pkg/config/modules.go index fae784ac7ad..c1e1f8de809 100644 --- a/vendor/github.com/containers/common/pkg/config/modules.go +++ b/vendor/go.podman.io/common/pkg/config/modules.go @@ -4,8 +4,8 @@ import ( "fmt" "path/filepath" - "github.com/containers/storage/pkg/fileutils" "github.com/hashicorp/go-multierror" + "go.podman.io/storage/pkg/fileutils" ) // LoadedModules returns absolute paths to loaded containers.conf modules. diff --git a/vendor/github.com/containers/common/pkg/config/new.go b/vendor/go.podman.io/common/pkg/config/new.go similarity index 98% rename from vendor/github.com/containers/common/pkg/config/new.go rename to vendor/go.podman.io/common/pkg/config/new.go index bc4948cbeb6..d40ff82c210 100644 --- a/vendor/github.com/containers/common/pkg/config/new.go +++ b/vendor/go.podman.io/common/pkg/config/new.go @@ -11,9 +11,9 @@ import ( "sync" "github.com/BurntSushi/toml" - "github.com/containers/storage/pkg/fileutils" - "github.com/containers/storage/pkg/unshare" "github.com/sirupsen/logrus" + "go.podman.io/storage/pkg/fileutils" + "go.podman.io/storage/pkg/unshare" ) var ( diff --git a/vendor/github.com/containers/common/pkg/config/nosystemd.go b/vendor/go.podman.io/common/pkg/config/nosystemd.go similarity index 100% rename from vendor/github.com/containers/common/pkg/config/nosystemd.go rename to vendor/go.podman.io/common/pkg/config/nosystemd.go diff --git a/vendor/github.com/containers/common/pkg/config/pod_exit_policy.go b/vendor/go.podman.io/common/pkg/config/pod_exit_policy.go similarity index 100% rename from vendor/github.com/containers/common/pkg/config/pod_exit_policy.go rename to vendor/go.podman.io/common/pkg/config/pod_exit_policy.go diff --git a/vendor/github.com/containers/common/pkg/config/pull_policy.go b/vendor/go.podman.io/common/pkg/config/pull_policy.go similarity index 100% rename from vendor/github.com/containers/common/pkg/config/pull_policy.go rename to vendor/go.podman.io/common/pkg/config/pull_policy.go diff --git a/vendor/github.com/containers/common/pkg/config/systemd.go b/vendor/go.podman.io/common/pkg/config/systemd.go similarity index 93% rename from vendor/github.com/containers/common/pkg/config/systemd.go rename to vendor/go.podman.io/common/pkg/config/systemd.go index 50637461906..f374c6dbc6a 100644 --- a/vendor/github.com/containers/common/pkg/config/systemd.go +++ b/vendor/go.podman.io/common/pkg/config/systemd.go @@ -8,8 +8,8 @@ import ( "strings" "sync" - "github.com/containers/common/pkg/cgroupv2" - "github.com/containers/storage/pkg/unshare" + "go.podman.io/common/pkg/cgroupv2" + "go.podman.io/storage/pkg/unshare" ) var ( diff --git a/vendor/github.com/containers/common/pkg/detach/copy.go b/vendor/go.podman.io/common/pkg/detach/copy.go similarity index 100% rename from vendor/github.com/containers/common/pkg/detach/copy.go rename to vendor/go.podman.io/common/pkg/detach/copy.go diff --git a/vendor/github.com/containers/common/pkg/download/download.go b/vendor/go.podman.io/common/pkg/download/download.go similarity index 100% rename from vendor/github.com/containers/common/pkg/download/download.go rename to vendor/go.podman.io/common/pkg/download/download.go diff --git a/vendor/github.com/containers/common/pkg/filters/filters.go b/vendor/go.podman.io/common/pkg/filters/filters.go similarity index 98% rename from vendor/github.com/containers/common/pkg/filters/filters.go rename to vendor/go.podman.io/common/pkg/filters/filters.go index 599900be5c8..adbfa3644a8 100644 --- a/vendor/github.com/containers/common/pkg/filters/filters.go +++ b/vendor/go.podman.io/common/pkg/filters/filters.go @@ -10,8 +10,8 @@ import ( "strings" "time" - "github.com/containers/common/libnetwork/types" - "github.com/containers/common/pkg/timetype" + "go.podman.io/common/libnetwork/types" + "go.podman.io/common/pkg/timetype" ) // ComputeUntilTimestamp extracts until timestamp from filters diff --git a/vendor/github.com/containers/common/pkg/flag/flag.go b/vendor/go.podman.io/common/pkg/flag/flag.go similarity index 100% rename from vendor/github.com/containers/common/pkg/flag/flag.go rename to vendor/go.podman.io/common/pkg/flag/flag.go diff --git a/vendor/github.com/containers/common/pkg/hooks/0.1.0/hook.go b/vendor/go.podman.io/common/pkg/hooks/0.1.0/hook.go similarity index 97% rename from vendor/github.com/containers/common/pkg/hooks/0.1.0/hook.go rename to vendor/go.podman.io/common/pkg/hooks/0.1.0/hook.go index 88ff5990f44..7d23e1e5a2c 100644 --- a/vendor/github.com/containers/common/pkg/hooks/0.1.0/hook.go +++ b/vendor/go.podman.io/common/pkg/hooks/0.1.0/hook.go @@ -6,8 +6,8 @@ import ( "errors" "strings" - current "github.com/containers/common/pkg/hooks/1.0.0" rspec "github.com/opencontainers/runtime-spec/specs-go" + current "go.podman.io/common/pkg/hooks/1.0.0" ) // Version is the hook configuration version defined in this package. diff --git a/vendor/github.com/containers/common/pkg/hooks/1.0.0/hook.go b/vendor/go.podman.io/common/pkg/hooks/1.0.0/hook.go similarity index 97% rename from vendor/github.com/containers/common/pkg/hooks/1.0.0/hook.go rename to vendor/go.podman.io/common/pkg/hooks/1.0.0/hook.go index be78b0cfbd6..dbac6e64bfa 100644 --- a/vendor/github.com/containers/common/pkg/hooks/1.0.0/hook.go +++ b/vendor/go.podman.io/common/pkg/hooks/1.0.0/hook.go @@ -7,8 +7,8 @@ import ( "fmt" "regexp" - "github.com/containers/storage/pkg/fileutils" rspec "github.com/opencontainers/runtime-spec/specs-go" + "go.podman.io/storage/pkg/fileutils" ) // Version is the hook configuration version defined in this package. diff --git a/vendor/github.com/containers/common/pkg/hooks/1.0.0/when.go b/vendor/go.podman.io/common/pkg/hooks/1.0.0/when.go similarity index 100% rename from vendor/github.com/containers/common/pkg/hooks/1.0.0/when.go rename to vendor/go.podman.io/common/pkg/hooks/1.0.0/when.go diff --git a/vendor/github.com/containers/common/pkg/hooks/README.md b/vendor/go.podman.io/common/pkg/hooks/README.md similarity index 100% rename from vendor/github.com/containers/common/pkg/hooks/README.md rename to vendor/go.podman.io/common/pkg/hooks/README.md diff --git a/vendor/github.com/containers/common/pkg/hooks/exec/exec.go b/vendor/go.podman.io/common/pkg/hooks/exec/exec.go similarity index 100% rename from vendor/github.com/containers/common/pkg/hooks/exec/exec.go rename to vendor/go.podman.io/common/pkg/hooks/exec/exec.go diff --git a/vendor/github.com/containers/common/pkg/hooks/exec/runtimeconfigfilter.go b/vendor/go.podman.io/common/pkg/hooks/exec/runtimeconfigfilter.go similarity index 100% rename from vendor/github.com/containers/common/pkg/hooks/exec/runtimeconfigfilter.go rename to vendor/go.podman.io/common/pkg/hooks/exec/runtimeconfigfilter.go diff --git a/vendor/github.com/containers/common/pkg/hooks/hooks.go b/vendor/go.podman.io/common/pkg/hooks/hooks.go similarity index 98% rename from vendor/github.com/containers/common/pkg/hooks/hooks.go rename to vendor/go.podman.io/common/pkg/hooks/hooks.go index 0b4ad052ba4..b62d0f7b895 100644 --- a/vendor/github.com/containers/common/pkg/hooks/hooks.go +++ b/vendor/go.podman.io/common/pkg/hooks/hooks.go @@ -10,9 +10,9 @@ import ( "strings" "sync" - current "github.com/containers/common/pkg/hooks/1.0.0" rspec "github.com/opencontainers/runtime-spec/specs-go" "github.com/sirupsen/logrus" + current "go.podman.io/common/pkg/hooks/1.0.0" ) // Version is the current hook configuration version. diff --git a/vendor/github.com/containers/common/pkg/hooks/monitor.go b/vendor/go.podman.io/common/pkg/hooks/monitor.go similarity index 96% rename from vendor/github.com/containers/common/pkg/hooks/monitor.go rename to vendor/go.podman.io/common/pkg/hooks/monitor.go index bd1ea9daf6d..c2039482ca9 100644 --- a/vendor/github.com/containers/common/pkg/hooks/monitor.go +++ b/vendor/go.podman.io/common/pkg/hooks/monitor.go @@ -3,9 +3,9 @@ package hooks import ( "context" - current "github.com/containers/common/pkg/hooks/1.0.0" "github.com/fsnotify/fsnotify" "github.com/sirupsen/logrus" + current "go.podman.io/common/pkg/hooks/1.0.0" ) // Monitor dynamically monitors hook directories for additions, diff --git a/vendor/github.com/containers/common/pkg/hooks/read.go b/vendor/go.podman.io/common/pkg/hooks/read.go similarity index 95% rename from vendor/github.com/containers/common/pkg/hooks/read.go rename to vendor/go.podman.io/common/pkg/hooks/read.go index e7d349f3e06..92f3e534b6e 100644 --- a/vendor/github.com/containers/common/pkg/hooks/read.go +++ b/vendor/go.podman.io/common/pkg/hooks/read.go @@ -9,9 +9,9 @@ import ( "path/filepath" "strings" - old "github.com/containers/common/pkg/hooks/0.1.0" - current "github.com/containers/common/pkg/hooks/1.0.0" "github.com/sirupsen/logrus" + old "go.podman.io/common/pkg/hooks/0.1.0" + current "go.podman.io/common/pkg/hooks/1.0.0" ) type reader func(content []byte) (*current.Hook, error) diff --git a/vendor/github.com/containers/common/pkg/hooks/version.go b/vendor/go.podman.io/common/pkg/hooks/version.go similarity index 100% rename from vendor/github.com/containers/common/pkg/hooks/version.go rename to vendor/go.podman.io/common/pkg/hooks/version.go diff --git a/vendor/github.com/containers/common/pkg/machine/machine.go b/vendor/go.podman.io/common/pkg/machine/machine.go similarity index 100% rename from vendor/github.com/containers/common/pkg/machine/machine.go rename to vendor/go.podman.io/common/pkg/machine/machine.go diff --git a/vendor/github.com/containers/common/pkg/manifests/errors.go b/vendor/go.podman.io/common/pkg/manifests/errors.go similarity index 100% rename from vendor/github.com/containers/common/pkg/manifests/errors.go rename to vendor/go.podman.io/common/pkg/manifests/errors.go diff --git a/vendor/github.com/containers/common/pkg/manifests/manifests.go b/vendor/go.podman.io/common/pkg/manifests/manifests.go similarity index 99% rename from vendor/github.com/containers/common/pkg/manifests/manifests.go rename to vendor/go.podman.io/common/pkg/manifests/manifests.go index 58ed0abf7ed..5198fc0ae60 100644 --- a/vendor/github.com/containers/common/pkg/manifests/manifests.go +++ b/vendor/go.podman.io/common/pkg/manifests/manifests.go @@ -8,11 +8,11 @@ import ( "slices" "strings" - "github.com/containers/common/internal" - "github.com/containers/image/v5/manifest" digest "github.com/opencontainers/go-digest" imgspec "github.com/opencontainers/image-spec/specs-go" v1 "github.com/opencontainers/image-spec/specs-go/v1" + "go.podman.io/common/internal" + "go.podman.io/image/v5/manifest" ) // List is a generic interface for manipulating a manifest list or an image diff --git a/vendor/github.com/containers/common/pkg/netns/netns_linux.go b/vendor/go.podman.io/common/pkg/netns/netns_linux.go similarity index 98% rename from vendor/github.com/containers/common/pkg/netns/netns_linux.go rename to vendor/go.podman.io/common/pkg/netns/netns_linux.go index 0947b9f709e..3bdeb2e69de 100644 --- a/vendor/github.com/containers/common/pkg/netns/netns_linux.go +++ b/vendor/go.podman.io/common/pkg/netns/netns_linux.go @@ -31,9 +31,9 @@ import ( "time" "github.com/containernetworking/plugins/pkg/ns" - "github.com/containers/storage/pkg/homedir" - "github.com/containers/storage/pkg/unshare" "github.com/sirupsen/logrus" + "go.podman.io/storage/pkg/homedir" + "go.podman.io/storage/pkg/unshare" "golang.org/x/sys/unix" ) diff --git a/vendor/github.com/containers/common/pkg/parse/parse.go b/vendor/go.podman.io/common/pkg/parse/parse.go similarity index 99% rename from vendor/github.com/containers/common/pkg/parse/parse.go rename to vendor/go.podman.io/common/pkg/parse/parse.go index e73e7cbf6bb..cc4a41f7a3d 100644 --- a/vendor/github.com/containers/common/pkg/parse/parse.go +++ b/vendor/go.podman.io/common/pkg/parse/parse.go @@ -10,7 +10,7 @@ import ( "path/filepath" "strings" - "github.com/containers/storage/pkg/fileutils" + "go.podman.io/storage/pkg/fileutils" ) // ValidateVolumeOpts validates a volume's options diff --git a/vendor/github.com/containers/common/pkg/parse/parse_unix.go b/vendor/go.podman.io/common/pkg/parse/parse_unix.go similarity index 96% rename from vendor/github.com/containers/common/pkg/parse/parse_unix.go rename to vendor/go.podman.io/common/pkg/parse/parse_unix.go index 0e96a0dd42e..ae534aec3cd 100644 --- a/vendor/github.com/containers/common/pkg/parse/parse_unix.go +++ b/vendor/go.podman.io/common/pkg/parse/parse_unix.go @@ -7,9 +7,9 @@ import ( "os" "path/filepath" - "github.com/containers/storage/pkg/unshare" "github.com/opencontainers/cgroups/devices/config" "github.com/opencontainers/runc/libcontainer/devices" + "go.podman.io/storage/pkg/unshare" ) func DeviceFromPath(device string) ([]config.Device, error) { diff --git a/vendor/github.com/containers/common/pkg/password/password_supported.go b/vendor/go.podman.io/common/pkg/password/password_supported.go similarity index 100% rename from vendor/github.com/containers/common/pkg/password/password_supported.go rename to vendor/go.podman.io/common/pkg/password/password_supported.go diff --git a/vendor/github.com/containers/common/pkg/password/password_windows.go b/vendor/go.podman.io/common/pkg/password/password_windows.go similarity index 100% rename from vendor/github.com/containers/common/pkg/password/password_windows.go rename to vendor/go.podman.io/common/pkg/password/password_windows.go diff --git a/vendor/github.com/containers/common/pkg/report/camelcase/LICENSE.md b/vendor/go.podman.io/common/pkg/report/camelcase/LICENSE.md similarity index 100% rename from vendor/github.com/containers/common/pkg/report/camelcase/LICENSE.md rename to vendor/go.podman.io/common/pkg/report/camelcase/LICENSE.md diff --git a/vendor/github.com/containers/common/pkg/report/camelcase/README.md b/vendor/go.podman.io/common/pkg/report/camelcase/README.md similarity index 100% rename from vendor/github.com/containers/common/pkg/report/camelcase/README.md rename to vendor/go.podman.io/common/pkg/report/camelcase/README.md diff --git a/vendor/github.com/containers/common/pkg/report/camelcase/camelcase.go b/vendor/go.podman.io/common/pkg/report/camelcase/camelcase.go similarity index 100% rename from vendor/github.com/containers/common/pkg/report/camelcase/camelcase.go rename to vendor/go.podman.io/common/pkg/report/camelcase/camelcase.go diff --git a/vendor/github.com/containers/common/pkg/report/doc.go b/vendor/go.podman.io/common/pkg/report/doc.go similarity index 100% rename from vendor/github.com/containers/common/pkg/report/doc.go rename to vendor/go.podman.io/common/pkg/report/doc.go diff --git a/vendor/github.com/containers/common/pkg/report/formatter.go b/vendor/go.podman.io/common/pkg/report/formatter.go similarity index 100% rename from vendor/github.com/containers/common/pkg/report/formatter.go rename to vendor/go.podman.io/common/pkg/report/formatter.go diff --git a/vendor/github.com/containers/common/pkg/report/template.go b/vendor/go.podman.io/common/pkg/report/template.go similarity index 98% rename from vendor/github.com/containers/common/pkg/report/template.go rename to vendor/go.podman.io/common/pkg/report/template.go index 607bb7ff2b8..be40ce5da7d 100644 --- a/vendor/github.com/containers/common/pkg/report/template.go +++ b/vendor/go.podman.io/common/pkg/report/template.go @@ -7,8 +7,8 @@ import ( "strings" "text/template" - "github.com/containers/common/pkg/report/camelcase" - "github.com/containers/storage/pkg/regexp" + "go.podman.io/common/pkg/report/camelcase" + "go.podman.io/storage/pkg/regexp" ) // Template embeds template.Template to add functionality to methods diff --git a/vendor/github.com/containers/common/pkg/report/validate.go b/vendor/go.podman.io/common/pkg/report/validate.go similarity index 91% rename from vendor/github.com/containers/common/pkg/report/validate.go rename to vendor/go.podman.io/common/pkg/report/validate.go index bdecf7796be..1da657c3f2d 100644 --- a/vendor/github.com/containers/common/pkg/report/validate.go +++ b/vendor/go.podman.io/common/pkg/report/validate.go @@ -1,7 +1,7 @@ package report import ( - "github.com/containers/storage/pkg/regexp" + "go.podman.io/storage/pkg/regexp" ) // Check for json, {{json }} and {{ json. }} which are not valid go template, diff --git a/vendor/github.com/containers/common/pkg/report/writer.go b/vendor/go.podman.io/common/pkg/report/writer.go similarity index 100% rename from vendor/github.com/containers/common/pkg/report/writer.go rename to vendor/go.podman.io/common/pkg/report/writer.go diff --git a/vendor/github.com/containers/common/pkg/resize/resize.go b/vendor/go.podman.io/common/pkg/resize/resize.go similarity index 100% rename from vendor/github.com/containers/common/pkg/resize/resize.go rename to vendor/go.podman.io/common/pkg/resize/resize.go diff --git a/vendor/github.com/containers/common/pkg/retry/retry.go b/vendor/go.podman.io/common/pkg/retry/retry.go similarity index 99% rename from vendor/github.com/containers/common/pkg/retry/retry.go rename to vendor/go.podman.io/common/pkg/retry/retry.go index 547d8ae372e..457dbaf6bc6 100644 --- a/vendor/github.com/containers/common/pkg/retry/retry.go +++ b/vendor/go.podman.io/common/pkg/retry/retry.go @@ -11,11 +11,11 @@ import ( "syscall" "time" - "github.com/containers/image/v5/docker" "github.com/docker/distribution/registry/api/errcode" errcodev2 "github.com/docker/distribution/registry/api/v2" "github.com/hashicorp/go-multierror" "github.com/sirupsen/logrus" + "go.podman.io/image/v5/docker" ) // Options defines the option to retry. diff --git a/vendor/github.com/containers/common/pkg/retry/retry_linux.go b/vendor/go.podman.io/common/pkg/retry/retry_linux.go similarity index 100% rename from vendor/github.com/containers/common/pkg/retry/retry_linux.go rename to vendor/go.podman.io/common/pkg/retry/retry_linux.go diff --git a/vendor/github.com/containers/common/pkg/retry/retry_unsupported.go b/vendor/go.podman.io/common/pkg/retry/retry_unsupported.go similarity index 100% rename from vendor/github.com/containers/common/pkg/retry/retry_unsupported.go rename to vendor/go.podman.io/common/pkg/retry/retry_unsupported.go diff --git a/vendor/github.com/containers/common/pkg/rootlessport/rootlessport_linux.go b/vendor/go.podman.io/common/pkg/rootlessport/rootlessport_linux.go similarity index 91% rename from vendor/github.com/containers/common/pkg/rootlessport/rootlessport_linux.go rename to vendor/go.podman.io/common/pkg/rootlessport/rootlessport_linux.go index dc4c5bf1a7f..78829b9fb61 100644 --- a/vendor/github.com/containers/common/pkg/rootlessport/rootlessport_linux.go +++ b/vendor/go.podman.io/common/pkg/rootlessport/rootlessport_linux.go @@ -4,7 +4,7 @@ package rootlessport import ( - "github.com/containers/common/libnetwork/types" + "go.podman.io/common/libnetwork/types" ) const ( diff --git a/vendor/github.com/containers/common/pkg/seccomp/conversion.go b/vendor/go.podman.io/common/pkg/seccomp/conversion.go similarity index 100% rename from vendor/github.com/containers/common/pkg/seccomp/conversion.go rename to vendor/go.podman.io/common/pkg/seccomp/conversion.go diff --git a/vendor/github.com/containers/common/pkg/seccomp/default_linux.go b/vendor/go.podman.io/common/pkg/seccomp/default_linux.go similarity index 100% rename from vendor/github.com/containers/common/pkg/seccomp/default_linux.go rename to vendor/go.podman.io/common/pkg/seccomp/default_linux.go diff --git a/vendor/github.com/containers/common/pkg/seccomp/errno_list.go b/vendor/go.podman.io/common/pkg/seccomp/errno_list.go similarity index 100% rename from vendor/github.com/containers/common/pkg/seccomp/errno_list.go rename to vendor/go.podman.io/common/pkg/seccomp/errno_list.go diff --git a/vendor/github.com/containers/common/pkg/seccomp/filter.go b/vendor/go.podman.io/common/pkg/seccomp/filter.go similarity index 100% rename from vendor/github.com/containers/common/pkg/seccomp/filter.go rename to vendor/go.podman.io/common/pkg/seccomp/filter.go diff --git a/vendor/github.com/containers/common/pkg/seccomp/seccomp.json b/vendor/go.podman.io/common/pkg/seccomp/seccomp.json similarity index 100% rename from vendor/github.com/containers/common/pkg/seccomp/seccomp.json rename to vendor/go.podman.io/common/pkg/seccomp/seccomp.json diff --git a/vendor/github.com/containers/common/pkg/seccomp/seccomp_linux.go b/vendor/go.podman.io/common/pkg/seccomp/seccomp_linux.go similarity index 100% rename from vendor/github.com/containers/common/pkg/seccomp/seccomp_linux.go rename to vendor/go.podman.io/common/pkg/seccomp/seccomp_linux.go diff --git a/vendor/github.com/containers/common/pkg/seccomp/seccomp_unsupported.go b/vendor/go.podman.io/common/pkg/seccomp/seccomp_unsupported.go similarity index 100% rename from vendor/github.com/containers/common/pkg/seccomp/seccomp_unsupported.go rename to vendor/go.podman.io/common/pkg/seccomp/seccomp_unsupported.go diff --git a/vendor/github.com/containers/common/pkg/seccomp/supported.go b/vendor/go.podman.io/common/pkg/seccomp/supported.go similarity index 100% rename from vendor/github.com/containers/common/pkg/seccomp/supported.go rename to vendor/go.podman.io/common/pkg/seccomp/supported.go diff --git a/vendor/github.com/containers/common/pkg/seccomp/types.go b/vendor/go.podman.io/common/pkg/seccomp/types.go similarity index 100% rename from vendor/github.com/containers/common/pkg/seccomp/types.go rename to vendor/go.podman.io/common/pkg/seccomp/types.go diff --git a/vendor/github.com/containers/common/pkg/seccomp/validate.go b/vendor/go.podman.io/common/pkg/seccomp/validate.go similarity index 100% rename from vendor/github.com/containers/common/pkg/seccomp/validate.go rename to vendor/go.podman.io/common/pkg/seccomp/validate.go diff --git a/vendor/github.com/containers/common/pkg/secrets/define/secrets.go b/vendor/go.podman.io/common/pkg/secrets/define/secrets.go similarity index 100% rename from vendor/github.com/containers/common/pkg/secrets/define/secrets.go rename to vendor/go.podman.io/common/pkg/secrets/define/secrets.go diff --git a/vendor/github.com/containers/common/pkg/secrets/filedriver/filedriver.go b/vendor/go.podman.io/common/pkg/secrets/filedriver/filedriver.go similarity index 96% rename from vendor/github.com/containers/common/pkg/secrets/filedriver/filedriver.go rename to vendor/go.podman.io/common/pkg/secrets/filedriver/filedriver.go index 33481cbbe6f..d026a697e4a 100644 --- a/vendor/github.com/containers/common/pkg/secrets/filedriver/filedriver.go +++ b/vendor/go.podman.io/common/pkg/secrets/filedriver/filedriver.go @@ -10,9 +10,9 @@ import ( "path/filepath" "slices" - "github.com/containers/common/pkg/secrets/define" - "github.com/containers/storage/pkg/fileutils" - "github.com/containers/storage/pkg/lockfile" + "go.podman.io/common/pkg/secrets/define" + "go.podman.io/storage/pkg/fileutils" + "go.podman.io/storage/pkg/lockfile" ) // secretsDataFile is the file where secrets data/payload will be stored diff --git a/vendor/github.com/containers/common/pkg/secrets/passdriver/passdriver.go b/vendor/go.podman.io/common/pkg/secrets/passdriver/passdriver.go similarity index 97% rename from vendor/github.com/containers/common/pkg/secrets/passdriver/passdriver.go rename to vendor/go.podman.io/common/pkg/secrets/passdriver/passdriver.go index b99541faa5b..9e5656080f4 100644 --- a/vendor/github.com/containers/common/pkg/secrets/passdriver/passdriver.go +++ b/vendor/go.podman.io/common/pkg/secrets/passdriver/passdriver.go @@ -12,8 +12,8 @@ import ( "sort" "strings" - "github.com/containers/common/pkg/secrets/define" - "github.com/containers/storage/pkg/fileutils" + "go.podman.io/common/pkg/secrets/define" + "go.podman.io/storage/pkg/fileutils" ) type driverConfig struct { diff --git a/vendor/github.com/containers/common/pkg/secrets/secrets.go b/vendor/go.podman.io/common/pkg/secrets/secrets.go similarity index 96% rename from vendor/github.com/containers/common/pkg/secrets/secrets.go rename to vendor/go.podman.io/common/pkg/secrets/secrets.go index 958b3971de1..5a744f7fecc 100644 --- a/vendor/github.com/containers/common/pkg/secrets/secrets.go +++ b/vendor/go.podman.io/common/pkg/secrets/secrets.go @@ -10,12 +10,12 @@ import ( "strings" "time" - "github.com/containers/common/pkg/secrets/define" - "github.com/containers/common/pkg/secrets/filedriver" - "github.com/containers/common/pkg/secrets/passdriver" - "github.com/containers/common/pkg/secrets/shelldriver" - "github.com/containers/storage/pkg/lockfile" - "github.com/containers/storage/pkg/stringid" + "go.podman.io/common/pkg/secrets/define" + "go.podman.io/common/pkg/secrets/filedriver" + "go.podman.io/common/pkg/secrets/passdriver" + "go.podman.io/common/pkg/secrets/shelldriver" + "go.podman.io/storage/pkg/lockfile" + "go.podman.io/storage/pkg/stringid" ) // maxSecretSize is the max size for secret data - 512kB diff --git a/vendor/github.com/containers/common/pkg/secrets/secretsdb.go b/vendor/go.podman.io/common/pkg/secrets/secretsdb.go similarity index 99% rename from vendor/github.com/containers/common/pkg/secrets/secretsdb.go rename to vendor/go.podman.io/common/pkg/secrets/secretsdb.go index fb8201f5900..3628bfd8779 100644 --- a/vendor/github.com/containers/common/pkg/secrets/secretsdb.go +++ b/vendor/go.podman.io/common/pkg/secrets/secretsdb.go @@ -9,7 +9,7 @@ import ( "strings" "time" - "github.com/containers/common/pkg/secrets/define" + "go.podman.io/common/pkg/secrets/define" ) type db struct { diff --git a/vendor/github.com/containers/common/pkg/secrets/shelldriver/shelldriver.go b/vendor/go.podman.io/common/pkg/secrets/shelldriver/shelldriver.go similarity index 98% rename from vendor/github.com/containers/common/pkg/secrets/shelldriver/shelldriver.go rename to vendor/go.podman.io/common/pkg/secrets/shelldriver/shelldriver.go index 262ee5cfc5d..173e2b5a6d9 100644 --- a/vendor/github.com/containers/common/pkg/secrets/shelldriver/shelldriver.go +++ b/vendor/go.podman.io/common/pkg/secrets/shelldriver/shelldriver.go @@ -10,7 +10,7 @@ import ( "sort" "strings" - "github.com/containers/common/pkg/secrets/define" + "go.podman.io/common/pkg/secrets/define" ) // errMissingConfig indicates that one or more of the external actions are not configured diff --git a/vendor/github.com/containers/common/pkg/servicereaper/service.go b/vendor/go.podman.io/common/pkg/servicereaper/service.go similarity index 100% rename from vendor/github.com/containers/common/pkg/servicereaper/service.go rename to vendor/go.podman.io/common/pkg/servicereaper/service.go diff --git a/vendor/github.com/containers/common/pkg/signal/signal_common.go b/vendor/go.podman.io/common/pkg/signal/signal_common.go similarity index 100% rename from vendor/github.com/containers/common/pkg/signal/signal_common.go rename to vendor/go.podman.io/common/pkg/signal/signal_common.go diff --git a/vendor/github.com/containers/common/pkg/signal/signal_linux.go b/vendor/go.podman.io/common/pkg/signal/signal_linux.go similarity index 100% rename from vendor/github.com/containers/common/pkg/signal/signal_linux.go rename to vendor/go.podman.io/common/pkg/signal/signal_linux.go diff --git a/vendor/github.com/containers/common/pkg/signal/signal_linux_mipsx.go b/vendor/go.podman.io/common/pkg/signal/signal_linux_mipsx.go similarity index 100% rename from vendor/github.com/containers/common/pkg/signal/signal_linux_mipsx.go rename to vendor/go.podman.io/common/pkg/signal/signal_linux_mipsx.go diff --git a/vendor/github.com/containers/common/pkg/signal/signal_unsupported.go b/vendor/go.podman.io/common/pkg/signal/signal_unsupported.go similarity index 100% rename from vendor/github.com/containers/common/pkg/signal/signal_unsupported.go rename to vendor/go.podman.io/common/pkg/signal/signal_unsupported.go diff --git a/vendor/github.com/containers/common/pkg/ssh/connection_golang.go b/vendor/go.podman.io/common/pkg/ssh/connection_golang.go similarity index 98% rename from vendor/github.com/containers/common/pkg/ssh/connection_golang.go rename to vendor/go.podman.io/common/pkg/ssh/connection_golang.go index 7749429d517..60c73df799e 100644 --- a/vendor/github.com/containers/common/pkg/ssh/connection_golang.go +++ b/vendor/go.podman.io/common/pkg/ssh/connection_golang.go @@ -23,12 +23,12 @@ import ( // by the server doesn't match the one in known_hosts: // https://github.com/golang/go/issues/29286 // https://github.com/containers/podman/issues/23575 - "github.com/containers/common/pkg/config" - "github.com/containers/storage/pkg/fileutils" - "github.com/containers/storage/pkg/homedir" "github.com/pkg/sftp" "github.com/sirupsen/logrus" "github.com/skeema/knownhosts" + "go.podman.io/common/pkg/config" + "go.podman.io/storage/pkg/fileutils" + "go.podman.io/storage/pkg/homedir" "golang.org/x/crypto/ssh" "golang.org/x/crypto/ssh/agent" ) diff --git a/vendor/github.com/containers/common/pkg/ssh/connection_native.go b/vendor/go.podman.io/common/pkg/ssh/connection_native.go similarity index 99% rename from vendor/github.com/containers/common/pkg/ssh/connection_native.go rename to vendor/go.podman.io/common/pkg/ssh/connection_native.go index a92693ff85b..39127bbab4d 100644 --- a/vendor/github.com/containers/common/pkg/ssh/connection_native.go +++ b/vendor/go.podman.io/common/pkg/ssh/connection_native.go @@ -9,7 +9,7 @@ import ( "regexp" "strings" - "github.com/containers/common/pkg/config" + "go.podman.io/common/pkg/config" ) func nativeConnectionCreate(options ConnectionCreateOptions) error { diff --git a/vendor/github.com/containers/common/pkg/ssh/ssh.go b/vendor/go.podman.io/common/pkg/ssh/ssh.go similarity index 100% rename from vendor/github.com/containers/common/pkg/ssh/ssh.go rename to vendor/go.podman.io/common/pkg/ssh/ssh.go diff --git a/vendor/github.com/containers/common/pkg/ssh/types.go b/vendor/go.podman.io/common/pkg/ssh/types.go similarity index 99% rename from vendor/github.com/containers/common/pkg/ssh/types.go rename to vendor/go.podman.io/common/pkg/ssh/types.go index bc41d78bf00..07ab181b484 100644 --- a/vendor/github.com/containers/common/pkg/ssh/types.go +++ b/vendor/go.podman.io/common/pkg/ssh/types.go @@ -4,7 +4,7 @@ import ( "net/url" "time" - "github.com/containers/storage/pkg/idtools" + "go.podman.io/storage/pkg/idtools" "golang.org/x/crypto/ssh" ) diff --git a/vendor/github.com/containers/common/pkg/ssh/utils.go b/vendor/go.podman.io/common/pkg/ssh/utils.go similarity index 98% rename from vendor/github.com/containers/common/pkg/ssh/utils.go rename to vendor/go.podman.io/common/pkg/ssh/utils.go index 0aa76d653b7..94b457173e6 100644 --- a/vendor/github.com/containers/common/pkg/ssh/utils.go +++ b/vendor/go.podman.io/common/pkg/ssh/utils.go @@ -11,7 +11,7 @@ import ( "strings" "sync" - "github.com/containers/common/pkg/config" + "go.podman.io/common/pkg/config" "golang.org/x/crypto/ssh" "golang.org/x/term" ) diff --git a/vendor/go.podman.io/common/pkg/strongunits/config.go b/vendor/go.podman.io/common/pkg/strongunits/config.go new file mode 100644 index 00000000000..35a6b0c3d14 --- /dev/null +++ b/vendor/go.podman.io/common/pkg/strongunits/config.go @@ -0,0 +1,65 @@ +package strongunits + +// supported units + +// B represents bytes +type B uint64 + +// KiB represents KiB +type KiB uint64 + +// MiB represents MiB +type MiB uint64 + +// GiB represents GiB +type GiB uint64 + +const ( + // kibToB is the math convert from bytes to KiB + kibToB = 1 << 10 + // mibToB is the math to convert from bytes to MiB + mibToB = 1 << 20 + // gibToB s the math to convert from bytes to GiB + gibToB = 1 << 30 +) + +// StorageUnits is an interface for converting disk/memory storage +// units amongst each other. +type StorageUnits interface { + ToBytes() B +} + +// ToBytes is a pass-through function for bytes +func (b B) ToBytes() B { + return b +} + +// ToBytes converts KiB to bytes +func (k KiB) ToBytes() B { + return B(k * kibToB) +} + +// ToBytes converts MiB to bytes +func (m MiB) ToBytes() B { + return B(m * mibToB) +} + +// ToBytes converts GiB to bytes +func (g GiB) ToBytes() B { + return B(g * gibToB) +} + +// ToKiB converts any StorageUnit type to KiB +func ToKiB(b StorageUnits) KiB { + return KiB(b.ToBytes() >> 10) +} + +// ToMib converts any StorageUnit type to MiB +func ToMib(b StorageUnits) MiB { + return MiB(b.ToBytes() >> 20) +} + +// ToGiB converts any StorageUnit type to GiB +func ToGiB(b StorageUnits) GiB { + return GiB(b.ToBytes() >> 30) +} diff --git a/vendor/github.com/containers/common/pkg/subscriptions/mounts.conf b/vendor/go.podman.io/common/pkg/subscriptions/mounts.conf similarity index 100% rename from vendor/github.com/containers/common/pkg/subscriptions/mounts.conf rename to vendor/go.podman.io/common/pkg/subscriptions/mounts.conf diff --git a/vendor/github.com/containers/common/pkg/subscriptions/subscriptions.go b/vendor/go.podman.io/common/pkg/subscriptions/subscriptions.go similarity index 99% rename from vendor/github.com/containers/common/pkg/subscriptions/subscriptions.go rename to vendor/go.podman.io/common/pkg/subscriptions/subscriptions.go index 202eb6d3c58..ffe11357612 100644 --- a/vendor/github.com/containers/common/pkg/subscriptions/subscriptions.go +++ b/vendor/go.podman.io/common/pkg/subscriptions/subscriptions.go @@ -8,13 +8,13 @@ import ( "path/filepath" "strings" - "github.com/containers/common/pkg/umask" - "github.com/containers/storage/pkg/fileutils" - "github.com/containers/storage/pkg/idtools" securejoin "github.com/cyphar/filepath-securejoin" rspec "github.com/opencontainers/runtime-spec/specs-go" "github.com/opencontainers/selinux/go-selinux/label" "github.com/sirupsen/logrus" + "go.podman.io/common/pkg/umask" + "go.podman.io/storage/pkg/fileutils" + "go.podman.io/storage/pkg/idtools" ) var ( diff --git a/vendor/github.com/containers/common/pkg/supplemented/errors.go b/vendor/go.podman.io/common/pkg/supplemented/errors.go similarity index 92% rename from vendor/github.com/containers/common/pkg/supplemented/errors.go rename to vendor/go.podman.io/common/pkg/supplemented/errors.go index a031951f152..15c3a793dea 100644 --- a/vendor/github.com/containers/common/pkg/supplemented/errors.go +++ b/vendor/go.podman.io/common/pkg/supplemented/errors.go @@ -3,7 +3,7 @@ package supplemented import ( "errors" - "github.com/containers/common/pkg/manifests" + "go.podman.io/common/pkg/manifests" ) var ( diff --git a/vendor/github.com/containers/common/pkg/supplemented/supplemented.go b/vendor/go.podman.io/common/pkg/supplemented/supplemented.go similarity index 98% rename from vendor/github.com/containers/common/pkg/supplemented/supplemented.go rename to vendor/go.podman.io/common/pkg/supplemented/supplemented.go index 2980126e575..f8d18f33073 100644 --- a/vendor/github.com/containers/common/pkg/supplemented/supplemented.go +++ b/vendor/go.podman.io/common/pkg/supplemented/supplemented.go @@ -8,14 +8,14 @@ import ( "io" "slices" - cp "github.com/containers/image/v5/copy" - "github.com/containers/image/v5/image" - "github.com/containers/image/v5/manifest" - "github.com/containers/image/v5/transports" - "github.com/containers/image/v5/types" multierror "github.com/hashicorp/go-multierror" digest "github.com/opencontainers/go-digest" "github.com/sirupsen/logrus" + cp "go.podman.io/image/v5/copy" + "go.podman.io/image/v5/image" + "go.podman.io/image/v5/manifest" + "go.podman.io/image/v5/transports" + "go.podman.io/image/v5/types" ) // supplementedImageReference groups multiple references together. diff --git a/vendor/github.com/containers/common/pkg/sysinfo/README.md b/vendor/go.podman.io/common/pkg/sysinfo/README.md similarity index 100% rename from vendor/github.com/containers/common/pkg/sysinfo/README.md rename to vendor/go.podman.io/common/pkg/sysinfo/README.md diff --git a/vendor/github.com/containers/common/pkg/sysinfo/numcpu.go b/vendor/go.podman.io/common/pkg/sysinfo/numcpu.go similarity index 100% rename from vendor/github.com/containers/common/pkg/sysinfo/numcpu.go rename to vendor/go.podman.io/common/pkg/sysinfo/numcpu.go diff --git a/vendor/github.com/containers/common/pkg/sysinfo/numcpu_linux.go b/vendor/go.podman.io/common/pkg/sysinfo/numcpu_linux.go similarity index 100% rename from vendor/github.com/containers/common/pkg/sysinfo/numcpu_linux.go rename to vendor/go.podman.io/common/pkg/sysinfo/numcpu_linux.go diff --git a/vendor/github.com/containers/common/pkg/sysinfo/numcpu_other.go b/vendor/go.podman.io/common/pkg/sysinfo/numcpu_other.go similarity index 100% rename from vendor/github.com/containers/common/pkg/sysinfo/numcpu_other.go rename to vendor/go.podman.io/common/pkg/sysinfo/numcpu_other.go diff --git a/vendor/github.com/containers/common/pkg/sysinfo/numcpu_windows.go b/vendor/go.podman.io/common/pkg/sysinfo/numcpu_windows.go similarity index 100% rename from vendor/github.com/containers/common/pkg/sysinfo/numcpu_windows.go rename to vendor/go.podman.io/common/pkg/sysinfo/numcpu_windows.go diff --git a/vendor/github.com/containers/common/pkg/sysinfo/sysinfo.go b/vendor/go.podman.io/common/pkg/sysinfo/sysinfo.go similarity index 98% rename from vendor/github.com/containers/common/pkg/sysinfo/sysinfo.go rename to vendor/go.podman.io/common/pkg/sysinfo/sysinfo.go index 5086a9dcc8e..45ec2834916 100644 --- a/vendor/github.com/containers/common/pkg/sysinfo/sysinfo.go +++ b/vendor/go.podman.io/common/pkg/sysinfo/sysinfo.go @@ -1,6 +1,6 @@ package sysinfo -import "github.com/containers/storage/pkg/parsers" +import "go.podman.io/storage/pkg/parsers" // SysInfo stores information about which features a kernel supports. // TODO Windows: Factor out platform specific capabilities. diff --git a/vendor/github.com/containers/common/pkg/sysinfo/sysinfo_linux.go b/vendor/go.podman.io/common/pkg/sysinfo/sysinfo_linux.go similarity index 98% rename from vendor/github.com/containers/common/pkg/sysinfo/sysinfo_linux.go rename to vendor/go.podman.io/common/pkg/sysinfo/sysinfo_linux.go index 67484ad025d..ea98d49481c 100644 --- a/vendor/github.com/containers/common/pkg/sysinfo/sysinfo_linux.go +++ b/vendor/go.podman.io/common/pkg/sysinfo/sysinfo_linux.go @@ -7,10 +7,10 @@ import ( "path" "strings" - "github.com/containers/common/pkg/cgroupv2" - "github.com/containers/storage/pkg/fileutils" "github.com/opencontainers/cgroups" "github.com/sirupsen/logrus" + "go.podman.io/common/pkg/cgroupv2" + "go.podman.io/storage/pkg/fileutils" "golang.org/x/sys/unix" ) diff --git a/vendor/github.com/containers/common/pkg/sysinfo/sysinfo_solaris.go b/vendor/go.podman.io/common/pkg/sysinfo/sysinfo_solaris.go similarity index 100% rename from vendor/github.com/containers/common/pkg/sysinfo/sysinfo_solaris.go rename to vendor/go.podman.io/common/pkg/sysinfo/sysinfo_solaris.go diff --git a/vendor/github.com/containers/common/pkg/sysinfo/sysinfo_unix.go b/vendor/go.podman.io/common/pkg/sysinfo/sysinfo_unix.go similarity index 100% rename from vendor/github.com/containers/common/pkg/sysinfo/sysinfo_unix.go rename to vendor/go.podman.io/common/pkg/sysinfo/sysinfo_unix.go diff --git a/vendor/github.com/containers/common/pkg/sysinfo/sysinfo_windows.go b/vendor/go.podman.io/common/pkg/sysinfo/sysinfo_windows.go similarity index 100% rename from vendor/github.com/containers/common/pkg/sysinfo/sysinfo_windows.go rename to vendor/go.podman.io/common/pkg/sysinfo/sysinfo_windows.go diff --git a/vendor/github.com/containers/common/pkg/systemd/systemd_linux.go b/vendor/go.podman.io/common/pkg/systemd/systemd_linux.go similarity index 97% rename from vendor/github.com/containers/common/pkg/systemd/systemd_linux.go rename to vendor/go.podman.io/common/pkg/systemd/systemd_linux.go index ea61ecaa184..fe7b8a9d9c2 100644 --- a/vendor/github.com/containers/common/pkg/systemd/systemd_linux.go +++ b/vendor/go.podman.io/common/pkg/systemd/systemd_linux.go @@ -8,11 +8,11 @@ import ( "strconv" "sync" - "github.com/containers/common/pkg/cgroups" - "github.com/containers/storage/pkg/unshare" systemdDbus "github.com/coreos/go-systemd/v22/dbus" "github.com/godbus/dbus/v5" "github.com/sirupsen/logrus" + "go.podman.io/common/pkg/cgroups" + "go.podman.io/storage/pkg/unshare" ) var ( diff --git a/vendor/github.com/containers/common/pkg/systemd/systemd_unsupported.go b/vendor/go.podman.io/common/pkg/systemd/systemd_unsupported.go similarity index 100% rename from vendor/github.com/containers/common/pkg/systemd/systemd_unsupported.go rename to vendor/go.podman.io/common/pkg/systemd/systemd_unsupported.go diff --git a/vendor/github.com/containers/common/pkg/timetype/timestamp.go b/vendor/go.podman.io/common/pkg/timetype/timestamp.go similarity index 100% rename from vendor/github.com/containers/common/pkg/timetype/timestamp.go rename to vendor/go.podman.io/common/pkg/timetype/timestamp.go diff --git a/vendor/github.com/containers/common/pkg/timezone/timezone.go b/vendor/go.podman.io/common/pkg/timezone/timezone.go similarity index 98% rename from vendor/github.com/containers/common/pkg/timezone/timezone.go rename to vendor/go.podman.io/common/pkg/timezone/timezone.go index e6066145786..2dd55d83588 100644 --- a/vendor/github.com/containers/common/pkg/timezone/timezone.go +++ b/vendor/go.podman.io/common/pkg/timezone/timezone.go @@ -10,9 +10,9 @@ import ( "os" "path/filepath" - "github.com/containers/storage/pkg/fileutils" securejoin "github.com/cyphar/filepath-securejoin" "github.com/sirupsen/logrus" + "go.podman.io/storage/pkg/fileutils" "golang.org/x/sys/unix" ) diff --git a/vendor/github.com/containers/common/pkg/timezone/timezone_linux.go b/vendor/go.podman.io/common/pkg/timezone/timezone_linux.go similarity index 100% rename from vendor/github.com/containers/common/pkg/timezone/timezone_linux.go rename to vendor/go.podman.io/common/pkg/timezone/timezone_linux.go diff --git a/vendor/github.com/containers/common/pkg/timezone/timezone_unix.go b/vendor/go.podman.io/common/pkg/timezone/timezone_unix.go similarity index 100% rename from vendor/github.com/containers/common/pkg/timezone/timezone_unix.go rename to vendor/go.podman.io/common/pkg/timezone/timezone_unix.go diff --git a/vendor/github.com/containers/common/pkg/timezone/timezone_windows.go b/vendor/go.podman.io/common/pkg/timezone/timezone_windows.go similarity index 100% rename from vendor/github.com/containers/common/pkg/timezone/timezone_windows.go rename to vendor/go.podman.io/common/pkg/timezone/timezone_windows.go diff --git a/vendor/github.com/containers/common/pkg/umask/umask.go b/vendor/go.podman.io/common/pkg/umask/umask.go similarity index 96% rename from vendor/github.com/containers/common/pkg/umask/umask.go rename to vendor/go.podman.io/common/pkg/umask/umask.go index e63a2d7d114..64670ce672a 100644 --- a/vendor/github.com/containers/common/pkg/umask/umask.go +++ b/vendor/go.podman.io/common/pkg/umask/umask.go @@ -5,7 +5,7 @@ import ( "os" "path/filepath" - "github.com/containers/storage/pkg/fileutils" + "go.podman.io/storage/pkg/fileutils" ) // MkdirAllIgnoreUmask creates a directory by ignoring the currently set umask. diff --git a/vendor/github.com/containers/common/pkg/umask/umask_unix.go b/vendor/go.podman.io/common/pkg/umask/umask_unix.go similarity index 100% rename from vendor/github.com/containers/common/pkg/umask/umask_unix.go rename to vendor/go.podman.io/common/pkg/umask/umask_unix.go diff --git a/vendor/github.com/containers/common/pkg/umask/umask_unsupported.go b/vendor/go.podman.io/common/pkg/umask/umask_unsupported.go similarity index 100% rename from vendor/github.com/containers/common/pkg/umask/umask_unsupported.go rename to vendor/go.podman.io/common/pkg/umask/umask_unsupported.go diff --git a/vendor/github.com/containers/common/pkg/util/util.go b/vendor/go.podman.io/common/pkg/util/util.go similarity index 97% rename from vendor/github.com/containers/common/pkg/util/util.go rename to vendor/go.podman.io/common/pkg/util/util.go index 72cb2404e9c..6907c143c13 100644 --- a/vendor/github.com/containers/common/pkg/util/util.go +++ b/vendor/go.podman.io/common/pkg/util/util.go @@ -7,9 +7,9 @@ import ( "regexp" "time" - "github.com/containers/storage/pkg/fileutils" "github.com/fsnotify/fsnotify" "github.com/sirupsen/logrus" + "go.podman.io/storage/pkg/fileutils" ) // StringMatchRegexSlice determines if a given string matches one of the given regexes, returns bool diff --git a/vendor/github.com/containers/common/pkg/version/version.go b/vendor/go.podman.io/common/pkg/version/version.go similarity index 98% rename from vendor/github.com/containers/common/pkg/version/version.go rename to vendor/go.podman.io/common/pkg/version/version.go index a7b160bf921..42340ce128e 100644 --- a/vendor/github.com/containers/common/pkg/version/version.go +++ b/vendor/go.podman.io/common/pkg/version/version.go @@ -6,7 +6,7 @@ import ( "os/exec" "strings" - "github.com/containers/storage/pkg/fileutils" + "go.podman.io/storage/pkg/fileutils" ) const ( diff --git a/vendor/github.com/containers/common/version/version.go b/vendor/go.podman.io/common/version/version.go similarity index 100% rename from vendor/github.com/containers/common/version/version.go rename to vendor/go.podman.io/common/version/version.go diff --git a/vendor/github.com/containers/image/v5/LICENSE b/vendor/go.podman.io/image/v5/LICENSE similarity index 100% rename from vendor/github.com/containers/image/v5/LICENSE rename to vendor/go.podman.io/image/v5/LICENSE diff --git a/vendor/github.com/containers/image/v5/copy/blob.go b/vendor/go.podman.io/image/v5/copy/blob.go similarity index 98% rename from vendor/github.com/containers/image/v5/copy/blob.go rename to vendor/go.podman.io/image/v5/copy/blob.go index 8d5580d7cb4..a881e062387 100644 --- a/vendor/github.com/containers/image/v5/copy/blob.go +++ b/vendor/go.podman.io/image/v5/copy/blob.go @@ -6,10 +6,10 @@ import ( "fmt" "io" - "github.com/containers/image/v5/internal/private" - compressiontypes "github.com/containers/image/v5/pkg/compression/types" - "github.com/containers/image/v5/types" "github.com/sirupsen/logrus" + "go.podman.io/image/v5/internal/private" + compressiontypes "go.podman.io/image/v5/pkg/compression/types" + "go.podman.io/image/v5/types" ) // copyBlobFromStream copies a blob with srcInfo (with known Digest and Annotations and possibly known Size) from srcReader to dest, diff --git a/vendor/github.com/containers/image/v5/copy/compression.go b/vendor/go.podman.io/image/v5/copy/compression.go similarity index 98% rename from vendor/github.com/containers/image/v5/copy/compression.go rename to vendor/go.podman.io/image/v5/copy/compression.go index fb5e1b174ef..0ecc8518669 100644 --- a/vendor/github.com/containers/image/v5/copy/compression.go +++ b/vendor/go.podman.io/image/v5/copy/compression.go @@ -6,14 +6,14 @@ import ( "io" "maps" - internalblobinfocache "github.com/containers/image/v5/internal/blobinfocache" - "github.com/containers/image/v5/manifest" - "github.com/containers/image/v5/pkg/compression" - compressiontypes "github.com/containers/image/v5/pkg/compression/types" - "github.com/containers/image/v5/types" - chunkedToc "github.com/containers/storage/pkg/chunked/toc" imgspecv1 "github.com/opencontainers/image-spec/specs-go/v1" "github.com/sirupsen/logrus" + internalblobinfocache "go.podman.io/image/v5/internal/blobinfocache" + "go.podman.io/image/v5/manifest" + "go.podman.io/image/v5/pkg/compression" + compressiontypes "go.podman.io/image/v5/pkg/compression/types" + "go.podman.io/image/v5/types" + chunkedToc "go.podman.io/storage/pkg/chunked/toc" ) var ( diff --git a/vendor/github.com/containers/image/v5/copy/copy.go b/vendor/go.podman.io/image/v5/copy/copy.go similarity index 96% rename from vendor/github.com/containers/image/v5/copy/copy.go rename to vendor/go.podman.io/image/v5/copy/copy.go index 44675f37cf4..eed5f8d96d3 100644 --- a/vendor/github.com/containers/image/v5/copy/copy.go +++ b/vendor/go.podman.io/image/v5/copy/copy.go @@ -9,23 +9,23 @@ import ( "slices" "time" - "github.com/containers/image/v5/docker/reference" - internalblobinfocache "github.com/containers/image/v5/internal/blobinfocache" - "github.com/containers/image/v5/internal/image" - "github.com/containers/image/v5/internal/imagedestination" - "github.com/containers/image/v5/internal/imagesource" - internalManifest "github.com/containers/image/v5/internal/manifest" - "github.com/containers/image/v5/internal/private" - "github.com/containers/image/v5/manifest" - "github.com/containers/image/v5/pkg/blobinfocache" - compression "github.com/containers/image/v5/pkg/compression/types" - "github.com/containers/image/v5/signature" - "github.com/containers/image/v5/signature/signer" - "github.com/containers/image/v5/transports" - "github.com/containers/image/v5/types" encconfig "github.com/containers/ocicrypt/config" digest "github.com/opencontainers/go-digest" "github.com/sirupsen/logrus" + "go.podman.io/image/v5/docker/reference" + internalblobinfocache "go.podman.io/image/v5/internal/blobinfocache" + "go.podman.io/image/v5/internal/image" + "go.podman.io/image/v5/internal/imagedestination" + "go.podman.io/image/v5/internal/imagesource" + internalManifest "go.podman.io/image/v5/internal/manifest" + "go.podman.io/image/v5/internal/private" + "go.podman.io/image/v5/manifest" + "go.podman.io/image/v5/pkg/blobinfocache" + compression "go.podman.io/image/v5/pkg/compression/types" + "go.podman.io/image/v5/signature" + "go.podman.io/image/v5/signature/signer" + "go.podman.io/image/v5/transports" + "go.podman.io/image/v5/types" "golang.org/x/sync/semaphore" "golang.org/x/term" ) diff --git a/vendor/github.com/containers/image/v5/copy/digesting_reader.go b/vendor/go.podman.io/image/v5/copy/digesting_reader.go similarity index 100% rename from vendor/github.com/containers/image/v5/copy/digesting_reader.go rename to vendor/go.podman.io/image/v5/copy/digesting_reader.go diff --git a/vendor/github.com/containers/image/v5/copy/encryption.go b/vendor/go.podman.io/image/v5/copy/encryption.go similarity index 99% rename from vendor/github.com/containers/image/v5/copy/encryption.go rename to vendor/go.podman.io/image/v5/copy/encryption.go index b5a88a914bd..59aecf1a116 100644 --- a/vendor/github.com/containers/image/v5/copy/encryption.go +++ b/vendor/go.podman.io/image/v5/copy/encryption.go @@ -6,9 +6,9 @@ import ( "slices" "strings" - "github.com/containers/image/v5/types" "github.com/containers/ocicrypt" imgspecv1 "github.com/opencontainers/image-spec/specs-go/v1" + "go.podman.io/image/v5/types" ) // isOciEncrypted returns a bool indicating if a mediatype is encrypted diff --git a/vendor/github.com/containers/image/v5/copy/manifest.go b/vendor/go.podman.io/image/v5/copy/manifest.go similarity index 97% rename from vendor/github.com/containers/image/v5/copy/manifest.go rename to vendor/go.podman.io/image/v5/copy/manifest.go index 97837f9f286..2fce87a48ca 100644 --- a/vendor/github.com/containers/image/v5/copy/manifest.go +++ b/vendor/go.podman.io/image/v5/copy/manifest.go @@ -7,13 +7,13 @@ import ( "slices" "strings" - internalManifest "github.com/containers/image/v5/internal/manifest" - "github.com/containers/image/v5/internal/set" - "github.com/containers/image/v5/manifest" - compressiontypes "github.com/containers/image/v5/pkg/compression/types" - "github.com/containers/image/v5/types" v1 "github.com/opencontainers/image-spec/specs-go/v1" "github.com/sirupsen/logrus" + internalManifest "go.podman.io/image/v5/internal/manifest" + "go.podman.io/image/v5/internal/set" + "go.podman.io/image/v5/manifest" + compressiontypes "go.podman.io/image/v5/pkg/compression/types" + "go.podman.io/image/v5/types" ) // preferredManifestMIMETypes lists manifest MIME types in order of our preference, if we can't use the original manifest and need to convert. diff --git a/vendor/github.com/containers/image/v5/copy/multiple.go b/vendor/go.podman.io/image/v5/copy/multiple.go similarity index 97% rename from vendor/github.com/containers/image/v5/copy/multiple.go rename to vendor/go.podman.io/image/v5/copy/multiple.go index b0c107e8ca3..0594aa20f5f 100644 --- a/vendor/github.com/containers/image/v5/copy/multiple.go +++ b/vendor/go.podman.io/image/v5/copy/multiple.go @@ -10,15 +10,15 @@ import ( "sort" "strings" - "github.com/containers/image/v5/docker/reference" - "github.com/containers/image/v5/internal/image" - internalManifest "github.com/containers/image/v5/internal/manifest" - "github.com/containers/image/v5/internal/set" - "github.com/containers/image/v5/manifest" - "github.com/containers/image/v5/pkg/compression" digest "github.com/opencontainers/go-digest" imgspecv1 "github.com/opencontainers/image-spec/specs-go/v1" "github.com/sirupsen/logrus" + "go.podman.io/image/v5/docker/reference" + "go.podman.io/image/v5/internal/image" + internalManifest "go.podman.io/image/v5/internal/manifest" + "go.podman.io/image/v5/internal/set" + "go.podman.io/image/v5/manifest" + "go.podman.io/image/v5/pkg/compression" ) type instanceCopyKind int diff --git a/vendor/github.com/containers/image/v5/copy/progress_bars.go b/vendor/go.podman.io/image/v5/copy/progress_bars.go similarity index 98% rename from vendor/github.com/containers/image/v5/copy/progress_bars.go rename to vendor/go.podman.io/image/v5/copy/progress_bars.go index 59f41d2169d..53363468251 100644 --- a/vendor/github.com/containers/image/v5/copy/progress_bars.go +++ b/vendor/go.podman.io/image/v5/copy/progress_bars.go @@ -7,10 +7,10 @@ import ( "math" "time" - "github.com/containers/image/v5/internal/private" - "github.com/containers/image/v5/types" "github.com/vbauerster/mpb/v8" "github.com/vbauerster/mpb/v8/decor" + "go.podman.io/image/v5/internal/private" + "go.podman.io/image/v5/types" ) // newProgressPool creates a *mpb.Progress. diff --git a/vendor/github.com/containers/image/v5/copy/progress_channel.go b/vendor/go.podman.io/image/v5/copy/progress_channel.go similarity index 98% rename from vendor/github.com/containers/image/v5/copy/progress_channel.go rename to vendor/go.podman.io/image/v5/copy/progress_channel.go index d5e9e09bda9..f57646156e1 100644 --- a/vendor/github.com/containers/image/v5/copy/progress_channel.go +++ b/vendor/go.podman.io/image/v5/copy/progress_channel.go @@ -4,7 +4,7 @@ import ( "io" "time" - "github.com/containers/image/v5/types" + "go.podman.io/image/v5/types" ) // progressReader is a reader that reports its progress to a types.ProgressProperties channel on an interval. diff --git a/vendor/github.com/containers/image/v5/copy/sign.go b/vendor/go.podman.io/image/v5/copy/sign.go similarity index 90% rename from vendor/github.com/containers/image/v5/copy/sign.go rename to vendor/go.podman.io/image/v5/copy/sign.go index 7ddfe917bbf..96038f3f833 100644 --- a/vendor/github.com/containers/image/v5/copy/sign.go +++ b/vendor/go.podman.io/image/v5/copy/sign.go @@ -4,13 +4,13 @@ import ( "context" "fmt" - "github.com/containers/image/v5/docker/reference" - "github.com/containers/image/v5/internal/private" - internalsig "github.com/containers/image/v5/internal/signature" - internalSigner "github.com/containers/image/v5/internal/signer" - "github.com/containers/image/v5/signature/sigstore" - "github.com/containers/image/v5/signature/simplesigning" - "github.com/containers/image/v5/transports" + "go.podman.io/image/v5/docker/reference" + "go.podman.io/image/v5/internal/private" + internalsig "go.podman.io/image/v5/internal/signature" + internalSigner "go.podman.io/image/v5/internal/signer" + "go.podman.io/image/v5/signature/sigstore" + "go.podman.io/image/v5/signature/simplesigning" + "go.podman.io/image/v5/transports" ) // setupSigners initializes c.signers. diff --git a/vendor/github.com/containers/image/v5/copy/single.go b/vendor/go.podman.io/image/v5/copy/single.go similarity index 98% rename from vendor/github.com/containers/image/v5/copy/single.go rename to vendor/go.podman.io/image/v5/copy/single.go index 19d410a61da..5c81fd2d530 100644 --- a/vendor/github.com/containers/image/v5/copy/single.go +++ b/vendor/go.podman.io/image/v5/copy/single.go @@ -13,21 +13,21 @@ import ( "strings" "sync" - "github.com/containers/image/v5/docker/reference" - "github.com/containers/image/v5/internal/image" - "github.com/containers/image/v5/internal/pkg/platform" - "github.com/containers/image/v5/internal/private" - "github.com/containers/image/v5/internal/set" - "github.com/containers/image/v5/manifest" - "github.com/containers/image/v5/pkg/compression" - compressiontypes "github.com/containers/image/v5/pkg/compression/types" - "github.com/containers/image/v5/transports" - "github.com/containers/image/v5/types" - chunkedToc "github.com/containers/storage/pkg/chunked/toc" digest "github.com/opencontainers/go-digest" imgspecv1 "github.com/opencontainers/image-spec/specs-go/v1" "github.com/sirupsen/logrus" "github.com/vbauerster/mpb/v8" + "go.podman.io/image/v5/docker/reference" + "go.podman.io/image/v5/internal/image" + "go.podman.io/image/v5/internal/pkg/platform" + "go.podman.io/image/v5/internal/private" + "go.podman.io/image/v5/internal/set" + "go.podman.io/image/v5/manifest" + "go.podman.io/image/v5/pkg/compression" + compressiontypes "go.podman.io/image/v5/pkg/compression/types" + "go.podman.io/image/v5/transports" + "go.podman.io/image/v5/types" + chunkedToc "go.podman.io/storage/pkg/chunked/toc" ) // imageCopier tracks state specific to a single image (possibly an item of a manifest list) diff --git a/vendor/github.com/containers/image/v5/directory/directory_dest.go b/vendor/go.podman.io/image/v5/directory/directory_dest.go similarity index 96% rename from vendor/github.com/containers/image/v5/directory/directory_dest.go rename to vendor/go.podman.io/image/v5/directory/directory_dest.go index 6e88aa01d1c..31842f7260a 100644 --- a/vendor/github.com/containers/image/v5/directory/directory_dest.go +++ b/vendor/go.podman.io/image/v5/directory/directory_dest.go @@ -9,15 +9,15 @@ import ( "path/filepath" "runtime" - "github.com/containers/image/v5/internal/imagedestination/impl" - "github.com/containers/image/v5/internal/imagedestination/stubs" - "github.com/containers/image/v5/internal/private" - "github.com/containers/image/v5/internal/putblobdigest" - "github.com/containers/image/v5/internal/signature" - "github.com/containers/image/v5/types" - "github.com/containers/storage/pkg/fileutils" "github.com/opencontainers/go-digest" "github.com/sirupsen/logrus" + "go.podman.io/image/v5/internal/imagedestination/impl" + "go.podman.io/image/v5/internal/imagedestination/stubs" + "go.podman.io/image/v5/internal/private" + "go.podman.io/image/v5/internal/putblobdigest" + "go.podman.io/image/v5/internal/signature" + "go.podman.io/image/v5/types" + "go.podman.io/storage/pkg/fileutils" ) const version = "Directory Transport Version: 1.1\n" diff --git a/vendor/github.com/containers/image/v5/directory/directory_src.go b/vendor/go.podman.io/image/v5/directory/directory_src.go similarity index 91% rename from vendor/github.com/containers/image/v5/directory/directory_src.go rename to vendor/go.podman.io/image/v5/directory/directory_src.go index 6d725bcfaf5..b7fb3855c5c 100644 --- a/vendor/github.com/containers/image/v5/directory/directory_src.go +++ b/vendor/go.podman.io/image/v5/directory/directory_src.go @@ -6,13 +6,13 @@ import ( "io" "os" - "github.com/containers/image/v5/internal/imagesource/impl" - "github.com/containers/image/v5/internal/imagesource/stubs" - "github.com/containers/image/v5/internal/manifest" - "github.com/containers/image/v5/internal/private" - "github.com/containers/image/v5/internal/signature" - "github.com/containers/image/v5/types" "github.com/opencontainers/go-digest" + "go.podman.io/image/v5/internal/imagesource/impl" + "go.podman.io/image/v5/internal/imagesource/stubs" + "go.podman.io/image/v5/internal/manifest" + "go.podman.io/image/v5/internal/private" + "go.podman.io/image/v5/internal/signature" + "go.podman.io/image/v5/types" ) type dirImageSource struct { diff --git a/vendor/github.com/containers/image/v5/directory/directory_transport.go b/vendor/go.podman.io/image/v5/directory/directory_transport.go similarity index 97% rename from vendor/github.com/containers/image/v5/directory/directory_transport.go rename to vendor/go.podman.io/image/v5/directory/directory_transport.go index 4f7d596b441..77c0e7be57d 100644 --- a/vendor/github.com/containers/image/v5/directory/directory_transport.go +++ b/vendor/go.podman.io/image/v5/directory/directory_transport.go @@ -7,12 +7,12 @@ import ( "path/filepath" "strings" - "github.com/containers/image/v5/directory/explicitfilepath" - "github.com/containers/image/v5/docker/reference" - "github.com/containers/image/v5/internal/image" - "github.com/containers/image/v5/transports" - "github.com/containers/image/v5/types" "github.com/opencontainers/go-digest" + "go.podman.io/image/v5/directory/explicitfilepath" + "go.podman.io/image/v5/docker/reference" + "go.podman.io/image/v5/internal/image" + "go.podman.io/image/v5/transports" + "go.podman.io/image/v5/types" ) func init() { diff --git a/vendor/github.com/containers/image/v5/directory/explicitfilepath/path.go b/vendor/go.podman.io/image/v5/directory/explicitfilepath/path.go similarity index 98% rename from vendor/github.com/containers/image/v5/directory/explicitfilepath/path.go rename to vendor/go.podman.io/image/v5/directory/explicitfilepath/path.go index 69c1e0727e4..0f92d4a5e7e 100644 --- a/vendor/github.com/containers/image/v5/directory/explicitfilepath/path.go +++ b/vendor/go.podman.io/image/v5/directory/explicitfilepath/path.go @@ -5,7 +5,7 @@ import ( "os" "path/filepath" - "github.com/containers/storage/pkg/fileutils" + "go.podman.io/storage/pkg/fileutils" ) // ResolvePathToFullyExplicit returns the input path converted to an absolute, no-symlinks, cleaned up path. diff --git a/vendor/github.com/containers/image/v5/docker/archive/dest.go b/vendor/go.podman.io/image/v5/docker/archive/dest.go similarity index 94% rename from vendor/github.com/containers/image/v5/docker/archive/dest.go rename to vendor/go.podman.io/image/v5/docker/archive/dest.go index 9e0d3200712..c1c0fdf5d83 100644 --- a/vendor/github.com/containers/image/v5/docker/archive/dest.go +++ b/vendor/go.podman.io/image/v5/docker/archive/dest.go @@ -4,9 +4,9 @@ import ( "context" "fmt" - "github.com/containers/image/v5/docker/internal/tarfile" - "github.com/containers/image/v5/internal/private" - "github.com/containers/image/v5/types" + "go.podman.io/image/v5/docker/internal/tarfile" + "go.podman.io/image/v5/internal/private" + "go.podman.io/image/v5/types" ) type archiveImageDestination struct { diff --git a/vendor/github.com/containers/image/v5/docker/archive/reader.go b/vendor/go.podman.io/image/v5/docker/archive/reader.go similarity index 95% rename from vendor/github.com/containers/image/v5/docker/archive/reader.go rename to vendor/go.podman.io/image/v5/docker/archive/reader.go index 70c4fbc7182..b4d495d816a 100644 --- a/vendor/github.com/containers/image/v5/docker/archive/reader.go +++ b/vendor/go.podman.io/image/v5/docker/archive/reader.go @@ -3,10 +3,10 @@ package archive import ( "fmt" - "github.com/containers/image/v5/docker/internal/tarfile" - "github.com/containers/image/v5/docker/reference" - "github.com/containers/image/v5/transports" - "github.com/containers/image/v5/types" + "go.podman.io/image/v5/docker/internal/tarfile" + "go.podman.io/image/v5/docker/reference" + "go.podman.io/image/v5/transports" + "go.podman.io/image/v5/types" ) // Reader manages a single Docker archive, allows listing its contents and accessing diff --git a/vendor/github.com/containers/image/v5/docker/archive/src.go b/vendor/go.podman.io/image/v5/docker/archive/src.go similarity index 88% rename from vendor/github.com/containers/image/v5/docker/archive/src.go rename to vendor/go.podman.io/image/v5/docker/archive/src.go index c4ab9a8c157..8ed60b3ba61 100644 --- a/vendor/github.com/containers/image/v5/docker/archive/src.go +++ b/vendor/go.podman.io/image/v5/docker/archive/src.go @@ -1,9 +1,9 @@ package archive import ( - "github.com/containers/image/v5/docker/internal/tarfile" - "github.com/containers/image/v5/internal/private" - "github.com/containers/image/v5/types" + "go.podman.io/image/v5/docker/internal/tarfile" + "go.podman.io/image/v5/internal/private" + "go.podman.io/image/v5/types" ) type archiveImageSource struct { diff --git a/vendor/github.com/containers/image/v5/docker/archive/transport.go b/vendor/go.podman.io/image/v5/docker/archive/transport.go similarity index 97% rename from vendor/github.com/containers/image/v5/docker/archive/transport.go rename to vendor/go.podman.io/image/v5/docker/archive/transport.go index 2c3926cca9c..706655ddcf7 100644 --- a/vendor/github.com/containers/image/v5/docker/archive/transport.go +++ b/vendor/go.podman.io/image/v5/docker/archive/transport.go @@ -7,11 +7,11 @@ import ( "strconv" "strings" - "github.com/containers/image/v5/docker/internal/tarfile" - "github.com/containers/image/v5/docker/reference" - ctrImage "github.com/containers/image/v5/internal/image" - "github.com/containers/image/v5/transports" - "github.com/containers/image/v5/types" + "go.podman.io/image/v5/docker/internal/tarfile" + "go.podman.io/image/v5/docker/reference" + ctrImage "go.podman.io/image/v5/internal/image" + "go.podman.io/image/v5/transports" + "go.podman.io/image/v5/types" ) func init() { diff --git a/vendor/github.com/containers/image/v5/docker/archive/writer.go b/vendor/go.podman.io/image/v5/docker/archive/writer.go similarity index 95% rename from vendor/github.com/containers/image/v5/docker/archive/writer.go rename to vendor/go.podman.io/image/v5/docker/archive/writer.go index 11f797c0071..0a59d89d0a9 100644 --- a/vendor/github.com/containers/image/v5/docker/archive/writer.go +++ b/vendor/go.podman.io/image/v5/docker/archive/writer.go @@ -7,9 +7,9 @@ import ( "os" "sync" - "github.com/containers/image/v5/docker/internal/tarfile" - "github.com/containers/image/v5/docker/reference" - "github.com/containers/image/v5/types" + "go.podman.io/image/v5/docker/internal/tarfile" + "go.podman.io/image/v5/docker/reference" + "go.podman.io/image/v5/types" ) // Writer manages a single in-progress Docker archive and allows adding images to it. diff --git a/vendor/github.com/containers/image/v5/docker/body_reader.go b/vendor/go.podman.io/image/v5/docker/body_reader.go similarity index 100% rename from vendor/github.com/containers/image/v5/docker/body_reader.go rename to vendor/go.podman.io/image/v5/docker/body_reader.go diff --git a/vendor/github.com/containers/image/v5/docker/cache.go b/vendor/go.podman.io/image/v5/docker/cache.go similarity index 89% rename from vendor/github.com/containers/image/v5/docker/cache.go rename to vendor/go.podman.io/image/v5/docker/cache.go index 728d32d170c..35fe37b3804 100644 --- a/vendor/github.com/containers/image/v5/docker/cache.go +++ b/vendor/go.podman.io/image/v5/docker/cache.go @@ -1,8 +1,8 @@ package docker import ( - "github.com/containers/image/v5/docker/reference" - "github.com/containers/image/v5/types" + "go.podman.io/image/v5/docker/reference" + "go.podman.io/image/v5/types" ) // bicTransportScope returns a BICTransportScope appropriate for ref. diff --git a/vendor/github.com/containers/image/v5/docker/daemon/client.go b/vendor/go.podman.io/image/v5/docker/daemon/client.go similarity index 98% rename from vendor/github.com/containers/image/v5/docker/daemon/client.go rename to vendor/go.podman.io/image/v5/docker/daemon/client.go index 6ade2384f7e..751c542f834 100644 --- a/vendor/github.com/containers/image/v5/docker/daemon/client.go +++ b/vendor/go.podman.io/image/v5/docker/daemon/client.go @@ -5,9 +5,9 @@ import ( "path/filepath" "time" - "github.com/containers/image/v5/types" dockerclient "github.com/docker/docker/client" "github.com/docker/go-connections/tlsconfig" + "go.podman.io/image/v5/types" ) // NewDockerClient initializes a new API client based on the passed SystemContext. diff --git a/vendor/github.com/containers/image/v5/docker/daemon/daemon_dest.go b/vendor/go.podman.io/image/v5/docker/daemon/daemon_dest.go similarity index 97% rename from vendor/github.com/containers/image/v5/docker/daemon/daemon_dest.go rename to vendor/go.podman.io/image/v5/docker/daemon/daemon_dest.go index c653708779c..337ba633161 100644 --- a/vendor/github.com/containers/image/v5/docker/daemon/daemon_dest.go +++ b/vendor/go.podman.io/image/v5/docker/daemon/daemon_dest.go @@ -7,12 +7,12 @@ import ( "fmt" "io" - "github.com/containers/image/v5/docker/internal/tarfile" - "github.com/containers/image/v5/docker/reference" - "github.com/containers/image/v5/internal/private" - "github.com/containers/image/v5/types" "github.com/docker/docker/client" "github.com/sirupsen/logrus" + "go.podman.io/image/v5/docker/internal/tarfile" + "go.podman.io/image/v5/docker/reference" + "go.podman.io/image/v5/internal/private" + "go.podman.io/image/v5/types" ) type daemonImageDestination struct { diff --git a/vendor/github.com/containers/image/v5/docker/daemon/daemon_src.go b/vendor/go.podman.io/image/v5/docker/daemon/daemon_src.go similarity index 92% rename from vendor/github.com/containers/image/v5/docker/daemon/daemon_src.go rename to vendor/go.podman.io/image/v5/docker/daemon/daemon_src.go index 10923c278e3..53f7a8fb862 100644 --- a/vendor/github.com/containers/image/v5/docker/daemon/daemon_src.go +++ b/vendor/go.podman.io/image/v5/docker/daemon/daemon_src.go @@ -4,9 +4,9 @@ import ( "context" "fmt" - "github.com/containers/image/v5/docker/internal/tarfile" - "github.com/containers/image/v5/internal/private" - "github.com/containers/image/v5/types" + "go.podman.io/image/v5/docker/internal/tarfile" + "go.podman.io/image/v5/internal/private" + "go.podman.io/image/v5/types" ) type daemonImageSource struct { diff --git a/vendor/github.com/containers/image/v5/docker/daemon/daemon_transport.go b/vendor/go.podman.io/image/v5/docker/daemon/daemon_transport.go similarity index 97% rename from vendor/github.com/containers/image/v5/docker/daemon/daemon_transport.go rename to vendor/go.podman.io/image/v5/docker/daemon/daemon_transport.go index 9fc0a92fd77..028ea0ee08a 100644 --- a/vendor/github.com/containers/image/v5/docker/daemon/daemon_transport.go +++ b/vendor/go.podman.io/image/v5/docker/daemon/daemon_transport.go @@ -5,12 +5,12 @@ import ( "errors" "fmt" - "github.com/containers/image/v5/docker/policyconfiguration" - "github.com/containers/image/v5/docker/reference" - "github.com/containers/image/v5/internal/image" - "github.com/containers/image/v5/transports" - "github.com/containers/image/v5/types" "github.com/opencontainers/go-digest" + "go.podman.io/image/v5/docker/policyconfiguration" + "go.podman.io/image/v5/docker/reference" + "go.podman.io/image/v5/internal/image" + "go.podman.io/image/v5/transports" + "go.podman.io/image/v5/types" ) func init() { diff --git a/vendor/github.com/containers/image/v5/docker/distribution_error.go b/vendor/go.podman.io/image/v5/docker/distribution_error.go similarity index 100% rename from vendor/github.com/containers/image/v5/docker/distribution_error.go rename to vendor/go.podman.io/image/v5/docker/distribution_error.go diff --git a/vendor/github.com/containers/image/v5/docker/docker_client.go b/vendor/go.podman.io/image/v5/docker/docker_client.go similarity index 98% rename from vendor/github.com/containers/image/v5/docker/docker_client.go rename to vendor/go.podman.io/image/v5/docker/docker_client.go index edb5eee25ed..a83e19a36a2 100644 --- a/vendor/github.com/containers/image/v5/docker/docker_client.go +++ b/vendor/go.podman.io/image/v5/docker/docker_client.go @@ -17,24 +17,24 @@ import ( "sync" "time" - "github.com/containers/image/v5/docker/reference" - "github.com/containers/image/v5/internal/iolimits" - "github.com/containers/image/v5/internal/multierr" - "github.com/containers/image/v5/internal/set" - "github.com/containers/image/v5/internal/useragent" - "github.com/containers/image/v5/manifest" - "github.com/containers/image/v5/pkg/docker/config" - "github.com/containers/image/v5/pkg/sysregistriesv2" - "github.com/containers/image/v5/pkg/tlsclientconfig" - "github.com/containers/image/v5/types" - "github.com/containers/storage/pkg/fileutils" - "github.com/containers/storage/pkg/homedir" "github.com/docker/distribution/registry/api/errcode" v2 "github.com/docker/distribution/registry/api/v2" "github.com/docker/go-connections/tlsconfig" digest "github.com/opencontainers/go-digest" imgspecv1 "github.com/opencontainers/image-spec/specs-go/v1" "github.com/sirupsen/logrus" + "go.podman.io/image/v5/docker/reference" + "go.podman.io/image/v5/internal/iolimits" + "go.podman.io/image/v5/internal/multierr" + "go.podman.io/image/v5/internal/set" + "go.podman.io/image/v5/internal/useragent" + "go.podman.io/image/v5/manifest" + "go.podman.io/image/v5/pkg/docker/config" + "go.podman.io/image/v5/pkg/sysregistriesv2" + "go.podman.io/image/v5/pkg/tlsclientconfig" + "go.podman.io/image/v5/types" + "go.podman.io/storage/pkg/fileutils" + "go.podman.io/storage/pkg/homedir" ) const ( diff --git a/vendor/github.com/containers/image/v5/docker/docker_image.go b/vendor/go.podman.io/image/v5/docker/docker_image.go similarity index 96% rename from vendor/github.com/containers/image/v5/docker/docker_image.go rename to vendor/go.podman.io/image/v5/docker/docker_image.go index 74f559dce75..1e5de65a749 100644 --- a/vendor/github.com/containers/image/v5/docker/docker_image.go +++ b/vendor/go.podman.io/image/v5/docker/docker_image.go @@ -9,12 +9,12 @@ import ( "net/url" "strings" - "github.com/containers/image/v5/docker/reference" - "github.com/containers/image/v5/internal/image" - "github.com/containers/image/v5/manifest" - "github.com/containers/image/v5/types" "github.com/opencontainers/go-digest" "github.com/sirupsen/logrus" + "go.podman.io/image/v5/docker/reference" + "go.podman.io/image/v5/internal/image" + "go.podman.io/image/v5/manifest" + "go.podman.io/image/v5/types" ) // Image is a Docker-specific implementation of types.ImageCloser with a few extra methods diff --git a/vendor/github.com/containers/image/v5/docker/docker_image_dest.go b/vendor/go.podman.io/image/v5/docker/docker_image_dest.go similarity index 97% rename from vendor/github.com/containers/image/v5/docker/docker_image_dest.go rename to vendor/go.podman.io/image/v5/docker/docker_image_dest.go index 76e48a3845b..86077fe9325 100644 --- a/vendor/github.com/containers/image/v5/docker/docker_image_dest.go +++ b/vendor/go.podman.io/image/v5/docker/docker_image_dest.go @@ -16,26 +16,26 @@ import ( "slices" "strings" - "github.com/containers/image/v5/docker/reference" - "github.com/containers/image/v5/internal/blobinfocache" - "github.com/containers/image/v5/internal/imagedestination/impl" - "github.com/containers/image/v5/internal/imagedestination/stubs" - "github.com/containers/image/v5/internal/iolimits" - "github.com/containers/image/v5/internal/private" - "github.com/containers/image/v5/internal/putblobdigest" - "github.com/containers/image/v5/internal/set" - "github.com/containers/image/v5/internal/signature" - "github.com/containers/image/v5/internal/streamdigest" - "github.com/containers/image/v5/internal/uploadreader" - "github.com/containers/image/v5/manifest" - "github.com/containers/image/v5/pkg/blobinfocache/none" - compressiontypes "github.com/containers/image/v5/pkg/compression/types" - "github.com/containers/image/v5/types" "github.com/docker/distribution/registry/api/errcode" v2 "github.com/docker/distribution/registry/api/v2" "github.com/opencontainers/go-digest" imgspecv1 "github.com/opencontainers/image-spec/specs-go/v1" "github.com/sirupsen/logrus" + "go.podman.io/image/v5/docker/reference" + "go.podman.io/image/v5/internal/blobinfocache" + "go.podman.io/image/v5/internal/imagedestination/impl" + "go.podman.io/image/v5/internal/imagedestination/stubs" + "go.podman.io/image/v5/internal/iolimits" + "go.podman.io/image/v5/internal/private" + "go.podman.io/image/v5/internal/putblobdigest" + "go.podman.io/image/v5/internal/set" + "go.podman.io/image/v5/internal/signature" + "go.podman.io/image/v5/internal/streamdigest" + "go.podman.io/image/v5/internal/uploadreader" + "go.podman.io/image/v5/manifest" + "go.podman.io/image/v5/pkg/blobinfocache/none" + compressiontypes "go.podman.io/image/v5/pkg/compression/types" + "go.podman.io/image/v5/types" ) type dockerImageDestination struct { diff --git a/vendor/github.com/containers/image/v5/docker/docker_image_src.go b/vendor/go.podman.io/image/v5/docker/docker_image_src.go similarity index 98% rename from vendor/github.com/containers/image/v5/docker/docker_image_src.go rename to vendor/go.podman.io/image/v5/docker/docker_image_src.go index 4eb9cdfba59..553dddeefe3 100644 --- a/vendor/github.com/containers/image/v5/docker/docker_image_src.go +++ b/vendor/go.podman.io/image/v5/docker/docker_image_src.go @@ -17,19 +17,19 @@ import ( "strings" "sync" - "github.com/containers/image/v5/docker/reference" - "github.com/containers/image/v5/internal/imagesource/impl" - "github.com/containers/image/v5/internal/imagesource/stubs" - "github.com/containers/image/v5/internal/iolimits" - "github.com/containers/image/v5/internal/private" - "github.com/containers/image/v5/internal/signature" - "github.com/containers/image/v5/manifest" - "github.com/containers/image/v5/pkg/blobinfocache/none" - "github.com/containers/image/v5/pkg/sysregistriesv2" - "github.com/containers/image/v5/types" - "github.com/containers/storage/pkg/regexp" digest "github.com/opencontainers/go-digest" "github.com/sirupsen/logrus" + "go.podman.io/image/v5/docker/reference" + "go.podman.io/image/v5/internal/imagesource/impl" + "go.podman.io/image/v5/internal/imagesource/stubs" + "go.podman.io/image/v5/internal/iolimits" + "go.podman.io/image/v5/internal/private" + "go.podman.io/image/v5/internal/signature" + "go.podman.io/image/v5/manifest" + "go.podman.io/image/v5/pkg/blobinfocache/none" + "go.podman.io/image/v5/pkg/sysregistriesv2" + "go.podman.io/image/v5/types" + "go.podman.io/storage/pkg/regexp" ) // maxLookasideSignatures is an arbitrary limit for the total number of signatures we would try to read from a lookaside server, diff --git a/vendor/github.com/containers/image/v5/docker/docker_transport.go b/vendor/go.podman.io/image/v5/docker/docker_transport.go similarity index 97% rename from vendor/github.com/containers/image/v5/docker/docker_transport.go rename to vendor/go.podman.io/image/v5/docker/docker_transport.go index c10463a4305..5831dc3cea6 100644 --- a/vendor/github.com/containers/image/v5/docker/docker_transport.go +++ b/vendor/go.podman.io/image/v5/docker/docker_transport.go @@ -6,10 +6,10 @@ import ( "fmt" "strings" - "github.com/containers/image/v5/docker/policyconfiguration" - "github.com/containers/image/v5/docker/reference" - "github.com/containers/image/v5/transports" - "github.com/containers/image/v5/types" + "go.podman.io/image/v5/docker/policyconfiguration" + "go.podman.io/image/v5/docker/reference" + "go.podman.io/image/v5/transports" + "go.podman.io/image/v5/types" ) // UnknownDigestSuffix can be appended to a reference when the caller diff --git a/vendor/github.com/containers/image/v5/docker/errors.go b/vendor/go.podman.io/image/v5/docker/errors.go similarity index 100% rename from vendor/github.com/containers/image/v5/docker/errors.go rename to vendor/go.podman.io/image/v5/docker/errors.go diff --git a/vendor/github.com/containers/image/v5/docker/internal/tarfile/dest.go b/vendor/go.podman.io/image/v5/docker/internal/tarfile/dest.go similarity index 95% rename from vendor/github.com/containers/image/v5/docker/internal/tarfile/dest.go rename to vendor/go.podman.io/image/v5/docker/internal/tarfile/dest.go index 8f5ba7e36e1..812749bad90 100644 --- a/vendor/github.com/containers/image/v5/docker/internal/tarfile/dest.go +++ b/vendor/go.podman.io/image/v5/docker/internal/tarfile/dest.go @@ -8,16 +8,16 @@ import ( "fmt" "io" - "github.com/containers/image/v5/docker/reference" - "github.com/containers/image/v5/internal/imagedestination/impl" - "github.com/containers/image/v5/internal/imagedestination/stubs" - "github.com/containers/image/v5/internal/iolimits" - "github.com/containers/image/v5/internal/private" - "github.com/containers/image/v5/internal/streamdigest" - "github.com/containers/image/v5/manifest" - "github.com/containers/image/v5/types" "github.com/opencontainers/go-digest" "github.com/sirupsen/logrus" + "go.podman.io/image/v5/docker/reference" + "go.podman.io/image/v5/internal/imagedestination/impl" + "go.podman.io/image/v5/internal/imagedestination/stubs" + "go.podman.io/image/v5/internal/iolimits" + "go.podman.io/image/v5/internal/private" + "go.podman.io/image/v5/internal/streamdigest" + "go.podman.io/image/v5/manifest" + "go.podman.io/image/v5/types" ) // Destination is a partial implementation of private.ImageDestination for writing to a Writer. diff --git a/vendor/github.com/containers/image/v5/docker/internal/tarfile/reader.go b/vendor/go.podman.io/image/v5/docker/internal/tarfile/reader.go similarity index 97% rename from vendor/github.com/containers/image/v5/docker/internal/tarfile/reader.go rename to vendor/go.podman.io/image/v5/docker/internal/tarfile/reader.go index 362657596e1..12e656af411 100644 --- a/vendor/github.com/containers/image/v5/docker/internal/tarfile/reader.go +++ b/vendor/go.podman.io/image/v5/docker/internal/tarfile/reader.go @@ -9,11 +9,11 @@ import ( "os" "path" - "github.com/containers/image/v5/docker/reference" - "github.com/containers/image/v5/internal/iolimits" - "github.com/containers/image/v5/internal/tmpdir" - "github.com/containers/image/v5/pkg/compression" - "github.com/containers/image/v5/types" + "go.podman.io/image/v5/docker/reference" + "go.podman.io/image/v5/internal/iolimits" + "go.podman.io/image/v5/internal/tmpdir" + "go.podman.io/image/v5/pkg/compression" + "go.podman.io/image/v5/types" ) // Reader is a ((docker save)-formatted) tar archive that allows random access to any component. diff --git a/vendor/github.com/containers/image/v5/docker/internal/tarfile/src.go b/vendor/go.podman.io/image/v5/docker/internal/tarfile/src.go similarity index 96% rename from vendor/github.com/containers/image/v5/docker/internal/tarfile/src.go rename to vendor/go.podman.io/image/v5/docker/internal/tarfile/src.go index 3364e6c9f62..56421afa138 100644 --- a/vendor/github.com/containers/image/v5/docker/internal/tarfile/src.go +++ b/vendor/go.podman.io/image/v5/docker/internal/tarfile/src.go @@ -12,14 +12,14 @@ import ( "path" "sync" - "github.com/containers/image/v5/docker/reference" - "github.com/containers/image/v5/internal/imagesource/impl" - "github.com/containers/image/v5/internal/imagesource/stubs" - "github.com/containers/image/v5/internal/iolimits" - "github.com/containers/image/v5/manifest" - "github.com/containers/image/v5/pkg/compression" - "github.com/containers/image/v5/types" digest "github.com/opencontainers/go-digest" + "go.podman.io/image/v5/docker/reference" + "go.podman.io/image/v5/internal/imagesource/impl" + "go.podman.io/image/v5/internal/imagesource/stubs" + "go.podman.io/image/v5/internal/iolimits" + "go.podman.io/image/v5/manifest" + "go.podman.io/image/v5/pkg/compression" + "go.podman.io/image/v5/types" ) // Source is a partial implementation of types.ImageSource for reading from tarPath. diff --git a/vendor/github.com/containers/image/v5/docker/internal/tarfile/types.go b/vendor/go.podman.io/image/v5/docker/internal/tarfile/types.go similarity index 95% rename from vendor/github.com/containers/image/v5/docker/internal/tarfile/types.go rename to vendor/go.podman.io/image/v5/docker/internal/tarfile/types.go index 6e6ccd2d808..c25ba685465 100644 --- a/vendor/github.com/containers/image/v5/docker/internal/tarfile/types.go +++ b/vendor/go.podman.io/image/v5/docker/internal/tarfile/types.go @@ -1,8 +1,8 @@ package tarfile import ( - "github.com/containers/image/v5/manifest" "github.com/opencontainers/go-digest" + "go.podman.io/image/v5/manifest" ) // Various data structures. diff --git a/vendor/github.com/containers/image/v5/docker/internal/tarfile/writer.go b/vendor/go.podman.io/image/v5/docker/internal/tarfile/writer.go similarity index 98% rename from vendor/github.com/containers/image/v5/docker/internal/tarfile/writer.go rename to vendor/go.podman.io/image/v5/docker/internal/tarfile/writer.go index 320a1780480..460224f4455 100644 --- a/vendor/github.com/containers/image/v5/docker/internal/tarfile/writer.go +++ b/vendor/go.podman.io/image/v5/docker/internal/tarfile/writer.go @@ -13,13 +13,13 @@ import ( "sync" "time" - "github.com/containers/image/v5/docker/reference" - "github.com/containers/image/v5/internal/private" - "github.com/containers/image/v5/internal/set" - "github.com/containers/image/v5/manifest" - "github.com/containers/image/v5/types" "github.com/opencontainers/go-digest" "github.com/sirupsen/logrus" + "go.podman.io/image/v5/docker/reference" + "go.podman.io/image/v5/internal/private" + "go.podman.io/image/v5/internal/set" + "go.podman.io/image/v5/manifest" + "go.podman.io/image/v5/types" ) // Writer allows creating a (docker save)-formatted tar archive containing one or more images. diff --git a/vendor/github.com/containers/image/v5/docker/paths_common.go b/vendor/go.podman.io/image/v5/docker/paths_common.go similarity index 100% rename from vendor/github.com/containers/image/v5/docker/paths_common.go rename to vendor/go.podman.io/image/v5/docker/paths_common.go diff --git a/vendor/github.com/containers/image/v5/docker/paths_freebsd.go b/vendor/go.podman.io/image/v5/docker/paths_freebsd.go similarity index 100% rename from vendor/github.com/containers/image/v5/docker/paths_freebsd.go rename to vendor/go.podman.io/image/v5/docker/paths_freebsd.go diff --git a/vendor/github.com/containers/image/v5/docker/policyconfiguration/naming.go b/vendor/go.podman.io/image/v5/docker/policyconfiguration/naming.go similarity index 98% rename from vendor/github.com/containers/image/v5/docker/policyconfiguration/naming.go rename to vendor/go.podman.io/image/v5/docker/policyconfiguration/naming.go index e1f1f1f2b75..ddb0bce1240 100644 --- a/vendor/github.com/containers/image/v5/docker/policyconfiguration/naming.go +++ b/vendor/go.podman.io/image/v5/docker/policyconfiguration/naming.go @@ -5,7 +5,7 @@ import ( "fmt" "strings" - "github.com/containers/image/v5/docker/reference" + "go.podman.io/image/v5/docker/reference" ) // DockerReferenceIdentity returns a string representation of the reference, suitable for policy lookup, diff --git a/vendor/github.com/containers/image/v5/docker/reference/README.md b/vendor/go.podman.io/image/v5/docker/reference/README.md similarity index 100% rename from vendor/github.com/containers/image/v5/docker/reference/README.md rename to vendor/go.podman.io/image/v5/docker/reference/README.md diff --git a/vendor/github.com/containers/image/v5/docker/reference/helpers.go b/vendor/go.podman.io/image/v5/docker/reference/helpers.go similarity index 100% rename from vendor/github.com/containers/image/v5/docker/reference/helpers.go rename to vendor/go.podman.io/image/v5/docker/reference/helpers.go diff --git a/vendor/github.com/containers/image/v5/docker/reference/normalize.go b/vendor/go.podman.io/image/v5/docker/reference/normalize.go similarity index 100% rename from vendor/github.com/containers/image/v5/docker/reference/normalize.go rename to vendor/go.podman.io/image/v5/docker/reference/normalize.go diff --git a/vendor/github.com/containers/image/v5/docker/reference/reference.go b/vendor/go.podman.io/image/v5/docker/reference/reference.go similarity index 100% rename from vendor/github.com/containers/image/v5/docker/reference/reference.go rename to vendor/go.podman.io/image/v5/docker/reference/reference.go diff --git a/vendor/github.com/containers/image/v5/docker/reference/regexp-additions.go b/vendor/go.podman.io/image/v5/docker/reference/regexp-additions.go similarity index 100% rename from vendor/github.com/containers/image/v5/docker/reference/regexp-additions.go rename to vendor/go.podman.io/image/v5/docker/reference/regexp-additions.go diff --git a/vendor/github.com/containers/image/v5/docker/reference/regexp.go b/vendor/go.podman.io/image/v5/docker/reference/regexp.go similarity index 98% rename from vendor/github.com/containers/image/v5/docker/reference/regexp.go rename to vendor/go.podman.io/image/v5/docker/reference/regexp.go index 76ba5c2d5c8..db656fe6aff 100644 --- a/vendor/github.com/containers/image/v5/docker/reference/regexp.go +++ b/vendor/go.podman.io/image/v5/docker/reference/regexp.go @@ -4,7 +4,7 @@ import ( "regexp" "strings" - storageRegexp "github.com/containers/storage/pkg/regexp" + storageRegexp "go.podman.io/storage/pkg/regexp" ) const ( diff --git a/vendor/github.com/containers/image/v5/docker/registries_d.go b/vendor/go.podman.io/image/v5/docker/registries_d.go similarity index 98% rename from vendor/github.com/containers/image/v5/docker/registries_d.go rename to vendor/go.podman.io/image/v5/docker/registries_d.go index 89d48cc4fed..638f9394798 100644 --- a/vendor/github.com/containers/image/v5/docker/registries_d.go +++ b/vendor/go.podman.io/image/v5/docker/registries_d.go @@ -10,13 +10,13 @@ import ( "path/filepath" "strings" - "github.com/containers/image/v5/docker/reference" - "github.com/containers/image/v5/internal/rootless" - "github.com/containers/image/v5/types" - "github.com/containers/storage/pkg/fileutils" - "github.com/containers/storage/pkg/homedir" "github.com/opencontainers/go-digest" "github.com/sirupsen/logrus" + "go.podman.io/image/v5/docker/reference" + "go.podman.io/image/v5/internal/rootless" + "go.podman.io/image/v5/types" + "go.podman.io/storage/pkg/fileutils" + "go.podman.io/storage/pkg/homedir" "gopkg.in/yaml.v3" ) diff --git a/vendor/github.com/containers/image/v5/docker/wwwauthenticate.go b/vendor/go.podman.io/image/v5/docker/wwwauthenticate.go similarity index 100% rename from vendor/github.com/containers/image/v5/docker/wwwauthenticate.go rename to vendor/go.podman.io/image/v5/docker/wwwauthenticate.go diff --git a/vendor/github.com/containers/image/v5/image/docker_schema2.go b/vendor/go.podman.io/image/v5/image/docker_schema2.go similarity index 91% rename from vendor/github.com/containers/image/v5/image/docker_schema2.go rename to vendor/go.podman.io/image/v5/image/docker_schema2.go index e5a3b899122..617d499e48e 100644 --- a/vendor/github.com/containers/image/v5/image/docker_schema2.go +++ b/vendor/go.podman.io/image/v5/image/docker_schema2.go @@ -1,7 +1,7 @@ package image import ( - "github.com/containers/image/v5/internal/image" + "go.podman.io/image/v5/internal/image" ) // GzippedEmptyLayer is a gzip-compressed version of an empty tar file (1024 NULL bytes) diff --git a/vendor/github.com/containers/image/v5/image/sourced.go b/vendor/go.podman.io/image/v5/image/sourced.go similarity index 95% rename from vendor/github.com/containers/image/v5/image/sourced.go rename to vendor/go.podman.io/image/v5/image/sourced.go index 2b7f6b144b9..76375c5f592 100644 --- a/vendor/github.com/containers/image/v5/image/sourced.go +++ b/vendor/go.podman.io/image/v5/image/sourced.go @@ -6,8 +6,8 @@ package image import ( "context" - "github.com/containers/image/v5/internal/image" - "github.com/containers/image/v5/types" + "go.podman.io/image/v5/internal/image" + "go.podman.io/image/v5/types" ) // FromSource returns a types.ImageCloser implementation for the default instance of source. diff --git a/vendor/github.com/containers/image/v5/image/unparsed.go b/vendor/go.podman.io/image/v5/image/unparsed.go similarity index 90% rename from vendor/github.com/containers/image/v5/image/unparsed.go rename to vendor/go.podman.io/image/v5/image/unparsed.go index f530824a929..79d446d70f3 100644 --- a/vendor/github.com/containers/image/v5/image/unparsed.go +++ b/vendor/go.podman.io/image/v5/image/unparsed.go @@ -1,11 +1,11 @@ package image import ( - "github.com/containers/image/v5/internal/image" - "github.com/containers/image/v5/internal/private" - "github.com/containers/image/v5/internal/unparsedimage" - "github.com/containers/image/v5/types" "github.com/opencontainers/go-digest" + "go.podman.io/image/v5/internal/image" + "go.podman.io/image/v5/internal/private" + "go.podman.io/image/v5/internal/unparsedimage" + "go.podman.io/image/v5/types" ) // UnparsedImage implements types.UnparsedImage . diff --git a/vendor/github.com/containers/image/v5/internal/blobinfocache/blobinfocache.go b/vendor/go.podman.io/image/v5/internal/blobinfocache/blobinfocache.go similarity index 97% rename from vendor/github.com/containers/image/v5/internal/blobinfocache/blobinfocache.go rename to vendor/go.podman.io/image/v5/internal/blobinfocache/blobinfocache.go index f31ee3124df..5399c2961d8 100644 --- a/vendor/github.com/containers/image/v5/internal/blobinfocache/blobinfocache.go +++ b/vendor/go.podman.io/image/v5/internal/blobinfocache/blobinfocache.go @@ -1,8 +1,8 @@ package blobinfocache import ( - "github.com/containers/image/v5/types" digest "github.com/opencontainers/go-digest" + "go.podman.io/image/v5/types" ) // FromBlobInfoCache returns a BlobInfoCache2 based on a BlobInfoCache, returning the original diff --git a/vendor/github.com/containers/image/v5/internal/blobinfocache/types.go b/vendor/go.podman.io/image/v5/internal/blobinfocache/types.go similarity index 97% rename from vendor/github.com/containers/image/v5/internal/blobinfocache/types.go rename to vendor/go.podman.io/image/v5/internal/blobinfocache/types.go index acf82ee6396..d9d27ec9500 100644 --- a/vendor/github.com/containers/image/v5/internal/blobinfocache/types.go +++ b/vendor/go.podman.io/image/v5/internal/blobinfocache/types.go @@ -1,9 +1,9 @@ package blobinfocache import ( - compressiontypes "github.com/containers/image/v5/pkg/compression/types" - "github.com/containers/image/v5/types" digest "github.com/opencontainers/go-digest" + compressiontypes "go.podman.io/image/v5/pkg/compression/types" + "go.podman.io/image/v5/types" ) const ( diff --git a/vendor/github.com/containers/image/v5/internal/image/docker_list.go b/vendor/go.podman.io/image/v5/internal/image/docker_list.go similarity index 91% rename from vendor/github.com/containers/image/v5/internal/image/docker_list.go rename to vendor/go.podman.io/image/v5/internal/image/docker_list.go index 617a451aa97..2b49964a176 100644 --- a/vendor/github.com/containers/image/v5/internal/image/docker_list.go +++ b/vendor/go.podman.io/image/v5/internal/image/docker_list.go @@ -4,8 +4,8 @@ import ( "context" "fmt" - "github.com/containers/image/v5/internal/manifest" - "github.com/containers/image/v5/types" + "go.podman.io/image/v5/internal/manifest" + "go.podman.io/image/v5/types" ) func manifestSchema2FromManifestList(ctx context.Context, sys *types.SystemContext, src types.ImageSource, manblob []byte) (genericManifest, error) { diff --git a/vendor/github.com/containers/image/v5/internal/image/docker_schema1.go b/vendor/go.podman.io/image/v5/internal/image/docker_schema1.go similarity index 98% rename from vendor/github.com/containers/image/v5/internal/image/docker_schema1.go rename to vendor/go.podman.io/image/v5/internal/image/docker_schema1.go index 3ef8e144d7b..ecf053e0b46 100644 --- a/vendor/github.com/containers/image/v5/internal/image/docker_schema1.go +++ b/vendor/go.podman.io/image/v5/internal/image/docker_schema1.go @@ -4,11 +4,11 @@ import ( "context" "fmt" - "github.com/containers/image/v5/docker/reference" - "github.com/containers/image/v5/manifest" - "github.com/containers/image/v5/types" "github.com/opencontainers/go-digest" imgspecv1 "github.com/opencontainers/image-spec/specs-go/v1" + "go.podman.io/image/v5/docker/reference" + "go.podman.io/image/v5/manifest" + "go.podman.io/image/v5/types" ) type manifestSchema1 struct { diff --git a/vendor/github.com/containers/image/v5/internal/image/docker_schema2.go b/vendor/go.podman.io/image/v5/internal/image/docker_schema2.go similarity index 98% rename from vendor/github.com/containers/image/v5/internal/image/docker_schema2.go rename to vendor/go.podman.io/image/v5/internal/image/docker_schema2.go index 01219e39192..9305524a086 100644 --- a/vendor/github.com/containers/image/v5/internal/image/docker_schema2.go +++ b/vendor/go.podman.io/image/v5/internal/image/docker_schema2.go @@ -10,14 +10,14 @@ import ( "fmt" "strings" - "github.com/containers/image/v5/docker/reference" - "github.com/containers/image/v5/internal/iolimits" - "github.com/containers/image/v5/manifest" - "github.com/containers/image/v5/pkg/blobinfocache/none" - "github.com/containers/image/v5/types" "github.com/opencontainers/go-digest" imgspecv1 "github.com/opencontainers/image-spec/specs-go/v1" "github.com/sirupsen/logrus" + "go.podman.io/image/v5/docker/reference" + "go.podman.io/image/v5/internal/iolimits" + "go.podman.io/image/v5/manifest" + "go.podman.io/image/v5/pkg/blobinfocache/none" + "go.podman.io/image/v5/types" ) // GzippedEmptyLayer is a gzip-compressed version of an empty tar file (1024 NULL bytes) diff --git a/vendor/github.com/containers/image/v5/internal/image/manifest.go b/vendor/go.podman.io/image/v5/internal/image/manifest.go similarity index 97% rename from vendor/github.com/containers/image/v5/internal/image/manifest.go rename to vendor/go.podman.io/image/v5/internal/image/manifest.go index ed57e08dd82..d6ae8b6fa59 100644 --- a/vendor/github.com/containers/image/v5/internal/image/manifest.go +++ b/vendor/go.podman.io/image/v5/internal/image/manifest.go @@ -4,10 +4,10 @@ import ( "context" "fmt" - "github.com/containers/image/v5/docker/reference" - "github.com/containers/image/v5/manifest" - "github.com/containers/image/v5/types" imgspecv1 "github.com/opencontainers/image-spec/specs-go/v1" + "go.podman.io/image/v5/docker/reference" + "go.podman.io/image/v5/manifest" + "go.podman.io/image/v5/types" ) // genericManifest is an interface for parsing, modifying image manifests and related data. diff --git a/vendor/github.com/containers/image/v5/internal/image/memory.go b/vendor/go.podman.io/image/v5/internal/image/memory.go similarity index 98% rename from vendor/github.com/containers/image/v5/internal/image/memory.go rename to vendor/go.podman.io/image/v5/internal/image/memory.go index e22c7aafdfa..9dff39197f1 100644 --- a/vendor/github.com/containers/image/v5/internal/image/memory.go +++ b/vendor/go.podman.io/image/v5/internal/image/memory.go @@ -4,7 +4,7 @@ import ( "context" "errors" - "github.com/containers/image/v5/types" + "go.podman.io/image/v5/types" ) // memoryImage is a mostly-implementation of types.Image assembled from data diff --git a/vendor/github.com/containers/image/v5/internal/image/oci.go b/vendor/go.podman.io/image/v5/internal/image/oci.go similarity index 97% rename from vendor/github.com/containers/image/v5/internal/image/oci.go rename to vendor/go.podman.io/image/v5/internal/image/oci.go index aaef95ff3df..8b73b91ffa0 100644 --- a/vendor/github.com/containers/image/v5/internal/image/oci.go +++ b/vendor/go.podman.io/image/v5/internal/image/oci.go @@ -7,15 +7,15 @@ import ( "fmt" "slices" - "github.com/containers/image/v5/docker/reference" - "github.com/containers/image/v5/internal/iolimits" - internalManifest "github.com/containers/image/v5/internal/manifest" - "github.com/containers/image/v5/manifest" - "github.com/containers/image/v5/pkg/blobinfocache/none" - "github.com/containers/image/v5/types" ociencspec "github.com/containers/ocicrypt/spec" "github.com/opencontainers/go-digest" imgspecv1 "github.com/opencontainers/image-spec/specs-go/v1" + "go.podman.io/image/v5/docker/reference" + "go.podman.io/image/v5/internal/iolimits" + internalManifest "go.podman.io/image/v5/internal/manifest" + "go.podman.io/image/v5/manifest" + "go.podman.io/image/v5/pkg/blobinfocache/none" + "go.podman.io/image/v5/types" ) type manifestOCI1 struct { diff --git a/vendor/github.com/containers/image/v5/internal/image/oci_index.go b/vendor/go.podman.io/image/v5/internal/image/oci_index.go similarity index 91% rename from vendor/github.com/containers/image/v5/internal/image/oci_index.go rename to vendor/go.podman.io/image/v5/internal/image/oci_index.go index 0e945c85194..b9071b55d38 100644 --- a/vendor/github.com/containers/image/v5/internal/image/oci_index.go +++ b/vendor/go.podman.io/image/v5/internal/image/oci_index.go @@ -4,8 +4,8 @@ import ( "context" "fmt" - "github.com/containers/image/v5/internal/manifest" - "github.com/containers/image/v5/types" + "go.podman.io/image/v5/internal/manifest" + "go.podman.io/image/v5/types" ) func manifestOCI1FromImageIndex(ctx context.Context, sys *types.SystemContext, src types.ImageSource, manblob []byte) (genericManifest, error) { diff --git a/vendor/github.com/containers/image/v5/internal/image/sourced.go b/vendor/go.podman.io/image/v5/internal/image/sourced.go similarity index 99% rename from vendor/github.com/containers/image/v5/internal/image/sourced.go rename to vendor/go.podman.io/image/v5/internal/image/sourced.go index 661891aa558..ba2eaa0c9a2 100644 --- a/vendor/github.com/containers/image/v5/internal/image/sourced.go +++ b/vendor/go.podman.io/image/v5/internal/image/sourced.go @@ -6,7 +6,7 @@ package image import ( "context" - "github.com/containers/image/v5/types" + "go.podman.io/image/v5/types" ) // FromReference returns a types.ImageCloser implementation for the default instance reading from reference. diff --git a/vendor/github.com/containers/image/v5/internal/image/unparsed.go b/vendor/go.podman.io/image/v5/internal/image/unparsed.go similarity index 94% rename from vendor/github.com/containers/image/v5/internal/image/unparsed.go rename to vendor/go.podman.io/image/v5/internal/image/unparsed.go index 1cffe4311b2..45c3723836d 100644 --- a/vendor/github.com/containers/image/v5/internal/image/unparsed.go +++ b/vendor/go.podman.io/image/v5/internal/image/unparsed.go @@ -4,13 +4,13 @@ import ( "context" "fmt" - "github.com/containers/image/v5/docker/reference" - "github.com/containers/image/v5/internal/imagesource" - "github.com/containers/image/v5/internal/private" - "github.com/containers/image/v5/internal/signature" - "github.com/containers/image/v5/manifest" - "github.com/containers/image/v5/types" "github.com/opencontainers/go-digest" + "go.podman.io/image/v5/docker/reference" + "go.podman.io/image/v5/internal/imagesource" + "go.podman.io/image/v5/internal/private" + "go.podman.io/image/v5/internal/signature" + "go.podman.io/image/v5/manifest" + "go.podman.io/image/v5/types" ) // UnparsedImage implements types.UnparsedImage . diff --git a/vendor/github.com/containers/image/v5/internal/imagedestination/impl/compat.go b/vendor/go.podman.io/image/v5/internal/imagedestination/impl/compat.go similarity index 96% rename from vendor/github.com/containers/image/v5/internal/imagedestination/impl/compat.go rename to vendor/go.podman.io/image/v5/internal/imagedestination/impl/compat.go index 70b207d9b54..9a8d187138a 100644 --- a/vendor/github.com/containers/image/v5/internal/imagedestination/impl/compat.go +++ b/vendor/go.podman.io/image/v5/internal/imagedestination/impl/compat.go @@ -4,11 +4,11 @@ import ( "context" "io" - "github.com/containers/image/v5/internal/blobinfocache" - "github.com/containers/image/v5/internal/private" - "github.com/containers/image/v5/internal/signature" - "github.com/containers/image/v5/types" "github.com/opencontainers/go-digest" + "go.podman.io/image/v5/internal/blobinfocache" + "go.podman.io/image/v5/internal/private" + "go.podman.io/image/v5/internal/signature" + "go.podman.io/image/v5/types" ) // Compat implements the obsolete parts of types.ImageDestination diff --git a/vendor/github.com/containers/image/v5/internal/imagedestination/impl/helpers.go b/vendor/go.podman.io/image/v5/internal/imagedestination/impl/helpers.go similarity index 82% rename from vendor/github.com/containers/image/v5/internal/imagedestination/impl/helpers.go rename to vendor/go.podman.io/image/v5/internal/imagedestination/impl/helpers.go index 9b42cfbec06..b12beff07f6 100644 --- a/vendor/github.com/containers/image/v5/internal/imagedestination/impl/helpers.go +++ b/vendor/go.podman.io/image/v5/internal/imagedestination/impl/helpers.go @@ -1,8 +1,8 @@ package impl import ( - "github.com/containers/image/v5/internal/manifest" - "github.com/containers/image/v5/internal/private" + "go.podman.io/image/v5/internal/manifest" + "go.podman.io/image/v5/internal/private" ) // OriginalCandidateMatchesTryReusingBlobOptions returns true if the original blob passed to TryReusingBlobWithOptions diff --git a/vendor/github.com/containers/image/v5/internal/imagedestination/impl/properties.go b/vendor/go.podman.io/image/v5/internal/imagedestination/impl/properties.go similarity index 98% rename from vendor/github.com/containers/image/v5/internal/imagedestination/impl/properties.go rename to vendor/go.podman.io/image/v5/internal/imagedestination/impl/properties.go index 704812e9abf..1aab4b06101 100644 --- a/vendor/github.com/containers/image/v5/internal/imagedestination/impl/properties.go +++ b/vendor/go.podman.io/image/v5/internal/imagedestination/impl/properties.go @@ -1,6 +1,6 @@ package impl -import "github.com/containers/image/v5/types" +import "go.podman.io/image/v5/types" // Properties collects properties of an ImageDestination that are constant throughout its lifetime // (but might differ across instances). diff --git a/vendor/github.com/containers/image/v5/internal/imagedestination/stubs/original_oci_config.go b/vendor/go.podman.io/image/v5/internal/imagedestination/stubs/original_oci_config.go similarity index 100% rename from vendor/github.com/containers/image/v5/internal/imagedestination/stubs/original_oci_config.go rename to vendor/go.podman.io/image/v5/internal/imagedestination/stubs/original_oci_config.go diff --git a/vendor/github.com/containers/image/v5/internal/imagedestination/stubs/put_blob_partial.go b/vendor/go.podman.io/image/v5/internal/imagedestination/stubs/put_blob_partial.go similarity index 95% rename from vendor/github.com/containers/image/v5/internal/imagedestination/stubs/put_blob_partial.go rename to vendor/go.podman.io/image/v5/internal/imagedestination/stubs/put_blob_partial.go index 22bed4b0fa5..573ad832e8e 100644 --- a/vendor/github.com/containers/image/v5/internal/imagedestination/stubs/put_blob_partial.go +++ b/vendor/go.podman.io/image/v5/internal/imagedestination/stubs/put_blob_partial.go @@ -4,8 +4,8 @@ import ( "context" "fmt" - "github.com/containers/image/v5/internal/private" - "github.com/containers/image/v5/types" + "go.podman.io/image/v5/internal/private" + "go.podman.io/image/v5/types" ) // NoPutBlobPartialInitialize implements parts of private.ImageDestination diff --git a/vendor/github.com/containers/image/v5/internal/imagedestination/stubs/signatures.go b/vendor/go.podman.io/image/v5/internal/imagedestination/stubs/signatures.go similarity index 97% rename from vendor/github.com/containers/image/v5/internal/imagedestination/stubs/signatures.go rename to vendor/go.podman.io/image/v5/internal/imagedestination/stubs/signatures.go index 7015fd06896..c046449b187 100644 --- a/vendor/github.com/containers/image/v5/internal/imagedestination/stubs/signatures.go +++ b/vendor/go.podman.io/image/v5/internal/imagedestination/stubs/signatures.go @@ -4,8 +4,8 @@ import ( "context" "errors" - "github.com/containers/image/v5/internal/signature" "github.com/opencontainers/go-digest" + "go.podman.io/image/v5/internal/signature" ) // NoSignaturesInitialize implements parts of private.ImageDestination diff --git a/vendor/github.com/containers/image/v5/internal/imagedestination/stubs/stubs.go b/vendor/go.podman.io/image/v5/internal/imagedestination/stubs/stubs.go similarity index 100% rename from vendor/github.com/containers/image/v5/internal/imagedestination/stubs/stubs.go rename to vendor/go.podman.io/image/v5/internal/imagedestination/stubs/stubs.go diff --git a/vendor/github.com/containers/image/v5/internal/imagedestination/wrapper.go b/vendor/go.podman.io/image/v5/internal/imagedestination/wrapper.go similarity index 96% rename from vendor/github.com/containers/image/v5/internal/imagedestination/wrapper.go rename to vendor/go.podman.io/image/v5/internal/imagedestination/wrapper.go index b2462a3bc15..cbbb6b42a5e 100644 --- a/vendor/github.com/containers/image/v5/internal/imagedestination/wrapper.go +++ b/vendor/go.podman.io/image/v5/internal/imagedestination/wrapper.go @@ -4,11 +4,11 @@ import ( "context" "io" - "github.com/containers/image/v5/internal/imagedestination/stubs" - "github.com/containers/image/v5/internal/private" - "github.com/containers/image/v5/internal/signature" - "github.com/containers/image/v5/types" "github.com/opencontainers/go-digest" + "go.podman.io/image/v5/internal/imagedestination/stubs" + "go.podman.io/image/v5/internal/private" + "go.podman.io/image/v5/internal/signature" + "go.podman.io/image/v5/types" ) // wrapped provides the private.ImageDestination operations diff --git a/vendor/github.com/containers/image/v5/internal/imagesource/impl/compat.go b/vendor/go.podman.io/image/v5/internal/imagesource/impl/compat.go similarity index 94% rename from vendor/github.com/containers/image/v5/internal/imagesource/impl/compat.go rename to vendor/go.podman.io/image/v5/internal/imagesource/impl/compat.go index 7d859c31258..4d56f43595d 100644 --- a/vendor/github.com/containers/image/v5/internal/imagesource/impl/compat.go +++ b/vendor/go.podman.io/image/v5/internal/imagesource/impl/compat.go @@ -3,9 +3,9 @@ package impl import ( "context" - "github.com/containers/image/v5/internal/private" - "github.com/containers/image/v5/internal/signature" "github.com/opencontainers/go-digest" + "go.podman.io/image/v5/internal/private" + "go.podman.io/image/v5/internal/signature" ) // Compat implements the obsolete parts of types.ImageSource diff --git a/vendor/github.com/containers/image/v5/internal/imagesource/impl/layer_infos.go b/vendor/go.podman.io/image/v5/internal/imagesource/impl/layer_infos.go similarity index 96% rename from vendor/github.com/containers/image/v5/internal/imagesource/impl/layer_infos.go rename to vendor/go.podman.io/image/v5/internal/imagesource/impl/layer_infos.go index d5eae63519e..63016f333e7 100644 --- a/vendor/github.com/containers/image/v5/internal/imagesource/impl/layer_infos.go +++ b/vendor/go.podman.io/image/v5/internal/imagesource/impl/layer_infos.go @@ -3,8 +3,8 @@ package impl import ( "context" - "github.com/containers/image/v5/types" "github.com/opencontainers/go-digest" + "go.podman.io/image/v5/types" ) // DoesNotAffectLayerInfosForCopy implements LayerInfosForCopy() that returns nothing. diff --git a/vendor/github.com/containers/image/v5/internal/imagesource/impl/properties.go b/vendor/go.podman.io/image/v5/internal/imagesource/impl/properties.go similarity index 100% rename from vendor/github.com/containers/image/v5/internal/imagesource/impl/properties.go rename to vendor/go.podman.io/image/v5/internal/imagesource/impl/properties.go diff --git a/vendor/github.com/containers/image/v5/internal/imagesource/impl/signatures.go b/vendor/go.podman.io/image/v5/internal/imagesource/impl/signatures.go similarity index 93% rename from vendor/github.com/containers/image/v5/internal/imagesource/impl/signatures.go rename to vendor/go.podman.io/image/v5/internal/imagesource/impl/signatures.go index b3a8c7e88d9..749e42a0c7f 100644 --- a/vendor/github.com/containers/image/v5/internal/imagesource/impl/signatures.go +++ b/vendor/go.podman.io/image/v5/internal/imagesource/impl/signatures.go @@ -3,8 +3,8 @@ package impl import ( "context" - "github.com/containers/image/v5/internal/signature" "github.com/opencontainers/go-digest" + "go.podman.io/image/v5/internal/signature" ) // NoSignatures implements GetSignatures() that returns nothing. diff --git a/vendor/github.com/containers/image/v5/internal/imagesource/stubs/get_blob_at.go b/vendor/go.podman.io/image/v5/internal/imagesource/stubs/get_blob_at.go similarity index 95% rename from vendor/github.com/containers/image/v5/internal/imagesource/stubs/get_blob_at.go rename to vendor/go.podman.io/image/v5/internal/imagesource/stubs/get_blob_at.go index 286ae524b17..b1fe9b9a6d4 100644 --- a/vendor/github.com/containers/image/v5/internal/imagesource/stubs/get_blob_at.go +++ b/vendor/go.podman.io/image/v5/internal/imagesource/stubs/get_blob_at.go @@ -5,8 +5,8 @@ import ( "fmt" "io" - "github.com/containers/image/v5/internal/private" - "github.com/containers/image/v5/types" + "go.podman.io/image/v5/internal/private" + "go.podman.io/image/v5/types" ) // NoGetBlobAtInitialize implements parts of private.ImageSource diff --git a/vendor/github.com/containers/image/v5/internal/imagesource/stubs/stubs.go b/vendor/go.podman.io/image/v5/internal/imagesource/stubs/stubs.go similarity index 100% rename from vendor/github.com/containers/image/v5/internal/imagesource/stubs/stubs.go rename to vendor/go.podman.io/image/v5/internal/imagesource/stubs/stubs.go diff --git a/vendor/github.com/containers/image/v5/internal/imagesource/wrapper.go b/vendor/go.podman.io/image/v5/internal/imagesource/wrapper.go similarity index 90% rename from vendor/github.com/containers/image/v5/internal/imagesource/wrapper.go rename to vendor/go.podman.io/image/v5/internal/imagesource/wrapper.go index f0d1d042bf8..00bf8893fc7 100644 --- a/vendor/github.com/containers/image/v5/internal/imagesource/wrapper.go +++ b/vendor/go.podman.io/image/v5/internal/imagesource/wrapper.go @@ -3,11 +3,11 @@ package imagesource import ( "context" - "github.com/containers/image/v5/internal/imagesource/stubs" - "github.com/containers/image/v5/internal/private" - "github.com/containers/image/v5/internal/signature" - "github.com/containers/image/v5/types" "github.com/opencontainers/go-digest" + "go.podman.io/image/v5/internal/imagesource/stubs" + "go.podman.io/image/v5/internal/private" + "go.podman.io/image/v5/internal/signature" + "go.podman.io/image/v5/types" ) // wrapped provides the private.ImageSource operations diff --git a/vendor/github.com/containers/image/v5/internal/iolimits/iolimits.go b/vendor/go.podman.io/image/v5/internal/iolimits/iolimits.go similarity index 100% rename from vendor/github.com/containers/image/v5/internal/iolimits/iolimits.go rename to vendor/go.podman.io/image/v5/internal/iolimits/iolimits.go diff --git a/vendor/github.com/containers/image/v5/internal/manifest/common.go b/vendor/go.podman.io/image/v5/internal/manifest/common.go similarity index 100% rename from vendor/github.com/containers/image/v5/internal/manifest/common.go rename to vendor/go.podman.io/image/v5/internal/manifest/common.go diff --git a/vendor/github.com/containers/image/v5/internal/manifest/docker_schema2.go b/vendor/go.podman.io/image/v5/internal/manifest/docker_schema2.go similarity index 100% rename from vendor/github.com/containers/image/v5/internal/manifest/docker_schema2.go rename to vendor/go.podman.io/image/v5/internal/manifest/docker_schema2.go diff --git a/vendor/github.com/containers/image/v5/internal/manifest/docker_schema2_list.go b/vendor/go.podman.io/image/v5/internal/manifest/docker_schema2_list.go similarity index 98% rename from vendor/github.com/containers/image/v5/internal/manifest/docker_schema2_list.go rename to vendor/go.podman.io/image/v5/internal/manifest/docker_schema2_list.go index 4c1589ef025..fdcc4208329 100644 --- a/vendor/github.com/containers/image/v5/internal/manifest/docker_schema2_list.go +++ b/vendor/go.podman.io/image/v5/internal/manifest/docker_schema2_list.go @@ -5,11 +5,11 @@ import ( "fmt" "slices" - platform "github.com/containers/image/v5/internal/pkg/platform" - compression "github.com/containers/image/v5/pkg/compression/types" - "github.com/containers/image/v5/types" "github.com/opencontainers/go-digest" imgspecv1 "github.com/opencontainers/image-spec/specs-go/v1" + platform "go.podman.io/image/v5/internal/pkg/platform" + compression "go.podman.io/image/v5/pkg/compression/types" + "go.podman.io/image/v5/types" ) // Schema2PlatformSpec describes the platform which a particular manifest is diff --git a/vendor/github.com/containers/image/v5/internal/manifest/errors.go b/vendor/go.podman.io/image/v5/internal/manifest/errors.go similarity index 100% rename from vendor/github.com/containers/image/v5/internal/manifest/errors.go rename to vendor/go.podman.io/image/v5/internal/manifest/errors.go diff --git a/vendor/github.com/containers/image/v5/internal/manifest/list.go b/vendor/go.podman.io/image/v5/internal/manifest/list.go similarity index 97% rename from vendor/github.com/containers/image/v5/internal/manifest/list.go rename to vendor/go.podman.io/image/v5/internal/manifest/list.go index 1c614d12462..100d1c86b9e 100644 --- a/vendor/github.com/containers/image/v5/internal/manifest/list.go +++ b/vendor/go.podman.io/image/v5/internal/manifest/list.go @@ -3,10 +3,10 @@ package manifest import ( "fmt" - compression "github.com/containers/image/v5/pkg/compression/types" - "github.com/containers/image/v5/types" digest "github.com/opencontainers/go-digest" imgspecv1 "github.com/opencontainers/image-spec/specs-go/v1" + compression "go.podman.io/image/v5/pkg/compression/types" + "go.podman.io/image/v5/types" ) // ListPublic is a subset of List which is a part of the public API; diff --git a/vendor/github.com/containers/image/v5/internal/manifest/manifest.go b/vendor/go.podman.io/image/v5/internal/manifest/manifest.go similarity index 99% rename from vendor/github.com/containers/image/v5/internal/manifest/manifest.go rename to vendor/go.podman.io/image/v5/internal/manifest/manifest.go index 3fb52104a61..7dfe77844ed 100644 --- a/vendor/github.com/containers/image/v5/internal/manifest/manifest.go +++ b/vendor/go.podman.io/image/v5/internal/manifest/manifest.go @@ -4,10 +4,10 @@ import ( "encoding/json" "slices" - compressiontypes "github.com/containers/image/v5/pkg/compression/types" "github.com/containers/libtrust" digest "github.com/opencontainers/go-digest" imgspecv1 "github.com/opencontainers/image-spec/specs-go/v1" + compressiontypes "go.podman.io/image/v5/pkg/compression/types" ) // FIXME: Should we just use docker/distribution and docker/docker implementations directly? diff --git a/vendor/github.com/containers/image/v5/internal/manifest/oci_index.go b/vendor/go.podman.io/image/v5/internal/manifest/oci_index.go similarity index 99% rename from vendor/github.com/containers/image/v5/internal/manifest/oci_index.go rename to vendor/go.podman.io/image/v5/internal/manifest/oci_index.go index 719deccbb2b..046d8e60706 100644 --- a/vendor/github.com/containers/image/v5/internal/manifest/oci_index.go +++ b/vendor/go.podman.io/image/v5/internal/manifest/oci_index.go @@ -9,12 +9,12 @@ import ( "runtime" "slices" - platform "github.com/containers/image/v5/internal/pkg/platform" - compression "github.com/containers/image/v5/pkg/compression/types" - "github.com/containers/image/v5/types" "github.com/opencontainers/go-digest" imgspec "github.com/opencontainers/image-spec/specs-go" imgspecv1 "github.com/opencontainers/image-spec/specs-go/v1" + platform "go.podman.io/image/v5/internal/pkg/platform" + compression "go.podman.io/image/v5/pkg/compression/types" + "go.podman.io/image/v5/types" ) const ( diff --git a/vendor/github.com/containers/image/v5/internal/multierr/multierr.go b/vendor/go.podman.io/image/v5/internal/multierr/multierr.go similarity index 100% rename from vendor/github.com/containers/image/v5/internal/multierr/multierr.go rename to vendor/go.podman.io/image/v5/internal/multierr/multierr.go diff --git a/vendor/github.com/containers/image/v5/internal/pkg/platform/platform_matcher.go b/vendor/go.podman.io/image/v5/internal/pkg/platform/platform_matcher.go similarity index 99% rename from vendor/github.com/containers/image/v5/internal/pkg/platform/platform_matcher.go rename to vendor/go.podman.io/image/v5/internal/pkg/platform/platform_matcher.go index 3a16dad6373..1714388914a 100644 --- a/vendor/github.com/containers/image/v5/internal/pkg/platform/platform_matcher.go +++ b/vendor/go.podman.io/image/v5/internal/pkg/platform/platform_matcher.go @@ -24,9 +24,9 @@ import ( "slices" "strings" - "github.com/containers/image/v5/types" imgspecv1 "github.com/opencontainers/image-spec/specs-go/v1" "github.com/sirupsen/logrus" + "go.podman.io/image/v5/types" ) // For Linux, the kernel has already detected the ABI, ISA and Features. diff --git a/vendor/github.com/containers/image/v5/internal/private/private.go b/vendor/go.podman.io/image/v5/internal/private/private.go similarity index 98% rename from vendor/github.com/containers/image/v5/internal/private/private.go rename to vendor/go.podman.io/image/v5/internal/private/private.go index ae0cbdf220e..a5d2057aef6 100644 --- a/vendor/github.com/containers/image/v5/internal/private/private.go +++ b/vendor/go.podman.io/image/v5/internal/private/private.go @@ -5,13 +5,13 @@ import ( "io" "time" - "github.com/containers/image/v5/docker/reference" - "github.com/containers/image/v5/internal/blobinfocache" - "github.com/containers/image/v5/internal/signature" - compression "github.com/containers/image/v5/pkg/compression/types" - "github.com/containers/image/v5/types" "github.com/opencontainers/go-digest" imgspecv1 "github.com/opencontainers/image-spec/specs-go/v1" + "go.podman.io/image/v5/docker/reference" + "go.podman.io/image/v5/internal/blobinfocache" + "go.podman.io/image/v5/internal/signature" + compression "go.podman.io/image/v5/pkg/compression/types" + "go.podman.io/image/v5/types" ) // ImageSourceInternalOnly is the part of private.ImageSource that is not diff --git a/vendor/github.com/containers/image/v5/internal/putblobdigest/put_blob_digest.go b/vendor/go.podman.io/image/v5/internal/putblobdigest/put_blob_digest.go similarity index 98% rename from vendor/github.com/containers/image/v5/internal/putblobdigest/put_blob_digest.go rename to vendor/go.podman.io/image/v5/internal/putblobdigest/put_blob_digest.go index b8d3a7e56d7..ce505427517 100644 --- a/vendor/github.com/containers/image/v5/internal/putblobdigest/put_blob_digest.go +++ b/vendor/go.podman.io/image/v5/internal/putblobdigest/put_blob_digest.go @@ -3,8 +3,8 @@ package putblobdigest import ( "io" - "github.com/containers/image/v5/types" "github.com/opencontainers/go-digest" + "go.podman.io/image/v5/types" ) // Digester computes a digest of the provided stream, if not known yet. diff --git a/vendor/github.com/containers/image/v5/internal/rootless/rootless.go b/vendor/go.podman.io/image/v5/internal/rootless/rootless.go similarity index 100% rename from vendor/github.com/containers/image/v5/internal/rootless/rootless.go rename to vendor/go.podman.io/image/v5/internal/rootless/rootless.go diff --git a/vendor/github.com/containers/image/v5/internal/set/set.go b/vendor/go.podman.io/image/v5/internal/set/set.go similarity index 100% rename from vendor/github.com/containers/image/v5/internal/set/set.go rename to vendor/go.podman.io/image/v5/internal/set/set.go diff --git a/vendor/github.com/containers/image/v5/internal/signature/signature.go b/vendor/go.podman.io/image/v5/internal/signature/signature.go similarity index 100% rename from vendor/github.com/containers/image/v5/internal/signature/signature.go rename to vendor/go.podman.io/image/v5/internal/signature/signature.go diff --git a/vendor/github.com/containers/image/v5/internal/signature/sigstore.go b/vendor/go.podman.io/image/v5/internal/signature/sigstore.go similarity index 100% rename from vendor/github.com/containers/image/v5/internal/signature/sigstore.go rename to vendor/go.podman.io/image/v5/internal/signature/sigstore.go diff --git a/vendor/github.com/containers/image/v5/internal/signature/simple.go b/vendor/go.podman.io/image/v5/internal/signature/simple.go similarity index 100% rename from vendor/github.com/containers/image/v5/internal/signature/simple.go rename to vendor/go.podman.io/image/v5/internal/signature/simple.go diff --git a/vendor/github.com/containers/image/v5/internal/signer/signer.go b/vendor/go.podman.io/image/v5/internal/signer/signer.go similarity index 94% rename from vendor/github.com/containers/image/v5/internal/signer/signer.go rename to vendor/go.podman.io/image/v5/internal/signer/signer.go index 5720254d1ce..526565d93e6 100644 --- a/vendor/github.com/containers/image/v5/internal/signer/signer.go +++ b/vendor/go.podman.io/image/v5/internal/signer/signer.go @@ -3,8 +3,8 @@ package signer import ( "context" - "github.com/containers/image/v5/docker/reference" - "github.com/containers/image/v5/internal/signature" + "go.podman.io/image/v5/docker/reference" + "go.podman.io/image/v5/internal/signature" ) // Signer is an object, possibly carrying state, that can be used by copy.Image to sign one or more container images. diff --git a/vendor/github.com/containers/image/v5/internal/streamdigest/stream_digest.go b/vendor/go.podman.io/image/v5/internal/streamdigest/stream_digest.go similarity index 89% rename from vendor/github.com/containers/image/v5/internal/streamdigest/stream_digest.go rename to vendor/go.podman.io/image/v5/internal/streamdigest/stream_digest.go index d5a5436a4d9..83608e04a60 100644 --- a/vendor/github.com/containers/image/v5/internal/streamdigest/stream_digest.go +++ b/vendor/go.podman.io/image/v5/internal/streamdigest/stream_digest.go @@ -5,9 +5,9 @@ import ( "io" "os" - "github.com/containers/image/v5/internal/putblobdigest" - "github.com/containers/image/v5/internal/tmpdir" - "github.com/containers/image/v5/types" + "go.podman.io/image/v5/internal/putblobdigest" + "go.podman.io/image/v5/internal/tmpdir" + "go.podman.io/image/v5/types" ) // ComputeBlobInfo streams a blob to a temporary file and populates Digest and Size in inputInfo. diff --git a/vendor/github.com/containers/image/v5/internal/tmpdir/tmpdir.go b/vendor/go.podman.io/image/v5/internal/tmpdir/tmpdir.go similarity index 97% rename from vendor/github.com/containers/image/v5/internal/tmpdir/tmpdir.go rename to vendor/go.podman.io/image/v5/internal/tmpdir/tmpdir.go index bab73ee3340..ac6fe934735 100644 --- a/vendor/github.com/containers/image/v5/internal/tmpdir/tmpdir.go +++ b/vendor/go.podman.io/image/v5/internal/tmpdir/tmpdir.go @@ -4,7 +4,7 @@ import ( "os" "runtime" - "github.com/containers/image/v5/types" + "go.podman.io/image/v5/types" ) // unixTempDirForBigFiles is the directory path to store big files on non Windows systems. diff --git a/vendor/github.com/containers/image/v5/internal/unparsedimage/wrapper.go b/vendor/go.podman.io/image/v5/internal/unparsedimage/wrapper.go similarity index 86% rename from vendor/github.com/containers/image/v5/internal/unparsedimage/wrapper.go rename to vendor/go.podman.io/image/v5/internal/unparsedimage/wrapper.go index fe65b1a982f..ef314d4b3d1 100644 --- a/vendor/github.com/containers/image/v5/internal/unparsedimage/wrapper.go +++ b/vendor/go.podman.io/image/v5/internal/unparsedimage/wrapper.go @@ -3,9 +3,9 @@ package unparsedimage import ( "context" - "github.com/containers/image/v5/internal/private" - "github.com/containers/image/v5/internal/signature" - "github.com/containers/image/v5/types" + "go.podman.io/image/v5/internal/private" + "go.podman.io/image/v5/internal/signature" + "go.podman.io/image/v5/types" ) // wrapped provides the private.UnparsedImage operations diff --git a/vendor/github.com/containers/image/v5/internal/uploadreader/upload_reader.go b/vendor/go.podman.io/image/v5/internal/uploadreader/upload_reader.go similarity index 100% rename from vendor/github.com/containers/image/v5/internal/uploadreader/upload_reader.go rename to vendor/go.podman.io/image/v5/internal/uploadreader/upload_reader.go diff --git a/vendor/github.com/containers/image/v5/internal/useragent/useragent.go b/vendor/go.podman.io/image/v5/internal/useragent/useragent.go similarity index 83% rename from vendor/github.com/containers/image/v5/internal/useragent/useragent.go rename to vendor/go.podman.io/image/v5/internal/useragent/useragent.go index 7ac49693ed5..54d8fcb70b7 100644 --- a/vendor/github.com/containers/image/v5/internal/useragent/useragent.go +++ b/vendor/go.podman.io/image/v5/internal/useragent/useragent.go @@ -1,6 +1,6 @@ package useragent -import "github.com/containers/image/v5/version" +import "go.podman.io/image/v5/version" // DefaultUserAgent is a value that should be used by User-Agent headers, unless the user specifically instructs us otherwise. var DefaultUserAgent = "containers/" + version.Version + " (github.com/containers/image)" diff --git a/vendor/github.com/containers/image/v5/manifest/common.go b/vendor/go.podman.io/image/v5/manifest/common.go similarity index 98% rename from vendor/github.com/containers/image/v5/manifest/common.go rename to vendor/go.podman.io/image/v5/manifest/common.go index 8d9d5795f20..dde1bf3c844 100644 --- a/vendor/github.com/containers/image/v5/manifest/common.go +++ b/vendor/go.podman.io/image/v5/manifest/common.go @@ -3,9 +3,9 @@ package manifest import ( "fmt" - compressiontypes "github.com/containers/image/v5/pkg/compression/types" - "github.com/containers/image/v5/types" "github.com/sirupsen/logrus" + compressiontypes "go.podman.io/image/v5/pkg/compression/types" + "go.podman.io/image/v5/types" ) // layerInfosToStrings converts a list of layer infos, presumably obtained from a Manifest.LayerInfos() diff --git a/vendor/github.com/containers/image/v5/manifest/docker_schema1.go b/vendor/go.podman.io/image/v5/manifest/docker_schema1.go similarity index 97% rename from vendor/github.com/containers/image/v5/manifest/docker_schema1.go rename to vendor/go.podman.io/image/v5/manifest/docker_schema1.go index f4b1fc03374..28c9fea30e1 100644 --- a/vendor/github.com/containers/image/v5/manifest/docker_schema1.go +++ b/vendor/go.podman.io/image/v5/manifest/docker_schema1.go @@ -8,14 +8,14 @@ import ( "strings" "time" - "github.com/containers/image/v5/docker/reference" - "github.com/containers/image/v5/internal/manifest" - "github.com/containers/image/v5/internal/set" - compressiontypes "github.com/containers/image/v5/pkg/compression/types" - "github.com/containers/image/v5/types" - "github.com/containers/storage/pkg/regexp" "github.com/docker/docker/api/types/versions" "github.com/opencontainers/go-digest" + "go.podman.io/image/v5/docker/reference" + "go.podman.io/image/v5/internal/manifest" + "go.podman.io/image/v5/internal/set" + compressiontypes "go.podman.io/image/v5/pkg/compression/types" + "go.podman.io/image/v5/types" + "go.podman.io/storage/pkg/regexp" ) // Schema1FSLayers is an entry of the "fsLayers" array in docker/distribution schema 1. diff --git a/vendor/github.com/containers/image/v5/manifest/docker_schema2.go b/vendor/go.podman.io/image/v5/manifest/docker_schema2.go similarity index 98% rename from vendor/github.com/containers/image/v5/manifest/docker_schema2.go rename to vendor/go.podman.io/image/v5/manifest/docker_schema2.go index 7e53f4f54e5..b4255d8863f 100644 --- a/vendor/github.com/containers/image/v5/manifest/docker_schema2.go +++ b/vendor/go.podman.io/image/v5/manifest/docker_schema2.go @@ -5,11 +5,11 @@ import ( "fmt" "time" - "github.com/containers/image/v5/internal/manifest" - compressiontypes "github.com/containers/image/v5/pkg/compression/types" - "github.com/containers/image/v5/pkg/strslice" - "github.com/containers/image/v5/types" "github.com/opencontainers/go-digest" + "go.podman.io/image/v5/internal/manifest" + compressiontypes "go.podman.io/image/v5/pkg/compression/types" + "go.podman.io/image/v5/pkg/strslice" + "go.podman.io/image/v5/types" ) // Schema2Descriptor is a “descriptor” in docker/distribution schema 2. diff --git a/vendor/github.com/containers/image/v5/manifest/docker_schema2_list.go b/vendor/go.podman.io/image/v5/manifest/docker_schema2_list.go similarity index 95% rename from vendor/github.com/containers/image/v5/manifest/docker_schema2_list.go rename to vendor/go.podman.io/image/v5/manifest/docker_schema2_list.go index c958a3fa3a6..158f7949ef3 100644 --- a/vendor/github.com/containers/image/v5/manifest/docker_schema2_list.go +++ b/vendor/go.podman.io/image/v5/manifest/docker_schema2_list.go @@ -1,7 +1,7 @@ package manifest import ( - "github.com/containers/image/v5/internal/manifest" + "go.podman.io/image/v5/internal/manifest" ) // Schema2PlatformSpec describes the platform which a particular manifest is diff --git a/vendor/github.com/containers/image/v5/manifest/list.go b/vendor/go.podman.io/image/v5/manifest/list.go similarity index 95% rename from vendor/github.com/containers/image/v5/manifest/list.go rename to vendor/go.podman.io/image/v5/manifest/list.go index 1d6fdc9f566..846ea7d43c2 100644 --- a/vendor/github.com/containers/image/v5/manifest/list.go +++ b/vendor/go.podman.io/image/v5/manifest/list.go @@ -1,8 +1,8 @@ package manifest import ( - "github.com/containers/image/v5/internal/manifest" imgspecv1 "github.com/opencontainers/image-spec/specs-go/v1" + "go.podman.io/image/v5/internal/manifest" ) var ( diff --git a/vendor/github.com/containers/image/v5/manifest/manifest.go b/vendor/go.podman.io/image/v5/manifest/manifest.go similarity index 98% rename from vendor/github.com/containers/image/v5/manifest/manifest.go rename to vendor/go.podman.io/image/v5/manifest/manifest.go index d8f37eb45db..45118fa4e19 100644 --- a/vendor/github.com/containers/image/v5/manifest/manifest.go +++ b/vendor/go.podman.io/image/v5/manifest/manifest.go @@ -3,11 +3,11 @@ package manifest import ( "fmt" - "github.com/containers/image/v5/internal/manifest" - "github.com/containers/image/v5/types" "github.com/containers/libtrust" digest "github.com/opencontainers/go-digest" imgspecv1 "github.com/opencontainers/image-spec/specs-go/v1" + "go.podman.io/image/v5/internal/manifest" + "go.podman.io/image/v5/types" ) // FIXME: Should we just use docker/distribution and docker/docker implementations directly? diff --git a/vendor/github.com/containers/image/v5/manifest/oci.go b/vendor/go.podman.io/image/v5/manifest/oci.go similarity index 98% rename from vendor/github.com/containers/image/v5/manifest/oci.go rename to vendor/go.podman.io/image/v5/manifest/oci.go index a18425d0e58..286d58c4230 100644 --- a/vendor/github.com/containers/image/v5/manifest/oci.go +++ b/vendor/go.podman.io/image/v5/manifest/oci.go @@ -6,13 +6,13 @@ import ( "slices" "strings" - "github.com/containers/image/v5/internal/manifest" - compressiontypes "github.com/containers/image/v5/pkg/compression/types" - "github.com/containers/image/v5/types" ociencspec "github.com/containers/ocicrypt/spec" "github.com/opencontainers/go-digest" "github.com/opencontainers/image-spec/specs-go" imgspecv1 "github.com/opencontainers/image-spec/specs-go/v1" + "go.podman.io/image/v5/internal/manifest" + compressiontypes "go.podman.io/image/v5/pkg/compression/types" + "go.podman.io/image/v5/types" ) // BlobInfoFromOCI1Descriptor returns a types.BlobInfo based on the input OCI1 descriptor. diff --git a/vendor/github.com/containers/image/v5/manifest/oci_index.go b/vendor/go.podman.io/image/v5/manifest/oci_index.go similarity index 94% rename from vendor/github.com/containers/image/v5/manifest/oci_index.go rename to vendor/go.podman.io/image/v5/manifest/oci_index.go index 193b08935a7..84dae607008 100644 --- a/vendor/github.com/containers/image/v5/manifest/oci_index.go +++ b/vendor/go.podman.io/image/v5/manifest/oci_index.go @@ -1,8 +1,8 @@ package manifest import ( - "github.com/containers/image/v5/internal/manifest" imgspecv1 "github.com/opencontainers/image-spec/specs-go/v1" + "go.podman.io/image/v5/internal/manifest" ) // OCI1Index is just an alias for the OCI index type, but one which we can diff --git a/vendor/github.com/containers/image/v5/oci/archive/oci_dest.go b/vendor/go.podman.io/image/v5/oci/archive/oci_dest.go similarity index 96% rename from vendor/github.com/containers/image/v5/oci/archive/oci_dest.go rename to vendor/go.podman.io/image/v5/oci/archive/oci_dest.go index 5aa40161e27..fe8b3820f96 100644 --- a/vendor/github.com/containers/image/v5/oci/archive/oci_dest.go +++ b/vendor/go.podman.io/image/v5/oci/archive/oci_dest.go @@ -7,16 +7,16 @@ import ( "os" "time" - "github.com/containers/image/v5/internal/imagedestination" - "github.com/containers/image/v5/internal/imagedestination/impl" - "github.com/containers/image/v5/internal/private" - "github.com/containers/image/v5/internal/signature" - "github.com/containers/image/v5/types" - "github.com/containers/storage/pkg/archive" - "github.com/containers/storage/pkg/idtools" digest "github.com/opencontainers/go-digest" imgspecv1 "github.com/opencontainers/image-spec/specs-go/v1" "github.com/sirupsen/logrus" + "go.podman.io/image/v5/internal/imagedestination" + "go.podman.io/image/v5/internal/imagedestination/impl" + "go.podman.io/image/v5/internal/private" + "go.podman.io/image/v5/internal/signature" + "go.podman.io/image/v5/types" + "go.podman.io/storage/pkg/archive" + "go.podman.io/storage/pkg/idtools" ) type ociArchiveImageDestination struct { diff --git a/vendor/github.com/containers/image/v5/oci/archive/oci_src.go b/vendor/go.podman.io/image/v5/oci/archive/oci_src.go similarity index 95% rename from vendor/github.com/containers/image/v5/oci/archive/oci_src.go rename to vendor/go.podman.io/image/v5/oci/archive/oci_src.go index d68814a17b3..cb15c06f031 100644 --- a/vendor/github.com/containers/image/v5/oci/archive/oci_src.go +++ b/vendor/go.podman.io/image/v5/oci/archive/oci_src.go @@ -6,15 +6,15 @@ import ( "fmt" "io" - "github.com/containers/image/v5/internal/imagesource" - "github.com/containers/image/v5/internal/imagesource/impl" - "github.com/containers/image/v5/internal/private" - "github.com/containers/image/v5/internal/signature" - ocilayout "github.com/containers/image/v5/oci/layout" - "github.com/containers/image/v5/types" digest "github.com/opencontainers/go-digest" imgspecv1 "github.com/opencontainers/image-spec/specs-go/v1" "github.com/sirupsen/logrus" + "go.podman.io/image/v5/internal/imagesource" + "go.podman.io/image/v5/internal/imagesource/impl" + "go.podman.io/image/v5/internal/private" + "go.podman.io/image/v5/internal/signature" + ocilayout "go.podman.io/image/v5/oci/layout" + "go.podman.io/image/v5/types" ) // ImageNotFoundError is used when the OCI structure, in principle, exists and seems valid enough, diff --git a/vendor/github.com/containers/image/v5/oci/archive/oci_transport.go b/vendor/go.podman.io/image/v5/oci/archive/oci_transport.go similarity index 94% rename from vendor/github.com/containers/image/v5/oci/archive/oci_transport.go rename to vendor/go.podman.io/image/v5/oci/archive/oci_transport.go index 1cc3fa3ba49..c0636b53d11 100644 --- a/vendor/github.com/containers/image/v5/oci/archive/oci_transport.go +++ b/vendor/go.podman.io/image/v5/oci/archive/oci_transport.go @@ -8,15 +8,15 @@ import ( "os" "strings" - "github.com/containers/image/v5/directory/explicitfilepath" - "github.com/containers/image/v5/docker/reference" - "github.com/containers/image/v5/internal/image" - "github.com/containers/image/v5/internal/tmpdir" - "github.com/containers/image/v5/oci/internal" - ocilayout "github.com/containers/image/v5/oci/layout" - "github.com/containers/image/v5/transports" - "github.com/containers/image/v5/types" - "github.com/containers/storage/pkg/archive" + "go.podman.io/image/v5/directory/explicitfilepath" + "go.podman.io/image/v5/docker/reference" + "go.podman.io/image/v5/internal/image" + "go.podman.io/image/v5/internal/tmpdir" + "go.podman.io/image/v5/oci/internal" + ocilayout "go.podman.io/image/v5/oci/layout" + "go.podman.io/image/v5/transports" + "go.podman.io/image/v5/types" + "go.podman.io/storage/pkg/archive" ) func init() { diff --git a/vendor/github.com/containers/image/v5/oci/internal/oci_util.go b/vendor/go.podman.io/image/v5/oci/internal/oci_util.go similarity index 100% rename from vendor/github.com/containers/image/v5/oci/internal/oci_util.go rename to vendor/go.podman.io/image/v5/oci/internal/oci_util.go diff --git a/vendor/github.com/containers/image/v5/oci/layout/oci_delete.go b/vendor/go.podman.io/image/v5/oci/layout/oci_delete.go similarity index 98% rename from vendor/github.com/containers/image/v5/oci/layout/oci_delete.go rename to vendor/go.podman.io/image/v5/oci/layout/oci_delete.go index 7978229d39b..7eaf6f0889b 100644 --- a/vendor/github.com/containers/image/v5/oci/layout/oci_delete.go +++ b/vendor/go.podman.io/image/v5/oci/layout/oci_delete.go @@ -8,11 +8,11 @@ import ( "os" "slices" - "github.com/containers/image/v5/internal/set" - "github.com/containers/image/v5/types" digest "github.com/opencontainers/go-digest" imgspecv1 "github.com/opencontainers/image-spec/specs-go/v1" "github.com/sirupsen/logrus" + "go.podman.io/image/v5/internal/set" + "go.podman.io/image/v5/types" ) // DeleteImage deletes the named image from the directory, if supported. diff --git a/vendor/github.com/containers/image/v5/oci/layout/oci_dest.go b/vendor/go.podman.io/image/v5/oci/layout/oci_dest.go similarity index 97% rename from vendor/github.com/containers/image/v5/oci/layout/oci_dest.go rename to vendor/go.podman.io/image/v5/oci/layout/oci_dest.go index 492ede591bd..48fe812df5a 100644 --- a/vendor/github.com/containers/image/v5/oci/layout/oci_dest.go +++ b/vendor/go.podman.io/image/v5/oci/layout/oci_dest.go @@ -12,16 +12,16 @@ import ( "runtime" "slices" - "github.com/containers/image/v5/internal/imagedestination/impl" - "github.com/containers/image/v5/internal/imagedestination/stubs" - "github.com/containers/image/v5/internal/manifest" - "github.com/containers/image/v5/internal/private" - "github.com/containers/image/v5/internal/putblobdigest" - "github.com/containers/image/v5/types" - "github.com/containers/storage/pkg/fileutils" digest "github.com/opencontainers/go-digest" imgspec "github.com/opencontainers/image-spec/specs-go" imgspecv1 "github.com/opencontainers/image-spec/specs-go/v1" + "go.podman.io/image/v5/internal/imagedestination/impl" + "go.podman.io/image/v5/internal/imagedestination/stubs" + "go.podman.io/image/v5/internal/manifest" + "go.podman.io/image/v5/internal/private" + "go.podman.io/image/v5/internal/putblobdigest" + "go.podman.io/image/v5/types" + "go.podman.io/storage/pkg/fileutils" ) type ociImageDestination struct { diff --git a/vendor/github.com/containers/image/v5/oci/layout/oci_src.go b/vendor/go.podman.io/image/v5/oci/layout/oci_src.go similarity index 95% rename from vendor/github.com/containers/image/v5/oci/layout/oci_src.go rename to vendor/go.podman.io/image/v5/oci/layout/oci_src.go index 851c3bca384..f265a21d708 100644 --- a/vendor/github.com/containers/image/v5/oci/layout/oci_src.go +++ b/vendor/go.podman.io/image/v5/oci/layout/oci_src.go @@ -11,16 +11,16 @@ import ( "os" "strconv" - "github.com/containers/image/v5/internal/imagesource/impl" - "github.com/containers/image/v5/internal/imagesource/stubs" - "github.com/containers/image/v5/internal/manifest" - "github.com/containers/image/v5/internal/private" - "github.com/containers/image/v5/pkg/tlsclientconfig" - "github.com/containers/image/v5/types" - "github.com/containers/storage/pkg/fileutils" "github.com/docker/go-connections/tlsconfig" "github.com/opencontainers/go-digest" imgspecv1 "github.com/opencontainers/image-spec/specs-go/v1" + "go.podman.io/image/v5/internal/imagesource/impl" + "go.podman.io/image/v5/internal/imagesource/stubs" + "go.podman.io/image/v5/internal/manifest" + "go.podman.io/image/v5/internal/private" + "go.podman.io/image/v5/pkg/tlsclientconfig" + "go.podman.io/image/v5/types" + "go.podman.io/storage/pkg/fileutils" ) // ImageNotFoundError is used when the OCI structure, in principle, exists and seems valid enough, diff --git a/vendor/github.com/containers/image/v5/oci/layout/oci_transport.go b/vendor/go.podman.io/image/v5/oci/layout/oci_transport.go similarity index 97% rename from vendor/github.com/containers/image/v5/oci/layout/oci_transport.go rename to vendor/go.podman.io/image/v5/oci/layout/oci_transport.go index 832f89080ea..7b5086cd88f 100644 --- a/vendor/github.com/containers/image/v5/oci/layout/oci_transport.go +++ b/vendor/go.podman.io/image/v5/oci/layout/oci_transport.go @@ -9,15 +9,15 @@ import ( "path/filepath" "strings" - "github.com/containers/image/v5/directory/explicitfilepath" - "github.com/containers/image/v5/docker/reference" - "github.com/containers/image/v5/internal/image" - "github.com/containers/image/v5/internal/manifest" - "github.com/containers/image/v5/oci/internal" - "github.com/containers/image/v5/transports" - "github.com/containers/image/v5/types" "github.com/opencontainers/go-digest" imgspecv1 "github.com/opencontainers/image-spec/specs-go/v1" + "go.podman.io/image/v5/directory/explicitfilepath" + "go.podman.io/image/v5/docker/reference" + "go.podman.io/image/v5/internal/image" + "go.podman.io/image/v5/internal/manifest" + "go.podman.io/image/v5/oci/internal" + "go.podman.io/image/v5/transports" + "go.podman.io/image/v5/types" ) func init() { diff --git a/vendor/github.com/containers/image/v5/oci/layout/reader.go b/vendor/go.podman.io/image/v5/oci/layout/reader.go similarity index 96% rename from vendor/github.com/containers/image/v5/oci/layout/reader.go rename to vendor/go.podman.io/image/v5/oci/layout/reader.go index 112db2d7054..0a88e945e7d 100644 --- a/vendor/github.com/containers/image/v5/oci/layout/reader.go +++ b/vendor/go.podman.io/image/v5/oci/layout/reader.go @@ -6,8 +6,8 @@ import ( "os" "path/filepath" - "github.com/containers/image/v5/types" imgspecv1 "github.com/opencontainers/image-spec/specs-go/v1" + "go.podman.io/image/v5/types" ) // This file is named reader.go for consistency with other transports’ diff --git a/vendor/github.com/containers/image/v5/openshift/openshift-copies.go b/vendor/go.podman.io/image/v5/openshift/openshift-copies.go similarity index 99% rename from vendor/github.com/containers/image/v5/openshift/openshift-copies.go rename to vendor/go.podman.io/image/v5/openshift/openshift-copies.go index 0bba3c21d80..1180d2dc8e4 100644 --- a/vendor/github.com/containers/image/v5/openshift/openshift-copies.go +++ b/vendor/go.podman.io/image/v5/openshift/openshift-copies.go @@ -19,9 +19,9 @@ import ( "time" "dario.cat/mergo" - "github.com/containers/image/v5/internal/multierr" - "github.com/containers/storage/pkg/homedir" "github.com/sirupsen/logrus" + "go.podman.io/image/v5/internal/multierr" + "go.podman.io/storage/pkg/homedir" "gopkg.in/yaml.v3" ) diff --git a/vendor/github.com/containers/image/v5/openshift/openshift.go b/vendor/go.podman.io/image/v5/openshift/openshift.go similarity index 98% rename from vendor/github.com/containers/image/v5/openshift/openshift.go rename to vendor/go.podman.io/image/v5/openshift/openshift.go index 63ca8371ec7..8e73de99373 100644 --- a/vendor/github.com/containers/image/v5/openshift/openshift.go +++ b/vendor/go.podman.io/image/v5/openshift/openshift.go @@ -11,10 +11,10 @@ import ( "net/url" "strings" - "github.com/containers/image/v5/docker/reference" - "github.com/containers/image/v5/internal/iolimits" - "github.com/containers/image/v5/version" "github.com/sirupsen/logrus" + "go.podman.io/image/v5/docker/reference" + "go.podman.io/image/v5/internal/iolimits" + "go.podman.io/image/v5/version" ) // openshiftClient is configuration for dealing with a single image stream, for reading or writing. diff --git a/vendor/github.com/containers/image/v5/openshift/openshift_dest.go b/vendor/go.podman.io/image/v5/openshift/openshift_dest.go similarity index 95% rename from vendor/github.com/containers/image/v5/openshift/openshift_dest.go rename to vendor/go.podman.io/image/v5/openshift/openshift_dest.go index bd5e77aa8f5..7c901d8e7d4 100644 --- a/vendor/github.com/containers/image/v5/openshift/openshift_dest.go +++ b/vendor/go.podman.io/image/v5/openshift/openshift_dest.go @@ -11,18 +11,18 @@ import ( "net/http" "slices" - "github.com/containers/image/v5/docker" - "github.com/containers/image/v5/docker/reference" - "github.com/containers/image/v5/internal/imagedestination" - "github.com/containers/image/v5/internal/imagedestination/impl" - "github.com/containers/image/v5/internal/imagedestination/stubs" - "github.com/containers/image/v5/internal/private" - "github.com/containers/image/v5/internal/set" - "github.com/containers/image/v5/internal/signature" - "github.com/containers/image/v5/manifest" - "github.com/containers/image/v5/types" "github.com/opencontainers/go-digest" imgspecv1 "github.com/opencontainers/image-spec/specs-go/v1" + "go.podman.io/image/v5/docker" + "go.podman.io/image/v5/docker/reference" + "go.podman.io/image/v5/internal/imagedestination" + "go.podman.io/image/v5/internal/imagedestination/impl" + "go.podman.io/image/v5/internal/imagedestination/stubs" + "go.podman.io/image/v5/internal/private" + "go.podman.io/image/v5/internal/set" + "go.podman.io/image/v5/internal/signature" + "go.podman.io/image/v5/manifest" + "go.podman.io/image/v5/types" ) type openshiftImageDestination struct { diff --git a/vendor/github.com/containers/image/v5/openshift/openshift_src.go b/vendor/go.podman.io/image/v5/openshift/openshift_src.go similarity index 95% rename from vendor/github.com/containers/image/v5/openshift/openshift_src.go rename to vendor/go.podman.io/image/v5/openshift/openshift_src.go index 62774afbb74..4842ba3018b 100644 --- a/vendor/github.com/containers/image/v5/openshift/openshift_src.go +++ b/vendor/go.podman.io/image/v5/openshift/openshift_src.go @@ -8,14 +8,14 @@ import ( "io" "net/http" - "github.com/containers/image/v5/docker" - "github.com/containers/image/v5/internal/imagesource/impl" - "github.com/containers/image/v5/internal/imagesource/stubs" - "github.com/containers/image/v5/internal/private" - "github.com/containers/image/v5/internal/signature" - "github.com/containers/image/v5/types" "github.com/opencontainers/go-digest" "github.com/sirupsen/logrus" + "go.podman.io/image/v5/docker" + "go.podman.io/image/v5/internal/imagesource/impl" + "go.podman.io/image/v5/internal/imagesource/stubs" + "go.podman.io/image/v5/internal/private" + "go.podman.io/image/v5/internal/signature" + "go.podman.io/image/v5/types" ) type openshiftImageSource struct { diff --git a/vendor/github.com/containers/image/v5/openshift/openshift_transport.go b/vendor/go.podman.io/image/v5/openshift/openshift_transport.go similarity index 95% rename from vendor/github.com/containers/image/v5/openshift/openshift_transport.go rename to vendor/go.podman.io/image/v5/openshift/openshift_transport.go index 0ba435d5600..8d959d61c0e 100644 --- a/vendor/github.com/containers/image/v5/openshift/openshift_transport.go +++ b/vendor/go.podman.io/image/v5/openshift/openshift_transport.go @@ -6,12 +6,12 @@ import ( "fmt" "strings" - "github.com/containers/image/v5/docker/policyconfiguration" - "github.com/containers/image/v5/docker/reference" - genericImage "github.com/containers/image/v5/internal/image" - "github.com/containers/image/v5/transports" - "github.com/containers/image/v5/types" - "github.com/containers/storage/pkg/regexp" + "go.podman.io/image/v5/docker/policyconfiguration" + "go.podman.io/image/v5/docker/reference" + genericImage "go.podman.io/image/v5/internal/image" + "go.podman.io/image/v5/transports" + "go.podman.io/image/v5/types" + "go.podman.io/storage/pkg/regexp" ) func init() { diff --git a/vendor/github.com/containers/image/v5/pkg/blobcache/blobcache.go b/vendor/go.podman.io/image/v5/pkg/blobcache/blobcache.go similarity index 96% rename from vendor/github.com/containers/image/v5/pkg/blobcache/blobcache.go rename to vendor/go.podman.io/image/v5/pkg/blobcache/blobcache.go index f4de6cebfe5..7ce75283f22 100644 --- a/vendor/github.com/containers/image/v5/pkg/blobcache/blobcache.go +++ b/vendor/go.podman.io/image/v5/pkg/blobcache/blobcache.go @@ -6,11 +6,11 @@ import ( "os" "path/filepath" - "github.com/containers/image/v5/docker/reference" - "github.com/containers/image/v5/internal/image" - "github.com/containers/image/v5/transports" - "github.com/containers/image/v5/types" digest "github.com/opencontainers/go-digest" + "go.podman.io/image/v5/docker/reference" + "go.podman.io/image/v5/internal/image" + "go.podman.io/image/v5/transports" + "go.podman.io/image/v5/types" ) const ( diff --git a/vendor/github.com/containers/image/v5/pkg/blobcache/dest.go b/vendor/go.podman.io/image/v5/pkg/blobcache/dest.go similarity index 96% rename from vendor/github.com/containers/image/v5/pkg/blobcache/dest.go rename to vendor/go.podman.io/image/v5/pkg/blobcache/dest.go index 54e3d294b9e..c1f74a42cdf 100644 --- a/vendor/github.com/containers/image/v5/pkg/blobcache/dest.go +++ b/vendor/go.podman.io/image/v5/pkg/blobcache/dest.go @@ -9,18 +9,18 @@ import ( "path/filepath" "sync" - "github.com/containers/image/v5/internal/imagedestination" - "github.com/containers/image/v5/internal/imagedestination/impl" - "github.com/containers/image/v5/internal/private" - "github.com/containers/image/v5/internal/signature" - "github.com/containers/image/v5/manifest" - "github.com/containers/image/v5/transports" - "github.com/containers/image/v5/types" - "github.com/containers/storage/pkg/archive" - "github.com/containers/storage/pkg/ioutils" digest "github.com/opencontainers/go-digest" imgspecv1 "github.com/opencontainers/image-spec/specs-go/v1" "github.com/sirupsen/logrus" + "go.podman.io/image/v5/internal/imagedestination" + "go.podman.io/image/v5/internal/imagedestination/impl" + "go.podman.io/image/v5/internal/private" + "go.podman.io/image/v5/internal/signature" + "go.podman.io/image/v5/manifest" + "go.podman.io/image/v5/transports" + "go.podman.io/image/v5/types" + "go.podman.io/storage/pkg/archive" + "go.podman.io/storage/pkg/ioutils" ) type blobCacheDestination struct { diff --git a/vendor/github.com/containers/image/v5/pkg/blobcache/src.go b/vendor/go.podman.io/image/v5/pkg/blobcache/src.go similarity index 95% rename from vendor/github.com/containers/image/v5/pkg/blobcache/src.go rename to vendor/go.podman.io/image/v5/pkg/blobcache/src.go index 7aa913ba9a3..309543fbb78 100644 --- a/vendor/github.com/containers/image/v5/pkg/blobcache/src.go +++ b/vendor/go.podman.io/image/v5/pkg/blobcache/src.go @@ -8,18 +8,18 @@ import ( "os" "sync" - "github.com/containers/image/v5/internal/image" - "github.com/containers/image/v5/internal/imagesource" - "github.com/containers/image/v5/internal/imagesource/impl" - "github.com/containers/image/v5/internal/manifest" - "github.com/containers/image/v5/internal/private" - "github.com/containers/image/v5/internal/signature" - "github.com/containers/image/v5/pkg/compression" - "github.com/containers/image/v5/transports" - "github.com/containers/image/v5/types" digest "github.com/opencontainers/go-digest" v1 "github.com/opencontainers/image-spec/specs-go/v1" "github.com/sirupsen/logrus" + "go.podman.io/image/v5/internal/image" + "go.podman.io/image/v5/internal/imagesource" + "go.podman.io/image/v5/internal/imagesource/impl" + "go.podman.io/image/v5/internal/manifest" + "go.podman.io/image/v5/internal/private" + "go.podman.io/image/v5/internal/signature" + "go.podman.io/image/v5/pkg/compression" + "go.podman.io/image/v5/transports" + "go.podman.io/image/v5/types" ) type blobCacheSource struct { diff --git a/vendor/github.com/containers/image/v5/pkg/blobinfocache/default.go b/vendor/go.podman.io/image/v5/pkg/blobinfocache/default.go similarity index 94% rename from vendor/github.com/containers/image/v5/pkg/blobinfocache/default.go rename to vendor/go.podman.io/image/v5/pkg/blobinfocache/default.go index b413ec5131b..7fe615e348e 100644 --- a/vendor/github.com/containers/image/v5/pkg/blobinfocache/default.go +++ b/vendor/go.podman.io/image/v5/pkg/blobinfocache/default.go @@ -5,11 +5,11 @@ import ( "os" "path/filepath" - "github.com/containers/image/v5/internal/rootless" - "github.com/containers/image/v5/pkg/blobinfocache/memory" - "github.com/containers/image/v5/pkg/blobinfocache/sqlite" - "github.com/containers/image/v5/types" "github.com/sirupsen/logrus" + "go.podman.io/image/v5/internal/rootless" + "go.podman.io/image/v5/pkg/blobinfocache/memory" + "go.podman.io/image/v5/pkg/blobinfocache/sqlite" + "go.podman.io/image/v5/types" ) const ( diff --git a/vendor/github.com/containers/image/v5/pkg/blobinfocache/internal/prioritize/prioritize.go b/vendor/go.podman.io/image/v5/pkg/blobinfocache/internal/prioritize/prioritize.go similarity index 98% rename from vendor/github.com/containers/image/v5/pkg/blobinfocache/internal/prioritize/prioritize.go rename to vendor/go.podman.io/image/v5/pkg/blobinfocache/internal/prioritize/prioritize.go index d73aafbdb18..993c78030ac 100644 --- a/vendor/github.com/containers/image/v5/pkg/blobinfocache/internal/prioritize/prioritize.go +++ b/vendor/go.podman.io/image/v5/pkg/blobinfocache/internal/prioritize/prioritize.go @@ -7,12 +7,12 @@ import ( "slices" "time" - "github.com/containers/image/v5/internal/blobinfocache" - "github.com/containers/image/v5/internal/manifest" - "github.com/containers/image/v5/pkg/compression" - "github.com/containers/image/v5/types" "github.com/opencontainers/go-digest" "github.com/sirupsen/logrus" + "go.podman.io/image/v5/internal/blobinfocache" + "go.podman.io/image/v5/internal/manifest" + "go.podman.io/image/v5/pkg/compression" + "go.podman.io/image/v5/types" ) // replacementAttempts is the number of blob replacement candidates with known location returned by destructivelyPrioritizeReplacementCandidates, diff --git a/vendor/github.com/containers/image/v5/pkg/blobinfocache/memory/memory.go b/vendor/go.podman.io/image/v5/pkg/blobinfocache/memory/memory.go similarity index 98% rename from vendor/github.com/containers/image/v5/pkg/blobinfocache/memory/memory.go rename to vendor/go.podman.io/image/v5/pkg/blobinfocache/memory/memory.go index 8e513d41e32..84e9b7d6d35 100644 --- a/vendor/github.com/containers/image/v5/pkg/blobinfocache/memory/memory.go +++ b/vendor/go.podman.io/image/v5/pkg/blobinfocache/memory/memory.go @@ -5,12 +5,12 @@ import ( "sync" "time" - "github.com/containers/image/v5/internal/blobinfocache" - "github.com/containers/image/v5/internal/set" - "github.com/containers/image/v5/pkg/blobinfocache/internal/prioritize" - "github.com/containers/image/v5/types" digest "github.com/opencontainers/go-digest" "github.com/sirupsen/logrus" + "go.podman.io/image/v5/internal/blobinfocache" + "go.podman.io/image/v5/internal/set" + "go.podman.io/image/v5/pkg/blobinfocache/internal/prioritize" + "go.podman.io/image/v5/types" ) // locationKey only exists to make lookup in knownLocations easier. diff --git a/vendor/github.com/containers/image/v5/pkg/blobinfocache/none/none.go b/vendor/go.podman.io/image/v5/pkg/blobinfocache/none/none.go similarity index 97% rename from vendor/github.com/containers/image/v5/pkg/blobinfocache/none/none.go rename to vendor/go.podman.io/image/v5/pkg/blobinfocache/none/none.go index 9a2219e795f..88c9024fd2b 100644 --- a/vendor/github.com/containers/image/v5/pkg/blobinfocache/none/none.go +++ b/vendor/go.podman.io/image/v5/pkg/blobinfocache/none/none.go @@ -2,9 +2,9 @@ package none import ( - "github.com/containers/image/v5/internal/blobinfocache" - "github.com/containers/image/v5/types" "github.com/opencontainers/go-digest" + "go.podman.io/image/v5/internal/blobinfocache" + "go.podman.io/image/v5/types" ) // noCache implements a dummy BlobInfoCache which records no data. diff --git a/vendor/github.com/containers/image/v5/pkg/blobinfocache/sqlite/sqlite.go b/vendor/go.podman.io/image/v5/pkg/blobinfocache/sqlite/sqlite.go similarity index 99% rename from vendor/github.com/containers/image/v5/pkg/blobinfocache/sqlite/sqlite.go rename to vendor/go.podman.io/image/v5/pkg/blobinfocache/sqlite/sqlite.go index 719c8edaffd..1d012757308 100644 --- a/vendor/github.com/containers/image/v5/pkg/blobinfocache/sqlite/sqlite.go +++ b/vendor/go.podman.io/image/v5/pkg/blobinfocache/sqlite/sqlite.go @@ -9,12 +9,12 @@ import ( "sync" "time" - "github.com/containers/image/v5/internal/blobinfocache" - "github.com/containers/image/v5/pkg/blobinfocache/internal/prioritize" - "github.com/containers/image/v5/types" _ "github.com/mattn/go-sqlite3" // Registers the "sqlite3" backend backend for database/sql "github.com/opencontainers/go-digest" "github.com/sirupsen/logrus" + "go.podman.io/image/v5/internal/blobinfocache" + "go.podman.io/image/v5/pkg/blobinfocache/internal/prioritize" + "go.podman.io/image/v5/types" ) const ( diff --git a/vendor/github.com/containers/image/v5/pkg/cli/passphrase.go b/vendor/go.podman.io/image/v5/pkg/cli/passphrase.go similarity index 100% rename from vendor/github.com/containers/image/v5/pkg/cli/passphrase.go rename to vendor/go.podman.io/image/v5/pkg/cli/passphrase.go diff --git a/vendor/github.com/containers/image/v5/pkg/cli/sigstore/params/sigstore.go b/vendor/go.podman.io/image/v5/pkg/cli/sigstore/params/sigstore.go similarity index 100% rename from vendor/github.com/containers/image/v5/pkg/cli/sigstore/params/sigstore.go rename to vendor/go.podman.io/image/v5/pkg/cli/sigstore/params/sigstore.go diff --git a/vendor/github.com/containers/image/v5/pkg/cli/sigstore/sigstore.go b/vendor/go.podman.io/image/v5/pkg/cli/sigstore/sigstore.go similarity index 92% rename from vendor/github.com/containers/image/v5/pkg/cli/sigstore/sigstore.go rename to vendor/go.podman.io/image/v5/pkg/cli/sigstore/sigstore.go index 62520c212f1..638f6c02965 100644 --- a/vendor/github.com/containers/image/v5/pkg/cli/sigstore/sigstore.go +++ b/vendor/go.podman.io/image/v5/pkg/cli/sigstore/sigstore.go @@ -6,12 +6,12 @@ import ( "io" "net/url" - "github.com/containers/image/v5/pkg/cli" - "github.com/containers/image/v5/pkg/cli/sigstore/params" - "github.com/containers/image/v5/signature/signer" - "github.com/containers/image/v5/signature/sigstore" - "github.com/containers/image/v5/signature/sigstore/fulcio" - "github.com/containers/image/v5/signature/sigstore/rekor" + "go.podman.io/image/v5/pkg/cli" + "go.podman.io/image/v5/pkg/cli/sigstore/params" + "go.podman.io/image/v5/signature/signer" + "go.podman.io/image/v5/signature/sigstore" + "go.podman.io/image/v5/signature/sigstore/fulcio" + "go.podman.io/image/v5/signature/sigstore/rekor" ) // Options collects data that the caller should provide to NewSignerFromParameterFile. diff --git a/vendor/github.com/containers/image/v5/pkg/compression/compression.go b/vendor/go.podman.io/image/v5/pkg/compression/compression.go similarity index 97% rename from vendor/github.com/containers/image/v5/pkg/compression/compression.go rename to vendor/go.podman.io/image/v5/pkg/compression/compression.go index 782c86d0685..6a6c4d4a39a 100644 --- a/vendor/github.com/containers/image/v5/pkg/compression/compression.go +++ b/vendor/go.podman.io/image/v5/pkg/compression/compression.go @@ -6,12 +6,12 @@ import ( "fmt" "io" - "github.com/containers/image/v5/pkg/compression/internal" - "github.com/containers/image/v5/pkg/compression/types" - "github.com/containers/storage/pkg/chunked/compressor" "github.com/klauspost/pgzip" "github.com/sirupsen/logrus" "github.com/ulikunitz/xz" + "go.podman.io/image/v5/pkg/compression/internal" + "go.podman.io/image/v5/pkg/compression/types" + "go.podman.io/storage/pkg/chunked/compressor" ) // Algorithm is a compression algorithm that can be used for CompressStream. diff --git a/vendor/github.com/containers/image/v5/pkg/compression/internal/types.go b/vendor/go.podman.io/image/v5/pkg/compression/internal/types.go similarity index 100% rename from vendor/github.com/containers/image/v5/pkg/compression/internal/types.go rename to vendor/go.podman.io/image/v5/pkg/compression/internal/types.go diff --git a/vendor/github.com/containers/image/v5/pkg/compression/types/types.go b/vendor/go.podman.io/image/v5/pkg/compression/types/types.go similarity index 97% rename from vendor/github.com/containers/image/v5/pkg/compression/types/types.go rename to vendor/go.podman.io/image/v5/pkg/compression/types/types.go index 43d03b601c4..197122c7bbb 100644 --- a/vendor/github.com/containers/image/v5/pkg/compression/types/types.go +++ b/vendor/go.podman.io/image/v5/pkg/compression/types/types.go @@ -1,7 +1,7 @@ package types import ( - "github.com/containers/image/v5/pkg/compression/internal" + "go.podman.io/image/v5/pkg/compression/internal" ) // DecompressorFunc returns the decompressed stream, given a compressed stream. diff --git a/vendor/github.com/containers/image/v5/pkg/compression/zstd.go b/vendor/go.podman.io/image/v5/pkg/compression/zstd.go similarity index 100% rename from vendor/github.com/containers/image/v5/pkg/compression/zstd.go rename to vendor/go.podman.io/image/v5/pkg/compression/zstd.go diff --git a/vendor/github.com/containers/image/v5/pkg/docker/config/config.go b/vendor/go.podman.io/image/v5/pkg/docker/config/config.go similarity index 98% rename from vendor/github.com/containers/image/v5/pkg/docker/config/config.go rename to vendor/go.podman.io/image/v5/pkg/docker/config/config.go index 243b13c88a6..56d4eb916c0 100644 --- a/vendor/github.com/containers/image/v5/pkg/docker/config/config.go +++ b/vendor/go.podman.io/image/v5/pkg/docker/config/config.go @@ -14,17 +14,17 @@ import ( "runtime" "strings" - "github.com/containers/image/v5/docker/reference" - "github.com/containers/image/v5/internal/multierr" - "github.com/containers/image/v5/internal/set" - "github.com/containers/image/v5/pkg/sysregistriesv2" - "github.com/containers/image/v5/types" - "github.com/containers/storage/pkg/fileutils" - "github.com/containers/storage/pkg/homedir" - "github.com/containers/storage/pkg/ioutils" helperclient "github.com/docker/docker-credential-helpers/client" "github.com/docker/docker-credential-helpers/credentials" "github.com/sirupsen/logrus" + "go.podman.io/image/v5/docker/reference" + "go.podman.io/image/v5/internal/multierr" + "go.podman.io/image/v5/internal/set" + "go.podman.io/image/v5/pkg/sysregistriesv2" + "go.podman.io/image/v5/types" + "go.podman.io/storage/pkg/fileutils" + "go.podman.io/storage/pkg/homedir" + "go.podman.io/storage/pkg/ioutils" ) type dockerAuthConfig struct { diff --git a/vendor/github.com/containers/image/v5/pkg/shortnames/shortnames.go b/vendor/go.podman.io/image/v5/pkg/shortnames/shortnames.go similarity index 98% rename from vendor/github.com/containers/image/v5/pkg/shortnames/shortnames.go rename to vendor/go.podman.io/image/v5/pkg/shortnames/shortnames.go index 9317600e58f..6846c6e44c3 100644 --- a/vendor/github.com/containers/image/v5/pkg/shortnames/shortnames.go +++ b/vendor/go.podman.io/image/v5/pkg/shortnames/shortnames.go @@ -7,12 +7,12 @@ import ( "slices" "strings" - "github.com/containers/image/v5/docker/reference" - "github.com/containers/image/v5/internal/multierr" - "github.com/containers/image/v5/pkg/sysregistriesv2" - "github.com/containers/image/v5/types" "github.com/manifoldco/promptui" "github.com/opencontainers/go-digest" + "go.podman.io/image/v5/docker/reference" + "go.podman.io/image/v5/internal/multierr" + "go.podman.io/image/v5/pkg/sysregistriesv2" + "go.podman.io/image/v5/types" "golang.org/x/term" ) diff --git a/vendor/github.com/containers/image/v5/pkg/strslice/README.md b/vendor/go.podman.io/image/v5/pkg/strslice/README.md similarity index 100% rename from vendor/github.com/containers/image/v5/pkg/strslice/README.md rename to vendor/go.podman.io/image/v5/pkg/strslice/README.md diff --git a/vendor/github.com/containers/image/v5/pkg/strslice/strslice.go b/vendor/go.podman.io/image/v5/pkg/strslice/strslice.go similarity index 100% rename from vendor/github.com/containers/image/v5/pkg/strslice/strslice.go rename to vendor/go.podman.io/image/v5/pkg/strslice/strslice.go diff --git a/vendor/github.com/containers/image/v5/pkg/sysregistriesv2/paths_common.go b/vendor/go.podman.io/image/v5/pkg/sysregistriesv2/paths_common.go similarity index 100% rename from vendor/github.com/containers/image/v5/pkg/sysregistriesv2/paths_common.go rename to vendor/go.podman.io/image/v5/pkg/sysregistriesv2/paths_common.go diff --git a/vendor/github.com/containers/image/v5/pkg/sysregistriesv2/paths_freebsd.go b/vendor/go.podman.io/image/v5/pkg/sysregistriesv2/paths_freebsd.go similarity index 100% rename from vendor/github.com/containers/image/v5/pkg/sysregistriesv2/paths_freebsd.go rename to vendor/go.podman.io/image/v5/pkg/sysregistriesv2/paths_freebsd.go diff --git a/vendor/github.com/containers/image/v5/pkg/sysregistriesv2/shortnames.go b/vendor/go.podman.io/image/v5/pkg/sysregistriesv2/shortnames.go similarity index 97% rename from vendor/github.com/containers/image/v5/pkg/sysregistriesv2/shortnames.go rename to vendor/go.podman.io/image/v5/pkg/sysregistriesv2/shortnames.go index 677629c5dbd..8c72ce7ffc7 100644 --- a/vendor/github.com/containers/image/v5/pkg/sysregistriesv2/shortnames.go +++ b/vendor/go.podman.io/image/v5/pkg/sysregistriesv2/shortnames.go @@ -9,13 +9,13 @@ import ( "strings" "github.com/BurntSushi/toml" - "github.com/containers/image/v5/docker/reference" - "github.com/containers/image/v5/internal/multierr" - "github.com/containers/image/v5/internal/rootless" - "github.com/containers/image/v5/types" - "github.com/containers/storage/pkg/homedir" - "github.com/containers/storage/pkg/lockfile" "github.com/sirupsen/logrus" + "go.podman.io/image/v5/docker/reference" + "go.podman.io/image/v5/internal/multierr" + "go.podman.io/image/v5/internal/rootless" + "go.podman.io/image/v5/types" + "go.podman.io/storage/pkg/homedir" + "go.podman.io/storage/pkg/lockfile" ) // defaultShortNameMode is the default mode of registries.conf files if the diff --git a/vendor/github.com/containers/image/v5/pkg/sysregistriesv2/system_registries_v2.go b/vendor/go.podman.io/image/v5/pkg/sysregistriesv2/system_registries_v2.go similarity index 99% rename from vendor/github.com/containers/image/v5/pkg/sysregistriesv2/system_registries_v2.go rename to vendor/go.podman.io/image/v5/pkg/sysregistriesv2/system_registries_v2.go index 318988f0544..692251961b5 100644 --- a/vendor/github.com/containers/image/v5/pkg/sysregistriesv2/system_registries_v2.go +++ b/vendor/go.podman.io/image/v5/pkg/sysregistriesv2/system_registries_v2.go @@ -14,12 +14,12 @@ import ( "sync" "github.com/BurntSushi/toml" - "github.com/containers/image/v5/docker/reference" - "github.com/containers/image/v5/types" - "github.com/containers/storage/pkg/fileutils" - "github.com/containers/storage/pkg/homedir" - "github.com/containers/storage/pkg/regexp" "github.com/sirupsen/logrus" + "go.podman.io/image/v5/docker/reference" + "go.podman.io/image/v5/types" + "go.podman.io/storage/pkg/fileutils" + "go.podman.io/storage/pkg/homedir" + "go.podman.io/storage/pkg/regexp" ) // systemRegistriesConfPath is the path to the system-wide registry diff --git a/vendor/github.com/containers/image/v5/pkg/tlsclientconfig/tlsclientconfig.go b/vendor/go.podman.io/image/v5/pkg/tlsclientconfig/tlsclientconfig.go similarity index 100% rename from vendor/github.com/containers/image/v5/pkg/tlsclientconfig/tlsclientconfig.go rename to vendor/go.podman.io/image/v5/pkg/tlsclientconfig/tlsclientconfig.go diff --git a/vendor/github.com/containers/image/v5/sif/load.go b/vendor/go.podman.io/image/v5/sif/load.go similarity index 100% rename from vendor/github.com/containers/image/v5/sif/load.go rename to vendor/go.podman.io/image/v5/sif/load.go diff --git a/vendor/github.com/containers/image/v5/sif/src.go b/vendor/go.podman.io/image/v5/sif/src.go similarity index 96% rename from vendor/github.com/containers/image/v5/sif/src.go rename to vendor/go.podman.io/image/v5/sif/src.go index f8bf3103442..5aaa74218d0 100644 --- a/vendor/github.com/containers/image/v5/sif/src.go +++ b/vendor/go.podman.io/image/v5/sif/src.go @@ -9,16 +9,16 @@ import ( "io" "os" - "github.com/containers/image/v5/internal/imagesource/impl" - "github.com/containers/image/v5/internal/imagesource/stubs" - "github.com/containers/image/v5/internal/private" - "github.com/containers/image/v5/internal/tmpdir" - "github.com/containers/image/v5/types" "github.com/opencontainers/go-digest" imgspecs "github.com/opencontainers/image-spec/specs-go" imgspecv1 "github.com/opencontainers/image-spec/specs-go/v1" "github.com/sirupsen/logrus" "github.com/sylabs/sif/v2/pkg/sif" + "go.podman.io/image/v5/internal/imagesource/impl" + "go.podman.io/image/v5/internal/imagesource/stubs" + "go.podman.io/image/v5/internal/private" + "go.podman.io/image/v5/internal/tmpdir" + "go.podman.io/image/v5/types" ) type sifImageSource struct { diff --git a/vendor/github.com/containers/image/v5/sif/transport.go b/vendor/go.podman.io/image/v5/sif/transport.go similarity index 96% rename from vendor/github.com/containers/image/v5/sif/transport.go rename to vendor/go.podman.io/image/v5/sif/transport.go index 4c090107143..6a42f132726 100644 --- a/vendor/github.com/containers/image/v5/sif/transport.go +++ b/vendor/go.podman.io/image/v5/sif/transport.go @@ -7,11 +7,11 @@ import ( "path/filepath" "strings" - "github.com/containers/image/v5/directory/explicitfilepath" - "github.com/containers/image/v5/docker/reference" - "github.com/containers/image/v5/internal/image" - "github.com/containers/image/v5/transports" - "github.com/containers/image/v5/types" + "go.podman.io/image/v5/directory/explicitfilepath" + "go.podman.io/image/v5/docker/reference" + "go.podman.io/image/v5/internal/image" + "go.podman.io/image/v5/transports" + "go.podman.io/image/v5/types" ) func init() { diff --git a/vendor/github.com/containers/image/v5/signature/docker.go b/vendor/go.podman.io/image/v5/signature/docker.go similarity index 86% rename from vendor/github.com/containers/image/v5/signature/docker.go rename to vendor/go.podman.io/image/v5/signature/docker.go index c9a2a3747ee..c85cfe91cad 100644 --- a/vendor/github.com/containers/image/v5/signature/docker.go +++ b/vendor/go.podman.io/image/v5/signature/docker.go @@ -5,12 +5,13 @@ package signature import ( "errors" "fmt" + "slices" "strings" - "github.com/containers/image/v5/docker/reference" - "github.com/containers/image/v5/manifest" - "github.com/containers/image/v5/signature/internal" "github.com/opencontainers/go-digest" + "go.podman.io/image/v5/docker/reference" + "go.podman.io/image/v5/manifest" + "go.podman.io/image/v5/signature/internal" ) // SignOptions includes optional parameters for signing container images. @@ -63,8 +64,15 @@ func VerifyImageManifestSignatureUsingKeyIdentityList(unverifiedSignature, unver if err != nil { return nil, "", err } - sig, matchedKeyIdentity, err := verifyAndExtractSignature(mech, unverifiedSignature, signatureAcceptanceRules{ - acceptedKeyIdentities: expectedKeyIdentities, + var matchedKeyIdentity string + sig, err := verifyAndExtractSignature(mech, unverifiedSignature, signatureAcceptanceRules{ + validateKeyIdentity: func(keyIdentity string) error { + if !slices.Contains(expectedKeyIdentities, keyIdentity) { + return internal.NewInvalidSignatureError(fmt.Sprintf("Signature by %s does not match expected fingerprints %v", keyIdentity, expectedKeyIdentities)) + } + matchedKeyIdentity = keyIdentity + return nil + }, validateSignedDockerReference: func(signedDockerReference string) error { signedRef, err := reference.ParseNormalizedNamed(signedDockerReference) if err != nil { diff --git a/vendor/github.com/containers/image/v5/signature/fulcio_cert.go b/vendor/go.podman.io/image/v5/signature/fulcio_cert.go similarity index 99% rename from vendor/github.com/containers/image/v5/signature/fulcio_cert.go rename to vendor/go.podman.io/image/v5/signature/fulcio_cert.go index 908dd0fd593..e9d98368f7d 100644 --- a/vendor/github.com/containers/image/v5/signature/fulcio_cert.go +++ b/vendor/go.podman.io/image/v5/signature/fulcio_cert.go @@ -10,9 +10,9 @@ import ( "slices" "time" - "github.com/containers/image/v5/signature/internal" "github.com/sigstore/fulcio/pkg/certificate" "github.com/sigstore/sigstore/pkg/cryptoutils" + "go.podman.io/image/v5/signature/internal" ) // fulcioTrustRoot contains policy allow validating Fulcio-issued certificates. diff --git a/vendor/github.com/containers/image/v5/signature/internal/errors.go b/vendor/go.podman.io/image/v5/signature/internal/errors.go similarity index 100% rename from vendor/github.com/containers/image/v5/signature/internal/errors.go rename to vendor/go.podman.io/image/v5/signature/internal/errors.go diff --git a/vendor/github.com/containers/image/v5/signature/internal/json.go b/vendor/go.podman.io/image/v5/signature/internal/json.go similarity index 98% rename from vendor/github.com/containers/image/v5/signature/internal/json.go rename to vendor/go.podman.io/image/v5/signature/internal/json.go index f9efafb8e13..246905d78a6 100644 --- a/vendor/github.com/containers/image/v5/signature/internal/json.go +++ b/vendor/go.podman.io/image/v5/signature/internal/json.go @@ -6,7 +6,7 @@ import ( "fmt" "io" - "github.com/containers/image/v5/internal/set" + "go.podman.io/image/v5/internal/set" ) // JSONFormatError is returned when JSON does not match expected format. diff --git a/vendor/github.com/containers/image/v5/signature/internal/rekor_api_types.go b/vendor/go.podman.io/image/v5/signature/internal/rekor_api_types.go similarity index 100% rename from vendor/github.com/containers/image/v5/signature/internal/rekor_api_types.go rename to vendor/go.podman.io/image/v5/signature/internal/rekor_api_types.go diff --git a/vendor/github.com/containers/image/v5/signature/internal/rekor_set.go b/vendor/go.podman.io/image/v5/signature/internal/rekor_set.go similarity index 100% rename from vendor/github.com/containers/image/v5/signature/internal/rekor_set.go rename to vendor/go.podman.io/image/v5/signature/internal/rekor_set.go diff --git a/vendor/github.com/containers/image/v5/signature/internal/sigstore_payload.go b/vendor/go.podman.io/image/v5/signature/internal/sigstore_payload.go similarity index 99% rename from vendor/github.com/containers/image/v5/signature/internal/sigstore_payload.go rename to vendor/go.podman.io/image/v5/signature/internal/sigstore_payload.go index 90a81dc1c4c..682360bae93 100644 --- a/vendor/github.com/containers/image/v5/signature/internal/sigstore_payload.go +++ b/vendor/go.podman.io/image/v5/signature/internal/sigstore_payload.go @@ -10,9 +10,9 @@ import ( "strings" "time" - "github.com/containers/image/v5/version" digest "github.com/opencontainers/go-digest" sigstoreSignature "github.com/sigstore/sigstore/pkg/signature" + "go.podman.io/image/v5/version" ) const ( diff --git a/vendor/github.com/containers/image/v5/signature/mechanism.go b/vendor/go.podman.io/image/v5/signature/mechanism.go similarity index 83% rename from vendor/github.com/containers/image/v5/signature/mechanism.go rename to vendor/go.podman.io/image/v5/signature/mechanism.go index 897fc499715..1d3fe0fdc99 100644 --- a/vendor/github.com/containers/image/v5/signature/mechanism.go +++ b/vendor/go.podman.io/image/v5/signature/mechanism.go @@ -27,10 +27,7 @@ type SigningMechanism interface { // Sign creates a (non-detached) signature of input using keyIdentity. // Fails with a SigningNotSupportedError if the mechanism does not support signing. Sign(input []byte, keyIdentity string) ([]byte, error) - // Verify parses unverifiedSignature and returns the content and the signer's identity. - // For mechanisms created using NewEphemeralGPGSigningMechanism, the returned key identity - // is expected to be one of the values returned by NewEphemeralGPGSigningMechanism, - // or the mechanism should implement signingMechanismWithVerificationIdentityLookup. + // Verify parses unverifiedSignature and returns the content and the signer's identity Verify(unverifiedSignature []byte) (contents []byte, keyIdentity string, err error) // UntrustedSignatureContents returns UNTRUSTED contents of the signature WITHOUT ANY VERIFICATION, // along with a short identifier of the key used for signing. @@ -49,16 +46,6 @@ type signingMechanismWithPassphrase interface { SignWithPassphrase(input []byte, keyIdentity string, passphrase string) ([]byte, error) } -// signingMechanismWithVerificationIdentityLookup is an internal extension of SigningMechanism. -type signingMechanismWithVerificationIdentityLookup interface { - SigningMechanism - // keyIdentityForVerificationKeyIdentity re-checks the key identity returned by Verify - // if it doesn't match an identity returned by NewEphemeralGPGSigningMechanism, trying to match it. - // (To be more specific, for mechanisms which return a subkey fingerprint from Verify, - // this converts the subkey fingerprint into the corresponding primary key fingerprint.) - keyIdentityForVerificationKeyIdentity(keyIdentity string) (string, error) -} - // SigningNotSupportedError is returned when trying to sign using a mechanism which does not support that. type SigningNotSupportedError string diff --git a/vendor/github.com/containers/image/v5/signature/mechanism_gpgme.go b/vendor/go.podman.io/image/v5/signature/mechanism_gpgme.go similarity index 72% rename from vendor/github.com/containers/image/v5/signature/mechanism_gpgme.go rename to vendor/go.podman.io/image/v5/signature/mechanism_gpgme.go index fe83661d125..71d57505502 100644 --- a/vendor/github.com/containers/image/v5/signature/mechanism_gpgme.go +++ b/vendor/go.podman.io/image/v5/signature/mechanism_gpgme.go @@ -2,17 +2,14 @@ package signature -// This is shared by mechanism_gpgme_only.go and mechanism_sequoia.go; in both situations -// newGPGSigningMechanismInDirectory is implemented using GPGME. - import ( "bytes" "errors" "fmt" "os" - "github.com/containers/image/v5/signature/internal" "github.com/proglottis/gpgme" + "go.podman.io/image/v5/signature/internal" ) // A GPG/OpenPGP signing mechanism, implemented using gpgme. @@ -21,16 +18,6 @@ type gpgmeSigningMechanism struct { ephemeralDir string // If not "", a directory to be removed on Close() } -// newGPGMESigningMechanism returns a new GPG/OpenPGP signing mechanism for ctx. -// The caller must call .Close() on the returned SigningMechanism; if ephemeralDir is set, -// the .Close() call will remove its contents. -func newGPGMESigningMechanism(ctx *gpgme.Context, ephemeralDir string) signingMechanismWithPassphrase { - return &gpgmeSigningMechanism{ - ctx: ctx, - ephemeralDir: ephemeralDir, - } -} - // newGPGSigningMechanismInDirectory returns a new GPG/OpenPGP signing mechanism, using optionalDir if not empty. // The caller must call .Close() on the returned SigningMechanism. func newGPGSigningMechanismInDirectory(optionalDir string) (signingMechanismWithPassphrase, error) { @@ -38,7 +25,46 @@ func newGPGSigningMechanismInDirectory(optionalDir string) (signingMechanismWith if err != nil { return nil, err } - return newGPGMESigningMechanism(ctx, ""), nil + return &gpgmeSigningMechanism{ + ctx: ctx, + ephemeralDir: "", + }, nil +} + +// newEphemeralGPGSigningMechanism returns a new GPG/OpenPGP signing mechanism which +// recognizes _only_ public keys from the supplied blobs, and returns the identities +// of these keys. +// The caller must call .Close() on the returned SigningMechanism. +func newEphemeralGPGSigningMechanism(blobs [][]byte) (signingMechanismWithPassphrase, []string, error) { + dir, err := os.MkdirTemp("", "containers-ephemeral-gpg-") + if err != nil { + return nil, nil, err + } + removeDir := true + defer func() { + if removeDir { + os.RemoveAll(dir) + } + }() + ctx, err := newGPGMEContext(dir) + if err != nil { + return nil, nil, err + } + mech := &gpgmeSigningMechanism{ + ctx: ctx, + ephemeralDir: dir, + } + keyIdentities := []string{} + for _, blob := range blobs { + ki, err := mech.importKeysFromBytes(blob) + if err != nil { + return nil, nil, err + } + keyIdentities = append(keyIdentities, ki...) + } + + removeDir = false + return mech, keyIdentities, nil } // newGPGMEContext returns a new *gpgme.Context, using optionalDir if not empty. @@ -68,6 +94,28 @@ func (m *gpgmeSigningMechanism) Close() error { return nil } +// importKeysFromBytes imports public keys from the supplied blob and returns their identities. +// The blob is assumed to have an appropriate format (the caller is expected to know which one). +// NOTE: This may modify long-term state (e.g. key storage in a directory underlying the mechanism); +// but we do not make this public, it can only be used through newEphemeralGPGSigningMechanism. +func (m *gpgmeSigningMechanism) importKeysFromBytes(blob []byte) ([]string, error) { + inputData, err := gpgme.NewDataBytes(blob) + if err != nil { + return nil, err + } + res, err := m.ctx.Import(inputData) + if err != nil { + return nil, err + } + keyIdentities := []string{} + for _, i := range res.Imports { + if i.Result == nil { + keyIdentities = append(keyIdentities, i.Fingerprint) + } + } + return keyIdentities, nil +} + // SupportsSigning returns nil if the mechanism supports signing, or a SigningNotSupportedError. func (m *gpgmeSigningMechanism) SupportsSigning() error { return nil @@ -121,10 +169,7 @@ func (m *gpgmeSigningMechanism) Sign(input []byte, keyIdentity string) ([]byte, return m.SignWithPassphrase(input, keyIdentity, "") } -// Verify parses unverifiedSignature and returns the content and the signer's identity. -// For mechanisms created using NewEphemeralGPGSigningMechanism, the returned key identity -// is expected to be one of the values returned by NewEphemeralGPGSigningMechanism, -// or the mechanism should implement signingMechanismWithVerificationIdentityLookup. +// Verify parses unverifiedSignature and returns the content and the signer's identity func (m *gpgmeSigningMechanism) Verify(unverifiedSignature []byte) (contents []byte, keyIdentity string, err error) { signedBuffer := bytes.Buffer{} signedData, err := gpgme.NewDataWriter(&signedBuffer) @@ -151,24 +196,6 @@ func (m *gpgmeSigningMechanism) Verify(unverifiedSignature []byte) (contents []b return signedBuffer.Bytes(), sig.Fingerprint, nil } -// keyIdentityForVerificationKeyIdentity re-checks the key identity returned by Verify -// if it doesn't match an identity returned by NewEphemeralGPGSigningMechanism, trying to match it. -// (To be more specific, for mechanisms which return a subkey fingerprint from Verify, -// this converts the subkey fingerprint into the corresponding primary key fingerprint.) -func (m *gpgmeSigningMechanism) keyIdentityForVerificationKeyIdentity(keyIdentity string) (string, error) { - // In theory, if keyIdentity refers to a subkey, the same subkey could be attached to different primary keys; - // in that case, GetKey fails with “ambiguous name”. - // We _could_ handle that, by using KeyList* (GetKey is internally just a helper for KeyList*), but sharing - // a subkey that way is very unexpected, so, for now, prefer the much simpler implementation. - key, err := m.ctx.GetKey(keyIdentity, false) - if err != nil { - return "", err - } - // In theory this value could be nil if (gpg --list-keys --with-colons) misses a "pub:" line - // or a "fpr:" line, but gpg (in recent enough versions) prints that unconditionally. // codespell:ignore fpr - return key.Fingerprint(), nil -} - // UntrustedSignatureContents returns UNTRUSTED contents of the signature WITHOUT ANY VERIFICATION, // along with a short identifier of the key used for signing. // WARNING: The short key identifier (which corresponds to "Key ID" for OpenPGP keys) diff --git a/vendor/github.com/containers/image/v5/signature/mechanism_openpgp.go b/vendor/go.podman.io/image/v5/signature/mechanism_openpgp.go similarity index 93% rename from vendor/github.com/containers/image/v5/signature/mechanism_openpgp.go rename to vendor/go.podman.io/image/v5/signature/mechanism_openpgp.go index 3b01df671d5..86f2920df4f 100644 --- a/vendor/github.com/containers/image/v5/signature/mechanism_openpgp.go +++ b/vendor/go.podman.io/image/v5/signature/mechanism_openpgp.go @@ -12,8 +12,8 @@ import ( "strings" "time" - "github.com/containers/image/v5/signature/internal" - "github.com/containers/storage/pkg/homedir" + "go.podman.io/image/v5/signature/internal" + "go.podman.io/storage/pkg/homedir" // This is a fallback code; the primary recommendation is to use the gpgme mechanism // implementation, which is out-of-process and more appropriate for handling long-term private key material @@ -127,10 +127,7 @@ func (m *openpgpSigningMechanism) Sign(input []byte, keyIdentity string) ([]byte return m.SignWithPassphrase(input, keyIdentity, "") } -// Verify parses unverifiedSignature and returns the content and the signer's identity. -// For mechanisms created using NewEphemeralGPGSigningMechanism, the returned key identity -// is expected to be one of the values returned by NewEphemeralGPGSigningMechanism, -// or the mechanism should implement signingMechanismWithVerificationIdentityLookup. +// Verify parses unverifiedSignature and returns the content and the signer's identity func (m *openpgpSigningMechanism) Verify(unverifiedSignature []byte) (contents []byte, keyIdentity string, err error) { md, err := openpgp.ReadMessage(bytes.NewReader(unverifiedSignature), m.keyring, nil, nil) if err != nil { @@ -169,7 +166,7 @@ func (m *openpgpSigningMechanism) Verify(unverifiedSignature []byte) (contents [ } // Uppercase the fingerprint to be compatible with gpgme - return content, strings.ToUpper(fmt.Sprintf("%x", md.SignedBy.Entity.PrimaryKey.Fingerprint)), nil + return content, strings.ToUpper(fmt.Sprintf("%x", md.SignedBy.PublicKey.Fingerprint)), nil } // UntrustedSignatureContents returns UNTRUSTED contents of the signature WITHOUT ANY VERIFICATION, diff --git a/vendor/github.com/containers/image/v5/signature/pki_cert.go b/vendor/go.podman.io/image/v5/signature/pki_cert.go similarity index 97% rename from vendor/github.com/containers/image/v5/signature/pki_cert.go rename to vendor/go.podman.io/image/v5/signature/pki_cert.go index 20624540fa6..6e3a40b798b 100644 --- a/vendor/github.com/containers/image/v5/signature/pki_cert.go +++ b/vendor/go.podman.io/image/v5/signature/pki_cert.go @@ -7,8 +7,8 @@ import ( "fmt" "slices" - "github.com/containers/image/v5/signature/internal" "github.com/sigstore/sigstore/pkg/cryptoutils" + "go.podman.io/image/v5/signature/internal" ) type pkiTrustRoot struct { diff --git a/vendor/github.com/containers/image/v5/signature/policy_config.go b/vendor/go.podman.io/image/v5/signature/policy_config.go similarity index 98% rename from vendor/github.com/containers/image/v5/signature/policy_config.go rename to vendor/go.podman.io/image/v5/signature/policy_config.go index 8de705c22fe..edace656914 100644 --- a/vendor/github.com/containers/image/v5/signature/policy_config.go +++ b/vendor/go.podman.io/image/v5/signature/policy_config.go @@ -20,13 +20,13 @@ import ( "os" "path/filepath" - "github.com/containers/image/v5/docker/reference" - "github.com/containers/image/v5/signature/internal" - "github.com/containers/image/v5/transports" - "github.com/containers/image/v5/types" - "github.com/containers/storage/pkg/fileutils" - "github.com/containers/storage/pkg/homedir" - "github.com/containers/storage/pkg/regexp" + "go.podman.io/image/v5/docker/reference" + "go.podman.io/image/v5/signature/internal" + "go.podman.io/image/v5/transports" + "go.podman.io/image/v5/types" + "go.podman.io/storage/pkg/fileutils" + "go.podman.io/storage/pkg/homedir" + "go.podman.io/storage/pkg/regexp" ) // systemDefaultPolicyPath is the policy path used for DefaultPolicy(). diff --git a/vendor/github.com/containers/image/v5/signature/policy_config_sigstore.go b/vendor/go.podman.io/image/v5/signature/policy_config_sigstore.go similarity index 99% rename from vendor/github.com/containers/image/v5/signature/policy_config_sigstore.go rename to vendor/go.podman.io/image/v5/signature/policy_config_sigstore.go index 6393b66ea62..87fb4555815 100644 --- a/vendor/github.com/containers/image/v5/signature/policy_config_sigstore.go +++ b/vendor/go.podman.io/image/v5/signature/policy_config_sigstore.go @@ -4,7 +4,7 @@ import ( "encoding/json" "fmt" - "github.com/containers/image/v5/signature/internal" + "go.podman.io/image/v5/signature/internal" ) // PRSigstoreSignedOption is way to pass values to NewPRSigstoreSigned diff --git a/vendor/github.com/containers/image/v5/signature/policy_eval.go b/vendor/go.podman.io/image/v5/signature/policy_eval.go similarity index 98% rename from vendor/github.com/containers/image/v5/signature/policy_eval.go rename to vendor/go.podman.io/image/v5/signature/policy_eval.go index ab6b89c2603..2d0db05ae4a 100644 --- a/vendor/github.com/containers/image/v5/signature/policy_eval.go +++ b/vendor/go.podman.io/image/v5/signature/policy_eval.go @@ -9,10 +9,10 @@ import ( "context" "fmt" - "github.com/containers/image/v5/internal/private" - "github.com/containers/image/v5/internal/unparsedimage" - "github.com/containers/image/v5/types" "github.com/sirupsen/logrus" + "go.podman.io/image/v5/internal/private" + "go.podman.io/image/v5/internal/unparsedimage" + "go.podman.io/image/v5/types" ) // PolicyRequirementError is an explanatory text for rejecting a signature or an image. diff --git a/vendor/github.com/containers/image/v5/signature/policy_eval_baselayer.go b/vendor/go.podman.io/image/v5/signature/policy_eval_baselayer.go similarity index 92% rename from vendor/github.com/containers/image/v5/signature/policy_eval_baselayer.go rename to vendor/go.podman.io/image/v5/signature/policy_eval_baselayer.go index a8bc0130107..f310342d10a 100644 --- a/vendor/github.com/containers/image/v5/signature/policy_eval_baselayer.go +++ b/vendor/go.podman.io/image/v5/signature/policy_eval_baselayer.go @@ -5,8 +5,8 @@ package signature import ( "context" - "github.com/containers/image/v5/internal/private" "github.com/sirupsen/logrus" + "go.podman.io/image/v5/internal/private" ) func (pr *prSignedBaseLayer) isSignatureAuthorAccepted(ctx context.Context, image private.UnparsedImage, sig []byte) (signatureAcceptanceResult, *Signature, error) { diff --git a/vendor/github.com/containers/image/v5/signature/policy_eval_signedby.go b/vendor/go.podman.io/image/v5/signature/policy_eval_signedby.go similarity index 86% rename from vendor/github.com/containers/image/v5/signature/policy_eval_signedby.go rename to vendor/go.podman.io/image/v5/signature/policy_eval_signedby.go index 18124a613d5..dec1e6adeeb 100644 --- a/vendor/github.com/containers/image/v5/signature/policy_eval_signedby.go +++ b/vendor/go.podman.io/image/v5/signature/policy_eval_signedby.go @@ -6,11 +6,12 @@ import ( "context" "errors" "fmt" + "slices" - "github.com/containers/image/v5/internal/multierr" - "github.com/containers/image/v5/internal/private" - "github.com/containers/image/v5/manifest" digest "github.com/opencontainers/go-digest" + "go.podman.io/image/v5/internal/multierr" + "go.podman.io/image/v5/internal/private" + "go.podman.io/image/v5/manifest" ) func (pr *prSignedBy) isSignatureAuthorAccepted(ctx context.Context, image private.UnparsedImage, sig []byte) (signatureAcceptanceResult, *Signature, error) { @@ -49,8 +50,15 @@ func (pr *prSignedBy) isSignatureAuthorAccepted(ctx context.Context, image priva return sarRejected, nil, PolicyRequirementError("No public keys imported") } - signature, _, err := verifyAndExtractSignature(mech, sig, signatureAcceptanceRules{ - acceptedKeyIdentities: trustedIdentities, + signature, err := verifyAndExtractSignature(mech, sig, signatureAcceptanceRules{ + validateKeyIdentity: func(keyIdentity string) error { + if slices.Contains(trustedIdentities, keyIdentity) { + return nil + } + // Coverage: We use a private GPG home directory and only import trusted keys, so this should + // not be reachable. + return PolicyRequirementError(fmt.Sprintf("Signature by key %s is not accepted", keyIdentity)) + }, validateSignedDockerReference: func(ref string) error { if !pr.SignedIdentity.matchesDockerReference(image, ref) { return PolicyRequirementError(fmt.Sprintf("Signature for identity %q is not accepted", ref)) diff --git a/vendor/github.com/containers/image/v5/signature/policy_eval_sigstore.go b/vendor/go.podman.io/image/v5/signature/policy_eval_sigstore.go similarity index 98% rename from vendor/github.com/containers/image/v5/signature/policy_eval_sigstore.go rename to vendor/go.podman.io/image/v5/signature/policy_eval_sigstore.go index faede787a1e..cee04dc4ed1 100644 --- a/vendor/github.com/containers/image/v5/signature/policy_eval_sigstore.go +++ b/vendor/go.podman.io/image/v5/signature/policy_eval_sigstore.go @@ -12,13 +12,13 @@ import ( "os" "strings" - "github.com/containers/image/v5/internal/multierr" - "github.com/containers/image/v5/internal/private" - "github.com/containers/image/v5/internal/signature" - "github.com/containers/image/v5/manifest" - "github.com/containers/image/v5/signature/internal" digest "github.com/opencontainers/go-digest" "github.com/sigstore/sigstore/pkg/cryptoutils" + "go.podman.io/image/v5/internal/multierr" + "go.podman.io/image/v5/internal/private" + "go.podman.io/image/v5/internal/signature" + "go.podman.io/image/v5/manifest" + "go.podman.io/image/v5/signature/internal" ) // configBytesSources contains configuration fields which may result in one or more []byte values diff --git a/vendor/github.com/containers/image/v5/signature/policy_eval_simple.go b/vendor/go.podman.io/image/v5/signature/policy_eval_simple.go similarity index 92% rename from vendor/github.com/containers/image/v5/signature/policy_eval_simple.go rename to vendor/go.podman.io/image/v5/signature/policy_eval_simple.go index 031866f0dc7..4ef35e3ad54 100644 --- a/vendor/github.com/containers/image/v5/signature/policy_eval_simple.go +++ b/vendor/go.podman.io/image/v5/signature/policy_eval_simple.go @@ -6,8 +6,8 @@ import ( "context" "fmt" - "github.com/containers/image/v5/internal/private" - "github.com/containers/image/v5/transports" + "go.podman.io/image/v5/internal/private" + "go.podman.io/image/v5/transports" ) func (pr *prInsecureAcceptAnything) isSignatureAuthorAccepted(ctx context.Context, image private.UnparsedImage, sig []byte) (signatureAcceptanceResult, *Signature, error) { diff --git a/vendor/github.com/containers/image/v5/signature/policy_paths_common.go b/vendor/go.podman.io/image/v5/signature/policy_paths_common.go similarity index 100% rename from vendor/github.com/containers/image/v5/signature/policy_paths_common.go rename to vendor/go.podman.io/image/v5/signature/policy_paths_common.go diff --git a/vendor/github.com/containers/image/v5/signature/policy_paths_freebsd.go b/vendor/go.podman.io/image/v5/signature/policy_paths_freebsd.go similarity index 100% rename from vendor/github.com/containers/image/v5/signature/policy_paths_freebsd.go rename to vendor/go.podman.io/image/v5/signature/policy_paths_freebsd.go diff --git a/vendor/github.com/containers/image/v5/signature/policy_reference_match.go b/vendor/go.podman.io/image/v5/signature/policy_reference_match.go similarity index 97% rename from vendor/github.com/containers/image/v5/signature/policy_reference_match.go rename to vendor/go.podman.io/image/v5/signature/policy_reference_match.go index 390957b02b4..0755c0399a6 100644 --- a/vendor/github.com/containers/image/v5/signature/policy_reference_match.go +++ b/vendor/go.podman.io/image/v5/signature/policy_reference_match.go @@ -6,9 +6,9 @@ import ( "fmt" "strings" - "github.com/containers/image/v5/docker/reference" - "github.com/containers/image/v5/internal/private" - "github.com/containers/image/v5/transports" + "go.podman.io/image/v5/docker/reference" + "go.podman.io/image/v5/internal/private" + "go.podman.io/image/v5/transports" ) // parseImageAndDockerReference converts an image and a reference string into two parsed entities, failing on any error and handling unidentified images. diff --git a/vendor/github.com/containers/image/v5/signature/policy_types.go b/vendor/go.podman.io/image/v5/signature/policy_types.go similarity index 100% rename from vendor/github.com/containers/image/v5/signature/policy_types.go rename to vendor/go.podman.io/image/v5/signature/policy_types.go diff --git a/vendor/github.com/containers/image/v5/signature/signer/signer.go b/vendor/go.podman.io/image/v5/signature/signer/signer.go similarity index 85% rename from vendor/github.com/containers/image/v5/signature/signer/signer.go rename to vendor/go.podman.io/image/v5/signature/signer/signer.go index 73ae550aa55..0a70338aa23 100644 --- a/vendor/github.com/containers/image/v5/signature/signer/signer.go +++ b/vendor/go.podman.io/image/v5/signature/signer/signer.go @@ -1,6 +1,6 @@ package signer -import "github.com/containers/image/v5/internal/signer" +import "go.podman.io/image/v5/internal/signer" // Signer is an object, possibly carrying state, that can be used by copy.Image to sign one or more container images. // It can only be created from within the containers/image package; it can’t be implemented externally. diff --git a/vendor/github.com/containers/image/v5/signature/sigstore/copied.go b/vendor/go.podman.io/image/v5/signature/sigstore/copied.go similarity index 100% rename from vendor/github.com/containers/image/v5/signature/sigstore/copied.go rename to vendor/go.podman.io/image/v5/signature/sigstore/copied.go diff --git a/vendor/github.com/containers/image/v5/signature/sigstore/fulcio/fulcio.go b/vendor/go.podman.io/image/v5/signature/sigstore/fulcio/fulcio.go similarity index 98% rename from vendor/github.com/containers/image/v5/signature/sigstore/fulcio/fulcio.go rename to vendor/go.podman.io/image/v5/signature/sigstore/fulcio/fulcio.go index 8d1620371bc..ad82bd0d6b5 100644 --- a/vendor/github.com/containers/image/v5/signature/sigstore/fulcio/fulcio.go +++ b/vendor/go.podman.io/image/v5/signature/sigstore/fulcio/fulcio.go @@ -11,13 +11,13 @@ import ( "io" "net/url" - "github.com/containers/image/v5/internal/useragent" - "github.com/containers/image/v5/signature/sigstore/internal" "github.com/sigstore/fulcio/pkg/api" "github.com/sigstore/sigstore/pkg/oauth" "github.com/sigstore/sigstore/pkg/oauthflow" sigstoreSignature "github.com/sigstore/sigstore/pkg/signature" "github.com/sirupsen/logrus" + "go.podman.io/image/v5/internal/useragent" + "go.podman.io/image/v5/signature/sigstore/internal" "golang.org/x/oauth2" ) diff --git a/vendor/github.com/containers/image/v5/signature/sigstore/generate.go b/vendor/go.podman.io/image/v5/signature/sigstore/generate.go similarity index 100% rename from vendor/github.com/containers/image/v5/signature/sigstore/generate.go rename to vendor/go.podman.io/image/v5/signature/sigstore/generate.go diff --git a/vendor/github.com/containers/image/v5/signature/sigstore/internal/signer.go b/vendor/go.podman.io/image/v5/signature/sigstore/internal/signer.go similarity index 94% rename from vendor/github.com/containers/image/v5/signature/sigstore/internal/signer.go rename to vendor/go.podman.io/image/v5/signature/sigstore/internal/signer.go index c6258f408f2..5a4c244bdd2 100644 --- a/vendor/github.com/containers/image/v5/signature/sigstore/internal/signer.go +++ b/vendor/go.podman.io/image/v5/signature/sigstore/internal/signer.go @@ -8,11 +8,11 @@ import ( "errors" "fmt" - "github.com/containers/image/v5/docker/reference" - "github.com/containers/image/v5/internal/signature" - "github.com/containers/image/v5/manifest" - "github.com/containers/image/v5/signature/internal" sigstoreSignature "github.com/sigstore/sigstore/pkg/signature" + "go.podman.io/image/v5/docker/reference" + "go.podman.io/image/v5/internal/signature" + "go.podman.io/image/v5/manifest" + "go.podman.io/image/v5/signature/internal" ) type Option func(*SigstoreSigner) error diff --git a/vendor/github.com/containers/image/v5/signature/sigstore/rekor/leveled_logger.go b/vendor/go.podman.io/image/v5/signature/sigstore/rekor/leveled_logger.go similarity index 100% rename from vendor/github.com/containers/image/v5/signature/sigstore/rekor/leveled_logger.go rename to vendor/go.podman.io/image/v5/signature/sigstore/rekor/leveled_logger.go diff --git a/vendor/github.com/containers/image/v5/signature/sigstore/rekor/openapi_infra.go b/vendor/go.podman.io/image/v5/signature/sigstore/rekor/openapi_infra.go similarity index 97% rename from vendor/github.com/containers/image/v5/signature/sigstore/rekor/openapi_infra.go rename to vendor/go.podman.io/image/v5/signature/sigstore/rekor/openapi_infra.go index 164dcba298f..6d51897cf97 100644 --- a/vendor/github.com/containers/image/v5/signature/sigstore/rekor/openapi_infra.go +++ b/vendor/go.podman.io/image/v5/signature/sigstore/rekor/openapi_infra.go @@ -28,6 +28,9 @@ import ( // makeRequest makes a http request to the requested requestPath, and returns the received response. func (r *rekorClient) makeRequest(ctx context.Context, method, requestPath string, bodyContent any) (*http.Response, error) { + ctx, cancel := context.WithCancel(ctx) + defer cancel() + var body io.Reader headers := http.Header{} diff --git a/vendor/github.com/containers/image/v5/signature/sigstore/rekor/rekor.go b/vendor/go.podman.io/image/v5/signature/sigstore/rekor/rekor.go similarity index 98% rename from vendor/github.com/containers/image/v5/signature/sigstore/rekor/rekor.go rename to vendor/go.podman.io/image/v5/signature/sigstore/rekor/rekor.go index 0518d88d1c6..a064c454c94 100644 --- a/vendor/github.com/containers/image/v5/signature/sigstore/rekor/rekor.go +++ b/vendor/go.podman.io/image/v5/signature/sigstore/rekor/rekor.go @@ -12,11 +12,11 @@ import ( "net/url" "strings" - "github.com/containers/image/v5/signature/internal" - signerInternal "github.com/containers/image/v5/signature/sigstore/internal" "github.com/hashicorp/go-cleanhttp" "github.com/hashicorp/go-retryablehttp" "github.com/sirupsen/logrus" + "go.podman.io/image/v5/signature/internal" + signerInternal "go.podman.io/image/v5/signature/sigstore/internal" ) const ( diff --git a/vendor/github.com/containers/image/v5/signature/sigstore/rekor/rekor_api.go b/vendor/go.podman.io/image/v5/signature/sigstore/rekor/rekor_api.go similarity index 100% rename from vendor/github.com/containers/image/v5/signature/sigstore/rekor/rekor_api.go rename to vendor/go.podman.io/image/v5/signature/sigstore/rekor/rekor_api.go diff --git a/vendor/github.com/containers/image/v5/signature/sigstore/rekor/rekor_api_types.go b/vendor/go.podman.io/image/v5/signature/sigstore/rekor/rekor_api_types.go similarity index 100% rename from vendor/github.com/containers/image/v5/signature/sigstore/rekor/rekor_api_types.go rename to vendor/go.podman.io/image/v5/signature/sigstore/rekor/rekor_api_types.go diff --git a/vendor/github.com/containers/image/v5/signature/sigstore/signer.go b/vendor/go.podman.io/image/v5/signature/sigstore/signer.go similarity index 89% rename from vendor/github.com/containers/image/v5/signature/sigstore/signer.go rename to vendor/go.podman.io/image/v5/signature/sigstore/signer.go index fb825ada9de..80ebfb2a508 100644 --- a/vendor/github.com/containers/image/v5/signature/sigstore/signer.go +++ b/vendor/go.podman.io/image/v5/signature/sigstore/signer.go @@ -5,10 +5,10 @@ import ( "fmt" "os" - internalSigner "github.com/containers/image/v5/internal/signer" - "github.com/containers/image/v5/signature/signer" - "github.com/containers/image/v5/signature/sigstore/internal" "github.com/sigstore/sigstore/pkg/cryptoutils" + internalSigner "go.podman.io/image/v5/internal/signer" + "go.podman.io/image/v5/signature/signer" + "go.podman.io/image/v5/signature/sigstore/internal" ) type Option = internal.Option diff --git a/vendor/github.com/containers/image/v5/signature/simple.go b/vendor/go.podman.io/image/v5/signature/simple.go similarity index 89% rename from vendor/github.com/containers/image/v5/signature/simple.go rename to vendor/go.podman.io/image/v5/signature/simple.go index 3130cfa9abd..3429e9d7f9a 100644 --- a/vendor/github.com/containers/image/v5/signature/simple.go +++ b/vendor/go.podman.io/image/v5/signature/simple.go @@ -8,12 +8,11 @@ import ( "encoding/json" "errors" "fmt" - "slices" "time" - "github.com/containers/image/v5/signature/internal" - "github.com/containers/image/v5/version" digest "github.com/opencontainers/go-digest" + "go.podman.io/image/v5/signature/internal" + "go.podman.io/image/v5/version" ) const ( @@ -208,52 +207,37 @@ func (s untrustedSignature) sign(mech SigningMechanism, keyIdentity string, pass // because the functions have the same or similar types, so there is a risk of exchanging the functions; // named members of this struct are more explicit. type signatureAcceptanceRules struct { - acceptedKeyIdentities []string + validateKeyIdentity func(string) error validateSignedDockerReference func(string) error validateSignedDockerManifestDigest func(digest.Digest) error } // verifyAndExtractSignature verifies that unverifiedSignature has been signed, and that its principal components -// match expected values, both as specified by rules. -// Returns the signature, and an identity of the key that signed it. -func verifyAndExtractSignature(mech SigningMechanism, unverifiedSignature []byte, rules signatureAcceptanceRules) (*Signature, string, error) { +// match expected values, both as specified by rules, and returns it +func verifyAndExtractSignature(mech SigningMechanism, unverifiedSignature []byte, rules signatureAcceptanceRules) (*Signature, error) { signed, keyIdentity, err := mech.Verify(unverifiedSignature) if err != nil { - return nil, "", err + return nil, err } - if !slices.Contains(rules.acceptedKeyIdentities, keyIdentity) { - withLookup, ok := mech.(signingMechanismWithVerificationIdentityLookup) - if !ok { - return nil, "", internal.NewInvalidSignatureError(fmt.Sprintf("signature by key %s is not accepted", keyIdentity)) - } - - primaryKey, err := withLookup.keyIdentityForVerificationKeyIdentity(keyIdentity) - if err != nil { - // Coverage: This only fails if lookup by keyIdentity fails, but we just found and used that key. - // Or maybe on some unexpected I/O error. - return nil, "", err - } - if !slices.Contains(rules.acceptedKeyIdentities, primaryKey) { - return nil, "", internal.NewInvalidSignatureError(fmt.Sprintf("signature by key %s of %s is not accepted", keyIdentity, primaryKey)) - } - keyIdentity = primaryKey + if err := rules.validateKeyIdentity(keyIdentity); err != nil { + return nil, err } var unmatchedSignature untrustedSignature if err := json.Unmarshal(signed, &unmatchedSignature); err != nil { - return nil, "", internal.NewInvalidSignatureError(err.Error()) + return nil, internal.NewInvalidSignatureError(err.Error()) } if err := rules.validateSignedDockerManifestDigest(unmatchedSignature.untrustedDockerManifestDigest); err != nil { - return nil, "", err + return nil, err } if err := rules.validateSignedDockerReference(unmatchedSignature.untrustedDockerReference); err != nil { - return nil, "", err + return nil, err } // signatureAcceptanceRules have accepted this value. return &Signature{ DockerManifestDigest: unmatchedSignature.untrustedDockerManifestDigest, DockerReference: unmatchedSignature.untrustedDockerReference, - }, keyIdentity, nil + }, nil } // GetUntrustedSignatureInformationWithoutVerifying extracts information available in an untrusted signature, diff --git a/vendor/github.com/containers/image/v5/signature/simplesigning/signer.go b/vendor/go.podman.io/image/v5/signature/simplesigning/signer.go similarity index 92% rename from vendor/github.com/containers/image/v5/signature/simplesigning/signer.go rename to vendor/go.podman.io/image/v5/signature/simplesigning/signer.go index 983bbb10b51..038a255c5b2 100644 --- a/vendor/github.com/containers/image/v5/signature/simplesigning/signer.go +++ b/vendor/go.podman.io/image/v5/signature/simplesigning/signer.go @@ -6,11 +6,11 @@ import ( "fmt" "strings" - "github.com/containers/image/v5/docker/reference" - internalSig "github.com/containers/image/v5/internal/signature" - internalSigner "github.com/containers/image/v5/internal/signer" - "github.com/containers/image/v5/signature" - "github.com/containers/image/v5/signature/signer" + "go.podman.io/image/v5/docker/reference" + internalSig "go.podman.io/image/v5/internal/signature" + internalSigner "go.podman.io/image/v5/internal/signer" + "go.podman.io/image/v5/signature" + "go.podman.io/image/v5/signature/signer" ) // simpleSigner is a signer.SignerImplementation implementation for simple signing signatures. diff --git a/vendor/github.com/containers/image/v5/storage/storage_dest.go b/vendor/go.podman.io/image/v5/storage/storage_dest.go similarity index 98% rename from vendor/github.com/containers/image/v5/storage/storage_dest.go rename to vendor/go.podman.io/image/v5/storage/storage_dest.go index 6d9b8cbf69b..7ea6cd0531e 100644 --- a/vendor/github.com/containers/image/v5/storage/storage_dest.go +++ b/vendor/go.podman.io/image/v5/storage/storage_dest.go @@ -15,28 +15,28 @@ import ( "sync" "sync/atomic" - "github.com/containers/image/v5/docker/reference" - "github.com/containers/image/v5/internal/image" - "github.com/containers/image/v5/internal/imagedestination/impl" - "github.com/containers/image/v5/internal/imagedestination/stubs" - srcImpl "github.com/containers/image/v5/internal/imagesource/impl" - srcStubs "github.com/containers/image/v5/internal/imagesource/stubs" - "github.com/containers/image/v5/internal/private" - "github.com/containers/image/v5/internal/putblobdigest" - "github.com/containers/image/v5/internal/signature" - "github.com/containers/image/v5/internal/tmpdir" - "github.com/containers/image/v5/manifest" - "github.com/containers/image/v5/pkg/blobinfocache/none" - "github.com/containers/image/v5/types" - "github.com/containers/storage" - graphdriver "github.com/containers/storage/drivers" - "github.com/containers/storage/pkg/archive" - "github.com/containers/storage/pkg/chunked" - "github.com/containers/storage/pkg/chunked/toc" - "github.com/containers/storage/pkg/ioutils" digest "github.com/opencontainers/go-digest" imgspecv1 "github.com/opencontainers/image-spec/specs-go/v1" "github.com/sirupsen/logrus" + "go.podman.io/image/v5/docker/reference" + "go.podman.io/image/v5/internal/image" + "go.podman.io/image/v5/internal/imagedestination/impl" + "go.podman.io/image/v5/internal/imagedestination/stubs" + srcImpl "go.podman.io/image/v5/internal/imagesource/impl" + srcStubs "go.podman.io/image/v5/internal/imagesource/stubs" + "go.podman.io/image/v5/internal/private" + "go.podman.io/image/v5/internal/putblobdigest" + "go.podman.io/image/v5/internal/signature" + "go.podman.io/image/v5/internal/tmpdir" + "go.podman.io/image/v5/manifest" + "go.podman.io/image/v5/pkg/blobinfocache/none" + "go.podman.io/image/v5/types" + "go.podman.io/storage" + graphdriver "go.podman.io/storage/drivers" + "go.podman.io/storage/pkg/archive" + "go.podman.io/storage/pkg/chunked" + "go.podman.io/storage/pkg/chunked/toc" + "go.podman.io/storage/pkg/ioutils" ) var ( diff --git a/vendor/github.com/containers/image/v5/storage/storage_image.go b/vendor/go.podman.io/image/v5/storage/storage_image.go similarity index 95% rename from vendor/github.com/containers/image/v5/storage/storage_image.go rename to vendor/go.podman.io/image/v5/storage/storage_image.go index e7ba1dd2290..d493c14db6a 100644 --- a/vendor/github.com/containers/image/v5/storage/storage_image.go +++ b/vendor/go.podman.io/image/v5/storage/storage_image.go @@ -5,10 +5,10 @@ package storage import ( "context" - "github.com/containers/image/v5/internal/image" - "github.com/containers/image/v5/types" - "github.com/containers/storage" digest "github.com/opencontainers/go-digest" + "go.podman.io/image/v5/internal/image" + "go.podman.io/image/v5/types" + "go.podman.io/storage" ) var ( diff --git a/vendor/github.com/containers/image/v5/storage/storage_reference.go b/vendor/go.podman.io/image/v5/storage/storage_reference.go similarity index 98% rename from vendor/github.com/containers/image/v5/storage/storage_reference.go rename to vendor/go.podman.io/image/v5/storage/storage_reference.go index 5e3ff9e69c4..dacffeef789 100644 --- a/vendor/github.com/containers/image/v5/storage/storage_reference.go +++ b/vendor/go.podman.io/image/v5/storage/storage_reference.go @@ -8,13 +8,13 @@ import ( "slices" "strings" - "github.com/containers/image/v5/docker/reference" - "github.com/containers/image/v5/manifest" - "github.com/containers/image/v5/transports" - "github.com/containers/image/v5/types" - "github.com/containers/storage" digest "github.com/opencontainers/go-digest" "github.com/sirupsen/logrus" + "go.podman.io/image/v5/docker/reference" + "go.podman.io/image/v5/manifest" + "go.podman.io/image/v5/transports" + "go.podman.io/image/v5/types" + "go.podman.io/storage" ) // A storageReference holds an arbitrary name and/or an ID, which is a 32-byte diff --git a/vendor/github.com/containers/image/v5/storage/storage_src.go b/vendor/go.podman.io/image/v5/storage/storage_src.go similarity index 97% rename from vendor/github.com/containers/image/v5/storage/storage_src.go rename to vendor/go.podman.io/image/v5/storage/storage_src.go index 7cedf1d88c9..d48381b59df 100644 --- a/vendor/github.com/containers/image/v5/storage/storage_src.go +++ b/vendor/go.podman.io/image/v5/storage/storage_src.go @@ -13,20 +13,20 @@ import ( "slices" "sync" - "github.com/containers/image/v5/docker/reference" - "github.com/containers/image/v5/internal/image" - "github.com/containers/image/v5/internal/imagesource/impl" - "github.com/containers/image/v5/internal/imagesource/stubs" - "github.com/containers/image/v5/internal/signature" - "github.com/containers/image/v5/internal/tmpdir" - "github.com/containers/image/v5/manifest" - "github.com/containers/image/v5/types" - "github.com/containers/storage" - "github.com/containers/storage/pkg/archive" - "github.com/containers/storage/pkg/ioutils" digest "github.com/opencontainers/go-digest" imgspecv1 "github.com/opencontainers/image-spec/specs-go/v1" "github.com/sirupsen/logrus" + "go.podman.io/image/v5/docker/reference" + "go.podman.io/image/v5/internal/image" + "go.podman.io/image/v5/internal/imagesource/impl" + "go.podman.io/image/v5/internal/imagesource/stubs" + "go.podman.io/image/v5/internal/signature" + "go.podman.io/image/v5/internal/tmpdir" + "go.podman.io/image/v5/manifest" + "go.podman.io/image/v5/types" + "go.podman.io/storage" + "go.podman.io/storage/pkg/archive" + "go.podman.io/storage/pkg/ioutils" ) type storageImageSource struct { diff --git a/vendor/github.com/containers/image/v5/storage/storage_transport.go b/vendor/go.podman.io/image/v5/storage/storage_transport.go similarity index 98% rename from vendor/github.com/containers/image/v5/storage/storage_transport.go rename to vendor/go.podman.io/image/v5/storage/storage_transport.go index a66a1d19a3d..2f0a18787c2 100644 --- a/vendor/github.com/containers/image/v5/storage/storage_transport.go +++ b/vendor/go.podman.io/image/v5/storage/storage_transport.go @@ -8,13 +8,13 @@ import ( "path/filepath" "strings" - "github.com/containers/image/v5/docker/reference" - "github.com/containers/image/v5/transports" - "github.com/containers/image/v5/types" - "github.com/containers/storage" - "github.com/containers/storage/pkg/idtools" digest "github.com/opencontainers/go-digest" "github.com/sirupsen/logrus" + "go.podman.io/image/v5/docker/reference" + "go.podman.io/image/v5/transports" + "go.podman.io/image/v5/types" + "go.podman.io/storage" + "go.podman.io/storage/pkg/idtools" ) const ( diff --git a/vendor/github.com/containers/image/v5/tarball/doc.go b/vendor/go.podman.io/image/v5/tarball/doc.go similarity index 86% rename from vendor/github.com/containers/image/v5/tarball/doc.go rename to vendor/go.podman.io/image/v5/tarball/doc.go index 064c78b1776..4aa7585349d 100644 --- a/vendor/github.com/containers/image/v5/tarball/doc.go +++ b/vendor/go.podman.io/image/v5/tarball/doc.go @@ -8,11 +8,11 @@ // import ( // "context" // -// cp "github.com/containers/image/v5/copy" -// "github.com/containers/image/v5/signature" -// "github.com/containers/image/v5/tarball" -// "github.com/containers/image/v5/transports/alltransports" -// "github.com/containers/image/v5/types" +// cp "go.podman.io/image/v5/copy" +// "go.podman.io/image/v5/signature" +// "go.podman.io/image/v5/tarball" +// "go.podman.io/image/v5/transports/alltransports" +// "go.podman.io/image/v5/types" // imgspecv1 "github.com/opencontainers/image-spec/specs-go/v1" // ) // diff --git a/vendor/github.com/containers/image/v5/tarball/tarball_reference.go b/vendor/go.podman.io/image/v5/tarball/tarball_reference.go similarity index 94% rename from vendor/github.com/containers/image/v5/tarball/tarball_reference.go rename to vendor/go.podman.io/image/v5/tarball/tarball_reference.go index 4e7ef3bcf8d..81f84fbee57 100644 --- a/vendor/github.com/containers/image/v5/tarball/tarball_reference.go +++ b/vendor/go.podman.io/image/v5/tarball/tarball_reference.go @@ -7,10 +7,10 @@ import ( "os" "strings" - "github.com/containers/image/v5/docker/reference" - "github.com/containers/image/v5/internal/image" - "github.com/containers/image/v5/types" imgspecv1 "github.com/opencontainers/image-spec/specs-go/v1" + "go.podman.io/image/v5/docker/reference" + "go.podman.io/image/v5/internal/image" + "go.podman.io/image/v5/types" ) // ConfigUpdater is an interface that ImageReferences for "tarball" images also diff --git a/vendor/github.com/containers/image/v5/tarball/tarball_src.go b/vendor/go.podman.io/image/v5/tarball/tarball_src.go similarity index 96% rename from vendor/github.com/containers/image/v5/tarball/tarball_src.go rename to vendor/go.podman.io/image/v5/tarball/tarball_src.go index 283a32d0ee0..a8af4b3256b 100644 --- a/vendor/github.com/containers/image/v5/tarball/tarball_src.go +++ b/vendor/go.podman.io/image/v5/tarball/tarball_src.go @@ -12,14 +12,14 @@ import ( "strings" "time" - "github.com/containers/image/v5/internal/imagesource/impl" - "github.com/containers/image/v5/internal/imagesource/stubs" - "github.com/containers/image/v5/pkg/compression" - compressionTypes "github.com/containers/image/v5/pkg/compression/types" - "github.com/containers/image/v5/types" digest "github.com/opencontainers/go-digest" imgspecs "github.com/opencontainers/image-spec/specs-go" imgspecv1 "github.com/opencontainers/image-spec/specs-go/v1" + "go.podman.io/image/v5/internal/imagesource/impl" + "go.podman.io/image/v5/internal/imagesource/stubs" + "go.podman.io/image/v5/pkg/compression" + compressionTypes "go.podman.io/image/v5/pkg/compression/types" + "go.podman.io/image/v5/types" ) type tarballImageSource struct { diff --git a/vendor/github.com/containers/image/v5/tarball/tarball_transport.go b/vendor/go.podman.io/image/v5/tarball/tarball_transport.go similarity index 95% rename from vendor/github.com/containers/image/v5/tarball/tarball_transport.go rename to vendor/go.podman.io/image/v5/tarball/tarball_transport.go index b33208a51b9..8c26e0c3830 100644 --- a/vendor/github.com/containers/image/v5/tarball/tarball_transport.go +++ b/vendor/go.podman.io/image/v5/tarball/tarball_transport.go @@ -7,8 +7,8 @@ import ( "os" "strings" - "github.com/containers/image/v5/transports" - "github.com/containers/image/v5/types" + "go.podman.io/image/v5/transports" + "go.podman.io/image/v5/types" ) const ( diff --git a/vendor/github.com/containers/image/v5/transports/alltransports/alltransports.go b/vendor/go.podman.io/image/v5/transports/alltransports/alltransports.go similarity index 76% rename from vendor/github.com/containers/image/v5/transports/alltransports/alltransports.go rename to vendor/go.podman.io/image/v5/transports/alltransports/alltransports.go index 0823a6196b7..8c30f5bd906 100644 --- a/vendor/github.com/containers/image/v5/transports/alltransports/alltransports.go +++ b/vendor/go.podman.io/image/v5/transports/alltransports/alltransports.go @@ -4,20 +4,20 @@ import ( "fmt" "strings" - "github.com/containers/image/v5/transports" - "github.com/containers/image/v5/types" + "go.podman.io/image/v5/transports" + "go.podman.io/image/v5/types" // Register all known transports. // NOTE: Make sure docs/containers-transports.5.md and docs/containers-policy.json.5.md are updated when adding or updating // a transport. - _ "github.com/containers/image/v5/directory" - _ "github.com/containers/image/v5/docker" - _ "github.com/containers/image/v5/docker/archive" - _ "github.com/containers/image/v5/oci/archive" - _ "github.com/containers/image/v5/oci/layout" - _ "github.com/containers/image/v5/openshift" - _ "github.com/containers/image/v5/sif" - _ "github.com/containers/image/v5/tarball" + _ "go.podman.io/image/v5/directory" + _ "go.podman.io/image/v5/docker" + _ "go.podman.io/image/v5/docker/archive" + _ "go.podman.io/image/v5/oci/archive" + _ "go.podman.io/image/v5/oci/layout" + _ "go.podman.io/image/v5/openshift" + _ "go.podman.io/image/v5/sif" + _ "go.podman.io/image/v5/tarball" // The docker-daemon transport is registeredy by docker_daemon*.go // The storage transport is registered by storage*.go ) diff --git a/vendor/github.com/containers/image/v5/transports/alltransports/docker_daemon.go b/vendor/go.podman.io/image/v5/transports/alltransports/docker_daemon.go similarity index 71% rename from vendor/github.com/containers/image/v5/transports/alltransports/docker_daemon.go rename to vendor/go.podman.io/image/v5/transports/alltransports/docker_daemon.go index 3a8caeeb109..db475766fc7 100644 --- a/vendor/github.com/containers/image/v5/transports/alltransports/docker_daemon.go +++ b/vendor/go.podman.io/image/v5/transports/alltransports/docker_daemon.go @@ -4,5 +4,5 @@ package alltransports import ( // Register the docker-daemon transport - _ "github.com/containers/image/v5/docker/daemon" + _ "go.podman.io/image/v5/docker/daemon" ) diff --git a/vendor/github.com/containers/image/v5/transports/alltransports/docker_daemon_stub.go b/vendor/go.podman.io/image/v5/transports/alltransports/docker_daemon_stub.go similarity index 75% rename from vendor/github.com/containers/image/v5/transports/alltransports/docker_daemon_stub.go rename to vendor/go.podman.io/image/v5/transports/alltransports/docker_daemon_stub.go index 8e470c805c8..9588814fda5 100644 --- a/vendor/github.com/containers/image/v5/transports/alltransports/docker_daemon_stub.go +++ b/vendor/go.podman.io/image/v5/transports/alltransports/docker_daemon_stub.go @@ -2,7 +2,7 @@ package alltransports -import "github.com/containers/image/v5/transports" +import "go.podman.io/image/v5/transports" func init() { transports.Register(transports.NewStubTransport("docker-daemon")) diff --git a/vendor/github.com/containers/image/v5/transports/alltransports/storage.go b/vendor/go.podman.io/image/v5/transports/alltransports/storage.go similarity index 71% rename from vendor/github.com/containers/image/v5/transports/alltransports/storage.go rename to vendor/go.podman.io/image/v5/transports/alltransports/storage.go index 4b27e059bff..e97722665f4 100644 --- a/vendor/github.com/containers/image/v5/transports/alltransports/storage.go +++ b/vendor/go.podman.io/image/v5/transports/alltransports/storage.go @@ -4,5 +4,5 @@ package alltransports import ( // Register the storage transport - _ "github.com/containers/image/v5/storage" + _ "go.podman.io/image/v5/storage" ) diff --git a/vendor/github.com/containers/image/v5/transports/alltransports/storage_stub.go b/vendor/go.podman.io/image/v5/transports/alltransports/storage_stub.go similarity index 75% rename from vendor/github.com/containers/image/v5/transports/alltransports/storage_stub.go rename to vendor/go.podman.io/image/v5/transports/alltransports/storage_stub.go index b021c1b50e6..d3a6027f2a4 100644 --- a/vendor/github.com/containers/image/v5/transports/alltransports/storage_stub.go +++ b/vendor/go.podman.io/image/v5/transports/alltransports/storage_stub.go @@ -2,7 +2,7 @@ package alltransports -import "github.com/containers/image/v5/transports" +import "go.podman.io/image/v5/transports" func init() { transports.Register(transports.NewStubTransport("containers-storage")) diff --git a/vendor/github.com/containers/image/v5/transports/stub.go b/vendor/go.podman.io/image/v5/transports/stub.go similarity index 97% rename from vendor/github.com/containers/image/v5/transports/stub.go rename to vendor/go.podman.io/image/v5/transports/stub.go index 2c186a90cca..ae44fd428ea 100644 --- a/vendor/github.com/containers/image/v5/transports/stub.go +++ b/vendor/go.podman.io/image/v5/transports/stub.go @@ -3,7 +3,7 @@ package transports import ( "fmt" - "github.com/containers/image/v5/types" + "go.podman.io/image/v5/types" ) // stubTransport is an implementation of types.ImageTransport which has a name, but rejects any references with “the transport $name: is not supported in this build”. diff --git a/vendor/github.com/containers/image/v5/transports/transports.go b/vendor/go.podman.io/image/v5/transports/transports.go similarity index 96% rename from vendor/github.com/containers/image/v5/transports/transports.go rename to vendor/go.podman.io/image/v5/transports/transports.go index 4c9c0889c23..04f05292b58 100644 --- a/vendor/github.com/containers/image/v5/transports/transports.go +++ b/vendor/go.podman.io/image/v5/transports/transports.go @@ -5,8 +5,8 @@ import ( "sort" "sync" - "github.com/containers/image/v5/internal/set" - "github.com/containers/image/v5/types" + "go.podman.io/image/v5/internal/set" + "go.podman.io/image/v5/types" ) // knownTransports is a registry of known ImageTransport instances. diff --git a/vendor/github.com/containers/image/v5/types/types.go b/vendor/go.podman.io/image/v5/types/types.go similarity index 99% rename from vendor/github.com/containers/image/v5/types/types.go rename to vendor/go.podman.io/image/v5/types/types.go index a93951780bc..41f1a632e2e 100644 --- a/vendor/github.com/containers/image/v5/types/types.go +++ b/vendor/go.podman.io/image/v5/types/types.go @@ -6,10 +6,10 @@ import ( "net/url" "time" - "github.com/containers/image/v5/docker/reference" - compression "github.com/containers/image/v5/pkg/compression/types" digest "github.com/opencontainers/go-digest" v1 "github.com/opencontainers/image-spec/specs-go/v1" + "go.podman.io/image/v5/docker/reference" + compression "go.podman.io/image/v5/pkg/compression/types" ) // ImageTransport is a top-level namespace for ways to store/load an image. diff --git a/vendor/github.com/containers/image/v5/version/version.go b/vendor/go.podman.io/image/v5/version/version.go similarity index 100% rename from vendor/github.com/containers/image/v5/version/version.go rename to vendor/go.podman.io/image/v5/version/version.go diff --git a/vendor/github.com/containers/storage/.cirrus.yml b/vendor/go.podman.io/storage/.cirrus.yml similarity index 98% rename from vendor/github.com/containers/storage/.cirrus.yml rename to vendor/go.podman.io/storage/.cirrus.yml index 623ede2dd6d..d26b97d23ac 100644 --- a/vendor/github.com/containers/storage/.cirrus.yml +++ b/vendor/go.podman.io/storage/.cirrus.yml @@ -171,13 +171,13 @@ vendor_task: cross_task: alias: cross container: - image: golang:1.23 + image: golang:1.24 build_script: make cross gofix_task: alias: gofix container: - image: golang:1.23 + image: golang:1.24 build_script: go fix ./... test_script: git diff --exit-code @@ -207,6 +207,6 @@ success_task: - gofix - codespell container: - image: golang:1.21 + image: golang:1.24 clone_script: 'mkdir -p "$CIRRUS_WORKING_DIR"' # Source code not needed script: /bin/true diff --git a/vendor/github.com/containers/storage/.codespellrc b/vendor/go.podman.io/storage/.codespellrc similarity index 100% rename from vendor/github.com/containers/storage/.codespellrc rename to vendor/go.podman.io/storage/.codespellrc diff --git a/vendor/github.com/containers/storage/.dockerignore b/vendor/go.podman.io/storage/.dockerignore similarity index 100% rename from vendor/github.com/containers/storage/.dockerignore rename to vendor/go.podman.io/storage/.dockerignore diff --git a/vendor/github.com/containers/storage/.gitignore b/vendor/go.podman.io/storage/.gitignore similarity index 100% rename from vendor/github.com/containers/storage/.gitignore rename to vendor/go.podman.io/storage/.gitignore diff --git a/vendor/github.com/containers/storage/.golangci.yml b/vendor/go.podman.io/storage/.golangci.yml similarity index 100% rename from vendor/github.com/containers/storage/.golangci.yml rename to vendor/go.podman.io/storage/.golangci.yml diff --git a/vendor/github.com/containers/storage/.mailmap b/vendor/go.podman.io/storage/.mailmap similarity index 100% rename from vendor/github.com/containers/storage/.mailmap rename to vendor/go.podman.io/storage/.mailmap diff --git a/vendor/github.com/containers/storage/AUTHORS b/vendor/go.podman.io/storage/AUTHORS similarity index 100% rename from vendor/github.com/containers/storage/AUTHORS rename to vendor/go.podman.io/storage/AUTHORS diff --git a/vendor/github.com/containers/storage/CODE-OF-CONDUCT.md b/vendor/go.podman.io/storage/CODE-OF-CONDUCT.md similarity index 100% rename from vendor/github.com/containers/storage/CODE-OF-CONDUCT.md rename to vendor/go.podman.io/storage/CODE-OF-CONDUCT.md diff --git a/vendor/github.com/containers/storage/CONTRIBUTING.md b/vendor/go.podman.io/storage/CONTRIBUTING.md similarity index 100% rename from vendor/github.com/containers/storage/CONTRIBUTING.md rename to vendor/go.podman.io/storage/CONTRIBUTING.md diff --git a/vendor/github.com/containers/storage/LICENSE b/vendor/go.podman.io/storage/LICENSE similarity index 100% rename from vendor/github.com/containers/storage/LICENSE rename to vendor/go.podman.io/storage/LICENSE diff --git a/vendor/github.com/containers/storage/Makefile b/vendor/go.podman.io/storage/Makefile similarity index 98% rename from vendor/github.com/containers/storage/Makefile rename to vendor/go.podman.io/storage/Makefile index cc6b65517cb..b4d23dc0738 100644 --- a/vendor/github.com/containers/storage/Makefile +++ b/vendor/go.podman.io/storage/Makefile @@ -35,7 +35,7 @@ TESTFLAGS := $(shell $(GO) test -race $(BUILDFLAGS) ./pkg/stringutils 2>&1 > /de # N/B: This value is managed by Renovate, manual changes are # possible, as long as they don't disturb the formatting # (i.e. DO NOT ADD A 'v' prefix!) -GOLANGCI_LINT_VERSION := 2.4.0 +GOLANGCI_LINT_VERSION := 2.3.1 default all: local-binary docs local-validate local-cross ## validate all checks, build and cross-build\nbinaries and docs @@ -97,5 +97,5 @@ vendor-in-container: vendor: $(GO) mod tidy - $(GO) mod vendor + $(GO) work vendor $(GO) mod verify diff --git a/vendor/github.com/containers/storage/NOTICE b/vendor/go.podman.io/storage/NOTICE similarity index 100% rename from vendor/github.com/containers/storage/NOTICE rename to vendor/go.podman.io/storage/NOTICE diff --git a/vendor/github.com/containers/storage/OWNERS b/vendor/go.podman.io/storage/OWNERS similarity index 100% rename from vendor/github.com/containers/storage/OWNERS rename to vendor/go.podman.io/storage/OWNERS diff --git a/vendor/github.com/containers/storage/README.md b/vendor/go.podman.io/storage/README.md similarity index 100% rename from vendor/github.com/containers/storage/README.md rename to vendor/go.podman.io/storage/README.md diff --git a/vendor/github.com/containers/storage/SECURITY.md b/vendor/go.podman.io/storage/SECURITY.md similarity index 100% rename from vendor/github.com/containers/storage/SECURITY.md rename to vendor/go.podman.io/storage/SECURITY.md diff --git a/vendor/github.com/containers/storage/VERSION b/vendor/go.podman.io/storage/VERSION similarity index 100% rename from vendor/github.com/containers/storage/VERSION rename to vendor/go.podman.io/storage/VERSION diff --git a/vendor/github.com/containers/storage/check.go b/vendor/go.podman.io/storage/check.go similarity index 99% rename from vendor/github.com/containers/storage/check.go rename to vendor/go.podman.io/storage/check.go index e8837ff953c..f0902dfced6 100644 --- a/vendor/github.com/containers/storage/check.go +++ b/vendor/go.podman.io/storage/check.go @@ -14,12 +14,12 @@ import ( "sync" "time" - drivers "github.com/containers/storage/drivers" - "github.com/containers/storage/pkg/archive" - "github.com/containers/storage/pkg/idtools" - "github.com/containers/storage/pkg/ioutils" - "github.com/containers/storage/types" "github.com/sirupsen/logrus" + drivers "go.podman.io/storage/drivers" + "go.podman.io/storage/pkg/archive" + "go.podman.io/storage/pkg/idtools" + "go.podman.io/storage/pkg/ioutils" + "go.podman.io/storage/types" ) var ( diff --git a/vendor/github.com/containers/storage/containers.go b/vendor/go.podman.io/storage/containers.go similarity index 99% rename from vendor/github.com/containers/storage/containers.go rename to vendor/go.podman.io/storage/containers.go index 21341f1e9d3..5c10453771a 100644 --- a/vendor/github.com/containers/storage/containers.go +++ b/vendor/go.podman.io/storage/containers.go @@ -9,13 +9,13 @@ import ( "sync" "time" - "github.com/containers/storage/pkg/idtools" - "github.com/containers/storage/pkg/ioutils" - "github.com/containers/storage/pkg/lockfile" - "github.com/containers/storage/pkg/stringid" - "github.com/containers/storage/pkg/truncindex" digest "github.com/opencontainers/go-digest" "github.com/sirupsen/logrus" + "go.podman.io/storage/pkg/idtools" + "go.podman.io/storage/pkg/ioutils" + "go.podman.io/storage/pkg/lockfile" + "go.podman.io/storage/pkg/stringid" + "go.podman.io/storage/pkg/truncindex" ) type containerLocations uint8 diff --git a/vendor/github.com/containers/storage/deprecated.go b/vendor/go.podman.io/storage/deprecated.go similarity index 98% rename from vendor/github.com/containers/storage/deprecated.go rename to vendor/go.podman.io/storage/deprecated.go index beb82b6bf32..b1e8baf1c03 100644 --- a/vendor/github.com/containers/storage/deprecated.go +++ b/vendor/go.podman.io/storage/deprecated.go @@ -4,9 +4,9 @@ import ( "io" "time" - drivers "github.com/containers/storage/drivers" - "github.com/containers/storage/pkg/archive" digest "github.com/opencontainers/go-digest" + drivers "go.podman.io/storage/drivers" + "go.podman.io/storage/pkg/archive" ) // The type definitions in this file exist ONLY to maintain formal API compatibility. diff --git a/vendor/github.com/containers/storage/drivers/aufs/aufs.go b/vendor/go.podman.io/storage/drivers/aufs/aufs.go similarity index 97% rename from vendor/github.com/containers/storage/drivers/aufs/aufs.go rename to vendor/go.podman.io/storage/drivers/aufs/aufs.go index 5925c9da3f9..b3eb33730ad 100644 --- a/vendor/github.com/containers/storage/drivers/aufs/aufs.go +++ b/vendor/go.podman.io/storage/drivers/aufs/aufs.go @@ -35,21 +35,21 @@ import ( "sync" "time" - graphdriver "github.com/containers/storage/drivers" - "github.com/containers/storage/internal/tempdir" - "github.com/containers/storage/pkg/archive" - "github.com/containers/storage/pkg/chrootarchive" - "github.com/containers/storage/pkg/directory" - "github.com/containers/storage/pkg/fileutils" - "github.com/containers/storage/pkg/idtools" - "github.com/containers/storage/pkg/locker" - mountpk "github.com/containers/storage/pkg/mount" - "github.com/containers/storage/pkg/parsers" - "github.com/containers/storage/pkg/system" - "github.com/containers/storage/pkg/unshare" "github.com/opencontainers/selinux/go-selinux/label" "github.com/sirupsen/logrus" "github.com/vbatts/tar-split/tar/storage" + graphdriver "go.podman.io/storage/drivers" + "go.podman.io/storage/internal/tempdir" + "go.podman.io/storage/pkg/archive" + "go.podman.io/storage/pkg/chrootarchive" + "go.podman.io/storage/pkg/directory" + "go.podman.io/storage/pkg/fileutils" + "go.podman.io/storage/pkg/idtools" + "go.podman.io/storage/pkg/locker" + mountpk "go.podman.io/storage/pkg/mount" + "go.podman.io/storage/pkg/parsers" + "go.podman.io/storage/pkg/system" + "go.podman.io/storage/pkg/unshare" "golang.org/x/sys/unix" ) diff --git a/vendor/github.com/containers/storage/drivers/aufs/dirs.go b/vendor/go.podman.io/storage/drivers/aufs/dirs.go similarity index 100% rename from vendor/github.com/containers/storage/drivers/aufs/dirs.go rename to vendor/go.podman.io/storage/drivers/aufs/dirs.go diff --git a/vendor/github.com/containers/storage/drivers/aufs/mount.go b/vendor/go.podman.io/storage/drivers/aufs/mount.go similarity index 100% rename from vendor/github.com/containers/storage/drivers/aufs/mount.go rename to vendor/go.podman.io/storage/drivers/aufs/mount.go diff --git a/vendor/github.com/containers/storage/drivers/aufs/mount_linux.go b/vendor/go.podman.io/storage/drivers/aufs/mount_linux.go similarity index 100% rename from vendor/github.com/containers/storage/drivers/aufs/mount_linux.go rename to vendor/go.podman.io/storage/drivers/aufs/mount_linux.go diff --git a/vendor/github.com/containers/storage/drivers/btrfs/btrfs.go b/vendor/go.podman.io/storage/drivers/btrfs/btrfs.go similarity index 97% rename from vendor/github.com/containers/storage/drivers/btrfs/btrfs.go rename to vendor/go.podman.io/storage/drivers/btrfs/btrfs.go index 95bbe8cc71a..aba898ed550 100644 --- a/vendor/github.com/containers/storage/drivers/btrfs/btrfs.go +++ b/vendor/go.podman.io/storage/drivers/btrfs/btrfs.go @@ -29,17 +29,17 @@ import ( "sync" "unsafe" - graphdriver "github.com/containers/storage/drivers" - "github.com/containers/storage/internal/tempdir" - "github.com/containers/storage/pkg/directory" - "github.com/containers/storage/pkg/fileutils" - "github.com/containers/storage/pkg/idtools" - "github.com/containers/storage/pkg/mount" - "github.com/containers/storage/pkg/parsers" - "github.com/containers/storage/pkg/system" "github.com/docker/go-units" "github.com/opencontainers/selinux/go-selinux/label" "github.com/sirupsen/logrus" + graphdriver "go.podman.io/storage/drivers" + "go.podman.io/storage/internal/tempdir" + "go.podman.io/storage/pkg/directory" + "go.podman.io/storage/pkg/fileutils" + "go.podman.io/storage/pkg/idtools" + "go.podman.io/storage/pkg/mount" + "go.podman.io/storage/pkg/parsers" + "go.podman.io/storage/pkg/system" "golang.org/x/sys/unix" ) diff --git a/vendor/github.com/containers/storage/drivers/btrfs/dummy_unsupported.go b/vendor/go.podman.io/storage/drivers/btrfs/dummy_unsupported.go similarity index 100% rename from vendor/github.com/containers/storage/drivers/btrfs/dummy_unsupported.go rename to vendor/go.podman.io/storage/drivers/btrfs/dummy_unsupported.go diff --git a/vendor/github.com/containers/storage/drivers/btrfs/version.go b/vendor/go.podman.io/storage/drivers/btrfs/version.go similarity index 100% rename from vendor/github.com/containers/storage/drivers/btrfs/version.go rename to vendor/go.podman.io/storage/drivers/btrfs/version.go diff --git a/vendor/github.com/containers/storage/drivers/chown.go b/vendor/go.podman.io/storage/drivers/chown.go similarity index 97% rename from vendor/github.com/containers/storage/drivers/chown.go rename to vendor/go.podman.io/storage/drivers/chown.go index df602760ede..808e0022ff6 100644 --- a/vendor/github.com/containers/storage/drivers/chown.go +++ b/vendor/go.podman.io/storage/drivers/chown.go @@ -7,9 +7,9 @@ import ( "io/fs" "os" - "github.com/containers/storage/pkg/idtools" - "github.com/containers/storage/pkg/reexec" "github.com/opencontainers/selinux/pkg/pwalkdir" + "go.podman.io/storage/pkg/idtools" + "go.podman.io/storage/pkg/reexec" ) const ( diff --git a/vendor/github.com/containers/storage/drivers/chown_darwin.go b/vendor/go.podman.io/storage/drivers/chown_darwin.go similarity index 96% rename from vendor/github.com/containers/storage/drivers/chown_darwin.go rename to vendor/go.podman.io/storage/drivers/chown_darwin.go index 4f27502073c..7490973212f 100644 --- a/vendor/github.com/containers/storage/drivers/chown_darwin.go +++ b/vendor/go.podman.io/storage/drivers/chown_darwin.go @@ -9,8 +9,8 @@ import ( "sync" "syscall" - "github.com/containers/storage/pkg/idtools" - "github.com/containers/storage/pkg/system" + "go.podman.io/storage/pkg/idtools" + "go.podman.io/storage/pkg/system" ) type inode struct { diff --git a/vendor/github.com/containers/storage/drivers/chown_unix.go b/vendor/go.podman.io/storage/drivers/chown_unix.go similarity index 97% rename from vendor/github.com/containers/storage/drivers/chown_unix.go rename to vendor/go.podman.io/storage/drivers/chown_unix.go index d5a58a507fa..e4567ecec98 100644 --- a/vendor/github.com/containers/storage/drivers/chown_unix.go +++ b/vendor/go.podman.io/storage/drivers/chown_unix.go @@ -9,8 +9,8 @@ import ( "sync" "syscall" - "github.com/containers/storage/pkg/idtools" - "github.com/containers/storage/pkg/system" + "go.podman.io/storage/pkg/idtools" + "go.podman.io/storage/pkg/system" ) type inode struct { diff --git a/vendor/github.com/containers/storage/drivers/chown_windows.go b/vendor/go.podman.io/storage/drivers/chown_windows.go similarity index 88% rename from vendor/github.com/containers/storage/drivers/chown_windows.go rename to vendor/go.podman.io/storage/drivers/chown_windows.go index 6c2bd2ca2ec..cf89d97b63a 100644 --- a/vendor/github.com/containers/storage/drivers/chown_windows.go +++ b/vendor/go.podman.io/storage/drivers/chown_windows.go @@ -6,7 +6,7 @@ import ( "os" "syscall" - "github.com/containers/storage/pkg/idtools" + "go.podman.io/storage/pkg/idtools" ) type platformChowner struct{} diff --git a/vendor/github.com/containers/storage/drivers/chroot_unix.go b/vendor/go.podman.io/storage/drivers/chroot_unix.go similarity index 100% rename from vendor/github.com/containers/storage/drivers/chroot_unix.go rename to vendor/go.podman.io/storage/drivers/chroot_unix.go diff --git a/vendor/github.com/containers/storage/drivers/chroot_windows.go b/vendor/go.podman.io/storage/drivers/chroot_windows.go similarity index 100% rename from vendor/github.com/containers/storage/drivers/chroot_windows.go rename to vendor/go.podman.io/storage/drivers/chroot_windows.go diff --git a/vendor/github.com/containers/storage/drivers/copy/copy_linux.go b/vendor/go.podman.io/storage/drivers/copy/copy_linux.go similarity index 97% rename from vendor/github.com/containers/storage/drivers/copy/copy_linux.go rename to vendor/go.podman.io/storage/drivers/copy/copy_linux.go index c94cb5e12b0..550c11181dc 100644 --- a/vendor/github.com/containers/storage/drivers/copy/copy_linux.go +++ b/vendor/go.podman.io/storage/drivers/copy/copy_linux.go @@ -22,10 +22,10 @@ import ( "syscall" "time" - "github.com/containers/storage/pkg/idtools" - "github.com/containers/storage/pkg/pools" - "github.com/containers/storage/pkg/system" - "github.com/containers/storage/pkg/unshare" + "go.podman.io/storage/pkg/idtools" + "go.podman.io/storage/pkg/pools" + "go.podman.io/storage/pkg/system" + "go.podman.io/storage/pkg/unshare" "golang.org/x/sys/unix" ) diff --git a/vendor/github.com/containers/storage/drivers/copy/copy_unsupported.go b/vendor/go.podman.io/storage/drivers/copy/copy_unsupported.go similarity index 96% rename from vendor/github.com/containers/storage/drivers/copy/copy_unsupported.go rename to vendor/go.podman.io/storage/drivers/copy/copy_unsupported.go index 191b355d2a9..413434fee0b 100644 --- a/vendor/github.com/containers/storage/drivers/copy/copy_unsupported.go +++ b/vendor/go.podman.io/storage/drivers/copy/copy_unsupported.go @@ -6,7 +6,7 @@ import ( "io" "os" - "github.com/containers/storage/pkg/chrootarchive" + "go.podman.io/storage/pkg/chrootarchive" ) // Mode indicates whether to use hardlink or copy content diff --git a/vendor/github.com/containers/storage/drivers/counter.go b/vendor/go.podman.io/storage/drivers/counter.go similarity index 100% rename from vendor/github.com/containers/storage/drivers/counter.go rename to vendor/go.podman.io/storage/drivers/counter.go diff --git a/vendor/github.com/containers/storage/drivers/driver.go b/vendor/go.podman.io/storage/drivers/driver.go similarity index 98% rename from vendor/github.com/containers/storage/drivers/driver.go rename to vendor/go.podman.io/storage/drivers/driver.go index 5537780815c..fed80751b51 100644 --- a/vendor/github.com/containers/storage/drivers/driver.go +++ b/vendor/go.podman.io/storage/drivers/driver.go @@ -8,15 +8,15 @@ import ( "path/filepath" "strings" - "github.com/containers/storage/internal/dedup" - "github.com/containers/storage/internal/tempdir" - "github.com/containers/storage/pkg/archive" - "github.com/containers/storage/pkg/directory" - "github.com/containers/storage/pkg/fileutils" - "github.com/containers/storage/pkg/idtools" digest "github.com/opencontainers/go-digest" "github.com/sirupsen/logrus" "github.com/vbatts/tar-split/tar/storage" + "go.podman.io/storage/internal/dedup" + "go.podman.io/storage/internal/tempdir" + "go.podman.io/storage/pkg/archive" + "go.podman.io/storage/pkg/directory" + "go.podman.io/storage/pkg/fileutils" + "go.podman.io/storage/pkg/idtools" ) // FsMagic unsigned id of the filesystem in use. diff --git a/vendor/github.com/containers/storage/drivers/driver_darwin.go b/vendor/go.podman.io/storage/drivers/driver_darwin.go similarity index 100% rename from vendor/github.com/containers/storage/drivers/driver_darwin.go rename to vendor/go.podman.io/storage/drivers/driver_darwin.go diff --git a/vendor/github.com/containers/storage/drivers/driver_freebsd.go b/vendor/go.podman.io/storage/drivers/driver_freebsd.go similarity index 95% rename from vendor/github.com/containers/storage/drivers/driver_freebsd.go rename to vendor/go.podman.io/storage/drivers/driver_freebsd.go index a6072ab56a4..7f9400d317c 100644 --- a/vendor/github.com/containers/storage/drivers/driver_freebsd.go +++ b/vendor/go.podman.io/storage/drivers/driver_freebsd.go @@ -3,7 +3,7 @@ package graphdriver import ( "golang.org/x/sys/unix" - "github.com/containers/storage/pkg/mount" + "go.podman.io/storage/pkg/mount" ) const ( diff --git a/vendor/github.com/containers/storage/drivers/driver_linux.go b/vendor/go.podman.io/storage/drivers/driver_linux.go similarity index 99% rename from vendor/github.com/containers/storage/drivers/driver_linux.go rename to vendor/go.podman.io/storage/drivers/driver_linux.go index d730dc38a10..7a95a1eaa65 100644 --- a/vendor/github.com/containers/storage/drivers/driver_linux.go +++ b/vendor/go.podman.io/storage/drivers/driver_linux.go @@ -5,8 +5,8 @@ package graphdriver import ( "path/filepath" - "github.com/containers/storage/pkg/mount" "github.com/sirupsen/logrus" + "go.podman.io/storage/pkg/mount" "golang.org/x/sys/unix" ) diff --git a/vendor/github.com/containers/storage/drivers/driver_solaris.go b/vendor/go.podman.io/storage/drivers/driver_solaris.go similarity index 97% rename from vendor/github.com/containers/storage/drivers/driver_solaris.go rename to vendor/go.podman.io/storage/drivers/driver_solaris.go index 47749c6ef63..4745d2f14d4 100644 --- a/vendor/github.com/containers/storage/drivers/driver_solaris.go +++ b/vendor/go.podman.io/storage/drivers/driver_solaris.go @@ -20,8 +20,8 @@ import ( "path/filepath" "unsafe" - "github.com/containers/storage/pkg/mount" "github.com/sirupsen/logrus" + "go.podman.io/storage/pkg/mount" ) const ( diff --git a/vendor/github.com/containers/storage/drivers/driver_unsupported.go b/vendor/go.podman.io/storage/drivers/driver_unsupported.go similarity index 100% rename from vendor/github.com/containers/storage/drivers/driver_unsupported.go rename to vendor/go.podman.io/storage/drivers/driver_unsupported.go diff --git a/vendor/github.com/containers/storage/drivers/fsdiff.go b/vendor/go.podman.io/storage/drivers/fsdiff.go similarity index 96% rename from vendor/github.com/containers/storage/drivers/fsdiff.go rename to vendor/go.podman.io/storage/drivers/fsdiff.go index e500585ff59..d80d00368c4 100644 --- a/vendor/github.com/containers/storage/drivers/fsdiff.go +++ b/vendor/go.podman.io/storage/drivers/fsdiff.go @@ -6,12 +6,12 @@ import ( "runtime" "time" - "github.com/containers/storage/pkg/archive" - "github.com/containers/storage/pkg/chrootarchive" - "github.com/containers/storage/pkg/idtools" - "github.com/containers/storage/pkg/ioutils" - "github.com/containers/storage/pkg/unshare" "github.com/sirupsen/logrus" + "go.podman.io/storage/pkg/archive" + "go.podman.io/storage/pkg/chrootarchive" + "go.podman.io/storage/pkg/idtools" + "go.podman.io/storage/pkg/ioutils" + "go.podman.io/storage/pkg/unshare" ) // ApplyUncompressedLayer defines the unpack method used by the graph diff --git a/vendor/github.com/containers/storage/drivers/jsoniter.go b/vendor/go.podman.io/storage/drivers/jsoniter.go similarity index 100% rename from vendor/github.com/containers/storage/drivers/jsoniter.go rename to vendor/go.podman.io/storage/drivers/jsoniter.go diff --git a/vendor/github.com/containers/storage/drivers/overlay/check.go b/vendor/go.podman.io/storage/drivers/overlay/check.go similarity index 97% rename from vendor/github.com/containers/storage/drivers/overlay/check.go rename to vendor/go.podman.io/storage/drivers/overlay/check.go index e398b0aa843..7caf50ea5f0 100644 --- a/vendor/github.com/containers/storage/drivers/overlay/check.go +++ b/vendor/go.podman.io/storage/drivers/overlay/check.go @@ -10,14 +10,14 @@ import ( "path/filepath" "syscall" - "github.com/containers/storage/pkg/archive" - "github.com/containers/storage/pkg/idmap" - "github.com/containers/storage/pkg/idtools" - "github.com/containers/storage/pkg/ioutils" - "github.com/containers/storage/pkg/mount" - "github.com/containers/storage/pkg/system" - "github.com/containers/storage/pkg/unshare" "github.com/sirupsen/logrus" + "go.podman.io/storage/pkg/archive" + "go.podman.io/storage/pkg/idmap" + "go.podman.io/storage/pkg/idtools" + "go.podman.io/storage/pkg/ioutils" + "go.podman.io/storage/pkg/mount" + "go.podman.io/storage/pkg/system" + "go.podman.io/storage/pkg/unshare" "golang.org/x/sys/unix" ) diff --git a/vendor/github.com/containers/storage/drivers/overlay/check_116.go b/vendor/go.podman.io/storage/drivers/overlay/check_116.go similarity index 90% rename from vendor/github.com/containers/storage/drivers/overlay/check_116.go rename to vendor/go.podman.io/storage/drivers/overlay/check_116.go index 5cbf5e1cef8..b42a9ef1ea0 100644 --- a/vendor/github.com/containers/storage/drivers/overlay/check_116.go +++ b/vendor/go.podman.io/storage/drivers/overlay/check_116.go @@ -8,8 +8,8 @@ import ( "path/filepath" "strings" - "github.com/containers/storage/pkg/archive" - "github.com/containers/storage/pkg/system" + "go.podman.io/storage/pkg/archive" + "go.podman.io/storage/pkg/system" ) func scanForMountProgramIndicators(home string) (detected bool, err error) { diff --git a/vendor/github.com/containers/storage/drivers/overlay/composefs.go b/vendor/go.podman.io/storage/drivers/overlay/composefs.go similarity index 97% rename from vendor/github.com/containers/storage/drivers/overlay/composefs.go rename to vendor/go.podman.io/storage/drivers/overlay/composefs.go index 270425a5141..713aeed3cb7 100644 --- a/vendor/github.com/containers/storage/drivers/overlay/composefs.go +++ b/vendor/go.podman.io/storage/drivers/overlay/composefs.go @@ -14,10 +14,10 @@ import ( "sync" "sync/atomic" - "github.com/containers/storage/pkg/chunked/dump" - "github.com/containers/storage/pkg/fsverity" - "github.com/containers/storage/pkg/loopback" "github.com/sirupsen/logrus" + "go.podman.io/storage/pkg/chunked/dump" + "go.podman.io/storage/pkg/fsverity" + "go.podman.io/storage/pkg/loopback" "golang.org/x/sys/unix" ) diff --git a/vendor/github.com/containers/storage/drivers/overlay/jsoniter.go b/vendor/go.podman.io/storage/drivers/overlay/jsoniter.go similarity index 100% rename from vendor/github.com/containers/storage/drivers/overlay/jsoniter.go rename to vendor/go.podman.io/storage/drivers/overlay/jsoniter.go diff --git a/vendor/github.com/containers/storage/drivers/overlay/mount.go b/vendor/go.podman.io/storage/drivers/overlay/mount.go similarity index 99% rename from vendor/github.com/containers/storage/drivers/overlay/mount.go rename to vendor/go.podman.io/storage/drivers/overlay/mount.go index b3ddac022f6..250a185a93e 100644 --- a/vendor/github.com/containers/storage/drivers/overlay/mount.go +++ b/vendor/go.podman.io/storage/drivers/overlay/mount.go @@ -11,7 +11,7 @@ import ( "runtime" "strings" - "github.com/containers/storage/pkg/reexec" + "go.podman.io/storage/pkg/reexec" "golang.org/x/sys/unix" ) diff --git a/vendor/github.com/containers/storage/drivers/overlay/overlay.go b/vendor/go.podman.io/storage/drivers/overlay/overlay.go similarity index 99% rename from vendor/github.com/containers/storage/drivers/overlay/overlay.go rename to vendor/go.podman.io/storage/drivers/overlay/overlay.go index 2bc115afd21..f65b2c515a7 100644 --- a/vendor/github.com/containers/storage/drivers/overlay/overlay.go +++ b/vendor/go.podman.io/storage/drivers/overlay/overlay.go @@ -19,28 +19,28 @@ import ( "sync" "syscall" - graphdriver "github.com/containers/storage/drivers" - "github.com/containers/storage/drivers/overlayutils" - "github.com/containers/storage/drivers/quota" - "github.com/containers/storage/internal/dedup" - "github.com/containers/storage/internal/staging_lockfile" - "github.com/containers/storage/internal/tempdir" - "github.com/containers/storage/pkg/archive" - "github.com/containers/storage/pkg/chrootarchive" - "github.com/containers/storage/pkg/directory" - "github.com/containers/storage/pkg/fileutils" - "github.com/containers/storage/pkg/fsutils" - "github.com/containers/storage/pkg/idmap" - "github.com/containers/storage/pkg/idtools" - "github.com/containers/storage/pkg/mount" - "github.com/containers/storage/pkg/parsers" - "github.com/containers/storage/pkg/system" - "github.com/containers/storage/pkg/unshare" units "github.com/docker/go-units" digest "github.com/opencontainers/go-digest" "github.com/opencontainers/selinux/go-selinux" "github.com/opencontainers/selinux/go-selinux/label" "github.com/sirupsen/logrus" + graphdriver "go.podman.io/storage/drivers" + "go.podman.io/storage/drivers/overlayutils" + "go.podman.io/storage/drivers/quota" + "go.podman.io/storage/internal/dedup" + "go.podman.io/storage/internal/staging_lockfile" + "go.podman.io/storage/internal/tempdir" + "go.podman.io/storage/pkg/archive" + "go.podman.io/storage/pkg/chrootarchive" + "go.podman.io/storage/pkg/directory" + "go.podman.io/storage/pkg/fileutils" + "go.podman.io/storage/pkg/fsutils" + "go.podman.io/storage/pkg/idmap" + "go.podman.io/storage/pkg/idtools" + "go.podman.io/storage/pkg/mount" + "go.podman.io/storage/pkg/parsers" + "go.podman.io/storage/pkg/system" + "go.podman.io/storage/pkg/unshare" "golang.org/x/sys/unix" ) diff --git a/vendor/github.com/containers/storage/drivers/overlay/overlay_disk_quota.go b/vendor/go.podman.io/storage/drivers/overlay/overlay_disk_quota.go similarity index 92% rename from vendor/github.com/containers/storage/drivers/overlay/overlay_disk_quota.go rename to vendor/go.podman.io/storage/drivers/overlay/overlay_disk_quota.go index 39ca489f521..ec6a00f731e 100644 --- a/vendor/github.com/containers/storage/drivers/overlay/overlay_disk_quota.go +++ b/vendor/go.podman.io/storage/drivers/overlay/overlay_disk_quota.go @@ -5,7 +5,7 @@ package overlay import ( "path" - "github.com/containers/storage/pkg/directory" + "go.podman.io/storage/pkg/directory" ) // ReadWriteDiskUsage returns the disk usage of the writable directory for the ID. diff --git a/vendor/github.com/containers/storage/drivers/overlay/overlay_disk_quota_unsupported.go b/vendor/go.podman.io/storage/drivers/overlay/overlay_disk_quota_unsupported.go similarity index 90% rename from vendor/github.com/containers/storage/drivers/overlay/overlay_disk_quota_unsupported.go rename to vendor/go.podman.io/storage/drivers/overlay/overlay_disk_quota_unsupported.go index 221006b28b9..0f7fec422e1 100644 --- a/vendor/github.com/containers/storage/drivers/overlay/overlay_disk_quota_unsupported.go +++ b/vendor/go.podman.io/storage/drivers/overlay/overlay_disk_quota_unsupported.go @@ -5,7 +5,7 @@ package overlay import ( "path" - "github.com/containers/storage/pkg/directory" + "go.podman.io/storage/pkg/directory" ) // ReadWriteDiskUsage returns the disk usage of the writable directory for the ID. diff --git a/vendor/github.com/containers/storage/drivers/overlay/overlay_unsupported.go b/vendor/go.podman.io/storage/drivers/overlay/overlay_unsupported.go similarity index 100% rename from vendor/github.com/containers/storage/drivers/overlay/overlay_unsupported.go rename to vendor/go.podman.io/storage/drivers/overlay/overlay_unsupported.go diff --git a/vendor/github.com/containers/storage/drivers/overlay/randomid.go b/vendor/go.podman.io/storage/drivers/overlay/randomid.go similarity index 100% rename from vendor/github.com/containers/storage/drivers/overlay/randomid.go rename to vendor/go.podman.io/storage/drivers/overlay/randomid.go diff --git a/vendor/github.com/containers/storage/drivers/overlayutils/overlayutils.go b/vendor/go.podman.io/storage/drivers/overlayutils/overlayutils.go similarity index 91% rename from vendor/github.com/containers/storage/drivers/overlayutils/overlayutils.go rename to vendor/go.podman.io/storage/drivers/overlayutils/overlayutils.go index b5baa11f42e..b26a9ad7fcd 100644 --- a/vendor/github.com/containers/storage/drivers/overlayutils/overlayutils.go +++ b/vendor/go.podman.io/storage/drivers/overlayutils/overlayutils.go @@ -5,7 +5,7 @@ package overlayutils import ( "fmt" - graphdriver "github.com/containers/storage/drivers" + graphdriver "go.podman.io/storage/drivers" ) // ErrDTypeNotSupported denotes that the backing filesystem doesn't support d_type. diff --git a/vendor/github.com/containers/storage/drivers/quota/projectquota.go b/vendor/go.podman.io/storage/drivers/quota/projectquota.go similarity index 100% rename from vendor/github.com/containers/storage/drivers/quota/projectquota.go rename to vendor/go.podman.io/storage/drivers/quota/projectquota.go diff --git a/vendor/github.com/containers/storage/drivers/quota/projectquota_supported.go b/vendor/go.podman.io/storage/drivers/quota/projectquota_supported.go similarity index 99% rename from vendor/github.com/containers/storage/drivers/quota/projectquota_supported.go rename to vendor/go.podman.io/storage/drivers/quota/projectquota_supported.go index c3b334f7cdd..680cd368d87 100644 --- a/vendor/github.com/containers/storage/drivers/quota/projectquota_supported.go +++ b/vendor/go.podman.io/storage/drivers/quota/projectquota_supported.go @@ -61,8 +61,8 @@ import ( "syscall" "unsafe" - "github.com/containers/storage/pkg/directory" "github.com/sirupsen/logrus" + "go.podman.io/storage/pkg/directory" "golang.org/x/sys/unix" ) diff --git a/vendor/github.com/containers/storage/drivers/quota/projectquota_unsupported.go b/vendor/go.podman.io/storage/drivers/quota/projectquota_unsupported.go similarity index 100% rename from vendor/github.com/containers/storage/drivers/quota/projectquota_unsupported.go rename to vendor/go.podman.io/storage/drivers/quota/projectquota_unsupported.go diff --git a/vendor/github.com/containers/storage/drivers/register/register_aufs.go b/vendor/go.podman.io/storage/drivers/register/register_aufs.go similarity index 69% rename from vendor/github.com/containers/storage/drivers/register/register_aufs.go rename to vendor/go.podman.io/storage/drivers/register/register_aufs.go index d95bd398b8c..595c25c219b 100644 --- a/vendor/github.com/containers/storage/drivers/register/register_aufs.go +++ b/vendor/go.podman.io/storage/drivers/register/register_aufs.go @@ -4,5 +4,5 @@ package register import ( // register the aufs graphdriver - _ "github.com/containers/storage/drivers/aufs" + _ "go.podman.io/storage/drivers/aufs" ) diff --git a/vendor/github.com/containers/storage/drivers/register/register_btrfs.go b/vendor/go.podman.io/storage/drivers/register/register_btrfs.go similarity index 69% rename from vendor/github.com/containers/storage/drivers/register/register_btrfs.go rename to vendor/go.podman.io/storage/drivers/register/register_btrfs.go index 01a32237453..f23fd636016 100644 --- a/vendor/github.com/containers/storage/drivers/register/register_btrfs.go +++ b/vendor/go.podman.io/storage/drivers/register/register_btrfs.go @@ -4,5 +4,5 @@ package register import ( // register the btrfs graphdriver - _ "github.com/containers/storage/drivers/btrfs" + _ "go.podman.io/storage/drivers/btrfs" ) diff --git a/vendor/github.com/containers/storage/drivers/register/register_overlay.go b/vendor/go.podman.io/storage/drivers/register/register_overlay.go similarity index 69% rename from vendor/github.com/containers/storage/drivers/register/register_overlay.go rename to vendor/go.podman.io/storage/drivers/register/register_overlay.go index c4f96282252..480f13b2307 100644 --- a/vendor/github.com/containers/storage/drivers/register/register_overlay.go +++ b/vendor/go.podman.io/storage/drivers/register/register_overlay.go @@ -4,5 +4,5 @@ package register import ( // register the overlay graphdriver - _ "github.com/containers/storage/drivers/overlay" + _ "go.podman.io/storage/drivers/overlay" ) diff --git a/vendor/go.podman.io/storage/drivers/register/register_vfs.go b/vendor/go.podman.io/storage/drivers/register/register_vfs.go new file mode 100644 index 00000000000..7bc33d9ec68 --- /dev/null +++ b/vendor/go.podman.io/storage/drivers/register/register_vfs.go @@ -0,0 +1,6 @@ +package register + +import ( + // register vfs + _ "go.podman.io/storage/drivers/vfs" +) diff --git a/vendor/github.com/containers/storage/drivers/register/register_zfs.go b/vendor/go.podman.io/storage/drivers/register/register_zfs.go similarity index 76% rename from vendor/github.com/containers/storage/drivers/register/register_zfs.go rename to vendor/go.podman.io/storage/drivers/register/register_zfs.go index 136848f4a7e..4619850cf9e 100644 --- a/vendor/github.com/containers/storage/drivers/register/register_zfs.go +++ b/vendor/go.podman.io/storage/drivers/register/register_zfs.go @@ -4,5 +4,5 @@ package register import ( // register the zfs driver - _ "github.com/containers/storage/drivers/zfs" + _ "go.podman.io/storage/drivers/zfs" ) diff --git a/vendor/github.com/containers/storage/drivers/template.go b/vendor/go.podman.io/storage/drivers/template.go similarity index 97% rename from vendor/github.com/containers/storage/drivers/template.go rename to vendor/go.podman.io/storage/drivers/template.go index 66ab89f7f78..03da13c5bb5 100644 --- a/vendor/github.com/containers/storage/drivers/template.go +++ b/vendor/go.podman.io/storage/drivers/template.go @@ -1,8 +1,8 @@ package graphdriver import ( - "github.com/containers/storage/pkg/idtools" "github.com/sirupsen/logrus" + "go.podman.io/storage/pkg/idtools" ) // TemplateDriver is just barely enough of a driver that we can implement a diff --git a/vendor/github.com/containers/storage/drivers/vfs/copy_linux.go b/vendor/go.podman.io/storage/drivers/vfs/copy_linux.go similarity index 69% rename from vendor/github.com/containers/storage/drivers/vfs/copy_linux.go rename to vendor/go.podman.io/storage/drivers/vfs/copy_linux.go index bf22a5f6fd5..c16b745ec4f 100644 --- a/vendor/github.com/containers/storage/drivers/vfs/copy_linux.go +++ b/vendor/go.podman.io/storage/drivers/vfs/copy_linux.go @@ -1,6 +1,6 @@ package vfs -import "github.com/containers/storage/drivers/copy" +import "go.podman.io/storage/drivers/copy" func dirCopy(srcDir, dstDir string) error { return copy.DirCopy(srcDir, dstDir, copy.Content, true) diff --git a/vendor/github.com/containers/storage/drivers/vfs/copy_unsupported.go b/vendor/go.podman.io/storage/drivers/vfs/copy_unsupported.go similarity index 52% rename from vendor/github.com/containers/storage/drivers/vfs/copy_unsupported.go rename to vendor/go.podman.io/storage/drivers/vfs/copy_unsupported.go index 17e9d5870c1..de96ec02d03 100644 --- a/vendor/github.com/containers/storage/drivers/vfs/copy_unsupported.go +++ b/vendor/go.podman.io/storage/drivers/vfs/copy_unsupported.go @@ -1,8 +1,8 @@ //go:build !linux -package vfs // import "github.com/containers/storage/drivers/vfs" +package vfs // import "go.podman.io/storage/drivers/vfs" -import "github.com/containers/storage/pkg/chrootarchive" +import "go.podman.io/storage/pkg/chrootarchive" func dirCopy(srcDir, dstDir string) error { return chrootarchive.NewArchiver(nil).CopyWithTar(srcDir, dstDir) diff --git a/vendor/github.com/containers/storage/drivers/vfs/driver.go b/vendor/go.podman.io/storage/drivers/vfs/driver.go similarity index 96% rename from vendor/github.com/containers/storage/drivers/vfs/driver.go rename to vendor/go.podman.io/storage/drivers/vfs/driver.go index 7ad5186aefb..c86e174e779 100644 --- a/vendor/github.com/containers/storage/drivers/vfs/driver.go +++ b/vendor/go.podman.io/storage/drivers/vfs/driver.go @@ -9,18 +9,18 @@ import ( "strconv" "strings" - graphdriver "github.com/containers/storage/drivers" - "github.com/containers/storage/internal/dedup" - "github.com/containers/storage/internal/tempdir" - "github.com/containers/storage/pkg/archive" - "github.com/containers/storage/pkg/directory" - "github.com/containers/storage/pkg/fileutils" - "github.com/containers/storage/pkg/idtools" - "github.com/containers/storage/pkg/parsers" - "github.com/containers/storage/pkg/system" "github.com/opencontainers/selinux/go-selinux/label" "github.com/sirupsen/logrus" "github.com/vbatts/tar-split/tar/storage" + graphdriver "go.podman.io/storage/drivers" + "go.podman.io/storage/internal/dedup" + "go.podman.io/storage/internal/tempdir" + "go.podman.io/storage/pkg/archive" + "go.podman.io/storage/pkg/directory" + "go.podman.io/storage/pkg/fileutils" + "go.podman.io/storage/pkg/idtools" + "go.podman.io/storage/pkg/parsers" + "go.podman.io/storage/pkg/system" ) const ( diff --git a/vendor/github.com/containers/storage/drivers/zfs/MAINTAINERS b/vendor/go.podman.io/storage/drivers/zfs/MAINTAINERS similarity index 100% rename from vendor/github.com/containers/storage/drivers/zfs/MAINTAINERS rename to vendor/go.podman.io/storage/drivers/zfs/MAINTAINERS diff --git a/vendor/github.com/containers/storage/drivers/zfs/zfs.go b/vendor/go.podman.io/storage/drivers/zfs/zfs.go similarity index 98% rename from vendor/github.com/containers/storage/drivers/zfs/zfs.go rename to vendor/go.podman.io/storage/drivers/zfs/zfs.go index 6be430b3e3c..b804cf0b3b9 100644 --- a/vendor/github.com/containers/storage/drivers/zfs/zfs.go +++ b/vendor/go.podman.io/storage/drivers/zfs/zfs.go @@ -12,15 +12,15 @@ import ( "sync" "time" - graphdriver "github.com/containers/storage/drivers" - "github.com/containers/storage/internal/tempdir" - "github.com/containers/storage/pkg/directory" - "github.com/containers/storage/pkg/idtools" - "github.com/containers/storage/pkg/mount" - "github.com/containers/storage/pkg/parsers" zfs "github.com/mistifyio/go-zfs/v3" "github.com/opencontainers/selinux/go-selinux/label" "github.com/sirupsen/logrus" + graphdriver "go.podman.io/storage/drivers" + "go.podman.io/storage/internal/tempdir" + "go.podman.io/storage/pkg/directory" + "go.podman.io/storage/pkg/idtools" + "go.podman.io/storage/pkg/mount" + "go.podman.io/storage/pkg/parsers" "golang.org/x/sys/unix" ) diff --git a/vendor/github.com/containers/storage/drivers/zfs/zfs_freebsd.go b/vendor/go.podman.io/storage/drivers/zfs/zfs_freebsd.go similarity index 94% rename from vendor/github.com/containers/storage/drivers/zfs/zfs_freebsd.go rename to vendor/go.podman.io/storage/drivers/zfs/zfs_freebsd.go index c3c73c61e7f..2ae801056ac 100644 --- a/vendor/github.com/containers/storage/drivers/zfs/zfs_freebsd.go +++ b/vendor/go.podman.io/storage/drivers/zfs/zfs_freebsd.go @@ -3,8 +3,8 @@ package zfs import ( "fmt" - graphdriver "github.com/containers/storage/drivers" "github.com/sirupsen/logrus" + graphdriver "go.podman.io/storage/drivers" "golang.org/x/sys/unix" ) diff --git a/vendor/github.com/containers/storage/drivers/zfs/zfs_linux.go b/vendor/go.podman.io/storage/drivers/zfs/zfs_linux.go similarity index 93% rename from vendor/github.com/containers/storage/drivers/zfs/zfs_linux.go rename to vendor/go.podman.io/storage/drivers/zfs/zfs_linux.go index d43ba5c2b14..730307c6b6e 100644 --- a/vendor/github.com/containers/storage/drivers/zfs/zfs_linux.go +++ b/vendor/go.podman.io/storage/drivers/zfs/zfs_linux.go @@ -3,8 +3,8 @@ package zfs import ( "fmt" - graphdriver "github.com/containers/storage/drivers" "github.com/sirupsen/logrus" + graphdriver "go.podman.io/storage/drivers" "golang.org/x/sys/unix" ) diff --git a/vendor/github.com/containers/storage/drivers/zfs/zfs_unsupported.go b/vendor/go.podman.io/storage/drivers/zfs/zfs_unsupported.go similarity index 100% rename from vendor/github.com/containers/storage/drivers/zfs/zfs_unsupported.go rename to vendor/go.podman.io/storage/drivers/zfs/zfs_unsupported.go diff --git a/vendor/github.com/containers/storage/errors.go b/vendor/go.podman.io/storage/errors.go similarity index 99% rename from vendor/github.com/containers/storage/errors.go rename to vendor/go.podman.io/storage/errors.go index de6e377541c..b818e2f1b50 100644 --- a/vendor/github.com/containers/storage/errors.go +++ b/vendor/go.podman.io/storage/errors.go @@ -3,7 +3,7 @@ package storage import ( "errors" - "github.com/containers/storage/types" + "go.podman.io/storage/types" ) var ( diff --git a/vendor/github.com/containers/storage/idset.go b/vendor/go.podman.io/storage/idset.go similarity index 98% rename from vendor/github.com/containers/storage/idset.go rename to vendor/go.podman.io/storage/idset.go index 43cf1fb5f1c..07ffcb85d33 100644 --- a/vendor/github.com/containers/storage/idset.go +++ b/vendor/go.podman.io/storage/idset.go @@ -4,9 +4,9 @@ import ( "fmt" "strings" - "github.com/containers/storage/pkg/idtools" - "github.com/containers/storage/types" "github.com/google/go-intervals/intervalset" + "go.podman.io/storage/pkg/idtools" + "go.podman.io/storage/types" ) // idSet represents a set of integer IDs. It is stored as an ordered set of intervals. diff --git a/vendor/github.com/containers/storage/images.go b/vendor/go.podman.io/storage/images.go similarity index 99% rename from vendor/github.com/containers/storage/images.go rename to vendor/go.podman.io/storage/images.go index 74f738cd706..e535b541e3c 100644 --- a/vendor/github.com/containers/storage/images.go +++ b/vendor/go.podman.io/storage/images.go @@ -9,13 +9,13 @@ import ( "sync" "time" - "github.com/containers/storage/pkg/ioutils" - "github.com/containers/storage/pkg/lockfile" - "github.com/containers/storage/pkg/stringid" - "github.com/containers/storage/pkg/stringutils" - "github.com/containers/storage/pkg/truncindex" digest "github.com/opencontainers/go-digest" "github.com/sirupsen/logrus" + "go.podman.io/storage/pkg/ioutils" + "go.podman.io/storage/pkg/lockfile" + "go.podman.io/storage/pkg/stringid" + "go.podman.io/storage/pkg/stringutils" + "go.podman.io/storage/pkg/truncindex" ) const ( diff --git a/vendor/github.com/containers/storage/internal/dedup/dedup.go b/vendor/go.podman.io/storage/internal/dedup/dedup.go similarity index 100% rename from vendor/github.com/containers/storage/internal/dedup/dedup.go rename to vendor/go.podman.io/storage/internal/dedup/dedup.go diff --git a/vendor/github.com/containers/storage/internal/dedup/dedup_linux.go b/vendor/go.podman.io/storage/internal/dedup/dedup_linux.go similarity index 100% rename from vendor/github.com/containers/storage/internal/dedup/dedup_linux.go rename to vendor/go.podman.io/storage/internal/dedup/dedup_linux.go diff --git a/vendor/github.com/containers/storage/internal/dedup/dedup_unsupported.go b/vendor/go.podman.io/storage/internal/dedup/dedup_unsupported.go similarity index 100% rename from vendor/github.com/containers/storage/internal/dedup/dedup_unsupported.go rename to vendor/go.podman.io/storage/internal/dedup/dedup_unsupported.go diff --git a/vendor/github.com/containers/storage/internal/rawfilelock/rawfilelock.go b/vendor/go.podman.io/storage/internal/rawfilelock/rawfilelock.go similarity index 100% rename from vendor/github.com/containers/storage/internal/rawfilelock/rawfilelock.go rename to vendor/go.podman.io/storage/internal/rawfilelock/rawfilelock.go diff --git a/vendor/github.com/containers/storage/internal/rawfilelock/rawfilelock_unix.go b/vendor/go.podman.io/storage/internal/rawfilelock/rawfilelock_unix.go similarity index 100% rename from vendor/github.com/containers/storage/internal/rawfilelock/rawfilelock_unix.go rename to vendor/go.podman.io/storage/internal/rawfilelock/rawfilelock_unix.go diff --git a/vendor/github.com/containers/storage/internal/rawfilelock/rawfilelock_windows.go b/vendor/go.podman.io/storage/internal/rawfilelock/rawfilelock_windows.go similarity index 100% rename from vendor/github.com/containers/storage/internal/rawfilelock/rawfilelock_windows.go rename to vendor/go.podman.io/storage/internal/rawfilelock/rawfilelock_windows.go diff --git a/vendor/github.com/containers/storage/internal/staging_lockfile/staging_lockfile.go b/vendor/go.podman.io/storage/internal/staging_lockfile/staging_lockfile.go similarity index 98% rename from vendor/github.com/containers/storage/internal/staging_lockfile/staging_lockfile.go rename to vendor/go.podman.io/storage/internal/staging_lockfile/staging_lockfile.go index 1cb2a3327be..cfe2c36b7e9 100644 --- a/vendor/github.com/containers/storage/internal/staging_lockfile/staging_lockfile.go +++ b/vendor/go.podman.io/storage/internal/staging_lockfile/staging_lockfile.go @@ -6,7 +6,7 @@ import ( "path/filepath" "sync" - "github.com/containers/storage/internal/rawfilelock" + "go.podman.io/storage/internal/rawfilelock" ) // StagingLockFile represents a file lock used to coordinate access to staging areas. diff --git a/vendor/github.com/containers/storage/internal/tempdir/tempdir.go b/vendor/go.podman.io/storage/internal/tempdir/tempdir.go similarity index 99% rename from vendor/github.com/containers/storage/internal/tempdir/tempdir.go rename to vendor/go.podman.io/storage/internal/tempdir/tempdir.go index bb6d3561626..91959b75c8e 100644 --- a/vendor/github.com/containers/storage/internal/tempdir/tempdir.go +++ b/vendor/go.podman.io/storage/internal/tempdir/tempdir.go @@ -7,8 +7,8 @@ import ( "path/filepath" "strings" - "github.com/containers/storage/internal/staging_lockfile" "github.com/sirupsen/logrus" + "go.podman.io/storage/internal/staging_lockfile" ) /* diff --git a/vendor/github.com/containers/storage/jsoniter.go b/vendor/go.podman.io/storage/jsoniter.go similarity index 100% rename from vendor/github.com/containers/storage/jsoniter.go rename to vendor/go.podman.io/storage/jsoniter.go diff --git a/vendor/github.com/containers/storage/layers.go b/vendor/go.podman.io/storage/layers.go similarity index 99% rename from vendor/github.com/containers/storage/layers.go rename to vendor/go.podman.io/storage/layers.go index 4d9e0b882e4..c6752927e3c 100644 --- a/vendor/github.com/containers/storage/layers.go +++ b/vendor/go.podman.io/storage/layers.go @@ -17,17 +17,6 @@ import ( "sync" "time" - drivers "github.com/containers/storage/drivers" - "github.com/containers/storage/internal/tempdir" - "github.com/containers/storage/pkg/archive" - "github.com/containers/storage/pkg/idtools" - "github.com/containers/storage/pkg/ioutils" - "github.com/containers/storage/pkg/lockfile" - "github.com/containers/storage/pkg/mount" - "github.com/containers/storage/pkg/stringid" - "github.com/containers/storage/pkg/system" - "github.com/containers/storage/pkg/tarlog" - "github.com/containers/storage/pkg/truncindex" "github.com/klauspost/pgzip" digest "github.com/opencontainers/go-digest" "github.com/opencontainers/selinux/go-selinux" @@ -35,6 +24,17 @@ import ( "github.com/vbatts/tar-split/archive/tar" "github.com/vbatts/tar-split/tar/asm" "github.com/vbatts/tar-split/tar/storage" + drivers "go.podman.io/storage/drivers" + "go.podman.io/storage/internal/tempdir" + "go.podman.io/storage/pkg/archive" + "go.podman.io/storage/pkg/idtools" + "go.podman.io/storage/pkg/ioutils" + "go.podman.io/storage/pkg/lockfile" + "go.podman.io/storage/pkg/mount" + "go.podman.io/storage/pkg/stringid" + "go.podman.io/storage/pkg/system" + "go.podman.io/storage/pkg/tarlog" + "go.podman.io/storage/pkg/truncindex" ) const ( diff --git a/vendor/github.com/containers/storage/lockfile_compat.go b/vendor/go.podman.io/storage/lockfile_compat.go similarity index 90% rename from vendor/github.com/containers/storage/lockfile_compat.go rename to vendor/go.podman.io/storage/lockfile_compat.go index ec98b40cebb..5cd59d78d28 100644 --- a/vendor/github.com/containers/storage/lockfile_compat.go +++ b/vendor/go.podman.io/storage/lockfile_compat.go @@ -1,7 +1,7 @@ package storage import ( - "github.com/containers/storage/pkg/lockfile" + "go.podman.io/storage/pkg/lockfile" ) // Deprecated: Use lockfile.*LockFile. diff --git a/vendor/github.com/containers/storage/pkg/archive/README.md b/vendor/go.podman.io/storage/pkg/archive/README.md similarity index 100% rename from vendor/github.com/containers/storage/pkg/archive/README.md rename to vendor/go.podman.io/storage/pkg/archive/README.md diff --git a/vendor/github.com/containers/storage/pkg/archive/archive.go b/vendor/go.podman.io/storage/pkg/archive/archive.go similarity index 99% rename from vendor/github.com/containers/storage/pkg/archive/archive.go rename to vendor/go.podman.io/storage/pkg/archive/archive.go index a66d2b89132..5f8647af7c2 100644 --- a/vendor/github.com/containers/storage/pkg/archive/archive.go +++ b/vendor/go.podman.io/storage/pkg/archive/archive.go @@ -18,15 +18,15 @@ import ( "syscall" "time" - "github.com/containers/storage/pkg/fileutils" - "github.com/containers/storage/pkg/idtools" - "github.com/containers/storage/pkg/pools" - "github.com/containers/storage/pkg/promise" - "github.com/containers/storage/pkg/system" - "github.com/containers/storage/pkg/unshare" gzip "github.com/klauspost/pgzip" "github.com/sirupsen/logrus" "github.com/ulikunitz/xz" + "go.podman.io/storage/pkg/fileutils" + "go.podman.io/storage/pkg/idtools" + "go.podman.io/storage/pkg/pools" + "go.podman.io/storage/pkg/promise" + "go.podman.io/storage/pkg/system" + "go.podman.io/storage/pkg/unshare" ) type ( diff --git a/vendor/github.com/containers/storage/pkg/archive/archive_110.go b/vendor/go.podman.io/storage/pkg/archive/archive_110.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/archive/archive_110.go rename to vendor/go.podman.io/storage/pkg/archive/archive_110.go diff --git a/vendor/github.com/containers/storage/pkg/archive/archive_19.go b/vendor/go.podman.io/storage/pkg/archive/archive_19.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/archive/archive_19.go rename to vendor/go.podman.io/storage/pkg/archive/archive_19.go diff --git a/vendor/github.com/containers/storage/pkg/archive/archive_bsd.go b/vendor/go.podman.io/storage/pkg/archive/archive_bsd.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/archive/archive_bsd.go rename to vendor/go.podman.io/storage/pkg/archive/archive_bsd.go diff --git a/vendor/github.com/containers/storage/pkg/archive/archive_linux.go b/vendor/go.podman.io/storage/pkg/archive/archive_linux.go similarity index 98% rename from vendor/github.com/containers/storage/pkg/archive/archive_linux.go rename to vendor/go.podman.io/storage/pkg/archive/archive_linux.go index b3245f7fd9c..fd7123babc9 100644 --- a/vendor/github.com/containers/storage/pkg/archive/archive_linux.go +++ b/vendor/go.podman.io/storage/pkg/archive/archive_linux.go @@ -7,8 +7,8 @@ import ( "strings" "syscall" - "github.com/containers/storage/pkg/idtools" - "github.com/containers/storage/pkg/system" + "go.podman.io/storage/pkg/idtools" + "go.podman.io/storage/pkg/system" "golang.org/x/sys/unix" ) diff --git a/vendor/github.com/containers/storage/pkg/archive/archive_other.go b/vendor/go.podman.io/storage/pkg/archive/archive_other.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/archive/archive_other.go rename to vendor/go.podman.io/storage/pkg/archive/archive_other.go diff --git a/vendor/github.com/containers/storage/pkg/archive/archive_unix.go b/vendor/go.podman.io/storage/pkg/archive/archive_unix.go similarity index 97% rename from vendor/github.com/containers/storage/pkg/archive/archive_unix.go rename to vendor/go.podman.io/storage/pkg/archive/archive_unix.go index d9bcb97ba04..2d9d68de2c2 100644 --- a/vendor/github.com/containers/storage/pkg/archive/archive_unix.go +++ b/vendor/go.podman.io/storage/pkg/archive/archive_unix.go @@ -9,8 +9,8 @@ import ( "path/filepath" "syscall" - "github.com/containers/storage/pkg/idtools" - "github.com/containers/storage/pkg/system" + "go.podman.io/storage/pkg/idtools" + "go.podman.io/storage/pkg/system" "golang.org/x/sys/unix" ) diff --git a/vendor/github.com/containers/storage/pkg/archive/archive_windows.go b/vendor/go.podman.io/storage/pkg/archive/archive_windows.go similarity index 96% rename from vendor/github.com/containers/storage/pkg/archive/archive_windows.go rename to vendor/go.podman.io/storage/pkg/archive/archive_windows.go index e987828698a..1183f4a282e 100644 --- a/vendor/github.com/containers/storage/pkg/archive/archive_windows.go +++ b/vendor/go.podman.io/storage/pkg/archive/archive_windows.go @@ -9,8 +9,8 @@ import ( "path/filepath" "strings" - "github.com/containers/storage/pkg/idtools" - "github.com/containers/storage/pkg/longpath" + "go.podman.io/storage/pkg/idtools" + "go.podman.io/storage/pkg/longpath" ) // fixVolumePathPrefix does platform specific processing to ensure that if diff --git a/vendor/github.com/containers/storage/pkg/archive/archive_zstd.go b/vendor/go.podman.io/storage/pkg/archive/archive_zstd.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/archive/archive_zstd.go rename to vendor/go.podman.io/storage/pkg/archive/archive_zstd.go diff --git a/vendor/github.com/containers/storage/pkg/archive/changes.go b/vendor/go.podman.io/storage/pkg/archive/changes.go similarity index 98% rename from vendor/github.com/containers/storage/pkg/archive/changes.go rename to vendor/go.podman.io/storage/pkg/archive/changes.go index 76edac85d46..051ab695287 100644 --- a/vendor/github.com/containers/storage/pkg/archive/changes.go +++ b/vendor/go.podman.io/storage/pkg/archive/changes.go @@ -14,11 +14,11 @@ import ( "syscall" "time" - "github.com/containers/storage/pkg/fileutils" - "github.com/containers/storage/pkg/idtools" - "github.com/containers/storage/pkg/pools" - "github.com/containers/storage/pkg/system" "github.com/sirupsen/logrus" + "go.podman.io/storage/pkg/fileutils" + "go.podman.io/storage/pkg/idtools" + "go.podman.io/storage/pkg/pools" + "go.podman.io/storage/pkg/system" ) // ChangeType represents the change type. diff --git a/vendor/github.com/containers/storage/pkg/archive/changes_linux.go b/vendor/go.podman.io/storage/pkg/archive/changes_linux.go similarity index 99% rename from vendor/github.com/containers/storage/pkg/archive/changes_linux.go rename to vendor/go.podman.io/storage/pkg/archive/changes_linux.go index 95284bb81be..343f3e686f2 100644 --- a/vendor/github.com/containers/storage/pkg/archive/changes_linux.go +++ b/vendor/go.podman.io/storage/pkg/archive/changes_linux.go @@ -11,9 +11,9 @@ import ( "syscall" "unsafe" - "github.com/containers/storage/pkg/idtools" - "github.com/containers/storage/pkg/system" "github.com/sirupsen/logrus" + "go.podman.io/storage/pkg/idtools" + "go.podman.io/storage/pkg/system" "golang.org/x/sys/unix" ) diff --git a/vendor/github.com/containers/storage/pkg/archive/changes_other.go b/vendor/go.podman.io/storage/pkg/archive/changes_other.go similarity index 96% rename from vendor/github.com/containers/storage/pkg/archive/changes_other.go rename to vendor/go.podman.io/storage/pkg/archive/changes_other.go index 2965ccc9fcb..5fde4c73817 100644 --- a/vendor/github.com/containers/storage/pkg/archive/changes_other.go +++ b/vendor/go.podman.io/storage/pkg/archive/changes_other.go @@ -10,8 +10,8 @@ import ( "runtime" "strings" - "github.com/containers/storage/pkg/idtools" - "github.com/containers/storage/pkg/system" + "go.podman.io/storage/pkg/idtools" + "go.podman.io/storage/pkg/system" ) func collectFileInfoForChanges(oldDir, newDir string, oldIDMap, newIDMap *idtools.IDMappings) (*FileInfo, *FileInfo, error) { diff --git a/vendor/github.com/containers/storage/pkg/archive/changes_unix.go b/vendor/go.podman.io/storage/pkg/archive/changes_unix.go similarity index 94% rename from vendor/github.com/containers/storage/pkg/archive/changes_unix.go rename to vendor/go.podman.io/storage/pkg/archive/changes_unix.go index fb2cb70c260..f07a135a46f 100644 --- a/vendor/github.com/containers/storage/pkg/archive/changes_unix.go +++ b/vendor/go.podman.io/storage/pkg/archive/changes_unix.go @@ -6,8 +6,8 @@ import ( "os" "syscall" - "github.com/containers/storage/pkg/idtools" - "github.com/containers/storage/pkg/system" + "go.podman.io/storage/pkg/idtools" + "go.podman.io/storage/pkg/system" "golang.org/x/sys/unix" ) diff --git a/vendor/github.com/containers/storage/pkg/archive/changes_windows.go b/vendor/go.podman.io/storage/pkg/archive/changes_windows.go similarity index 93% rename from vendor/github.com/containers/storage/pkg/archive/changes_windows.go rename to vendor/go.podman.io/storage/pkg/archive/changes_windows.go index 1bab94fa59f..947ec2d224f 100644 --- a/vendor/github.com/containers/storage/pkg/archive/changes_windows.go +++ b/vendor/go.podman.io/storage/pkg/archive/changes_windows.go @@ -3,7 +3,7 @@ package archive import ( "os" - "github.com/containers/storage/pkg/system" + "go.podman.io/storage/pkg/system" ) func statDifferent(oldStat *system.StatT, oldInfo *FileInfo, newStat *system.StatT, newInfo *FileInfo) bool { diff --git a/vendor/github.com/containers/storage/pkg/archive/copy.go b/vendor/go.podman.io/storage/pkg/archive/copy.go similarity index 99% rename from vendor/github.com/containers/storage/pkg/archive/copy.go rename to vendor/go.podman.io/storage/pkg/archive/copy.go index 4d46167d705..308f132d586 100644 --- a/vendor/github.com/containers/storage/pkg/archive/copy.go +++ b/vendor/go.podman.io/storage/pkg/archive/copy.go @@ -8,8 +8,8 @@ import ( "path/filepath" "strings" - "github.com/containers/storage/pkg/fileutils" "github.com/sirupsen/logrus" + "go.podman.io/storage/pkg/fileutils" ) // Errors used or returned by this file. diff --git a/vendor/github.com/containers/storage/pkg/archive/copy_unix.go b/vendor/go.podman.io/storage/pkg/archive/copy_unix.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/archive/copy_unix.go rename to vendor/go.podman.io/storage/pkg/archive/copy_unix.go diff --git a/vendor/github.com/containers/storage/pkg/archive/copy_windows.go b/vendor/go.podman.io/storage/pkg/archive/copy_windows.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/archive/copy_windows.go rename to vendor/go.podman.io/storage/pkg/archive/copy_windows.go diff --git a/vendor/github.com/containers/storage/pkg/archive/diff.go b/vendor/go.podman.io/storage/pkg/archive/diff.go similarity index 97% rename from vendor/github.com/containers/storage/pkg/archive/diff.go rename to vendor/go.podman.io/storage/pkg/archive/diff.go index 6f3067770c7..355d65f2127 100644 --- a/vendor/github.com/containers/storage/pkg/archive/diff.go +++ b/vendor/go.podman.io/storage/pkg/archive/diff.go @@ -10,11 +10,11 @@ import ( "runtime" "strings" - "github.com/containers/storage/pkg/fileutils" - "github.com/containers/storage/pkg/idtools" - "github.com/containers/storage/pkg/pools" - "github.com/containers/storage/pkg/system" "github.com/sirupsen/logrus" + "go.podman.io/storage/pkg/fileutils" + "go.podman.io/storage/pkg/idtools" + "go.podman.io/storage/pkg/pools" + "go.podman.io/storage/pkg/system" ) // UnpackLayer unpack `layer` to a `dest`. The stream `layer` can be diff --git a/vendor/github.com/containers/storage/pkg/archive/fflags_bsd.go b/vendor/go.podman.io/storage/pkg/archive/fflags_bsd.go similarity index 98% rename from vendor/github.com/containers/storage/pkg/archive/fflags_bsd.go rename to vendor/go.podman.io/storage/pkg/archive/fflags_bsd.go index 4da1ced3e01..829c95ef142 100644 --- a/vendor/github.com/containers/storage/pkg/archive/fflags_bsd.go +++ b/vendor/go.podman.io/storage/pkg/archive/fflags_bsd.go @@ -10,7 +10,7 @@ import ( "strings" "syscall" - "github.com/containers/storage/pkg/system" + "go.podman.io/storage/pkg/system" ) const ( diff --git a/vendor/github.com/containers/storage/pkg/archive/fflags_unsupported.go b/vendor/go.podman.io/storage/pkg/archive/fflags_unsupported.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/archive/fflags_unsupported.go rename to vendor/go.podman.io/storage/pkg/archive/fflags_unsupported.go diff --git a/vendor/github.com/containers/storage/pkg/archive/filter.go b/vendor/go.podman.io/storage/pkg/archive/filter.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/archive/filter.go rename to vendor/go.podman.io/storage/pkg/archive/filter.go diff --git a/vendor/github.com/containers/storage/pkg/archive/time_linux.go b/vendor/go.podman.io/storage/pkg/archive/time_linux.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/archive/time_linux.go rename to vendor/go.podman.io/storage/pkg/archive/time_linux.go diff --git a/vendor/github.com/containers/storage/pkg/archive/time_unsupported.go b/vendor/go.podman.io/storage/pkg/archive/time_unsupported.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/archive/time_unsupported.go rename to vendor/go.podman.io/storage/pkg/archive/time_unsupported.go diff --git a/vendor/github.com/containers/storage/pkg/archive/whiteouts.go b/vendor/go.podman.io/storage/pkg/archive/whiteouts.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/archive/whiteouts.go rename to vendor/go.podman.io/storage/pkg/archive/whiteouts.go diff --git a/vendor/github.com/containers/storage/pkg/archive/wrap.go b/vendor/go.podman.io/storage/pkg/archive/wrap.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/archive/wrap.go rename to vendor/go.podman.io/storage/pkg/archive/wrap.go diff --git a/vendor/github.com/containers/storage/pkg/chrootarchive/archive.go b/vendor/go.podman.io/storage/pkg/chrootarchive/archive.go similarity index 97% rename from vendor/github.com/containers/storage/pkg/chrootarchive/archive.go rename to vendor/go.podman.io/storage/pkg/chrootarchive/archive.go index 0ebb1cb8e46..e144ba789e5 100644 --- a/vendor/github.com/containers/storage/pkg/chrootarchive/archive.go +++ b/vendor/go.podman.io/storage/pkg/chrootarchive/archive.go @@ -8,10 +8,10 @@ import ( "path/filepath" "sync" - "github.com/containers/storage/pkg/archive" - "github.com/containers/storage/pkg/fileutils" - "github.com/containers/storage/pkg/idtools" - "github.com/containers/storage/pkg/unshare" + "go.podman.io/storage/pkg/archive" + "go.podman.io/storage/pkg/fileutils" + "go.podman.io/storage/pkg/idtools" + "go.podman.io/storage/pkg/unshare" ) // NewArchiver returns a new Archiver which uses chrootarchive.Untar diff --git a/vendor/github.com/containers/storage/pkg/chrootarchive/archive_darwin.go b/vendor/go.podman.io/storage/pkg/chrootarchive/archive_darwin.go similarity index 94% rename from vendor/github.com/containers/storage/pkg/chrootarchive/archive_darwin.go rename to vendor/go.podman.io/storage/pkg/chrootarchive/archive_darwin.go index caf34849326..f8ff3eac0be 100644 --- a/vendor/github.com/containers/storage/pkg/chrootarchive/archive_darwin.go +++ b/vendor/go.podman.io/storage/pkg/chrootarchive/archive_darwin.go @@ -3,7 +3,7 @@ package chrootarchive import ( "io" - "github.com/containers/storage/pkg/archive" + "go.podman.io/storage/pkg/archive" ) type unpackDestination struct { diff --git a/vendor/github.com/containers/storage/pkg/chrootarchive/archive_unix.go b/vendor/go.podman.io/storage/pkg/chrootarchive/archive_unix.go similarity index 98% rename from vendor/github.com/containers/storage/pkg/chrootarchive/archive_unix.go rename to vendor/go.podman.io/storage/pkg/chrootarchive/archive_unix.go index 88df9e56f6a..bc649bbbe69 100644 --- a/vendor/github.com/containers/storage/pkg/chrootarchive/archive_unix.go +++ b/vendor/go.podman.io/storage/pkg/chrootarchive/archive_unix.go @@ -16,8 +16,8 @@ import ( "golang.org/x/sys/unix" - "github.com/containers/storage/pkg/archive" - "github.com/containers/storage/pkg/reexec" + "go.podman.io/storage/pkg/archive" + "go.podman.io/storage/pkg/reexec" ) type unpackDestination struct { diff --git a/vendor/github.com/containers/storage/pkg/chrootarchive/archive_windows.go b/vendor/go.podman.io/storage/pkg/chrootarchive/archive_windows.go similarity index 92% rename from vendor/github.com/containers/storage/pkg/chrootarchive/archive_windows.go rename to vendor/go.podman.io/storage/pkg/chrootarchive/archive_windows.go index 6611cbade74..e225bad7053 100644 --- a/vendor/github.com/containers/storage/pkg/chrootarchive/archive_windows.go +++ b/vendor/go.podman.io/storage/pkg/chrootarchive/archive_windows.go @@ -3,8 +3,8 @@ package chrootarchive import ( "io" - "github.com/containers/storage/pkg/archive" - "github.com/containers/storage/pkg/longpath" + "go.podman.io/storage/pkg/archive" + "go.podman.io/storage/pkg/longpath" ) type unpackDestination struct { diff --git a/vendor/github.com/containers/storage/pkg/chrootarchive/chroot_linux.go b/vendor/go.podman.io/storage/pkg/chrootarchive/chroot_linux.go similarity index 98% rename from vendor/github.com/containers/storage/pkg/chrootarchive/chroot_linux.go rename to vendor/go.podman.io/storage/pkg/chrootarchive/chroot_linux.go index 3ca99a2c213..42a6fddc1e7 100644 --- a/vendor/github.com/containers/storage/pkg/chrootarchive/chroot_linux.go +++ b/vendor/go.podman.io/storage/pkg/chrootarchive/chroot_linux.go @@ -7,8 +7,8 @@ import ( "os/user" "path/filepath" - "github.com/containers/storage/pkg/mount" "github.com/moby/sys/capability" + "go.podman.io/storage/pkg/mount" "golang.org/x/sys/unix" ) diff --git a/vendor/github.com/containers/storage/pkg/chrootarchive/chroot_unix.go b/vendor/go.podman.io/storage/pkg/chrootarchive/chroot_unix.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/chrootarchive/chroot_unix.go rename to vendor/go.podman.io/storage/pkg/chrootarchive/chroot_unix.go diff --git a/vendor/github.com/containers/storage/pkg/chrootarchive/diff.go b/vendor/go.podman.io/storage/pkg/chrootarchive/diff.go similarity index 94% rename from vendor/github.com/containers/storage/pkg/chrootarchive/diff.go rename to vendor/go.podman.io/storage/pkg/chrootarchive/diff.go index 68b8f74f775..21e58ad3e1f 100644 --- a/vendor/github.com/containers/storage/pkg/chrootarchive/diff.go +++ b/vendor/go.podman.io/storage/pkg/chrootarchive/diff.go @@ -3,7 +3,7 @@ package chrootarchive import ( "io" - "github.com/containers/storage/pkg/archive" + "go.podman.io/storage/pkg/archive" ) // ApplyLayer parses a diff in the standard layer format from `layer`, diff --git a/vendor/github.com/containers/storage/pkg/chrootarchive/diff_darwin.go b/vendor/go.podman.io/storage/pkg/chrootarchive/diff_darwin.go similarity index 95% rename from vendor/github.com/containers/storage/pkg/chrootarchive/diff_darwin.go rename to vendor/go.podman.io/storage/pkg/chrootarchive/diff_darwin.go index 7b4ea9e51c6..6d053212a12 100644 --- a/vendor/github.com/containers/storage/pkg/chrootarchive/diff_darwin.go +++ b/vendor/go.podman.io/storage/pkg/chrootarchive/diff_darwin.go @@ -6,7 +6,7 @@ import ( "os" "path/filepath" - "github.com/containers/storage/pkg/archive" + "go.podman.io/storage/pkg/archive" ) // applyLayerHandler parses a diff in the standard layer format from `layer`, and diff --git a/vendor/github.com/containers/storage/pkg/chrootarchive/diff_unix.go b/vendor/go.podman.io/storage/pkg/chrootarchive/diff_unix.go similarity index 94% rename from vendor/github.com/containers/storage/pkg/chrootarchive/diff_unix.go rename to vendor/go.podman.io/storage/pkg/chrootarchive/diff_unix.go index 361e23d37a5..5f230d8afbe 100644 --- a/vendor/github.com/containers/storage/pkg/chrootarchive/diff_unix.go +++ b/vendor/go.podman.io/storage/pkg/chrootarchive/diff_unix.go @@ -11,10 +11,10 @@ import ( "path/filepath" "runtime" - "github.com/containers/storage/pkg/archive" - "github.com/containers/storage/pkg/reexec" - "github.com/containers/storage/pkg/system" - "github.com/containers/storage/pkg/unshare" + "go.podman.io/storage/pkg/archive" + "go.podman.io/storage/pkg/reexec" + "go.podman.io/storage/pkg/system" + "go.podman.io/storage/pkg/unshare" ) type applyLayerResponse struct { diff --git a/vendor/github.com/containers/storage/pkg/chrootarchive/diff_windows.go b/vendor/go.podman.io/storage/pkg/chrootarchive/diff_windows.go similarity index 91% rename from vendor/github.com/containers/storage/pkg/chrootarchive/diff_windows.go rename to vendor/go.podman.io/storage/pkg/chrootarchive/diff_windows.go index 8bfff5d65ba..8b5a5f20ed2 100644 --- a/vendor/github.com/containers/storage/pkg/chrootarchive/diff_windows.go +++ b/vendor/go.podman.io/storage/pkg/chrootarchive/diff_windows.go @@ -6,8 +6,8 @@ import ( "os" "path/filepath" - "github.com/containers/storage/pkg/archive" - "github.com/containers/storage/pkg/longpath" + "go.podman.io/storage/pkg/archive" + "go.podman.io/storage/pkg/longpath" ) // applyLayerHandler parses a diff in the standard layer format from `layer`, and diff --git a/vendor/github.com/containers/storage/pkg/chrootarchive/init_unix.go b/vendor/go.podman.io/storage/pkg/chrootarchive/init_unix.go similarity index 91% rename from vendor/github.com/containers/storage/pkg/chrootarchive/init_unix.go rename to vendor/go.podman.io/storage/pkg/chrootarchive/init_unix.go index 0fd96190a2e..1b566c817ea 100644 --- a/vendor/github.com/containers/storage/pkg/chrootarchive/init_unix.go +++ b/vendor/go.podman.io/storage/pkg/chrootarchive/init_unix.go @@ -7,7 +7,7 @@ import ( "io" "os" - "github.com/containers/storage/pkg/reexec" + "go.podman.io/storage/pkg/reexec" ) func init() { diff --git a/vendor/github.com/containers/storage/pkg/chrootarchive/jsoniter.go b/vendor/go.podman.io/storage/pkg/chrootarchive/jsoniter.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/chrootarchive/jsoniter.go rename to vendor/go.podman.io/storage/pkg/chrootarchive/jsoniter.go diff --git a/vendor/github.com/containers/storage/pkg/chunked/bloom_filter_linux.go b/vendor/go.podman.io/storage/pkg/chunked/bloom_filter_linux.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/chunked/bloom_filter_linux.go rename to vendor/go.podman.io/storage/pkg/chunked/bloom_filter_linux.go diff --git a/vendor/github.com/containers/storage/pkg/chunked/cache_linux.go b/vendor/go.podman.io/storage/pkg/chunked/cache_linux.go similarity index 99% rename from vendor/github.com/containers/storage/pkg/chunked/cache_linux.go rename to vendor/go.podman.io/storage/pkg/chunked/cache_linux.go index 0e49ddd8886..87bd065a802 100644 --- a/vendor/github.com/containers/storage/pkg/chunked/cache_linux.go +++ b/vendor/go.podman.io/storage/pkg/chunked/cache_linux.go @@ -14,14 +14,14 @@ import ( "sync" "time" - storage "github.com/containers/storage" - graphdriver "github.com/containers/storage/drivers" - "github.com/containers/storage/pkg/chunked/internal/minimal" - "github.com/containers/storage/pkg/ioutils" "github.com/docker/go-units" jsoniter "github.com/json-iterator/go" digest "github.com/opencontainers/go-digest" "github.com/sirupsen/logrus" + storage "go.podman.io/storage" + graphdriver "go.podman.io/storage/drivers" + "go.podman.io/storage/pkg/chunked/internal/minimal" + "go.podman.io/storage/pkg/ioutils" "golang.org/x/sys/unix" ) diff --git a/vendor/github.com/containers/storage/pkg/chunked/compression.go b/vendor/go.podman.io/storage/pkg/chunked/compression.go similarity index 83% rename from vendor/github.com/containers/storage/pkg/chunked/compression.go rename to vendor/go.podman.io/storage/pkg/chunked/compression.go index 564efc8bf02..29d4f286445 100644 --- a/vendor/github.com/containers/storage/pkg/chunked/compression.go +++ b/vendor/go.podman.io/storage/pkg/chunked/compression.go @@ -3,8 +3,8 @@ package chunked import ( "io" - "github.com/containers/storage/pkg/chunked/compressor" - "github.com/containers/storage/pkg/chunked/internal/minimal" + "go.podman.io/storage/pkg/chunked/compressor" + "go.podman.io/storage/pkg/chunked/internal/minimal" ) const ( diff --git a/vendor/github.com/containers/storage/pkg/chunked/compression_linux.go b/vendor/go.podman.io/storage/pkg/chunked/compression_linux.go similarity index 99% rename from vendor/github.com/containers/storage/pkg/chunked/compression_linux.go rename to vendor/go.podman.io/storage/pkg/chunked/compression_linux.go index ddd7ff53b16..502bb7f4a0e 100644 --- a/vendor/github.com/containers/storage/pkg/chunked/compression_linux.go +++ b/vendor/go.podman.io/storage/pkg/chunked/compression_linux.go @@ -12,13 +12,13 @@ import ( "strconv" "time" - "github.com/containers/storage/pkg/chunked/internal/minimal" "github.com/klauspost/compress/zstd" "github.com/klauspost/pgzip" digest "github.com/opencontainers/go-digest" "github.com/vbatts/tar-split/archive/tar" "github.com/vbatts/tar-split/tar/asm" "github.com/vbatts/tar-split/tar/storage" + "go.podman.io/storage/pkg/chunked/internal/minimal" "golang.org/x/sys/unix" ) diff --git a/vendor/github.com/containers/storage/pkg/chunked/compressor/compressor.go b/vendor/go.podman.io/storage/pkg/chunked/compressor/compressor.go similarity index 99% rename from vendor/github.com/containers/storage/pkg/chunked/compressor/compressor.go rename to vendor/go.podman.io/storage/pkg/chunked/compressor/compressor.go index 2930723aa7c..23bcbda5194 100644 --- a/vendor/github.com/containers/storage/pkg/chunked/compressor/compressor.go +++ b/vendor/go.podman.io/storage/pkg/chunked/compressor/compressor.go @@ -9,12 +9,12 @@ import ( "bytes" "io" - "github.com/containers/storage/pkg/chunked/internal/minimal" - "github.com/containers/storage/pkg/ioutils" "github.com/opencontainers/go-digest" "github.com/vbatts/tar-split/archive/tar" "github.com/vbatts/tar-split/tar/asm" "github.com/vbatts/tar-split/tar/storage" + "go.podman.io/storage/pkg/chunked/internal/minimal" + "go.podman.io/storage/pkg/ioutils" ) const ( diff --git a/vendor/github.com/containers/storage/pkg/chunked/compressor/rollsum.go b/vendor/go.podman.io/storage/pkg/chunked/compressor/rollsum.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/chunked/compressor/rollsum.go rename to vendor/go.podman.io/storage/pkg/chunked/compressor/rollsum.go diff --git a/vendor/github.com/containers/storage/pkg/chunked/dump/dump.go b/vendor/go.podman.io/storage/pkg/chunked/dump/dump.go similarity index 97% rename from vendor/github.com/containers/storage/pkg/chunked/dump/dump.go rename to vendor/go.podman.io/storage/pkg/chunked/dump/dump.go index 0bda7a0d80b..facd7a1694d 100644 --- a/vendor/github.com/containers/storage/pkg/chunked/dump/dump.go +++ b/vendor/go.podman.io/storage/pkg/chunked/dump/dump.go @@ -11,9 +11,9 @@ import ( "reflect" "time" - "github.com/containers/storage/pkg/chunked/internal/minimal" - storagePath "github.com/containers/storage/pkg/chunked/internal/path" "github.com/opencontainers/go-digest" + "go.podman.io/storage/pkg/chunked/internal/minimal" + storagePath "go.podman.io/storage/pkg/chunked/internal/path" "golang.org/x/sys/unix" ) diff --git a/vendor/github.com/containers/storage/pkg/chunked/filesystem_linux.go b/vendor/go.podman.io/storage/pkg/chunked/filesystem_linux.go similarity index 98% rename from vendor/github.com/containers/storage/pkg/chunked/filesystem_linux.go rename to vendor/go.podman.io/storage/pkg/chunked/filesystem_linux.go index 82685e9c914..3f8311bffc0 100644 --- a/vendor/github.com/containers/storage/pkg/chunked/filesystem_linux.go +++ b/vendor/go.podman.io/storage/pkg/chunked/filesystem_linux.go @@ -13,12 +13,12 @@ import ( "syscall" "time" - driversCopy "github.com/containers/storage/drivers/copy" - "github.com/containers/storage/pkg/archive" - "github.com/containers/storage/pkg/chunked/internal/minimal" - storagePath "github.com/containers/storage/pkg/chunked/internal/path" securejoin "github.com/cyphar/filepath-securejoin" "github.com/vbatts/tar-split/archive/tar" + driversCopy "go.podman.io/storage/drivers/copy" + "go.podman.io/storage/pkg/archive" + "go.podman.io/storage/pkg/chunked/internal/minimal" + storagePath "go.podman.io/storage/pkg/chunked/internal/path" "golang.org/x/sys/unix" ) diff --git a/vendor/github.com/containers/storage/pkg/chunked/internal/minimal/compression.go b/vendor/go.podman.io/storage/pkg/chunked/internal/minimal/compression.go similarity index 99% rename from vendor/github.com/containers/storage/pkg/chunked/internal/minimal/compression.go rename to vendor/go.podman.io/storage/pkg/chunked/internal/minimal/compression.go index 4191524cc58..256365759c6 100644 --- a/vendor/github.com/containers/storage/pkg/chunked/internal/minimal/compression.go +++ b/vendor/go.podman.io/storage/pkg/chunked/internal/minimal/compression.go @@ -13,11 +13,11 @@ import ( "strings" "time" - "github.com/containers/storage/pkg/archive" jsoniter "github.com/json-iterator/go" "github.com/klauspost/compress/zstd" "github.com/opencontainers/go-digest" "github.com/vbatts/tar-split/archive/tar" + "go.podman.io/storage/pkg/archive" ) // ZstdWriter is an interface that wraps standard io.WriteCloser and Reset() to reuse the compressor with a new writer. diff --git a/vendor/github.com/containers/storage/pkg/chunked/internal/path/path.go b/vendor/go.podman.io/storage/pkg/chunked/internal/path/path.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/chunked/internal/path/path.go rename to vendor/go.podman.io/storage/pkg/chunked/internal/path/path.go diff --git a/vendor/github.com/containers/storage/pkg/chunked/storage.go b/vendor/go.podman.io/storage/pkg/chunked/storage.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/chunked/storage.go rename to vendor/go.podman.io/storage/pkg/chunked/storage.go diff --git a/vendor/github.com/containers/storage/pkg/chunked/storage_linux.go b/vendor/go.podman.io/storage/pkg/chunked/storage_linux.go similarity index 99% rename from vendor/github.com/containers/storage/pkg/chunked/storage_linux.go rename to vendor/go.podman.io/storage/pkg/chunked/storage_linux.go index f23a96b7a20..e6e3c9c6d14 100644 --- a/vendor/github.com/containers/storage/pkg/chunked/storage_linux.go +++ b/vendor/go.podman.io/storage/pkg/chunked/storage_linux.go @@ -18,16 +18,6 @@ import ( "syscall" "github.com/containerd/stargz-snapshotter/estargz" - storage "github.com/containers/storage" - graphdriver "github.com/containers/storage/drivers" - "github.com/containers/storage/pkg/archive" - "github.com/containers/storage/pkg/chunked/compressor" - "github.com/containers/storage/pkg/chunked/internal/minimal" - path "github.com/containers/storage/pkg/chunked/internal/path" - "github.com/containers/storage/pkg/chunked/toc" - "github.com/containers/storage/pkg/fsverity" - "github.com/containers/storage/pkg/idtools" - "github.com/containers/storage/pkg/system" securejoin "github.com/cyphar/filepath-securejoin" jsoniter "github.com/json-iterator/go" "github.com/klauspost/compress/zstd" @@ -37,6 +27,16 @@ import ( "github.com/vbatts/tar-split/archive/tar" "github.com/vbatts/tar-split/tar/asm" tsStorage "github.com/vbatts/tar-split/tar/storage" + storage "go.podman.io/storage" + graphdriver "go.podman.io/storage/drivers" + "go.podman.io/storage/pkg/archive" + "go.podman.io/storage/pkg/chunked/compressor" + "go.podman.io/storage/pkg/chunked/internal/minimal" + path "go.podman.io/storage/pkg/chunked/internal/path" + "go.podman.io/storage/pkg/chunked/toc" + "go.podman.io/storage/pkg/fsverity" + "go.podman.io/storage/pkg/idtools" + "go.podman.io/storage/pkg/system" "golang.org/x/sys/unix" ) diff --git a/vendor/github.com/containers/storage/pkg/chunked/storage_unsupported.go b/vendor/go.podman.io/storage/pkg/chunked/storage_unsupported.go similarity index 85% rename from vendor/github.com/containers/storage/pkg/chunked/storage_unsupported.go rename to vendor/go.podman.io/storage/pkg/chunked/storage_unsupported.go index 7e73a145b6c..7aa313c4afd 100644 --- a/vendor/github.com/containers/storage/pkg/chunked/storage_unsupported.go +++ b/vendor/go.podman.io/storage/pkg/chunked/storage_unsupported.go @@ -6,9 +6,9 @@ import ( "context" "errors" - storage "github.com/containers/storage" - graphdriver "github.com/containers/storage/drivers" digest "github.com/opencontainers/go-digest" + storage "go.podman.io/storage" + graphdriver "go.podman.io/storage/drivers" ) // NewDiffer returns a differ than can be used with [Store.PrepareStagedLayer]. diff --git a/vendor/github.com/containers/storage/pkg/chunked/toc/toc.go b/vendor/go.podman.io/storage/pkg/chunked/toc/toc.go similarity index 95% rename from vendor/github.com/containers/storage/pkg/chunked/toc/toc.go rename to vendor/go.podman.io/storage/pkg/chunked/toc/toc.go index 6f39b2ae2e8..7059b5406d3 100644 --- a/vendor/github.com/containers/storage/pkg/chunked/toc/toc.go +++ b/vendor/go.podman.io/storage/pkg/chunked/toc/toc.go @@ -3,8 +3,8 @@ package toc import ( "errors" - "github.com/containers/storage/pkg/chunked/internal/minimal" digest "github.com/opencontainers/go-digest" + "go.podman.io/storage/pkg/chunked/internal/minimal" ) // tocJSONDigestAnnotation is the annotation key for the digest of the estargz diff --git a/vendor/github.com/containers/storage/pkg/config/config.go b/vendor/go.podman.io/storage/pkg/config/config.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/config/config.go rename to vendor/go.podman.io/storage/pkg/config/config.go diff --git a/vendor/github.com/containers/storage/pkg/directory/directory.go b/vendor/go.podman.io/storage/pkg/directory/directory.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/directory/directory.go rename to vendor/go.podman.io/storage/pkg/directory/directory.go diff --git a/vendor/github.com/containers/storage/pkg/directory/directory_unix.go b/vendor/go.podman.io/storage/pkg/directory/directory_unix.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/directory/directory_unix.go rename to vendor/go.podman.io/storage/pkg/directory/directory_unix.go diff --git a/vendor/github.com/containers/storage/pkg/directory/directory_windows.go b/vendor/go.podman.io/storage/pkg/directory/directory_windows.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/directory/directory_windows.go rename to vendor/go.podman.io/storage/pkg/directory/directory_windows.go diff --git a/vendor/github.com/containers/storage/pkg/fileutils/exists_freebsd.go b/vendor/go.podman.io/storage/pkg/fileutils/exists_freebsd.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/fileutils/exists_freebsd.go rename to vendor/go.podman.io/storage/pkg/fileutils/exists_freebsd.go diff --git a/vendor/github.com/containers/storage/pkg/fileutils/exists_unix.go b/vendor/go.podman.io/storage/pkg/fileutils/exists_unix.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/fileutils/exists_unix.go rename to vendor/go.podman.io/storage/pkg/fileutils/exists_unix.go diff --git a/vendor/github.com/containers/storage/pkg/fileutils/exists_windows.go b/vendor/go.podman.io/storage/pkg/fileutils/exists_windows.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/fileutils/exists_windows.go rename to vendor/go.podman.io/storage/pkg/fileutils/exists_windows.go diff --git a/vendor/github.com/containers/storage/pkg/fileutils/fileutils.go b/vendor/go.podman.io/storage/pkg/fileutils/fileutils.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/fileutils/fileutils.go rename to vendor/go.podman.io/storage/pkg/fileutils/fileutils.go diff --git a/vendor/github.com/containers/storage/pkg/fileutils/fileutils_darwin.go b/vendor/go.podman.io/storage/pkg/fileutils/fileutils_darwin.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/fileutils/fileutils_darwin.go rename to vendor/go.podman.io/storage/pkg/fileutils/fileutils_darwin.go diff --git a/vendor/github.com/containers/storage/pkg/fileutils/fileutils_solaris.go b/vendor/go.podman.io/storage/pkg/fileutils/fileutils_solaris.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/fileutils/fileutils_solaris.go rename to vendor/go.podman.io/storage/pkg/fileutils/fileutils_solaris.go diff --git a/vendor/github.com/containers/storage/pkg/fileutils/fileutils_unix.go b/vendor/go.podman.io/storage/pkg/fileutils/fileutils_unix.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/fileutils/fileutils_unix.go rename to vendor/go.podman.io/storage/pkg/fileutils/fileutils_unix.go diff --git a/vendor/github.com/containers/storage/pkg/fileutils/fileutils_windows.go b/vendor/go.podman.io/storage/pkg/fileutils/fileutils_windows.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/fileutils/fileutils_windows.go rename to vendor/go.podman.io/storage/pkg/fileutils/fileutils_windows.go diff --git a/vendor/github.com/containers/storage/pkg/fileutils/reflink_linux.go b/vendor/go.podman.io/storage/pkg/fileutils/reflink_linux.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/fileutils/reflink_linux.go rename to vendor/go.podman.io/storage/pkg/fileutils/reflink_linux.go diff --git a/vendor/github.com/containers/storage/pkg/fileutils/reflink_unsupported.go b/vendor/go.podman.io/storage/pkg/fileutils/reflink_unsupported.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/fileutils/reflink_unsupported.go rename to vendor/go.podman.io/storage/pkg/fileutils/reflink_unsupported.go diff --git a/vendor/github.com/containers/storage/pkg/fsutils/fsutils_linux.go b/vendor/go.podman.io/storage/pkg/fsutils/fsutils_linux.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/fsutils/fsutils_linux.go rename to vendor/go.podman.io/storage/pkg/fsutils/fsutils_linux.go diff --git a/vendor/github.com/containers/storage/pkg/fsverity/fsverity_linux.go b/vendor/go.podman.io/storage/pkg/fsverity/fsverity_linux.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/fsverity/fsverity_linux.go rename to vendor/go.podman.io/storage/pkg/fsverity/fsverity_linux.go diff --git a/vendor/github.com/containers/storage/pkg/fsverity/fsverity_unsupported.go b/vendor/go.podman.io/storage/pkg/fsverity/fsverity_unsupported.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/fsverity/fsverity_unsupported.go rename to vendor/go.podman.io/storage/pkg/fsverity/fsverity_unsupported.go diff --git a/vendor/github.com/containers/storage/pkg/homedir/homedir.go b/vendor/go.podman.io/storage/pkg/homedir/homedir.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/homedir/homedir.go rename to vendor/go.podman.io/storage/pkg/homedir/homedir.go diff --git a/vendor/github.com/containers/storage/pkg/homedir/homedir_unix.go b/vendor/go.podman.io/storage/pkg/homedir/homedir_unix.go similarity index 99% rename from vendor/github.com/containers/storage/pkg/homedir/homedir_unix.go rename to vendor/go.podman.io/storage/pkg/homedir/homedir_unix.go index f351b48bb4f..b088c2a85d6 100644 --- a/vendor/github.com/containers/storage/pkg/homedir/homedir_unix.go +++ b/vendor/go.podman.io/storage/pkg/homedir/homedir_unix.go @@ -14,8 +14,8 @@ import ( "sync" "syscall" - "github.com/containers/storage/pkg/unshare" "github.com/sirupsen/logrus" + "go.podman.io/storage/pkg/unshare" ) // Key returns the env var name for the user's home dir based on diff --git a/vendor/github.com/containers/storage/pkg/homedir/homedir_windows.go b/vendor/go.podman.io/storage/pkg/homedir/homedir_windows.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/homedir/homedir_windows.go rename to vendor/go.podman.io/storage/pkg/homedir/homedir_windows.go diff --git a/vendor/github.com/containers/storage/pkg/idmap/idmapped_utils.go b/vendor/go.podman.io/storage/pkg/idmap/idmapped_utils.go similarity index 98% rename from vendor/github.com/containers/storage/pkg/idmap/idmapped_utils.go rename to vendor/go.podman.io/storage/pkg/idmap/idmapped_utils.go index fac9a2f8992..42c805873e7 100644 --- a/vendor/github.com/containers/storage/pkg/idmap/idmapped_utils.go +++ b/vendor/go.podman.io/storage/pkg/idmap/idmapped_utils.go @@ -10,8 +10,8 @@ import ( "runtime" "syscall" - "github.com/containers/storage/pkg/idtools" "github.com/sirupsen/logrus" + "go.podman.io/storage/pkg/idtools" "golang.org/x/sys/unix" ) diff --git a/vendor/github.com/containers/storage/pkg/idmap/idmapped_utils_unsupported.go b/vendor/go.podman.io/storage/pkg/idmap/idmapped_utils_unsupported.go similarity index 93% rename from vendor/github.com/containers/storage/pkg/idmap/idmapped_utils_unsupported.go rename to vendor/go.podman.io/storage/pkg/idmap/idmapped_utils_unsupported.go index d58137b99bb..509156b8533 100644 --- a/vendor/github.com/containers/storage/pkg/idmap/idmapped_utils_unsupported.go +++ b/vendor/go.podman.io/storage/pkg/idmap/idmapped_utils_unsupported.go @@ -5,7 +5,7 @@ package idmap import ( "fmt" - "github.com/containers/storage/pkg/idtools" + "go.podman.io/storage/pkg/idtools" ) // CreateIDMappedMount creates a IDMapped bind mount from SOURCE to TARGET using the user namespace diff --git a/vendor/github.com/containers/storage/pkg/idtools/idtools.go b/vendor/go.podman.io/storage/pkg/idtools/idtools.go similarity index 99% rename from vendor/github.com/containers/storage/pkg/idtools/idtools.go rename to vendor/go.podman.io/storage/pkg/idtools/idtools.go index 13277f090ef..6fcba9b33ec 100644 --- a/vendor/github.com/containers/storage/pkg/idtools/idtools.go +++ b/vendor/go.podman.io/storage/pkg/idtools/idtools.go @@ -14,8 +14,8 @@ import ( "sync" "syscall" - "github.com/containers/storage/pkg/system" "github.com/sirupsen/logrus" + "go.podman.io/storage/pkg/system" ) // IDMap contains a single entry for user namespace range remapping. An array diff --git a/vendor/github.com/containers/storage/pkg/idtools/idtools_supported.go b/vendor/go.podman.io/storage/pkg/idtools/idtools_supported.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/idtools/idtools_supported.go rename to vendor/go.podman.io/storage/pkg/idtools/idtools_supported.go diff --git a/vendor/github.com/containers/storage/pkg/idtools/idtools_unix.go b/vendor/go.podman.io/storage/pkg/idtools/idtools_unix.go similarity index 98% rename from vendor/github.com/containers/storage/pkg/idtools/idtools_unix.go rename to vendor/go.podman.io/storage/pkg/idtools/idtools_unix.go index 1da7dadbfa8..817b59aed1c 100644 --- a/vendor/github.com/containers/storage/pkg/idtools/idtools_unix.go +++ b/vendor/go.podman.io/storage/pkg/idtools/idtools_unix.go @@ -12,9 +12,9 @@ import ( "sync" "syscall" - "github.com/containers/storage/pkg/fileutils" - "github.com/containers/storage/pkg/system" "github.com/moby/sys/user" + "go.podman.io/storage/pkg/fileutils" + "go.podman.io/storage/pkg/system" ) var ( diff --git a/vendor/github.com/containers/storage/pkg/idtools/idtools_unsupported.go b/vendor/go.podman.io/storage/pkg/idtools/idtools_unsupported.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/idtools/idtools_unsupported.go rename to vendor/go.podman.io/storage/pkg/idtools/idtools_unsupported.go diff --git a/vendor/github.com/containers/storage/pkg/idtools/idtools_windows.go b/vendor/go.podman.io/storage/pkg/idtools/idtools_windows.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/idtools/idtools_windows.go rename to vendor/go.podman.io/storage/pkg/idtools/idtools_windows.go diff --git a/vendor/github.com/containers/storage/pkg/idtools/parser.go b/vendor/go.podman.io/storage/pkg/idtools/parser.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/idtools/parser.go rename to vendor/go.podman.io/storage/pkg/idtools/parser.go diff --git a/vendor/github.com/containers/storage/pkg/idtools/usergroupadd_linux.go b/vendor/go.podman.io/storage/pkg/idtools/usergroupadd_linux.go similarity index 99% rename from vendor/github.com/containers/storage/pkg/idtools/usergroupadd_linux.go rename to vendor/go.podman.io/storage/pkg/idtools/usergroupadd_linux.go index ac27718de21..d2ff4466c1c 100644 --- a/vendor/github.com/containers/storage/pkg/idtools/usergroupadd_linux.go +++ b/vendor/go.podman.io/storage/pkg/idtools/usergroupadd_linux.go @@ -7,7 +7,7 @@ import ( "strings" "sync" - "github.com/containers/storage/pkg/regexp" + "go.podman.io/storage/pkg/regexp" ) // add a user and/or group to Linux /etc/passwd, /etc/group using standard diff --git a/vendor/github.com/containers/storage/pkg/idtools/usergroupadd_unsupported.go b/vendor/go.podman.io/storage/pkg/idtools/usergroupadd_unsupported.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/idtools/usergroupadd_unsupported.go rename to vendor/go.podman.io/storage/pkg/idtools/usergroupadd_unsupported.go diff --git a/vendor/github.com/containers/storage/pkg/idtools/utils_unix.go b/vendor/go.podman.io/storage/pkg/idtools/utils_unix.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/idtools/utils_unix.go rename to vendor/go.podman.io/storage/pkg/idtools/utils_unix.go diff --git a/vendor/github.com/containers/storage/pkg/ioutils/buffer.go b/vendor/go.podman.io/storage/pkg/ioutils/buffer.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/ioutils/buffer.go rename to vendor/go.podman.io/storage/pkg/ioutils/buffer.go diff --git a/vendor/github.com/containers/storage/pkg/ioutils/bytespipe.go b/vendor/go.podman.io/storage/pkg/ioutils/bytespipe.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/ioutils/bytespipe.go rename to vendor/go.podman.io/storage/pkg/ioutils/bytespipe.go diff --git a/vendor/github.com/containers/storage/pkg/ioutils/fswriters.go b/vendor/go.podman.io/storage/pkg/ioutils/fswriters.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/ioutils/fswriters.go rename to vendor/go.podman.io/storage/pkg/ioutils/fswriters.go diff --git a/vendor/github.com/containers/storage/pkg/ioutils/fswriters_linux.go b/vendor/go.podman.io/storage/pkg/ioutils/fswriters_linux.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/ioutils/fswriters_linux.go rename to vendor/go.podman.io/storage/pkg/ioutils/fswriters_linux.go diff --git a/vendor/github.com/containers/storage/pkg/ioutils/fswriters_other.go b/vendor/go.podman.io/storage/pkg/ioutils/fswriters_other.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/ioutils/fswriters_other.go rename to vendor/go.podman.io/storage/pkg/ioutils/fswriters_other.go diff --git a/vendor/github.com/containers/storage/pkg/ioutils/readers.go b/vendor/go.podman.io/storage/pkg/ioutils/readers.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/ioutils/readers.go rename to vendor/go.podman.io/storage/pkg/ioutils/readers.go diff --git a/vendor/github.com/containers/storage/pkg/ioutils/temp_unix.go b/vendor/go.podman.io/storage/pkg/ioutils/temp_unix.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/ioutils/temp_unix.go rename to vendor/go.podman.io/storage/pkg/ioutils/temp_unix.go diff --git a/vendor/github.com/containers/storage/pkg/ioutils/temp_windows.go b/vendor/go.podman.io/storage/pkg/ioutils/temp_windows.go similarity index 87% rename from vendor/github.com/containers/storage/pkg/ioutils/temp_windows.go rename to vendor/go.podman.io/storage/pkg/ioutils/temp_windows.go index 79837fb33e1..b60ad8f495a 100644 --- a/vendor/github.com/containers/storage/pkg/ioutils/temp_windows.go +++ b/vendor/go.podman.io/storage/pkg/ioutils/temp_windows.go @@ -5,7 +5,7 @@ package ioutils import ( "os" - "github.com/containers/storage/pkg/longpath" + "go.podman.io/storage/pkg/longpath" ) // TempDir is the equivalent of os.MkdirTemp, except that the result is in Windows longpath format. diff --git a/vendor/github.com/containers/storage/pkg/ioutils/writeflusher.go b/vendor/go.podman.io/storage/pkg/ioutils/writeflusher.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/ioutils/writeflusher.go rename to vendor/go.podman.io/storage/pkg/ioutils/writeflusher.go diff --git a/vendor/github.com/containers/storage/pkg/ioutils/writers.go b/vendor/go.podman.io/storage/pkg/ioutils/writers.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/ioutils/writers.go rename to vendor/go.podman.io/storage/pkg/ioutils/writers.go diff --git a/vendor/github.com/containers/storage/pkg/locker/README.md b/vendor/go.podman.io/storage/pkg/locker/README.md similarity index 100% rename from vendor/github.com/containers/storage/pkg/locker/README.md rename to vendor/go.podman.io/storage/pkg/locker/README.md diff --git a/vendor/github.com/containers/storage/pkg/locker/locker.go b/vendor/go.podman.io/storage/pkg/locker/locker.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/locker/locker.go rename to vendor/go.podman.io/storage/pkg/locker/locker.go diff --git a/vendor/github.com/containers/storage/pkg/lockfile/lastwrite.go b/vendor/go.podman.io/storage/pkg/lockfile/lastwrite.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/lockfile/lastwrite.go rename to vendor/go.podman.io/storage/pkg/lockfile/lastwrite.go diff --git a/vendor/github.com/containers/storage/pkg/lockfile/lockfile.go b/vendor/go.podman.io/storage/pkg/lockfile/lockfile.go similarity index 99% rename from vendor/github.com/containers/storage/pkg/lockfile/lockfile.go rename to vendor/go.podman.io/storage/pkg/lockfile/lockfile.go index dfe81c24585..52b4fe597e5 100644 --- a/vendor/github.com/containers/storage/pkg/lockfile/lockfile.go +++ b/vendor/go.podman.io/storage/pkg/lockfile/lockfile.go @@ -7,7 +7,7 @@ import ( "sync" "time" - "github.com/containers/storage/internal/rawfilelock" + "go.podman.io/storage/internal/rawfilelock" ) // A Locker represents a file lock where the file is used to cache an diff --git a/vendor/github.com/containers/storage/pkg/lockfile/lockfile_unix.go b/vendor/go.podman.io/storage/pkg/lockfile/lockfile_unix.go similarity index 97% rename from vendor/github.com/containers/storage/pkg/lockfile/lockfile_unix.go rename to vendor/go.podman.io/storage/pkg/lockfile/lockfile_unix.go index 14c27c51fb9..780ad8aef1f 100644 --- a/vendor/github.com/containers/storage/pkg/lockfile/lockfile_unix.go +++ b/vendor/go.podman.io/storage/pkg/lockfile/lockfile_unix.go @@ -5,7 +5,7 @@ package lockfile import ( "time" - "github.com/containers/storage/pkg/system" + "go.podman.io/storage/pkg/system" "golang.org/x/sys/unix" ) diff --git a/vendor/github.com/containers/storage/pkg/lockfile/lockfile_windows.go b/vendor/go.podman.io/storage/pkg/lockfile/lockfile_windows.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/lockfile/lockfile_windows.go rename to vendor/go.podman.io/storage/pkg/lockfile/lockfile_windows.go diff --git a/vendor/github.com/containers/storage/pkg/longpath/longpath.go b/vendor/go.podman.io/storage/pkg/longpath/longpath.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/longpath/longpath.go rename to vendor/go.podman.io/storage/pkg/longpath/longpath.go diff --git a/vendor/github.com/containers/storage/pkg/loopback/attach_loopback.go b/vendor/go.podman.io/storage/pkg/loopback/attach_loopback.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/loopback/attach_loopback.go rename to vendor/go.podman.io/storage/pkg/loopback/attach_loopback.go diff --git a/vendor/github.com/containers/storage/pkg/loopback/ioctl.go b/vendor/go.podman.io/storage/pkg/loopback/ioctl.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/loopback/ioctl.go rename to vendor/go.podman.io/storage/pkg/loopback/ioctl.go diff --git a/vendor/github.com/containers/storage/pkg/loopback/loop_wrapper.go b/vendor/go.podman.io/storage/pkg/loopback/loop_wrapper.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/loopback/loop_wrapper.go rename to vendor/go.podman.io/storage/pkg/loopback/loop_wrapper.go diff --git a/vendor/github.com/containers/storage/pkg/loopback/loopback.go b/vendor/go.podman.io/storage/pkg/loopback/loopback.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/loopback/loopback.go rename to vendor/go.podman.io/storage/pkg/loopback/loopback.go diff --git a/vendor/github.com/containers/storage/pkg/loopback/loopback_unsupported.go b/vendor/go.podman.io/storage/pkg/loopback/loopback_unsupported.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/loopback/loopback_unsupported.go rename to vendor/go.podman.io/storage/pkg/loopback/loopback_unsupported.go diff --git a/vendor/github.com/containers/storage/pkg/mount/flags.go b/vendor/go.podman.io/storage/pkg/mount/flags.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/mount/flags.go rename to vendor/go.podman.io/storage/pkg/mount/flags.go diff --git a/vendor/github.com/containers/storage/pkg/mount/flags_freebsd.go b/vendor/go.podman.io/storage/pkg/mount/flags_freebsd.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/mount/flags_freebsd.go rename to vendor/go.podman.io/storage/pkg/mount/flags_freebsd.go diff --git a/vendor/github.com/containers/storage/pkg/mount/flags_linux.go b/vendor/go.podman.io/storage/pkg/mount/flags_linux.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/mount/flags_linux.go rename to vendor/go.podman.io/storage/pkg/mount/flags_linux.go diff --git a/vendor/github.com/containers/storage/pkg/mount/flags_unsupported.go b/vendor/go.podman.io/storage/pkg/mount/flags_unsupported.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/mount/flags_unsupported.go rename to vendor/go.podman.io/storage/pkg/mount/flags_unsupported.go diff --git a/vendor/github.com/containers/storage/pkg/mount/mount.go b/vendor/go.podman.io/storage/pkg/mount/mount.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/mount/mount.go rename to vendor/go.podman.io/storage/pkg/mount/mount.go diff --git a/vendor/github.com/containers/storage/pkg/mount/mounter_freebsd.go b/vendor/go.podman.io/storage/pkg/mount/mounter_freebsd.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/mount/mounter_freebsd.go rename to vendor/go.podman.io/storage/pkg/mount/mounter_freebsd.go diff --git a/vendor/github.com/containers/storage/pkg/mount/mounter_linux.go b/vendor/go.podman.io/storage/pkg/mount/mounter_linux.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/mount/mounter_linux.go rename to vendor/go.podman.io/storage/pkg/mount/mounter_linux.go diff --git a/vendor/github.com/containers/storage/pkg/mount/mounter_unsupported.go b/vendor/go.podman.io/storage/pkg/mount/mounter_unsupported.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/mount/mounter_unsupported.go rename to vendor/go.podman.io/storage/pkg/mount/mounter_unsupported.go diff --git a/vendor/github.com/containers/storage/pkg/mount/mountinfo.go b/vendor/go.podman.io/storage/pkg/mount/mountinfo.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/mount/mountinfo.go rename to vendor/go.podman.io/storage/pkg/mount/mountinfo.go diff --git a/vendor/github.com/containers/storage/pkg/mount/mountinfo_linux.go b/vendor/go.podman.io/storage/pkg/mount/mountinfo_linux.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/mount/mountinfo_linux.go rename to vendor/go.podman.io/storage/pkg/mount/mountinfo_linux.go diff --git a/vendor/github.com/containers/storage/pkg/mount/sharedsubtree_linux.go b/vendor/go.podman.io/storage/pkg/mount/sharedsubtree_linux.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/mount/sharedsubtree_linux.go rename to vendor/go.podman.io/storage/pkg/mount/sharedsubtree_linux.go diff --git a/vendor/github.com/containers/storage/pkg/mount/unmount_unix.go b/vendor/go.podman.io/storage/pkg/mount/unmount_unix.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/mount/unmount_unix.go rename to vendor/go.podman.io/storage/pkg/mount/unmount_unix.go diff --git a/vendor/github.com/containers/storage/pkg/mount/unmount_unsupported.go b/vendor/go.podman.io/storage/pkg/mount/unmount_unsupported.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/mount/unmount_unsupported.go rename to vendor/go.podman.io/storage/pkg/mount/unmount_unsupported.go diff --git a/vendor/github.com/containers/storage/pkg/parsers/parsers.go b/vendor/go.podman.io/storage/pkg/parsers/parsers.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/parsers/parsers.go rename to vendor/go.podman.io/storage/pkg/parsers/parsers.go diff --git a/vendor/github.com/containers/storage/pkg/pools/pools.go b/vendor/go.podman.io/storage/pkg/pools/pools.go similarity index 98% rename from vendor/github.com/containers/storage/pkg/pools/pools.go rename to vendor/go.podman.io/storage/pkg/pools/pools.go index e68648d1d64..78b729c2e37 100644 --- a/vendor/github.com/containers/storage/pkg/pools/pools.go +++ b/vendor/go.podman.io/storage/pkg/pools/pools.go @@ -14,7 +14,7 @@ import ( "io" "sync" - "github.com/containers/storage/pkg/ioutils" + "go.podman.io/storage/pkg/ioutils" ) var ( diff --git a/vendor/github.com/containers/storage/pkg/promise/promise.go b/vendor/go.podman.io/storage/pkg/promise/promise.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/promise/promise.go rename to vendor/go.podman.io/storage/pkg/promise/promise.go diff --git a/vendor/github.com/containers/storage/pkg/reexec/README.md b/vendor/go.podman.io/storage/pkg/reexec/README.md similarity index 100% rename from vendor/github.com/containers/storage/pkg/reexec/README.md rename to vendor/go.podman.io/storage/pkg/reexec/README.md diff --git a/vendor/github.com/containers/storage/pkg/reexec/command_freebsd.go b/vendor/go.podman.io/storage/pkg/reexec/command_freebsd.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/reexec/command_freebsd.go rename to vendor/go.podman.io/storage/pkg/reexec/command_freebsd.go diff --git a/vendor/github.com/containers/storage/pkg/reexec/command_linux.go b/vendor/go.podman.io/storage/pkg/reexec/command_linux.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/reexec/command_linux.go rename to vendor/go.podman.io/storage/pkg/reexec/command_linux.go diff --git a/vendor/github.com/containers/storage/pkg/reexec/command_unix.go b/vendor/go.podman.io/storage/pkg/reexec/command_unix.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/reexec/command_unix.go rename to vendor/go.podman.io/storage/pkg/reexec/command_unix.go diff --git a/vendor/github.com/containers/storage/pkg/reexec/command_unsupported.go b/vendor/go.podman.io/storage/pkg/reexec/command_unsupported.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/reexec/command_unsupported.go rename to vendor/go.podman.io/storage/pkg/reexec/command_unsupported.go diff --git a/vendor/github.com/containers/storage/pkg/reexec/command_windows.go b/vendor/go.podman.io/storage/pkg/reexec/command_windows.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/reexec/command_windows.go rename to vendor/go.podman.io/storage/pkg/reexec/command_windows.go diff --git a/vendor/github.com/containers/storage/pkg/reexec/reexec.go b/vendor/go.podman.io/storage/pkg/reexec/reexec.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/reexec/reexec.go rename to vendor/go.podman.io/storage/pkg/reexec/reexec.go diff --git a/vendor/github.com/containers/storage/pkg/regexp/regexp.go b/vendor/go.podman.io/storage/pkg/regexp/regexp.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/regexp/regexp.go rename to vendor/go.podman.io/storage/pkg/regexp/regexp.go diff --git a/vendor/github.com/containers/storage/pkg/regexp/regexp_dontprecompile.go b/vendor/go.podman.io/storage/pkg/regexp/regexp_dontprecompile.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/regexp/regexp_dontprecompile.go rename to vendor/go.podman.io/storage/pkg/regexp/regexp_dontprecompile.go diff --git a/vendor/github.com/containers/storage/pkg/regexp/regexp_precompile.go b/vendor/go.podman.io/storage/pkg/regexp/regexp_precompile.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/regexp/regexp_precompile.go rename to vendor/go.podman.io/storage/pkg/regexp/regexp_precompile.go diff --git a/vendor/github.com/containers/storage/pkg/stringid/README.md b/vendor/go.podman.io/storage/pkg/stringid/README.md similarity index 100% rename from vendor/github.com/containers/storage/pkg/stringid/README.md rename to vendor/go.podman.io/storage/pkg/stringid/README.md diff --git a/vendor/github.com/containers/storage/pkg/stringid/stringid.go b/vendor/go.podman.io/storage/pkg/stringid/stringid.go similarity index 98% rename from vendor/github.com/containers/storage/pkg/stringid/stringid.go rename to vendor/go.podman.io/storage/pkg/stringid/stringid.go index 20abc74073f..78569bd6da5 100644 --- a/vendor/github.com/containers/storage/pkg/stringid/stringid.go +++ b/vendor/go.podman.io/storage/pkg/stringid/stringid.go @@ -14,7 +14,7 @@ import ( "sync" "time" - "github.com/containers/storage/pkg/regexp" + "go.podman.io/storage/pkg/regexp" ) const shortLen = 12 diff --git a/vendor/github.com/containers/storage/pkg/stringutils/README.md b/vendor/go.podman.io/storage/pkg/stringutils/README.md similarity index 100% rename from vendor/github.com/containers/storage/pkg/stringutils/README.md rename to vendor/go.podman.io/storage/pkg/stringutils/README.md diff --git a/vendor/github.com/containers/storage/pkg/stringutils/stringutils.go b/vendor/go.podman.io/storage/pkg/stringutils/stringutils.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/stringutils/stringutils.go rename to vendor/go.podman.io/storage/pkg/stringutils/stringutils.go diff --git a/vendor/github.com/containers/storage/pkg/system/chmod.go b/vendor/go.podman.io/storage/pkg/system/chmod.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/system/chmod.go rename to vendor/go.podman.io/storage/pkg/system/chmod.go diff --git a/vendor/github.com/containers/storage/pkg/system/chtimes.go b/vendor/go.podman.io/storage/pkg/system/chtimes.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/system/chtimes.go rename to vendor/go.podman.io/storage/pkg/system/chtimes.go diff --git a/vendor/github.com/containers/storage/pkg/system/chtimes_unix.go b/vendor/go.podman.io/storage/pkg/system/chtimes_unix.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/system/chtimes_unix.go rename to vendor/go.podman.io/storage/pkg/system/chtimes_unix.go diff --git a/vendor/github.com/containers/storage/pkg/system/chtimes_windows.go b/vendor/go.podman.io/storage/pkg/system/chtimes_windows.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/system/chtimes_windows.go rename to vendor/go.podman.io/storage/pkg/system/chtimes_windows.go diff --git a/vendor/github.com/containers/storage/pkg/system/errors.go b/vendor/go.podman.io/storage/pkg/system/errors.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/system/errors.go rename to vendor/go.podman.io/storage/pkg/system/errors.go diff --git a/vendor/github.com/containers/storage/pkg/system/exitcode.go b/vendor/go.podman.io/storage/pkg/system/exitcode.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/system/exitcode.go rename to vendor/go.podman.io/storage/pkg/system/exitcode.go diff --git a/vendor/github.com/containers/storage/pkg/system/extattr_freebsd.go b/vendor/go.podman.io/storage/pkg/system/extattr_freebsd.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/system/extattr_freebsd.go rename to vendor/go.podman.io/storage/pkg/system/extattr_freebsd.go diff --git a/vendor/github.com/containers/storage/pkg/system/extattr_unsupported.go b/vendor/go.podman.io/storage/pkg/system/extattr_unsupported.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/system/extattr_unsupported.go rename to vendor/go.podman.io/storage/pkg/system/extattr_unsupported.go diff --git a/vendor/github.com/containers/storage/pkg/system/init.go b/vendor/go.podman.io/storage/pkg/system/init.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/system/init.go rename to vendor/go.podman.io/storage/pkg/system/init.go diff --git a/vendor/github.com/containers/storage/pkg/system/init_windows.go b/vendor/go.podman.io/storage/pkg/system/init_windows.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/system/init_windows.go rename to vendor/go.podman.io/storage/pkg/system/init_windows.go diff --git a/vendor/github.com/containers/storage/pkg/system/lchflags_bsd.go b/vendor/go.podman.io/storage/pkg/system/lchflags_bsd.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/system/lchflags_bsd.go rename to vendor/go.podman.io/storage/pkg/system/lchflags_bsd.go diff --git a/vendor/github.com/containers/storage/pkg/system/lchown.go b/vendor/go.podman.io/storage/pkg/system/lchown.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/system/lchown.go rename to vendor/go.podman.io/storage/pkg/system/lchown.go diff --git a/vendor/github.com/containers/storage/pkg/system/lcow_unix.go b/vendor/go.podman.io/storage/pkg/system/lcow_unix.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/system/lcow_unix.go rename to vendor/go.podman.io/storage/pkg/system/lcow_unix.go diff --git a/vendor/github.com/containers/storage/pkg/system/lcow_windows.go b/vendor/go.podman.io/storage/pkg/system/lcow_windows.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/system/lcow_windows.go rename to vendor/go.podman.io/storage/pkg/system/lcow_windows.go diff --git a/vendor/github.com/containers/storage/pkg/system/lstat_unix.go b/vendor/go.podman.io/storage/pkg/system/lstat_unix.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/system/lstat_unix.go rename to vendor/go.podman.io/storage/pkg/system/lstat_unix.go diff --git a/vendor/github.com/containers/storage/pkg/system/lstat_windows.go b/vendor/go.podman.io/storage/pkg/system/lstat_windows.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/system/lstat_windows.go rename to vendor/go.podman.io/storage/pkg/system/lstat_windows.go diff --git a/vendor/github.com/containers/storage/pkg/system/meminfo.go b/vendor/go.podman.io/storage/pkg/system/meminfo.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/system/meminfo.go rename to vendor/go.podman.io/storage/pkg/system/meminfo.go diff --git a/vendor/github.com/containers/storage/pkg/system/meminfo_freebsd.go b/vendor/go.podman.io/storage/pkg/system/meminfo_freebsd.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/system/meminfo_freebsd.go rename to vendor/go.podman.io/storage/pkg/system/meminfo_freebsd.go diff --git a/vendor/github.com/containers/storage/pkg/system/meminfo_linux.go b/vendor/go.podman.io/storage/pkg/system/meminfo_linux.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/system/meminfo_linux.go rename to vendor/go.podman.io/storage/pkg/system/meminfo_linux.go diff --git a/vendor/github.com/containers/storage/pkg/system/meminfo_solaris.go b/vendor/go.podman.io/storage/pkg/system/meminfo_solaris.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/system/meminfo_solaris.go rename to vendor/go.podman.io/storage/pkg/system/meminfo_solaris.go diff --git a/vendor/github.com/containers/storage/pkg/system/meminfo_unsupported.go b/vendor/go.podman.io/storage/pkg/system/meminfo_unsupported.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/system/meminfo_unsupported.go rename to vendor/go.podman.io/storage/pkg/system/meminfo_unsupported.go diff --git a/vendor/github.com/containers/storage/pkg/system/meminfo_windows.go b/vendor/go.podman.io/storage/pkg/system/meminfo_windows.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/system/meminfo_windows.go rename to vendor/go.podman.io/storage/pkg/system/meminfo_windows.go diff --git a/vendor/github.com/containers/storage/pkg/system/mknod.go b/vendor/go.podman.io/storage/pkg/system/mknod.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/system/mknod.go rename to vendor/go.podman.io/storage/pkg/system/mknod.go diff --git a/vendor/github.com/containers/storage/pkg/system/mknod_freebsd.go b/vendor/go.podman.io/storage/pkg/system/mknod_freebsd.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/system/mknod_freebsd.go rename to vendor/go.podman.io/storage/pkg/system/mknod_freebsd.go diff --git a/vendor/github.com/containers/storage/pkg/system/mknod_windows.go b/vendor/go.podman.io/storage/pkg/system/mknod_windows.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/system/mknod_windows.go rename to vendor/go.podman.io/storage/pkg/system/mknod_windows.go diff --git a/vendor/github.com/containers/storage/pkg/system/path.go b/vendor/go.podman.io/storage/pkg/system/path.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/system/path.go rename to vendor/go.podman.io/storage/pkg/system/path.go diff --git a/vendor/github.com/containers/storage/pkg/system/path_unix.go b/vendor/go.podman.io/storage/pkg/system/path_unix.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/system/path_unix.go rename to vendor/go.podman.io/storage/pkg/system/path_unix.go diff --git a/vendor/github.com/containers/storage/pkg/system/path_windows.go b/vendor/go.podman.io/storage/pkg/system/path_windows.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/system/path_windows.go rename to vendor/go.podman.io/storage/pkg/system/path_windows.go diff --git a/vendor/github.com/containers/storage/pkg/system/process_unix.go b/vendor/go.podman.io/storage/pkg/system/process_unix.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/system/process_unix.go rename to vendor/go.podman.io/storage/pkg/system/process_unix.go diff --git a/vendor/github.com/containers/storage/pkg/system/rm.go b/vendor/go.podman.io/storage/pkg/system/rm.go similarity index 98% rename from vendor/github.com/containers/storage/pkg/system/rm.go rename to vendor/go.podman.io/storage/pkg/system/rm.go index 12243707ac5..c151c1449e9 100644 --- a/vendor/github.com/containers/storage/pkg/system/rm.go +++ b/vendor/go.podman.io/storage/pkg/system/rm.go @@ -7,8 +7,8 @@ import ( "syscall" "time" - "github.com/containers/storage/pkg/mount" "github.com/sirupsen/logrus" + "go.podman.io/storage/pkg/mount" ) // EnsureRemoveAll wraps `os.RemoveAll` to check for specific errors that can diff --git a/vendor/github.com/containers/storage/pkg/system/rm_common.go b/vendor/go.podman.io/storage/pkg/system/rm_common.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/system/rm_common.go rename to vendor/go.podman.io/storage/pkg/system/rm_common.go diff --git a/vendor/github.com/containers/storage/pkg/system/rm_freebsd.go b/vendor/go.podman.io/storage/pkg/system/rm_freebsd.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/system/rm_freebsd.go rename to vendor/go.podman.io/storage/pkg/system/rm_freebsd.go diff --git a/vendor/github.com/containers/storage/pkg/system/stat_common.go b/vendor/go.podman.io/storage/pkg/system/stat_common.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/system/stat_common.go rename to vendor/go.podman.io/storage/pkg/system/stat_common.go diff --git a/vendor/github.com/containers/storage/pkg/system/stat_darwin.go b/vendor/go.podman.io/storage/pkg/system/stat_darwin.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/system/stat_darwin.go rename to vendor/go.podman.io/storage/pkg/system/stat_darwin.go diff --git a/vendor/github.com/containers/storage/pkg/system/stat_freebsd.go b/vendor/go.podman.io/storage/pkg/system/stat_freebsd.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/system/stat_freebsd.go rename to vendor/go.podman.io/storage/pkg/system/stat_freebsd.go diff --git a/vendor/github.com/containers/storage/pkg/system/stat_linux.go b/vendor/go.podman.io/storage/pkg/system/stat_linux.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/system/stat_linux.go rename to vendor/go.podman.io/storage/pkg/system/stat_linux.go diff --git a/vendor/github.com/containers/storage/pkg/system/stat_netbsd.go b/vendor/go.podman.io/storage/pkg/system/stat_netbsd.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/system/stat_netbsd.go rename to vendor/go.podman.io/storage/pkg/system/stat_netbsd.go diff --git a/vendor/github.com/containers/storage/pkg/system/stat_openbsd.go b/vendor/go.podman.io/storage/pkg/system/stat_openbsd.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/system/stat_openbsd.go rename to vendor/go.podman.io/storage/pkg/system/stat_openbsd.go diff --git a/vendor/github.com/containers/storage/pkg/system/stat_solaris.go b/vendor/go.podman.io/storage/pkg/system/stat_solaris.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/system/stat_solaris.go rename to vendor/go.podman.io/storage/pkg/system/stat_solaris.go diff --git a/vendor/github.com/containers/storage/pkg/system/stat_unix.go b/vendor/go.podman.io/storage/pkg/system/stat_unix.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/system/stat_unix.go rename to vendor/go.podman.io/storage/pkg/system/stat_unix.go diff --git a/vendor/github.com/containers/storage/pkg/system/stat_windows.go b/vendor/go.podman.io/storage/pkg/system/stat_windows.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/system/stat_windows.go rename to vendor/go.podman.io/storage/pkg/system/stat_windows.go diff --git a/vendor/github.com/containers/storage/pkg/system/syscall_unix.go b/vendor/go.podman.io/storage/pkg/system/syscall_unix.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/system/syscall_unix.go rename to vendor/go.podman.io/storage/pkg/system/syscall_unix.go diff --git a/vendor/github.com/containers/storage/pkg/system/syscall_windows.go b/vendor/go.podman.io/storage/pkg/system/syscall_windows.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/system/syscall_windows.go rename to vendor/go.podman.io/storage/pkg/system/syscall_windows.go diff --git a/vendor/github.com/containers/storage/pkg/system/umask.go b/vendor/go.podman.io/storage/pkg/system/umask.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/system/umask.go rename to vendor/go.podman.io/storage/pkg/system/umask.go diff --git a/vendor/github.com/containers/storage/pkg/system/umask_windows.go b/vendor/go.podman.io/storage/pkg/system/umask_windows.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/system/umask_windows.go rename to vendor/go.podman.io/storage/pkg/system/umask_windows.go diff --git a/vendor/github.com/containers/storage/pkg/system/utimes_freebsd.go b/vendor/go.podman.io/storage/pkg/system/utimes_freebsd.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/system/utimes_freebsd.go rename to vendor/go.podman.io/storage/pkg/system/utimes_freebsd.go diff --git a/vendor/github.com/containers/storage/pkg/system/utimes_linux.go b/vendor/go.podman.io/storage/pkg/system/utimes_linux.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/system/utimes_linux.go rename to vendor/go.podman.io/storage/pkg/system/utimes_linux.go diff --git a/vendor/github.com/containers/storage/pkg/system/utimes_unsupported.go b/vendor/go.podman.io/storage/pkg/system/utimes_unsupported.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/system/utimes_unsupported.go rename to vendor/go.podman.io/storage/pkg/system/utimes_unsupported.go diff --git a/vendor/github.com/containers/storage/pkg/system/xattrs_darwin.go b/vendor/go.podman.io/storage/pkg/system/xattrs_darwin.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/system/xattrs_darwin.go rename to vendor/go.podman.io/storage/pkg/system/xattrs_darwin.go diff --git a/vendor/github.com/containers/storage/pkg/system/xattrs_freebsd.go b/vendor/go.podman.io/storage/pkg/system/xattrs_freebsd.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/system/xattrs_freebsd.go rename to vendor/go.podman.io/storage/pkg/system/xattrs_freebsd.go diff --git a/vendor/github.com/containers/storage/pkg/system/xattrs_linux.go b/vendor/go.podman.io/storage/pkg/system/xattrs_linux.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/system/xattrs_linux.go rename to vendor/go.podman.io/storage/pkg/system/xattrs_linux.go diff --git a/vendor/github.com/containers/storage/pkg/system/xattrs_unsupported.go b/vendor/go.podman.io/storage/pkg/system/xattrs_unsupported.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/system/xattrs_unsupported.go rename to vendor/go.podman.io/storage/pkg/system/xattrs_unsupported.go diff --git a/vendor/github.com/containers/storage/pkg/tarlog/tarlogger.go b/vendor/go.podman.io/storage/pkg/tarlog/tarlogger.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/tarlog/tarlogger.go rename to vendor/go.podman.io/storage/pkg/tarlog/tarlogger.go diff --git a/vendor/github.com/containers/storage/pkg/truncindex/truncindex.go b/vendor/go.podman.io/storage/pkg/truncindex/truncindex.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/truncindex/truncindex.go rename to vendor/go.podman.io/storage/pkg/truncindex/truncindex.go diff --git a/vendor/github.com/containers/storage/pkg/unshare/getenv_linux_cgo.go b/vendor/go.podman.io/storage/pkg/unshare/getenv_linux_cgo.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/unshare/getenv_linux_cgo.go rename to vendor/go.podman.io/storage/pkg/unshare/getenv_linux_cgo.go diff --git a/vendor/github.com/containers/storage/pkg/unshare/getenv_linux_nocgo.go b/vendor/go.podman.io/storage/pkg/unshare/getenv_linux_nocgo.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/unshare/getenv_linux_nocgo.go rename to vendor/go.podman.io/storage/pkg/unshare/getenv_linux_nocgo.go diff --git a/vendor/github.com/containers/storage/pkg/unshare/unshare.c b/vendor/go.podman.io/storage/pkg/unshare/unshare.c similarity index 100% rename from vendor/github.com/containers/storage/pkg/unshare/unshare.c rename to vendor/go.podman.io/storage/pkg/unshare/unshare.c diff --git a/vendor/github.com/containers/storage/pkg/unshare/unshare.go b/vendor/go.podman.io/storage/pkg/unshare/unshare.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/unshare/unshare.go rename to vendor/go.podman.io/storage/pkg/unshare/unshare.go diff --git a/vendor/github.com/containers/storage/pkg/unshare/unshare_cgo.go b/vendor/go.podman.io/storage/pkg/unshare/unshare_cgo.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/unshare/unshare_cgo.go rename to vendor/go.podman.io/storage/pkg/unshare/unshare_cgo.go diff --git a/vendor/github.com/containers/storage/pkg/unshare/unshare_darwin.go b/vendor/go.podman.io/storage/pkg/unshare/unshare_darwin.go similarity index 97% rename from vendor/github.com/containers/storage/pkg/unshare/unshare_darwin.go rename to vendor/go.podman.io/storage/pkg/unshare/unshare_darwin.go index 5d0a7a683ca..a9daf714c08 100644 --- a/vendor/github.com/containers/storage/pkg/unshare/unshare_darwin.go +++ b/vendor/go.podman.io/storage/pkg/unshare/unshare_darwin.go @@ -5,8 +5,8 @@ package unshare import ( "os" - "github.com/containers/storage/pkg/idtools" "github.com/opencontainers/runtime-spec/specs-go" + "go.podman.io/storage/pkg/idtools" ) const ( diff --git a/vendor/github.com/containers/storage/pkg/unshare/unshare_freebsd.c b/vendor/go.podman.io/storage/pkg/unshare/unshare_freebsd.c similarity index 100% rename from vendor/github.com/containers/storage/pkg/unshare/unshare_freebsd.c rename to vendor/go.podman.io/storage/pkg/unshare/unshare_freebsd.c diff --git a/vendor/github.com/containers/storage/pkg/unshare/unshare_freebsd.go b/vendor/go.podman.io/storage/pkg/unshare/unshare_freebsd.go similarity index 98% rename from vendor/github.com/containers/storage/pkg/unshare/unshare_freebsd.go rename to vendor/go.podman.io/storage/pkg/unshare/unshare_freebsd.go index 37a87fa5bd1..2b81f896b16 100644 --- a/vendor/github.com/containers/storage/pkg/unshare/unshare_freebsd.go +++ b/vendor/go.podman.io/storage/pkg/unshare/unshare_freebsd.go @@ -13,8 +13,8 @@ import ( "strconv" "syscall" - "github.com/containers/storage/pkg/reexec" "github.com/sirupsen/logrus" + "go.podman.io/storage/pkg/reexec" ) // Cmd wraps an exec.Cmd created by the reexec package in unshare(), diff --git a/vendor/github.com/containers/storage/pkg/unshare/unshare_gccgo.go b/vendor/go.podman.io/storage/pkg/unshare/unshare_gccgo.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/unshare/unshare_gccgo.go rename to vendor/go.podman.io/storage/pkg/unshare/unshare_gccgo.go diff --git a/vendor/github.com/containers/storage/pkg/unshare/unshare_linux.go b/vendor/go.podman.io/storage/pkg/unshare/unshare_linux.go similarity index 99% rename from vendor/github.com/containers/storage/pkg/unshare/unshare_linux.go rename to vendor/go.podman.io/storage/pkg/unshare/unshare_linux.go index 9e0e562d205..7cb069c78c5 100644 --- a/vendor/github.com/containers/storage/pkg/unshare/unshare_linux.go +++ b/vendor/go.podman.io/storage/pkg/unshare/unshare_linux.go @@ -18,11 +18,11 @@ import ( "sync" "syscall" - "github.com/containers/storage/pkg/idtools" - "github.com/containers/storage/pkg/reexec" "github.com/moby/sys/capability" "github.com/opencontainers/runtime-spec/specs-go" "github.com/sirupsen/logrus" + "go.podman.io/storage/pkg/idtools" + "go.podman.io/storage/pkg/reexec" ) // Cmd wraps an exec.Cmd created by the reexec package in unshare(), and diff --git a/vendor/github.com/containers/storage/pkg/unshare/unshare_unsupported.go b/vendor/go.podman.io/storage/pkg/unshare/unshare_unsupported.go similarity index 97% rename from vendor/github.com/containers/storage/pkg/unshare/unshare_unsupported.go rename to vendor/go.podman.io/storage/pkg/unshare/unshare_unsupported.go index 05706b8fe6f..3b463627ce3 100644 --- a/vendor/github.com/containers/storage/pkg/unshare/unshare_unsupported.go +++ b/vendor/go.podman.io/storage/pkg/unshare/unshare_unsupported.go @@ -5,8 +5,8 @@ package unshare import ( "os" - "github.com/containers/storage/pkg/idtools" "github.com/opencontainers/runtime-spec/specs-go" + "go.podman.io/storage/pkg/idtools" ) const ( diff --git a/vendor/github.com/containers/storage/pkg/unshare/unshare_unsupported_cgo.go b/vendor/go.podman.io/storage/pkg/unshare/unshare_unsupported_cgo.go similarity index 100% rename from vendor/github.com/containers/storage/pkg/unshare/unshare_unsupported_cgo.go rename to vendor/go.podman.io/storage/pkg/unshare/unshare_unsupported_cgo.go diff --git a/vendor/github.com/containers/storage/storage.conf b/vendor/go.podman.io/storage/storage.conf similarity index 100% rename from vendor/github.com/containers/storage/storage.conf rename to vendor/go.podman.io/storage/storage.conf diff --git a/vendor/github.com/containers/storage/storage.conf-freebsd b/vendor/go.podman.io/storage/storage.conf-freebsd similarity index 100% rename from vendor/github.com/containers/storage/storage.conf-freebsd rename to vendor/go.podman.io/storage/storage.conf-freebsd diff --git a/vendor/github.com/containers/storage/store.go b/vendor/go.podman.io/storage/store.go similarity index 99% rename from vendor/github.com/containers/storage/store.go rename to vendor/go.podman.io/storage/store.go index 10f4d56a875..fa34f4eecc9 100644 --- a/vendor/github.com/containers/storage/store.go +++ b/vendor/go.podman.io/storage/store.go @@ -17,24 +17,24 @@ import ( "time" // register all of the built-in drivers - _ "github.com/containers/storage/drivers/register" + _ "go.podman.io/storage/drivers/register" "golang.org/x/sync/errgroup" - drivers "github.com/containers/storage/drivers" - "github.com/containers/storage/internal/dedup" - "github.com/containers/storage/internal/tempdir" - "github.com/containers/storage/pkg/archive" - "github.com/containers/storage/pkg/directory" - "github.com/containers/storage/pkg/idtools" - "github.com/containers/storage/pkg/ioutils" - "github.com/containers/storage/pkg/lockfile" - "github.com/containers/storage/pkg/parsers" - "github.com/containers/storage/pkg/stringutils" - "github.com/containers/storage/pkg/system" - "github.com/containers/storage/types" digest "github.com/opencontainers/go-digest" "github.com/opencontainers/selinux/go-selinux/label" "github.com/sirupsen/logrus" + drivers "go.podman.io/storage/drivers" + "go.podman.io/storage/internal/dedup" + "go.podman.io/storage/internal/tempdir" + "go.podman.io/storage/pkg/archive" + "go.podman.io/storage/pkg/directory" + "go.podman.io/storage/pkg/idtools" + "go.podman.io/storage/pkg/ioutils" + "go.podman.io/storage/pkg/lockfile" + "go.podman.io/storage/pkg/parsers" + "go.podman.io/storage/pkg/stringutils" + "go.podman.io/storage/pkg/system" + "go.podman.io/storage/types" ) type updateNameOperation int diff --git a/vendor/github.com/containers/storage/types/default_override_test.conf b/vendor/go.podman.io/storage/types/default_override_test.conf similarity index 100% rename from vendor/github.com/containers/storage/types/default_override_test.conf rename to vendor/go.podman.io/storage/types/default_override_test.conf diff --git a/vendor/github.com/containers/storage/types/errors.go b/vendor/go.podman.io/storage/types/errors.go similarity index 100% rename from vendor/github.com/containers/storage/types/errors.go rename to vendor/go.podman.io/storage/types/errors.go diff --git a/vendor/github.com/containers/storage/types/idmappings.go b/vendor/go.podman.io/storage/types/idmappings.go similarity index 98% rename from vendor/github.com/containers/storage/types/idmappings.go rename to vendor/go.podman.io/storage/types/idmappings.go index aabdf7a81f3..e53ec229c31 100644 --- a/vendor/github.com/containers/storage/types/idmappings.go +++ b/vendor/go.podman.io/storage/types/idmappings.go @@ -4,7 +4,7 @@ import ( "fmt" "os" - "github.com/containers/storage/pkg/idtools" + "go.podman.io/storage/pkg/idtools" ) // AutoUserNsOptions defines how to automatically create a user namespace. diff --git a/vendor/github.com/containers/storage/types/options.go b/vendor/go.podman.io/storage/types/options.go similarity index 98% rename from vendor/github.com/containers/storage/types/options.go rename to vendor/go.podman.io/storage/types/options.go index 451a3f6dea4..2c2be5c22d8 100644 --- a/vendor/github.com/containers/storage/types/options.go +++ b/vendor/go.podman.io/storage/types/options.go @@ -10,12 +10,12 @@ import ( "time" "github.com/BurntSushi/toml" - cfg "github.com/containers/storage/pkg/config" - "github.com/containers/storage/pkg/fileutils" - "github.com/containers/storage/pkg/homedir" - "github.com/containers/storage/pkg/idtools" - "github.com/containers/storage/pkg/unshare" "github.com/sirupsen/logrus" + cfg "go.podman.io/storage/pkg/config" + "go.podman.io/storage/pkg/fileutils" + "go.podman.io/storage/pkg/homedir" + "go.podman.io/storage/pkg/idtools" + "go.podman.io/storage/pkg/unshare" ) // TOML-friendly explicit tables used for conversions. diff --git a/vendor/github.com/containers/storage/types/options_bsd.go b/vendor/go.podman.io/storage/types/options_bsd.go similarity index 100% rename from vendor/github.com/containers/storage/types/options_bsd.go rename to vendor/go.podman.io/storage/types/options_bsd.go diff --git a/vendor/github.com/containers/storage/types/options_darwin.go b/vendor/go.podman.io/storage/types/options_darwin.go similarity index 100% rename from vendor/github.com/containers/storage/types/options_darwin.go rename to vendor/go.podman.io/storage/types/options_darwin.go diff --git a/vendor/github.com/containers/storage/types/options_linux.go b/vendor/go.podman.io/storage/types/options_linux.go similarity index 100% rename from vendor/github.com/containers/storage/types/options_linux.go rename to vendor/go.podman.io/storage/types/options_linux.go diff --git a/vendor/github.com/containers/storage/types/options_windows.go b/vendor/go.podman.io/storage/types/options_windows.go similarity index 100% rename from vendor/github.com/containers/storage/types/options_windows.go rename to vendor/go.podman.io/storage/types/options_windows.go diff --git a/vendor/github.com/containers/storage/types/storage_broken.conf b/vendor/go.podman.io/storage/types/storage_broken.conf similarity index 100% rename from vendor/github.com/containers/storage/types/storage_broken.conf rename to vendor/go.podman.io/storage/types/storage_broken.conf diff --git a/vendor/github.com/containers/storage/types/storage_test.conf b/vendor/go.podman.io/storage/types/storage_test.conf similarity index 100% rename from vendor/github.com/containers/storage/types/storage_test.conf rename to vendor/go.podman.io/storage/types/storage_test.conf diff --git a/vendor/github.com/containers/storage/types/utils.go b/vendor/go.podman.io/storage/types/utils.go similarity index 95% rename from vendor/github.com/containers/storage/types/utils.go rename to vendor/go.podman.io/storage/types/utils.go index 1a8c463e35c..fd25eaa0751 100644 --- a/vendor/github.com/containers/storage/types/utils.go +++ b/vendor/go.podman.io/storage/types/utils.go @@ -7,9 +7,9 @@ import ( "strconv" "strings" - "github.com/containers/storage/pkg/fileutils" - "github.com/containers/storage/pkg/homedir" "github.com/sirupsen/logrus" + "go.podman.io/storage/pkg/fileutils" + "go.podman.io/storage/pkg/homedir" ) func expandEnvPath(path string, rootlessUID int) (string, error) { diff --git a/vendor/github.com/containers/storage/userns.go b/vendor/go.podman.io/storage/userns.go similarity index 98% rename from vendor/github.com/containers/storage/userns.go rename to vendor/go.podman.io/storage/userns.go index 117a732ce0b..b3d76a31bfc 100644 --- a/vendor/github.com/containers/storage/userns.go +++ b/vendor/go.podman.io/storage/userns.go @@ -8,13 +8,13 @@ import ( "os/user" "strconv" - drivers "github.com/containers/storage/drivers" - "github.com/containers/storage/pkg/idtools" - "github.com/containers/storage/pkg/unshare" - "github.com/containers/storage/types" securejoin "github.com/cyphar/filepath-securejoin" libcontainerUser "github.com/moby/sys/user" "github.com/sirupsen/logrus" + drivers "go.podman.io/storage/drivers" + "go.podman.io/storage/pkg/idtools" + "go.podman.io/storage/pkg/unshare" + "go.podman.io/storage/types" "golang.org/x/sys/unix" ) diff --git a/vendor/github.com/containers/storage/userns_unsupported.go b/vendor/go.podman.io/storage/userns_unsupported.go similarity index 77% rename from vendor/github.com/containers/storage/userns_unsupported.go rename to vendor/go.podman.io/storage/userns_unsupported.go index e37c18fe438..9e899cafca8 100644 --- a/vendor/github.com/containers/storage/userns_unsupported.go +++ b/vendor/go.podman.io/storage/userns_unsupported.go @@ -5,8 +5,8 @@ package storage import ( "errors" - "github.com/containers/storage/pkg/idtools" - "github.com/containers/storage/types" + "go.podman.io/storage/pkg/idtools" + "go.podman.io/storage/types" ) func (s *store) getAutoUserNS(_ *types.AutoUserNsOptions, _ *Image, _ rwLayerStore, _ []roLayerStore) ([]idtools.IDMap, []idtools.IDMap, error) { diff --git a/vendor/github.com/containers/storage/utils.go b/vendor/go.podman.io/storage/utils.go similarity index 97% rename from vendor/github.com/containers/storage/utils.go rename to vendor/go.podman.io/storage/utils.go index c61d798378d..44a463ffbf3 100644 --- a/vendor/github.com/containers/storage/utils.go +++ b/vendor/go.podman.io/storage/utils.go @@ -4,7 +4,7 @@ import ( "fmt" "slices" - "github.com/containers/storage/types" + "go.podman.io/storage/types" ) // ParseIDMapping takes idmappings and subuid and subgid maps and returns a storage mapping diff --git a/vendor/modules.txt b/vendor/modules.txt index 4698ce17384..b95686d1e9a 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -78,7 +78,7 @@ github.com/containernetworking/cni/pkg/version # github.com/containernetworking/plugins v1.7.1 ## explicit; go 1.23.0 github.com/containernetworking/plugins/pkg/ns -# github.com/containers/buildah v1.41.1-0.20250825221131-264309dc1081 +# github.com/containers/buildah v1.41.1-0.20250829135344-3367a9bc2c9f ## explicit; go 1.23.3 github.com/containers/buildah github.com/containers/buildah/bind @@ -111,154 +111,17 @@ github.com/containers/buildah/pkg/sshagent github.com/containers/buildah/pkg/util github.com/containers/buildah/pkg/volumes github.com/containers/buildah/util -# github.com/containers/common v0.64.2-0.20250826074712-7692941ae9c8 -## explicit; go 1.23.3 -github.com/containers/common/internal -github.com/containers/common/internal/attributedstring -github.com/containers/common/libimage -github.com/containers/common/libimage/define -github.com/containers/common/libimage/filter -github.com/containers/common/libimage/manifests -github.com/containers/common/libimage/platform -github.com/containers/common/libnetwork/cni -github.com/containers/common/libnetwork/etchosts -github.com/containers/common/libnetwork/internal/rootlessnetns -github.com/containers/common/libnetwork/internal/util -github.com/containers/common/libnetwork/netavark -github.com/containers/common/libnetwork/network -github.com/containers/common/libnetwork/pasta -github.com/containers/common/libnetwork/resolvconf -github.com/containers/common/libnetwork/slirp4netns -github.com/containers/common/libnetwork/types -github.com/containers/common/libnetwork/util -github.com/containers/common/pkg/apparmor -github.com/containers/common/pkg/apparmor/internal/supported -github.com/containers/common/pkg/auth -github.com/containers/common/pkg/capabilities -github.com/containers/common/pkg/cgroups -github.com/containers/common/pkg/cgroupv2 -github.com/containers/common/pkg/chown -github.com/containers/common/pkg/completion -github.com/containers/common/pkg/config -github.com/containers/common/pkg/detach -github.com/containers/common/pkg/download -github.com/containers/common/pkg/filters -github.com/containers/common/pkg/flag -github.com/containers/common/pkg/hooks -github.com/containers/common/pkg/hooks/0.1.0 -github.com/containers/common/pkg/hooks/1.0.0 -github.com/containers/common/pkg/hooks/exec -github.com/containers/common/pkg/machine -github.com/containers/common/pkg/manifests -github.com/containers/common/pkg/netns -github.com/containers/common/pkg/parse -github.com/containers/common/pkg/password -github.com/containers/common/pkg/report -github.com/containers/common/pkg/report/camelcase -github.com/containers/common/pkg/resize -github.com/containers/common/pkg/retry -github.com/containers/common/pkg/rootlessport -github.com/containers/common/pkg/seccomp -github.com/containers/common/pkg/secrets -github.com/containers/common/pkg/secrets/define -github.com/containers/common/pkg/secrets/filedriver -github.com/containers/common/pkg/secrets/passdriver -github.com/containers/common/pkg/secrets/shelldriver -github.com/containers/common/pkg/servicereaper -github.com/containers/common/pkg/signal -github.com/containers/common/pkg/ssh +# github.com/containers/common v0.62.2 +## explicit; go 1.22.8 github.com/containers/common/pkg/strongunits -github.com/containers/common/pkg/subscriptions -github.com/containers/common/pkg/supplemented -github.com/containers/common/pkg/sysinfo -github.com/containers/common/pkg/systemd -github.com/containers/common/pkg/timetype -github.com/containers/common/pkg/timezone -github.com/containers/common/pkg/umask -github.com/containers/common/pkg/util -github.com/containers/common/pkg/version -github.com/containers/common/version # github.com/containers/conmon v2.0.20+incompatible ## explicit github.com/containers/conmon/runner/config # github.com/containers/gvisor-tap-vsock v0.8.7 ## explicit; go 1.23.0 github.com/containers/gvisor-tap-vsock/pkg/types -# github.com/containers/image/v5 v5.36.2-0.20250825172340-9b99818eb1db +# github.com/containers/libhvee v0.10.1-0.20250829163521-178d10e67860 ## explicit; go 1.23.3 -github.com/containers/image/v5/copy -github.com/containers/image/v5/directory -github.com/containers/image/v5/directory/explicitfilepath -github.com/containers/image/v5/docker -github.com/containers/image/v5/docker/archive -github.com/containers/image/v5/docker/daemon -github.com/containers/image/v5/docker/internal/tarfile -github.com/containers/image/v5/docker/policyconfiguration -github.com/containers/image/v5/docker/reference -github.com/containers/image/v5/image -github.com/containers/image/v5/internal/blobinfocache -github.com/containers/image/v5/internal/image -github.com/containers/image/v5/internal/imagedestination -github.com/containers/image/v5/internal/imagedestination/impl -github.com/containers/image/v5/internal/imagedestination/stubs -github.com/containers/image/v5/internal/imagesource -github.com/containers/image/v5/internal/imagesource/impl -github.com/containers/image/v5/internal/imagesource/stubs -github.com/containers/image/v5/internal/iolimits -github.com/containers/image/v5/internal/manifest -github.com/containers/image/v5/internal/multierr -github.com/containers/image/v5/internal/pkg/platform -github.com/containers/image/v5/internal/private -github.com/containers/image/v5/internal/putblobdigest -github.com/containers/image/v5/internal/rootless -github.com/containers/image/v5/internal/set -github.com/containers/image/v5/internal/signature -github.com/containers/image/v5/internal/signer -github.com/containers/image/v5/internal/streamdigest -github.com/containers/image/v5/internal/tmpdir -github.com/containers/image/v5/internal/unparsedimage -github.com/containers/image/v5/internal/uploadreader -github.com/containers/image/v5/internal/useragent -github.com/containers/image/v5/manifest -github.com/containers/image/v5/oci/archive -github.com/containers/image/v5/oci/internal -github.com/containers/image/v5/oci/layout -github.com/containers/image/v5/openshift -github.com/containers/image/v5/pkg/blobcache -github.com/containers/image/v5/pkg/blobinfocache -github.com/containers/image/v5/pkg/blobinfocache/internal/prioritize -github.com/containers/image/v5/pkg/blobinfocache/memory -github.com/containers/image/v5/pkg/blobinfocache/none -github.com/containers/image/v5/pkg/blobinfocache/sqlite -github.com/containers/image/v5/pkg/cli -github.com/containers/image/v5/pkg/cli/sigstore -github.com/containers/image/v5/pkg/cli/sigstore/params -github.com/containers/image/v5/pkg/compression -github.com/containers/image/v5/pkg/compression/internal -github.com/containers/image/v5/pkg/compression/types -github.com/containers/image/v5/pkg/docker/config -github.com/containers/image/v5/pkg/shortnames -github.com/containers/image/v5/pkg/strslice -github.com/containers/image/v5/pkg/sysregistriesv2 -github.com/containers/image/v5/pkg/tlsclientconfig -github.com/containers/image/v5/sif -github.com/containers/image/v5/signature -github.com/containers/image/v5/signature/internal -github.com/containers/image/v5/signature/internal/sequoia -github.com/containers/image/v5/signature/signer -github.com/containers/image/v5/signature/sigstore -github.com/containers/image/v5/signature/sigstore/fulcio -github.com/containers/image/v5/signature/sigstore/internal -github.com/containers/image/v5/signature/sigstore/rekor -github.com/containers/image/v5/signature/simplesigning -github.com/containers/image/v5/storage -github.com/containers/image/v5/tarball -github.com/containers/image/v5/transports -github.com/containers/image/v5/transports/alltransports -github.com/containers/image/v5/types -github.com/containers/image/v5/version -# github.com/containers/libhvee v0.10.0 -## explicit; go 1.22.8 github.com/containers/libhvee/pkg/hypervctl github.com/containers/libhvee/pkg/kvp/ginsu github.com/containers/libhvee/pkg/wmiext @@ -286,8 +149,8 @@ github.com/containers/ocicrypt/keywrap/pkcs7 github.com/containers/ocicrypt/spec github.com/containers/ocicrypt/utils github.com/containers/ocicrypt/utils/keyprovider -# github.com/containers/psgo v1.9.0 -## explicit; go 1.18 +# github.com/containers/psgo v1.9.1-0.20250826150930-4ae76f200c86 +## explicit; go 1.23.3 github.com/containers/psgo github.com/containers/psgo/internal/capabilities github.com/containers/psgo/internal/cgroups @@ -295,57 +158,6 @@ github.com/containers/psgo/internal/dev github.com/containers/psgo/internal/host github.com/containers/psgo/internal/proc github.com/containers/psgo/internal/process -# github.com/containers/storage v1.59.2-0.20250820181736-3f7c116059ca -## explicit; go 1.23.0 -github.com/containers/storage -github.com/containers/storage/drivers -github.com/containers/storage/drivers/aufs -github.com/containers/storage/drivers/btrfs -github.com/containers/storage/drivers/copy -github.com/containers/storage/drivers/overlay -github.com/containers/storage/drivers/overlayutils -github.com/containers/storage/drivers/quota -github.com/containers/storage/drivers/register -github.com/containers/storage/drivers/vfs -github.com/containers/storage/drivers/zfs -github.com/containers/storage/internal/dedup -github.com/containers/storage/internal/rawfilelock -github.com/containers/storage/internal/staging_lockfile -github.com/containers/storage/internal/tempdir -github.com/containers/storage/pkg/archive -github.com/containers/storage/pkg/chrootarchive -github.com/containers/storage/pkg/chunked -github.com/containers/storage/pkg/chunked/compressor -github.com/containers/storage/pkg/chunked/dump -github.com/containers/storage/pkg/chunked/internal/minimal -github.com/containers/storage/pkg/chunked/internal/path -github.com/containers/storage/pkg/chunked/toc -github.com/containers/storage/pkg/config -github.com/containers/storage/pkg/directory -github.com/containers/storage/pkg/fileutils -github.com/containers/storage/pkg/fsutils -github.com/containers/storage/pkg/fsverity -github.com/containers/storage/pkg/homedir -github.com/containers/storage/pkg/idmap -github.com/containers/storage/pkg/idtools -github.com/containers/storage/pkg/ioutils -github.com/containers/storage/pkg/locker -github.com/containers/storage/pkg/lockfile -github.com/containers/storage/pkg/longpath -github.com/containers/storage/pkg/loopback -github.com/containers/storage/pkg/mount -github.com/containers/storage/pkg/parsers -github.com/containers/storage/pkg/pools -github.com/containers/storage/pkg/promise -github.com/containers/storage/pkg/reexec -github.com/containers/storage/pkg/regexp -github.com/containers/storage/pkg/stringid -github.com/containers/storage/pkg/stringutils -github.com/containers/storage/pkg/system -github.com/containers/storage/pkg/tarlog -github.com/containers/storage/pkg/truncindex -github.com/containers/storage/pkg/unshare -github.com/containers/storage/types # github.com/containers/winquit v1.1.0 ## explicit; go 1.19 github.com/containers/winquit/pkg/winquit @@ -728,7 +540,6 @@ github.com/opencontainers/image-spec/specs-go/v1 ## explicit; go 1.23.0 github.com/opencontainers/runc/libcontainer/apparmor github.com/opencontainers/runc/libcontainer/devices -github.com/opencontainers/runc/libcontainer/user github.com/opencontainers/runc/libcontainer/utils # github.com/opencontainers/runtime-spec v1.2.1 ## explicit @@ -743,8 +554,8 @@ github.com/opencontainers/runtime-tools/validate/capabilities github.com/opencontainers/selinux/go-selinux github.com/opencontainers/selinux/go-selinux/label github.com/opencontainers/selinux/pkg/pwalkdir -# github.com/openshift/imagebuilder v1.2.16 -## explicit; go 1.22.0 +# github.com/openshift/imagebuilder v1.2.16-0.20250828154754-e22ebd3ff511 +## explicit; go 1.23.3 github.com/openshift/imagebuilder github.com/openshift/imagebuilder/dockerfile/command github.com/openshift/imagebuilder/dockerfile/parser @@ -866,7 +677,7 @@ github.com/tklauser/numcpus # github.com/u-root/uio v0.0.0-20240224005618-d2acac8f3701 ## explicit; go 1.21 github.com/u-root/uio/ulog -# github.com/ulikunitz/xz v0.5.13 +# github.com/ulikunitz/xz v0.5.15 ## explicit; go 1.12 github.com/ulikunitz/xz github.com/ulikunitz/xz/internal/hash @@ -890,8 +701,6 @@ github.com/vishvananda/netlink/nl # github.com/vishvananda/netns v0.0.5 ## explicit; go 1.17 github.com/vishvananda/netns -# github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb -## explicit # github.com/yusufpapurcu/wmi v1.2.4 ## explicit; go 1.16 github.com/yusufpapurcu/wmi @@ -935,6 +744,196 @@ go.opentelemetry.io/otel/trace go.opentelemetry.io/otel/trace/embedded go.opentelemetry.io/otel/trace/internal/telemetry go.opentelemetry.io/otel/trace/noop +# go.podman.io/common v0.0.0-20250826054041-6e4bed3c9118 +## explicit; go 1.23.3 +go.podman.io/common/internal +go.podman.io/common/internal/attributedstring +go.podman.io/common/libimage +go.podman.io/common/libimage/define +go.podman.io/common/libimage/filter +go.podman.io/common/libimage/manifests +go.podman.io/common/libimage/platform +go.podman.io/common/libnetwork/cni +go.podman.io/common/libnetwork/etchosts +go.podman.io/common/libnetwork/internal/rootlessnetns +go.podman.io/common/libnetwork/internal/util +go.podman.io/common/libnetwork/netavark +go.podman.io/common/libnetwork/network +go.podman.io/common/libnetwork/pasta +go.podman.io/common/libnetwork/resolvconf +go.podman.io/common/libnetwork/slirp4netns +go.podman.io/common/libnetwork/types +go.podman.io/common/libnetwork/util +go.podman.io/common/pkg/apparmor +go.podman.io/common/pkg/apparmor/internal/supported +go.podman.io/common/pkg/auth +go.podman.io/common/pkg/capabilities +go.podman.io/common/pkg/cgroups +go.podman.io/common/pkg/cgroupv2 +go.podman.io/common/pkg/chown +go.podman.io/common/pkg/completion +go.podman.io/common/pkg/config +go.podman.io/common/pkg/detach +go.podman.io/common/pkg/download +go.podman.io/common/pkg/filters +go.podman.io/common/pkg/flag +go.podman.io/common/pkg/hooks +go.podman.io/common/pkg/hooks/0.1.0 +go.podman.io/common/pkg/hooks/1.0.0 +go.podman.io/common/pkg/hooks/exec +go.podman.io/common/pkg/machine +go.podman.io/common/pkg/manifests +go.podman.io/common/pkg/netns +go.podman.io/common/pkg/parse +go.podman.io/common/pkg/password +go.podman.io/common/pkg/report +go.podman.io/common/pkg/report/camelcase +go.podman.io/common/pkg/resize +go.podman.io/common/pkg/retry +go.podman.io/common/pkg/rootlessport +go.podman.io/common/pkg/seccomp +go.podman.io/common/pkg/secrets +go.podman.io/common/pkg/secrets/define +go.podman.io/common/pkg/secrets/filedriver +go.podman.io/common/pkg/secrets/passdriver +go.podman.io/common/pkg/secrets/shelldriver +go.podman.io/common/pkg/servicereaper +go.podman.io/common/pkg/signal +go.podman.io/common/pkg/ssh +go.podman.io/common/pkg/strongunits +go.podman.io/common/pkg/subscriptions +go.podman.io/common/pkg/supplemented +go.podman.io/common/pkg/sysinfo +go.podman.io/common/pkg/systemd +go.podman.io/common/pkg/timetype +go.podman.io/common/pkg/timezone +go.podman.io/common/pkg/umask +go.podman.io/common/pkg/util +go.podman.io/common/pkg/version +go.podman.io/common/version +# go.podman.io/image/v5 v5.36.1-0.20250820085751-a13b38f45723 +## explicit; go 1.23.3 +go.podman.io/image/v5/copy +go.podman.io/image/v5/directory +go.podman.io/image/v5/directory/explicitfilepath +go.podman.io/image/v5/docker +go.podman.io/image/v5/docker/archive +go.podman.io/image/v5/docker/daemon +go.podman.io/image/v5/docker/internal/tarfile +go.podman.io/image/v5/docker/policyconfiguration +go.podman.io/image/v5/docker/reference +go.podman.io/image/v5/image +go.podman.io/image/v5/internal/blobinfocache +go.podman.io/image/v5/internal/image +go.podman.io/image/v5/internal/imagedestination +go.podman.io/image/v5/internal/imagedestination/impl +go.podman.io/image/v5/internal/imagedestination/stubs +go.podman.io/image/v5/internal/imagesource +go.podman.io/image/v5/internal/imagesource/impl +go.podman.io/image/v5/internal/imagesource/stubs +go.podman.io/image/v5/internal/iolimits +go.podman.io/image/v5/internal/manifest +go.podman.io/image/v5/internal/multierr +go.podman.io/image/v5/internal/pkg/platform +go.podman.io/image/v5/internal/private +go.podman.io/image/v5/internal/putblobdigest +go.podman.io/image/v5/internal/rootless +go.podman.io/image/v5/internal/set +go.podman.io/image/v5/internal/signature +go.podman.io/image/v5/internal/signer +go.podman.io/image/v5/internal/streamdigest +go.podman.io/image/v5/internal/tmpdir +go.podman.io/image/v5/internal/unparsedimage +go.podman.io/image/v5/internal/uploadreader +go.podman.io/image/v5/internal/useragent +go.podman.io/image/v5/manifest +go.podman.io/image/v5/oci/archive +go.podman.io/image/v5/oci/internal +go.podman.io/image/v5/oci/layout +go.podman.io/image/v5/openshift +go.podman.io/image/v5/pkg/blobcache +go.podman.io/image/v5/pkg/blobinfocache +go.podman.io/image/v5/pkg/blobinfocache/internal/prioritize +go.podman.io/image/v5/pkg/blobinfocache/memory +go.podman.io/image/v5/pkg/blobinfocache/none +go.podman.io/image/v5/pkg/blobinfocache/sqlite +go.podman.io/image/v5/pkg/cli +go.podman.io/image/v5/pkg/cli/sigstore +go.podman.io/image/v5/pkg/cli/sigstore/params +go.podman.io/image/v5/pkg/compression +go.podman.io/image/v5/pkg/compression/internal +go.podman.io/image/v5/pkg/compression/types +go.podman.io/image/v5/pkg/docker/config +go.podman.io/image/v5/pkg/shortnames +go.podman.io/image/v5/pkg/strslice +go.podman.io/image/v5/pkg/sysregistriesv2 +go.podman.io/image/v5/pkg/tlsclientconfig +go.podman.io/image/v5/sif +go.podman.io/image/v5/signature +go.podman.io/image/v5/signature/internal +go.podman.io/image/v5/signature/signer +go.podman.io/image/v5/signature/sigstore +go.podman.io/image/v5/signature/sigstore/fulcio +go.podman.io/image/v5/signature/sigstore/internal +go.podman.io/image/v5/signature/sigstore/rekor +go.podman.io/image/v5/signature/simplesigning +go.podman.io/image/v5/storage +go.podman.io/image/v5/tarball +go.podman.io/image/v5/transports +go.podman.io/image/v5/transports/alltransports +go.podman.io/image/v5/types +go.podman.io/image/v5/version +# go.podman.io/storage v1.59.1-0.20250820085751-a13b38f45723 +## explicit; go 1.23.3 +go.podman.io/storage +go.podman.io/storage/drivers +go.podman.io/storage/drivers/aufs +go.podman.io/storage/drivers/btrfs +go.podman.io/storage/drivers/copy +go.podman.io/storage/drivers/overlay +go.podman.io/storage/drivers/overlayutils +go.podman.io/storage/drivers/quota +go.podman.io/storage/drivers/register +go.podman.io/storage/drivers/vfs +go.podman.io/storage/drivers/zfs +go.podman.io/storage/internal/dedup +go.podman.io/storage/internal/rawfilelock +go.podman.io/storage/internal/staging_lockfile +go.podman.io/storage/internal/tempdir +go.podman.io/storage/pkg/archive +go.podman.io/storage/pkg/chrootarchive +go.podman.io/storage/pkg/chunked +go.podman.io/storage/pkg/chunked/compressor +go.podman.io/storage/pkg/chunked/dump +go.podman.io/storage/pkg/chunked/internal/minimal +go.podman.io/storage/pkg/chunked/internal/path +go.podman.io/storage/pkg/chunked/toc +go.podman.io/storage/pkg/config +go.podman.io/storage/pkg/directory +go.podman.io/storage/pkg/fileutils +go.podman.io/storage/pkg/fsutils +go.podman.io/storage/pkg/fsverity +go.podman.io/storage/pkg/homedir +go.podman.io/storage/pkg/idmap +go.podman.io/storage/pkg/idtools +go.podman.io/storage/pkg/ioutils +go.podman.io/storage/pkg/locker +go.podman.io/storage/pkg/lockfile +go.podman.io/storage/pkg/longpath +go.podman.io/storage/pkg/loopback +go.podman.io/storage/pkg/mount +go.podman.io/storage/pkg/parsers +go.podman.io/storage/pkg/pools +go.podman.io/storage/pkg/promise +go.podman.io/storage/pkg/reexec +go.podman.io/storage/pkg/regexp +go.podman.io/storage/pkg/stringid +go.podman.io/storage/pkg/stringutils +go.podman.io/storage/pkg/system +go.podman.io/storage/pkg/tarlog +go.podman.io/storage/pkg/truncindex +go.podman.io/storage/pkg/unshare +go.podman.io/storage/types # go.uber.org/automaxprocs v1.6.0 ## explicit; go 1.20 go.uber.org/automaxprocs