diff --git a/cmd/podman/artifact/pull.go b/cmd/podman/artifact/pull.go index fe90422238..bb2904fb62 100644 --- a/cmd/podman/artifact/pull.go +++ b/cmd/podman/artifact/pull.go @@ -4,12 +4,12 @@ import ( "fmt" "os" - "github.com/containers/buildah/pkg/cli" "github.com/containers/podman/v6/cmd/podman/common" "github.com/containers/podman/v6/cmd/podman/registry" "github.com/containers/podman/v6/pkg/domain/entities" "github.com/containers/podman/v6/pkg/util" "github.com/spf13/cobra" + "go.podman.io/buildah/pkg/cli" "go.podman.io/common/pkg/auth" "go.podman.io/common/pkg/completion" "go.podman.io/image/v5/types" diff --git a/cmd/podman/artifact/push.go b/cmd/podman/artifact/push.go index 122f3fb69b..0d666e8d7b 100644 --- a/cmd/podman/artifact/push.go +++ b/cmd/podman/artifact/push.go @@ -4,12 +4,12 @@ import ( "fmt" "os" - "github.com/containers/buildah/pkg/cli" "github.com/containers/podman/v6/cmd/podman/common" "github.com/containers/podman/v6/cmd/podman/registry" "github.com/containers/podman/v6/pkg/domain/entities" "github.com/containers/podman/v6/pkg/util" "github.com/spf13/cobra" + "go.podman.io/buildah/pkg/cli" "go.podman.io/common/pkg/auth" "go.podman.io/common/pkg/completion" "go.podman.io/image/v5/types" diff --git a/cmd/podman/common/build.go b/cmd/podman/common/build.go index 6fee80eb45..8389f47ea1 100644 --- a/cmd/podman/common/build.go +++ b/cmd/podman/common/build.go @@ -13,10 +13,6 @@ import ( "syscall" "time" - buildahDefine "github.com/containers/buildah/define" - buildahCLI "github.com/containers/buildah/pkg/cli" - "github.com/containers/buildah/pkg/parse" - buildahUtil "github.com/containers/buildah/pkg/util" encconfig "github.com/containers/ocicrypt/config" enchelpers "github.com/containers/ocicrypt/helpers" "github.com/containers/podman/v6/cmd/podman/registry" @@ -26,6 +22,10 @@ import ( "github.com/openshift/imagebuilder" "github.com/sirupsen/logrus" "github.com/spf13/cobra" + buildahDefine "go.podman.io/buildah/define" + buildahCLI "go.podman.io/buildah/pkg/cli" + "go.podman.io/buildah/pkg/parse" + buildahUtil "go.podman.io/buildah/pkg/util" "go.podman.io/common/pkg/auth" "go.podman.io/common/pkg/completion" "go.podman.io/common/pkg/config" diff --git a/cmd/podman/containers/cp.go b/cmd/podman/containers/cp.go index 5cc65596ed..9471cf1391 100644 --- a/cmd/podman/containers/cp.go +++ b/cmd/podman/containers/cp.go @@ -11,7 +11,6 @@ import ( "strconv" "strings" - buildahCopiah "github.com/containers/buildah/copier" "github.com/containers/podman/v6/cmd/podman/common" "github.com/containers/podman/v6/cmd/podman/registry" "github.com/containers/podman/v6/pkg/copy" @@ -19,6 +18,7 @@ import ( "github.com/containers/podman/v6/pkg/errorhandling" "github.com/sirupsen/logrus" "github.com/spf13/cobra" + buildahCopiah "go.podman.io/buildah/copier" "go.podman.io/storage/pkg/archive" "go.podman.io/storage/pkg/idtools" ) diff --git a/cmd/podman/containers/create.go b/cmd/podman/containers/create.go index 8f8aebb82d..c48d5d7578 100644 --- a/cmd/podman/containers/create.go +++ b/cmd/podman/containers/create.go @@ -9,7 +9,6 @@ import ( "strconv" "strings" - "github.com/containers/buildah/pkg/cli" "github.com/containers/podman/v6/cmd/podman/common" "github.com/containers/podman/v6/cmd/podman/registry" "github.com/containers/podman/v6/cmd/podman/utils" @@ -20,6 +19,7 @@ import ( "github.com/containers/podman/v6/pkg/util" "github.com/sirupsen/logrus" "github.com/spf13/cobra" + "go.podman.io/buildah/pkg/cli" "go.podman.io/common/pkg/auth" "go.podman.io/common/pkg/config" "go.podman.io/image/v5/transports/alltransports" diff --git a/cmd/podman/images/build.go b/cmd/podman/images/build.go index fdfc95eef0..be1b710018 100644 --- a/cmd/podman/images/build.go +++ b/cmd/podman/images/build.go @@ -5,12 +5,12 @@ import ( "os" "os/exec" - buildahCLI "github.com/containers/buildah/pkg/cli" "github.com/containers/podman/v6/cmd/podman/common" "github.com/containers/podman/v6/cmd/podman/registry" "github.com/containers/podman/v6/cmd/podman/utils" "github.com/sirupsen/logrus" "github.com/spf13/cobra" + buildahCLI "go.podman.io/buildah/pkg/cli" ) var ( diff --git a/cmd/podman/images/pull.go b/cmd/podman/images/pull.go index 8ff7492d7f..2ecf0c6f40 100644 --- a/cmd/podman/images/pull.go +++ b/cmd/podman/images/pull.go @@ -6,13 +6,13 @@ import ( "os" "strings" - "github.com/containers/buildah/pkg/cli" "github.com/containers/podman/v6/cmd/podman/common" "github.com/containers/podman/v6/cmd/podman/registry" "github.com/containers/podman/v6/cmd/podman/utils" "github.com/containers/podman/v6/pkg/domain/entities" "github.com/containers/podman/v6/pkg/util" "github.com/spf13/cobra" + "go.podman.io/buildah/pkg/cli" "go.podman.io/common/pkg/auth" "go.podman.io/common/pkg/completion" "go.podman.io/common/pkg/config" diff --git a/cmd/podman/images/push.go b/cmd/podman/images/push.go index 02dcc29f74..afac5b40d5 100644 --- a/cmd/podman/images/push.go +++ b/cmd/podman/images/push.go @@ -4,12 +4,12 @@ import ( "fmt" "os" - "github.com/containers/buildah/pkg/cli" "github.com/containers/podman/v6/cmd/podman/common" "github.com/containers/podman/v6/cmd/podman/registry" "github.com/containers/podman/v6/pkg/domain/entities" "github.com/containers/podman/v6/pkg/util" "github.com/spf13/cobra" + "go.podman.io/buildah/pkg/cli" "go.podman.io/common/pkg/auth" "go.podman.io/common/pkg/completion" "go.podman.io/image/v5/types" diff --git a/cmd/podman/images/version.go b/cmd/podman/images/version.go index 8ab88812bb..190464662d 100644 --- a/cmd/podman/images/version.go +++ b/cmd/podman/images/version.go @@ -3,10 +3,10 @@ package images import ( "fmt" - "github.com/containers/buildah/define" "github.com/containers/podman/v6/cmd/podman/registry" "github.com/containers/podman/v6/cmd/podman/validate" "github.com/spf13/cobra" + "go.podman.io/buildah/define" "go.podman.io/common/pkg/completion" ) diff --git a/cmd/podman/kube/play.go b/cmd/podman/kube/play.go index 2104ba2c5b..7d97355569 100644 --- a/cmd/podman/kube/play.go +++ b/cmd/podman/kube/play.go @@ -12,7 +12,6 @@ import ( "strings" "syscall" - buildahParse "github.com/containers/buildah/pkg/parse" "github.com/containers/podman/v6/cmd/podman/common" "github.com/containers/podman/v6/cmd/podman/parse" "github.com/containers/podman/v6/cmd/podman/registry" @@ -24,6 +23,7 @@ import ( "github.com/containers/podman/v6/pkg/errorhandling" "github.com/containers/podman/v6/pkg/util" "github.com/spf13/cobra" + buildahParse "go.podman.io/buildah/pkg/parse" "go.podman.io/common/pkg/auth" "go.podman.io/common/pkg/completion" "go.podman.io/image/v5/types" diff --git a/cmd/podman/system/reset.go b/cmd/podman/system/reset.go index c302c0c6f3..0da6495caa 100644 --- a/cmd/podman/system/reset.go +++ b/cmd/podman/system/reset.go @@ -8,11 +8,11 @@ import ( "os" "strings" - "github.com/containers/buildah/pkg/volumes" "github.com/containers/podman/v6/cmd/podman/registry" "github.com/containers/podman/v6/cmd/podman/validate" "github.com/sirupsen/logrus" "github.com/spf13/cobra" + "go.podman.io/buildah/pkg/volumes" "go.podman.io/common/pkg/completion" ) diff --git a/cmd/podman/utils/error.go b/cmd/podman/utils/error.go index 73bd147dc5..c590c9379c 100644 --- a/cmd/podman/utils/error.go +++ b/cmd/podman/utils/error.go @@ -8,8 +8,8 @@ import ( "strconv" "strings" - buildahCLI "github.com/containers/buildah/pkg/cli" "github.com/containers/podman/v6/cmd/podman/registry" + buildahCLI "go.podman.io/buildah/pkg/cli" ) type OutputErrors []error diff --git a/go.mod b/go.mod index feffaa40a5..1fdbc7d747 100644 --- a/go.mod +++ b/go.mod @@ -10,7 +10,6 @@ require ( github.com/blang/semver/v4 v4.0.0 github.com/checkpoint-restore/checkpointctl v1.5.0 github.com/checkpoint-restore/go-criu/v7 v7.2.0 - github.com/containers/buildah v1.42.1-0.20260417103105-4e43fa8d9e07 github.com/containers/gvisor-tap-vsock v0.8.8 github.com/containers/libhvee v0.11.0 github.com/containers/ocicrypt v1.3.0 @@ -42,7 +41,7 @@ require ( github.com/mdlayher/vsock v1.2.1 github.com/moby/docker-image-spec v1.3.1 github.com/moby/moby/api v1.54.2 - github.com/moby/moby/client v0.4.0 + github.com/moby/moby/client v0.4.1 github.com/moby/sys/capability v0.4.0 github.com/moby/sys/user v0.4.0 github.com/moby/term v0.5.2 @@ -64,6 +63,7 @@ require ( github.com/stretchr/testify v1.11.1 github.com/vbauerster/mpb/v8 v8.12.0 github.com/vishvananda/netlink v1.3.1 + go.podman.io/buildah v1.42.1-0.20260421143840-0acb6b8cca85 go.podman.io/common v0.67.2-0.20260420103546-618304d6f83d go.podman.io/image/v5 v5.39.3-0.20260420103546-618304d6f83d go.podman.io/storage v1.62.1-0.20260420103546-618304d6f83d diff --git a/go.sum b/go.sum index 4786a6cec5..590b16bd0a 100644 --- a/go.sum +++ b/go.sum @@ -55,8 +55,6 @@ 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.9.1 h1:8oU6WsIsU3bpnNZuvHp74a6cE1MJwbj2P7s4/yTUNlA= github.com/containernetworking/plugins v1.9.1/go.mod h1:fj7kS55qg3o/RgS+WGsF3+ZxwIImMPusQZKzBpcSr4c= -github.com/containers/buildah v1.42.1-0.20260417103105-4e43fa8d9e07 h1:0N0sTooGSQwgmEC9sBtmSjy0uEiIBnZ6EE9K2gHqzvE= -github.com/containers/buildah v1.42.1-0.20260417103105-4e43fa8d9e07/go.mod h1:v6yB1iltuFJ55H36HFWb7+TjqyoW4nq3X6sjpvgP6qI= github.com/containers/common v0.64.2 h1:1xepE7QwQggUXxmyQ1Dbh6Cn0yd7ktk14sN3McSWf5I= github.com/containers/common v0.64.2/go.mod h1:o29GfYy4tefUuShm8mOn2AiL5Mpzdio+viHI7n24KJ4= github.com/containers/gvisor-tap-vsock v0.8.8 h1:5FznbOYMIuaCv8B6zQ7M6wjqP63Lasy0A6GpViEnjTg= @@ -257,8 +255,8 @@ github.com/moby/go-archive v0.2.0 h1:zg5QDUM2mi0JIM9fdQZWC7U8+2ZfixfTYoHL7rWUcP8 github.com/moby/go-archive v0.2.0/go.mod h1:mNeivT14o8xU+5q1YnNrkQVpK+dnNe/K6fHqnTg4qPU= github.com/moby/moby/api v1.54.2 h1:wiat9QAhnDQjA7wk1kh/TqHz2I1uUA7M7t9SAl/JNXg= github.com/moby/moby/api v1.54.2/go.mod h1:+RQ6wluLwtYaTd1WnPLykIDPekkuyD/ROWQClE83pzs= -github.com/moby/moby/client v0.4.0 h1:S+2XegzHQrrvTCvF6s5HFzcrywWQmuVnhOXe2kiWjIw= -github.com/moby/moby/client v0.4.0/go.mod h1:QWPbvWchQbxBNdaLSpoKpCdf5E+WxFAgNHogCWDoa7g= +github.com/moby/moby/client v0.4.1 h1:DMQgisVoMkmMs7fp3ROSdiBnoAu8+vo3GggFl06M/wY= +github.com/moby/moby/client v0.4.1/go.mod h1:z52C9O2POPOsnxZAy//WtKcQ32P+jT/NGeXu/7nfjGQ= github.com/moby/patternmatcher v0.6.1 h1:qlhtafmr6kgMIJjKJMDmMWq7WLkKIo23hsrpR3x084U= github.com/moby/patternmatcher v0.6.1/go.mod h1:hDPoyOpDY7OrrMDLaYoY3hf52gNCR/YOUYxkhApJIxc= github.com/moby/sys/capability v0.4.0 h1:4D4mI6KlNtWMCM1Z/K0i7RV1FkX+DBDHKVJpCndZoHk= @@ -429,6 +427,8 @@ go.opentelemetry.io/otel/sdk/metric v1.42.0 h1:D/1QR46Clz6ajyZ3G8SgNlTJKBdGp84q9 go.opentelemetry.io/otel/sdk/metric v1.42.0/go.mod h1:Ua6AAlDKdZ7tdvaQKfSmnFTdHx37+J4ba8MwVCYM5hc= go.opentelemetry.io/otel/trace v1.42.0 h1:OUCgIPt+mzOnaUTpOQcBiM/PLQ/Op7oq6g4LenLmOYY= go.opentelemetry.io/otel/trace v1.42.0/go.mod h1:f3K9S+IFqnumBkKhRJMeaZeNk9epyhnCmQh/EysQCdc= +go.podman.io/buildah v1.42.1-0.20260421143840-0acb6b8cca85 h1:rVKRagobPO6kGHOg2NhGNs6xWVgZctiOn4tmxa3cytA= +go.podman.io/buildah v1.42.1-0.20260421143840-0acb6b8cca85/go.mod h1:JjFirF1zlILz55ZkVYYhLRnted7mPlmoS2w2ihYw8iw= go.podman.io/common v0.67.2-0.20260420103546-618304d6f83d h1:zryioAYWqUu1BUPraJJ6q5mLiclNZ3kTuQyyBO/5vYs= go.podman.io/common v0.67.2-0.20260420103546-618304d6f83d/go.mod h1:Pom4Io+8C+CCZzr3CRUkr6A5inTMY8nVaFS3X1Y5NbI= go.podman.io/image/v5 v5.39.3-0.20260420103546-618304d6f83d h1:NeMM89Fwaw19guPj/hXEjBtoCeH/mGgbAWoBnpnRiIo= diff --git a/hack/buildah-vendor-treadmill b/hack/buildah-vendor-treadmill index b6d2a2339e..74d826ffe2 100755 --- a/hack/buildah-vendor-treadmill +++ b/hack/buildah-vendor-treadmill @@ -30,7 +30,7 @@ our $Docs_URL = 'https://github.com/containers/podman/wiki/Buildah-Vendor-Treadmill'; # github path to buildah -our $Buildah = 'github.com/containers/buildah'; +our $Buildah = 'go.podman.io/buildah'; # FIXME FIXME FIXME: add 'main'? I hope we never need this script for branches. our $Treadmill_PR_Title = 'DO NOT MERGE: buildah vendor treadmill'; diff --git a/libpod/container_commit.go b/libpod/container_commit.go index 8c1ac425f7..d8a31c85f3 100644 --- a/libpod/container_commit.go +++ b/libpod/container_commit.go @@ -9,10 +9,10 @@ import ( "slices" "strings" - "github.com/containers/buildah" "github.com/containers/podman/v6/libpod/define" "github.com/containers/podman/v6/libpod/events" "github.com/sirupsen/logrus" + "go.podman.io/buildah" "go.podman.io/common/libimage" is "go.podman.io/image/v5/storage" "go.podman.io/image/v5/types" diff --git a/libpod/container_copy_common.go b/libpod/container_copy_common.go index 62a7033612..ecdd1144bc 100644 --- a/libpod/container_copy_common.go +++ b/libpod/container_copy_common.go @@ -10,14 +10,14 @@ import ( "path/filepath" "strings" - buildahCopiah "github.com/containers/buildah/copier" - "github.com/containers/buildah/pkg/chrootuser" - "github.com/containers/buildah/util" "github.com/containers/podman/v6/libpod/define" "github.com/containers/podman/v6/libpod/shutdown" "github.com/containers/podman/v6/pkg/rootless" "github.com/opencontainers/runtime-spec/specs-go" "github.com/sirupsen/logrus" + buildahCopiah "go.podman.io/buildah/copier" + "go.podman.io/buildah/pkg/chrootuser" + "go.podman.io/buildah/util" "go.podman.io/storage/pkg/archive" "go.podman.io/storage/pkg/idtools" "go.podman.io/storage/pkg/stringid" diff --git a/libpod/container_internal.go b/libpod/container_internal.go index bb96e512f4..a0ebcbc049 100644 --- a/libpod/container_internal.go +++ b/libpod/container_internal.go @@ -20,9 +20,6 @@ import ( "time" metadata "github.com/checkpoint-restore/checkpointctl/lib" - "github.com/containers/buildah/copier" - "github.com/containers/buildah/pkg/overlay" - butil "github.com/containers/buildah/util" "github.com/containers/podman/v6/libpod/define" "github.com/containers/podman/v6/libpod/events" "github.com/containers/podman/v6/libpod/shutdown" @@ -40,6 +37,9 @@ import ( "github.com/opencontainers/runtime-tools/generate" "github.com/opencontainers/selinux/go-selinux/label" "github.com/sirupsen/logrus" + "go.podman.io/buildah/copier" + "go.podman.io/buildah/pkg/overlay" + butil "go.podman.io/buildah/util" "go.podman.io/common/libnetwork/etchosts" "go.podman.io/common/pkg/chown" "go.podman.io/common/pkg/config" diff --git a/libpod/container_internal_common.go b/libpod/container_internal_common.go index a8c0dc794a..2ca407ba07 100644 --- a/libpod/container_internal_common.go +++ b/libpod/container_internal_common.go @@ -23,10 +23,6 @@ import ( metadata "github.com/checkpoint-restore/checkpointctl/lib" "github.com/checkpoint-restore/go-criu/v7/stats" - "github.com/containers/buildah" - "github.com/containers/buildah/pkg/chrootuser" - "github.com/containers/buildah/pkg/overlay" - butil "github.com/containers/buildah/util" "github.com/containers/podman/v6/libpod/define" "github.com/containers/podman/v6/libpod/events" "github.com/containers/podman/v6/pkg/annotations" @@ -43,6 +39,10 @@ import ( "github.com/opencontainers/selinux/go-selinux" "github.com/opencontainers/selinux/go-selinux/label" "github.com/sirupsen/logrus" + "go.podman.io/buildah" + "go.podman.io/buildah/pkg/chrootuser" + "go.podman.io/buildah/pkg/overlay" + butil "go.podman.io/buildah/util" "go.podman.io/common/libnetwork/etchosts" "go.podman.io/common/libnetwork/resolvconf" "go.podman.io/common/libnetwork/types" diff --git a/libpod/container_stat_common.go b/libpod/container_stat_common.go index d5a03d14f8..b565f3515c 100644 --- a/libpod/container_stat_common.go +++ b/libpod/container_stat_common.go @@ -9,9 +9,9 @@ import ( "path/filepath" "strings" - "github.com/containers/buildah/copier" "github.com/containers/podman/v6/libpod/define" "github.com/containers/podman/v6/pkg/copy" + "go.podman.io/buildah/copier" ) // statOnHost stats the specified path *on the host*. It returns the file info diff --git a/libpod/container_stat_freebsd.go b/libpod/container_stat_freebsd.go index 16464689e8..977e88d530 100644 --- a/libpod/container_stat_freebsd.go +++ b/libpod/container_stat_freebsd.go @@ -3,7 +3,7 @@ package libpod import ( - "github.com/containers/buildah/copier" + "go.podman.io/buildah/copier" ) // On FreeBSD, jails use the global mount namespace, filtered to only diff --git a/libpod/container_stat_linux.go b/libpod/container_stat_linux.go index a9eb63bfc9..c70b858b5a 100644 --- a/libpod/container_stat_linux.go +++ b/libpod/container_stat_linux.go @@ -3,8 +3,8 @@ package libpod import ( - "github.com/containers/buildah/copier" "github.com/containers/podman/v6/libpod/define" + "go.podman.io/buildah/copier" ) // statInsideMount stats the specified path *inside* the container's mount and PID diff --git a/libpod/info.go b/libpod/info.go index 5b58cde7ba..bc55ff0cbb 100644 --- a/libpod/info.go +++ b/libpod/info.go @@ -14,12 +14,12 @@ import ( "syscall" "time" - "github.com/containers/buildah" - "github.com/containers/buildah/pkg/parse" - "github.com/containers/buildah/pkg/util" "github.com/containers/podman/v6/libpod/define" "github.com/containers/podman/v6/libpod/linkmode" "github.com/sirupsen/logrus" + "go.podman.io/buildah" + "go.podman.io/buildah/pkg/parse" + "go.podman.io/buildah/pkg/util" "go.podman.io/common/pkg/version" "go.podman.io/image/v5/pkg/sysregistriesv2" "go.podman.io/storage/pkg/system" diff --git a/libpod/networking_freebsd.go b/libpod/networking_freebsd.go index ff4ce8f811..cb2e2e4815 100644 --- a/libpod/networking_freebsd.go +++ b/libpod/networking_freebsd.go @@ -9,9 +9,9 @@ import ( "fmt" "os/exec" - "github.com/containers/buildah/pkg/jail" "github.com/containers/podman/v6/libpod/define" "github.com/sirupsen/logrus" + "go.podman.io/buildah/pkg/jail" "go.podman.io/common/libnetwork/types" ) diff --git a/libpod/runtime.go b/libpod/runtime.go index 833264d1ef..49c2910f9b 100644 --- a/libpod/runtime.go +++ b/libpod/runtime.go @@ -15,7 +15,6 @@ import ( "syscall" "time" - "github.com/containers/buildah/pkg/parse" "github.com/containers/podman/v6/libpod/define" "github.com/containers/podman/v6/libpod/events" "github.com/containers/podman/v6/libpod/lock" @@ -31,6 +30,7 @@ import ( jsoniter "github.com/json-iterator/go" spec "github.com/opencontainers/runtime-spec/specs-go" "github.com/sirupsen/logrus" + "go.podman.io/buildah/pkg/parse" "go.podman.io/common/libimage" "go.podman.io/common/libnetwork/network" nettypes "go.podman.io/common/libnetwork/types" diff --git a/libpod/runtime_ctr.go b/libpod/runtime_ctr.go index 36bfc72de7..88a346a9bf 100644 --- a/libpod/runtime_ctr.go +++ b/libpod/runtime_ctr.go @@ -15,7 +15,6 @@ import ( "strings" "time" - "github.com/containers/buildah" "github.com/containers/podman/v6/libpod/define" "github.com/containers/podman/v6/libpod/events" "github.com/containers/podman/v6/libpod/shutdown" @@ -27,6 +26,7 @@ import ( spec "github.com/opencontainers/runtime-spec/specs-go" "github.com/opencontainers/runtime-tools/generate" "github.com/sirupsen/logrus" + "go.podman.io/buildah" "go.podman.io/common/libnetwork/types" "go.podman.io/common/pkg/config" "go.podman.io/storage" diff --git a/libpod/runtime_img.go b/libpod/runtime_img.go index 95d65f1873..4936b204da 100644 --- a/libpod/runtime_img.go +++ b/libpod/runtime_img.go @@ -7,11 +7,11 @@ import ( "errors" "fmt" - buildahDefine "github.com/containers/buildah/define" - "github.com/containers/buildah/imagebuildah" "github.com/containers/podman/v6/libpod/define" "github.com/containers/podman/v6/libpod/events" "github.com/sirupsen/logrus" + buildahDefine "go.podman.io/buildah/define" + "go.podman.io/buildah/imagebuildah" "go.podman.io/common/libimage" "go.podman.io/image/v5/docker/reference" ) diff --git a/pkg/api/handlers/compat/containers_create.go b/pkg/api/handlers/compat/containers_create.go index 3d874d79a0..afad135f0d 100644 --- a/pkg/api/handlers/compat/containers_create.go +++ b/pkg/api/handlers/compat/containers_create.go @@ -13,7 +13,6 @@ import ( "strconv" "strings" - "github.com/containers/buildah/pkg/parse" "github.com/containers/podman/v6/libpod" "github.com/containers/podman/v6/libpod/define" "github.com/containers/podman/v6/pkg/api/handlers" @@ -25,6 +24,7 @@ import ( "github.com/containers/podman/v6/pkg/specgen" "github.com/containers/podman/v6/pkg/specgenutil" "github.com/moby/moby/api/types/mount" + "go.podman.io/buildah/pkg/parse" "go.podman.io/common/libimage" "go.podman.io/common/libnetwork/types" "go.podman.io/common/pkg/config" diff --git a/pkg/api/handlers/compat/images.go b/pkg/api/handlers/compat/images.go index c4573f83d9..f98ca2b3c9 100644 --- a/pkg/api/handlers/compat/images.go +++ b/pkg/api/handlers/compat/images.go @@ -11,7 +11,6 @@ import ( "strings" "time" - "github.com/containers/buildah" "github.com/containers/podman/v6/libpod" "github.com/containers/podman/v6/pkg/api/handlers" "github.com/containers/podman/v6/pkg/api/handlers/utils" @@ -28,6 +27,7 @@ import ( "github.com/opencontainers/go-digest" imageSpec "github.com/opencontainers/image-spec/specs-go/v1" "github.com/sirupsen/logrus" + "go.podman.io/buildah" "go.podman.io/common/libimage" "go.podman.io/common/pkg/config" "go.podman.io/common/pkg/filters" diff --git a/pkg/api/handlers/compat/images_build.go b/pkg/api/handlers/compat/images_build.go index e97036aa96..7c498ab84c 100644 --- a/pkg/api/handlers/compat/images_build.go +++ b/pkg/api/handlers/compat/images_build.go @@ -18,9 +18,6 @@ import ( "syscall" "time" - "github.com/containers/buildah" - buildahDefine "github.com/containers/buildah/define" - "github.com/containers/buildah/pkg/parse" "github.com/containers/podman/v6/internal/localapi" "github.com/containers/podman/v6/libpod" "github.com/containers/podman/v6/pkg/api/handlers/utils" @@ -31,6 +28,9 @@ import ( "github.com/containers/podman/v6/pkg/util" "github.com/opencontainers/runtime-spec/specs-go" "github.com/sirupsen/logrus" + "go.podman.io/buildah" + buildahDefine "go.podman.io/buildah/define" + "go.podman.io/buildah/pkg/parse" "go.podman.io/common/pkg/config" "go.podman.io/image/v5/docker/reference" "go.podman.io/image/v5/types" diff --git a/pkg/api/handlers/compat/ping.go b/pkg/api/handlers/compat/ping.go index 82b2fb2b5e..3078d3b922 100644 --- a/pkg/api/handlers/compat/ping.go +++ b/pkg/api/handlers/compat/ping.go @@ -7,7 +7,7 @@ import ( "net/http" "runtime" - "github.com/containers/buildah" + "go.podman.io/buildah" ) // Ping returns headers to client about the service diff --git a/pkg/api/handlers/libpod/images.go b/pkg/api/handlers/libpod/images.go index b16fe23456..35801e62a0 100644 --- a/pkg/api/handlers/libpod/images.go +++ b/pkg/api/handlers/libpod/images.go @@ -15,7 +15,6 @@ import ( "strconv" "strings" - "github.com/containers/buildah" "github.com/containers/podman/v6/internal/localapi" "github.com/containers/podman/v6/libpod" "github.com/containers/podman/v6/libpod/define" @@ -34,6 +33,7 @@ import ( "github.com/gorilla/schema" "github.com/moby/moby/api/types/jsonstream" "github.com/sirupsen/logrus" + "go.podman.io/buildah" "go.podman.io/common/libimage" "go.podman.io/common/pkg/ssh" "go.podman.io/image/v5/manifest" diff --git a/pkg/bindings/images/build.go b/pkg/bindings/images/build.go index 515ee76a71..f2faf0b662 100644 --- a/pkg/bindings/images/build.go +++ b/pkg/bindings/images/build.go @@ -19,8 +19,6 @@ import ( "strings" "github.com/blang/semver/v4" - "github.com/containers/buildah/define" - "github.com/containers/buildah/pkg/parse" "github.com/containers/podman/v6/internal/remote_build_helpers" ldefine "github.com/containers/podman/v6/libpod/define" "github.com/containers/podman/v6/pkg/auth" @@ -34,6 +32,8 @@ import ( gzip "github.com/klauspost/pgzip" "github.com/moby/moby/api/types/jsonstream" "github.com/sirupsen/logrus" + "go.podman.io/buildah/define" + "go.podman.io/buildah/pkg/parse" imageTypes "go.podman.io/image/v5/types" "go.podman.io/storage/pkg/archive" "go.podman.io/storage/pkg/fileutils" diff --git a/pkg/bindings/images/build_test.go b/pkg/bindings/images/build_test.go index b895262777..378a3a3d3d 100644 --- a/pkg/bindings/images/build_test.go +++ b/pkg/bindings/images/build_test.go @@ -3,8 +3,8 @@ package images import ( "testing" - "github.com/containers/buildah/define" "github.com/stretchr/testify/assert" + "go.podman.io/buildah/define" ) func TestBuildMatchIID(t *testing.T) { diff --git a/pkg/domain/entities/types/types.go b/pkg/domain/entities/types/types.go index b06a88b74a..a832552a82 100644 --- a/pkg/domain/entities/types/types.go +++ b/pkg/domain/entities/types/types.go @@ -4,7 +4,7 @@ package types import ( "os" - buildahDefine "github.com/containers/buildah/define" + buildahDefine "go.podman.io/buildah/define" ) // ComponentVersion describes the version information for a specific component. diff --git a/pkg/domain/infra/abi/containers.go b/pkg/domain/infra/abi/containers.go index b9c506b66d..eb57420ed8 100644 --- a/pkg/domain/infra/abi/containers.go +++ b/pkg/domain/infra/abi/containers.go @@ -14,7 +14,6 @@ import ( "sync" "time" - "github.com/containers/buildah" "github.com/containers/podman/v6/libpod" "github.com/containers/podman/v6/libpod/define" "github.com/containers/podman/v6/libpod/logs" @@ -34,6 +33,7 @@ import ( "github.com/containers/podman/v6/pkg/util" "github.com/hashicorp/go-multierror" "github.com/sirupsen/logrus" + "go.podman.io/buildah" "go.podman.io/common/pkg/config" "go.podman.io/image/v5/manifest" "go.podman.io/storage" diff --git a/pkg/domain/infra/abi/farm.go b/pkg/domain/infra/abi/farm.go index fad14cfb5b..f19a889b5c 100644 --- a/pkg/domain/infra/abi/farm.go +++ b/pkg/domain/infra/abi/farm.go @@ -7,9 +7,9 @@ import ( "fmt" "strings" - "github.com/containers/buildah/pkg/parse" "github.com/containers/podman/v6/pkg/domain/entities" "github.com/containers/podman/v6/pkg/emulation" + "go.podman.io/buildah/pkg/parse" lplatform "go.podman.io/common/libimage/platform" ) diff --git a/pkg/domain/infra/abi/images.go b/pkg/domain/infra/abi/images.go index 55c84458b1..0b0d4978cd 100644 --- a/pkg/domain/infra/abi/images.go +++ b/pkg/domain/infra/abi/images.go @@ -19,8 +19,6 @@ import ( "syscall" "time" - bdefine "github.com/containers/buildah/define" - "github.com/containers/buildah/pkg/volumes" "github.com/containers/podman/v6/libpod/define" "github.com/containers/podman/v6/pkg/domain/entities" "github.com/containers/podman/v6/pkg/domain/entities/reports" @@ -30,6 +28,8 @@ import ( "github.com/opencontainers/go-digest" imgspecv1 "github.com/opencontainers/image-spec/specs-go/v1" "github.com/sirupsen/logrus" + bdefine "go.podman.io/buildah/define" + "go.podman.io/buildah/pkg/volumes" "go.podman.io/common/libimage" "go.podman.io/common/libimage/filter" "go.podman.io/common/pkg/config" diff --git a/pkg/domain/infra/abi/play.go b/pkg/domain/infra/abi/play.go index 855d34121d..88f400e6e6 100644 --- a/pkg/domain/infra/abi/play.go +++ b/pkg/domain/infra/abi/play.go @@ -15,8 +15,6 @@ import ( "strings" "sync" - buildahDefine "github.com/containers/buildah/define" - bparse "github.com/containers/buildah/pkg/parse" "github.com/containers/podman/v6/cmd/podman/parse" "github.com/containers/podman/v6/libpod" "github.com/containers/podman/v6/libpod/define" @@ -37,6 +35,8 @@ import ( "github.com/opencontainers/go-digest" "github.com/opencontainers/selinux/go-selinux" "github.com/sirupsen/logrus" + buildahDefine "go.podman.io/buildah/define" + bparse "go.podman.io/buildah/pkg/parse" "go.podman.io/common/libimage" nettypes "go.podman.io/common/libnetwork/types" "go.podman.io/common/pkg/config" diff --git a/pkg/domain/infra/tunnel/images.go b/pkg/domain/infra/tunnel/images.go index ce059385b2..477d3ab32e 100644 --- a/pkg/domain/infra/tunnel/images.go +++ b/pkg/domain/infra/tunnel/images.go @@ -10,7 +10,6 @@ import ( "strings" "time" - bdefine "github.com/containers/buildah/define" "github.com/containers/podman/v6/internal/localapi" "github.com/containers/podman/v6/libpod/define" "github.com/containers/podman/v6/pkg/bindings/images" @@ -19,6 +18,7 @@ import ( "github.com/containers/podman/v6/pkg/domain/utils" "github.com/containers/podman/v6/pkg/errorhandling" "github.com/sirupsen/logrus" + bdefine "go.podman.io/buildah/define" "go.podman.io/common/libimage/filter" "go.podman.io/common/pkg/config" "go.podman.io/image/v5/docker/reference" diff --git a/pkg/farm/farm.go b/pkg/farm/farm.go index 665bdd6a56..51a695e45a 100644 --- a/pkg/farm/farm.go +++ b/pkg/farm/farm.go @@ -11,11 +11,11 @@ import ( "strings" "sync" - "github.com/containers/buildah/define" "github.com/containers/podman/v6/pkg/domain/entities" "github.com/containers/podman/v6/pkg/domain/infra" "github.com/hashicorp/go-multierror" "github.com/sirupsen/logrus" + "go.podman.io/buildah/define" lplatform "go.podman.io/common/libimage/platform" "go.podman.io/common/pkg/config" ) diff --git a/pkg/machine/ocipull/pull.go b/pkg/machine/ocipull/pull.go index 9690429a3e..a92f62059d 100644 --- a/pkg/machine/ocipull/pull.go +++ b/pkg/machine/ocipull/pull.go @@ -6,9 +6,9 @@ import ( "fmt" "os" - "github.com/containers/buildah/pkg/parse" "github.com/containers/podman/v6/pkg/machine/define" "github.com/sirupsen/logrus" + "go.podman.io/buildah/pkg/parse" "go.podman.io/image/v5/copy" "go.podman.io/image/v5/oci/layout" "go.podman.io/image/v5/signature" diff --git a/pkg/specgen/generate/namespaces_freebsd.go b/pkg/specgen/generate/namespaces_freebsd.go index af37fc38f0..1c1b48c801 100644 --- a/pkg/specgen/generate/namespaces_freebsd.go +++ b/pkg/specgen/generate/namespaces_freebsd.go @@ -6,11 +6,11 @@ import ( "fmt" "os" - "github.com/containers/buildah/pkg/jail" "github.com/containers/podman/v6/libpod" "github.com/containers/podman/v6/pkg/specgen" "github.com/opencontainers/runtime-tools/generate" "github.com/sirupsen/logrus" + "go.podman.io/buildah/pkg/jail" ) func specConfigureNamespaces(s *specgen.SpecGenerator, g *generate.Generator, rt *libpod.Runtime, pod *libpod.Pod) error { diff --git a/test/buildah-bud/run-buildah-bud-tests b/test/buildah-bud/run-buildah-bud-tests index 5a08d94e98..446496c78e 100755 --- a/test/buildah-bud/run-buildah-bud-tests +++ b/test/buildah-bud/run-buildah-bud-tests @@ -7,6 +7,7 @@ ME=$(basename $0) # Buildah main repository; unlikely to change often BUILDAH_REPO=github.com/containers/buildah +BUILDAH_MODULE=go.podman.io/buildah # Tag name used to identify the base checkout BASE_TAG=buildah-bud-in-podman @@ -91,12 +92,12 @@ trap 'if [[ $? != 0 ]]; then if [[ -n $failhint ]]; then echo;echo "************ # Find the version of buildah we've vendored in, so we can run the right tests. # Note first check if buildah is being replaced with a different version in which case we need to use that one. -buildah_replace=$(go list -m -f '{{if .Replace}}{{.Replace}}{{end}}' $BUILDAH_REPO) +buildah_replace=$(go list -m -f '{{if .Replace}}{{.Replace}}{{end}}' $BUILDAH_MODULE) buildah_checkout_repo="$BUILDAH_REPO" if [[ -z "$buildah_replace" ]]; then # No replace this is fine, check the main version - buildah_version=$(go list -m -f '{{.Version}}' $BUILDAH_REPO) + buildah_version=$(go list -m -f '{{.Version}}' $BUILDAH_MODULE) else # replace string is "REPO VERSION" so split this into our two vars buildah_checkout_repo="${buildah_replace% *}" @@ -134,7 +135,7 @@ if [[ -n $CIRRUS_CHANGE_IN_REPO ]]; then base=$(set -x;git merge-base ${DEST_BRANCH} $head) changes=$(set -x;git diff --name-status $base $head) if [[ -n $changes ]]; then - if [[ $changes =~ vendor/$BUILDAH_REPO ]]; then + if [[ $changes =~ vendor/$BUILDAH_MODULE ]]; then is_revendor=y fi fi diff --git a/test/e2e/build_test.go b/test/e2e/build_test.go index 44aab3d2c4..e18340c7f6 100644 --- a/test/e2e/build_test.go +++ b/test/e2e/build_test.go @@ -11,11 +11,11 @@ import ( "runtime" "strings" - "github.com/containers/buildah/define" . "github.com/containers/podman/v6/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" + "go.podman.io/buildah/define" ) var _ = Describe("Podman build", func() { diff --git a/vendor/github.com/containers/buildah/internal/mkcw/embed/entrypoint_amd64.gz b/vendor/github.com/containers/buildah/internal/mkcw/embed/entrypoint_amd64.gz deleted file mode 100644 index e5fed2b3ce..0000000000 Binary files a/vendor/github.com/containers/buildah/internal/mkcw/embed/entrypoint_amd64.gz and /dev/null differ diff --git a/vendor/github.com/moby/moby/client/internal/json-stream.go b/vendor/github.com/moby/moby/client/internal/json-stream.go index 07d07bd7e3..d86b99da2e 100644 --- a/vendor/github.com/moby/moby/client/internal/json-stream.go +++ b/vendor/github.com/moby/moby/client/internal/json-stream.go @@ -12,8 +12,9 @@ const rs = 0x1E type DecoderFn func(v any) error -// NewJSONStreamDecoder builds adequate DecoderFn to read json records formatted with specified content-type -func NewJSONStreamDecoder(r io.Reader, contentType string) DecoderFn { +// NewJSONStreamDecoder builds a DecoderFn to read a stream of JSON records +// formatted with the specified content-type. +func NewJSONStreamDecoder(r io.Reader, contentType types.MediaType) DecoderFn { switch contentType { case types.MediaTypeJSONSequence: return json.NewDecoder(NewRSFilterReader(r)).Decode @@ -24,27 +25,38 @@ func NewJSONStreamDecoder(r io.Reader, contentType string) DecoderFn { } } -// RSFilterReader wraps an io.Reader and filters out ASCII RS characters -type RSFilterReader struct { +type rsFilterReader struct { reader io.Reader - buffer []byte } -// NewRSFilterReader creates a new RSFilterReader that filters out RS characters -func NewRSFilterReader(r io.Reader) *RSFilterReader { - return &RSFilterReader{ - reader: r, - buffer: make([]byte, 4096), // Internal buffer for reading chunks - } +// NewRSFilterReader creates an [io.Reader] that filters out ASCII Record Separators (RS). +func NewRSFilterReader(r io.Reader) io.Reader { + return &rsFilterReader{reader: r} } -// Read implements the io.Reader interface, filtering out RS characters -func (r *RSFilterReader) Read(p []byte) (n int, err error) { +func (r *rsFilterReader) Read(p []byte) (int, error) { if len(p) == 0 { return 0, nil } - n, err = r.reader.Read(p) - filtered := slices.DeleteFunc(p[:n], func(b byte) bool { return b == rs }) - return len(filtered), err + for { + n, err := r.reader.Read(p) + if n == 0 { + return 0, err + } + + filtered := slices.DeleteFunc(p[:n], func(b byte) bool { return b == rs }) + n = len(filtered) + if err != nil { + if err == io.EOF && n > 0 { + return n, nil + } + return n, err + } + if n == 0 { + // Avoid returning (0, nil) after consuming input; keep reading until data or an error (e.g., EOF). + continue + } + return n, nil + } } diff --git a/vendor/github.com/moby/moby/client/internal/jsonmessages.go b/vendor/github.com/moby/moby/client/internal/jsonmessages.go index 31262fd8e2..05210d0dc7 100644 --- a/vendor/github.com/moby/moby/client/internal/jsonmessages.go +++ b/vendor/github.com/moby/moby/client/internal/jsonmessages.go @@ -8,6 +8,8 @@ import ( "iter" "sync" + "github.com/containerd/errdefs/pkg/errhttp" + "github.com/moby/moby/api/types/jsonstream" ) @@ -44,41 +46,90 @@ func (r Stream) Close() error { var _ io.ReadCloser = Stream{} -// JSONMessages decodes the response stream as a sequence of JSONMessages. -// if stream ends or context is cancelled, the underlying [io.Reader] is closed. +// JSONMessages decodes the response stream as a sequence of [jsonstream.Message]. +// The underlying [io.Reader] is closed when the stream ends or if the context +// is cancelled. func (r Stream) JSONMessages(ctx context.Context) iter.Seq2[jsonstream.Message, error] { stop := context.AfterFunc(ctx, func() { _ = r.Close() }) - dec := json.NewDecoder(r) return func(yield func(jsonstream.Message, error) bool) { defer func() { stop() // unregister AfterFunc - r.Close() + _ = r.Close() }() + + dec := json.NewDecoder(r) for { var jm jsonstream.Message - err := dec.Decode(&jm) - if errors.Is(err, io.EOF) { - break - } - if ctx.Err() != nil { - yield(jm, ctx.Err()) + if err := dec.Decode(&jm); err != nil { + if errors.Is(err, io.EOF) { + return + } + if err := ctx.Err(); err != nil { + // Do not return decoding errors if the context was + // cancelled, because the decoding errors may be due + // to the context being cancelled. + yield(jsonstream.Message{}, err) + return + } + yield(jsonstream.Message{}, err) return } - if !yield(jm, err) { + if !yield(jm, nil) { return } } } } -// Wait waits for operation to complete and detects errors reported as JSONMessage +// Wait consumes the stream until completion. +// +// It returns nil if the operation completes successfully. Errors are +// returned if the context is canceled, a decoding/transport failure +// occurs, or a JSON message reports an error ([jsonstream.Message.Error]). func (r Stream) Wait(ctx context.Context) error { - for _, err := range r.JSONMessages(ctx) { + for jm, err := range r.JSONMessages(ctx) { if err != nil { + // decode, transport and context cancellation errors. return err } + if jm.Error != nil { + // push/pull failures. + return httpErrorFromStatusCode(jm.Error, jm.Error.Code) + } } return nil } + +type httpError struct { + err error + errdef error +} + +func (e *httpError) Error() string { + return e.err.Error() +} + +func (e *httpError) Unwrap() error { + return e.err +} + +func (e *httpError) Is(target error) bool { + return errors.Is(e.errdef, target) +} + +// httpErrorFromStatusCode creates an errdef error, based on the provided HTTP status-code +// +// TODO(thaJeztah): unify with the implementation in client and move to an internal package +// see https://github.com/moby/moby/blob/client/v0.4.0/client/errors.go#L76-L114 +func httpErrorFromStatusCode(err error, statusCode int) error { + if err == nil { + return nil + } + + return &httpError{ + err: err, + errdef: errhttp.ToNative(statusCode), + } +} diff --git a/vendor/github.com/moby/moby/client/system_disk_usage.go b/vendor/github.com/moby/moby/client/system_disk_usage.go index c5df1e1b19..3f54bfd349 100644 --- a/vendor/github.com/moby/moby/client/system_disk_usage.go +++ b/vendor/github.com/moby/moby/client/system_disk_usage.go @@ -244,12 +244,15 @@ func imageDiskUsageFromLegacyAPI(du *legacyDiskUsage) ImagesDiskUsage { Items: du.Images, } - for _, i := range idu.Items { - if i.Containers > 0 { + for _, img := range idu.Items { + switch { + case img.Containers < 0: + // No container-count information available; skip (assume it's in use). + case img.Containers > 0: idu.ActiveCount++ - } else if i.Size != -1 && i.SharedSize != -1 { - // Only count reclaimable size if we have size information - idu.Reclaimable += (i.Size - i.SharedSize) + case img.Containers == 0 && img.Size != -1 && img.SharedSize != -1: + reclaimable := img.Size - img.SharedSize + idu.Reclaimable += reclaimable } } diff --git a/vendor/github.com/containers/buildah/.cirrus.yml b/vendor/go.podman.io/buildah/.cirrus.yml similarity index 100% rename from vendor/github.com/containers/buildah/.cirrus.yml rename to vendor/go.podman.io/buildah/.cirrus.yml diff --git a/vendor/github.com/containers/buildah/.codespellrc b/vendor/go.podman.io/buildah/.codespellrc similarity index 100% rename from vendor/github.com/containers/buildah/.codespellrc rename to vendor/go.podman.io/buildah/.codespellrc diff --git a/vendor/github.com/containers/buildah/.gitignore b/vendor/go.podman.io/buildah/.gitignore similarity index 100% rename from vendor/github.com/containers/buildah/.gitignore rename to vendor/go.podman.io/buildah/.gitignore diff --git a/vendor/github.com/containers/buildah/.golangci.yml b/vendor/go.podman.io/buildah/.golangci.yml similarity index 100% rename from vendor/github.com/containers/buildah/.golangci.yml rename to vendor/go.podman.io/buildah/.golangci.yml diff --git a/vendor/github.com/containers/buildah/.packit.yaml b/vendor/go.podman.io/buildah/.packit.yaml similarity index 100% rename from vendor/github.com/containers/buildah/.packit.yaml rename to vendor/go.podman.io/buildah/.packit.yaml diff --git a/vendor/github.com/containers/buildah/CHANGELOG.md b/vendor/go.podman.io/buildah/CHANGELOG.md similarity index 100% rename from vendor/github.com/containers/buildah/CHANGELOG.md rename to vendor/go.podman.io/buildah/CHANGELOG.md diff --git a/vendor/github.com/containers/buildah/CODE-OF-CONDUCT.md b/vendor/go.podman.io/buildah/CODE-OF-CONDUCT.md similarity index 100% rename from vendor/github.com/containers/buildah/CODE-OF-CONDUCT.md rename to vendor/go.podman.io/buildah/CODE-OF-CONDUCT.md diff --git a/vendor/github.com/containers/buildah/CONTRIBUTING.md b/vendor/go.podman.io/buildah/CONTRIBUTING.md similarity index 100% rename from vendor/github.com/containers/buildah/CONTRIBUTING.md rename to vendor/go.podman.io/buildah/CONTRIBUTING.md diff --git a/vendor/github.com/containers/buildah/GOVERNANCE.md b/vendor/go.podman.io/buildah/GOVERNANCE.md similarity index 100% rename from vendor/github.com/containers/buildah/GOVERNANCE.md rename to vendor/go.podman.io/buildah/GOVERNANCE.md diff --git a/vendor/github.com/containers/buildah/LICENSE b/vendor/go.podman.io/buildah/LICENSE similarity index 100% rename from vendor/github.com/containers/buildah/LICENSE rename to vendor/go.podman.io/buildah/LICENSE diff --git a/vendor/github.com/containers/buildah/MAINTAINERS.md b/vendor/go.podman.io/buildah/MAINTAINERS.md similarity index 100% rename from vendor/github.com/containers/buildah/MAINTAINERS.md rename to vendor/go.podman.io/buildah/MAINTAINERS.md diff --git a/vendor/github.com/containers/buildah/Makefile b/vendor/go.podman.io/buildah/Makefile similarity index 100% rename from vendor/github.com/containers/buildah/Makefile rename to vendor/go.podman.io/buildah/Makefile diff --git a/vendor/github.com/containers/buildah/OWNERS b/vendor/go.podman.io/buildah/OWNERS similarity index 100% rename from vendor/github.com/containers/buildah/OWNERS rename to vendor/go.podman.io/buildah/OWNERS diff --git a/vendor/github.com/containers/buildah/README.md b/vendor/go.podman.io/buildah/README.md similarity index 100% rename from vendor/github.com/containers/buildah/README.md rename to vendor/go.podman.io/buildah/README.md diff --git a/vendor/github.com/containers/buildah/ROADMAP.md b/vendor/go.podman.io/buildah/ROADMAP.md similarity index 100% rename from vendor/github.com/containers/buildah/ROADMAP.md rename to vendor/go.podman.io/buildah/ROADMAP.md diff --git a/vendor/github.com/containers/buildah/SECURITY.md b/vendor/go.podman.io/buildah/SECURITY.md similarity index 100% rename from vendor/github.com/containers/buildah/SECURITY.md rename to vendor/go.podman.io/buildah/SECURITY.md diff --git a/vendor/github.com/containers/buildah/add.go b/vendor/go.podman.io/buildah/add.go similarity index 99% rename from vendor/github.com/containers/buildah/add.go rename to vendor/go.podman.io/buildah/add.go index 8804901536..3e7a8f3937 100644 --- a/vendor/github.com/containers/buildah/add.go +++ b/vendor/go.podman.io/buildah/add.go @@ -19,10 +19,6 @@ import ( "syscall" "time" - "github.com/containers/buildah/copier" - "github.com/containers/buildah/define" - "github.com/containers/buildah/internal/tmpdir" - "github.com/containers/buildah/pkg/chrootuser" "github.com/docker/go-connections/tlsconfig" "github.com/hashicorp/go-multierror" "github.com/moby/sys/userns" @@ -30,6 +26,10 @@ import ( v1 "github.com/opencontainers/image-spec/specs-go/v1" "github.com/opencontainers/runtime-spec/specs-go" "github.com/sirupsen/logrus" + "go.podman.io/buildah/copier" + "go.podman.io/buildah/define" + "go.podman.io/buildah/internal/tmpdir" + "go.podman.io/buildah/pkg/chrootuser" "go.podman.io/common/pkg/retry" "go.podman.io/image/v5/pkg/tlsclientconfig" "go.podman.io/image/v5/types" diff --git a/vendor/github.com/containers/buildah/bind/mount.go b/vendor/go.podman.io/buildah/bind/mount.go similarity index 99% rename from vendor/github.com/containers/buildah/bind/mount.go rename to vendor/go.podman.io/buildah/bind/mount.go index 5153dfc56f..fe3cdd956b 100644 --- a/vendor/github.com/containers/buildah/bind/mount.go +++ b/vendor/go.podman.io/buildah/bind/mount.go @@ -10,9 +10,9 @@ import ( "slices" "syscall" - "github.com/containers/buildah/util" "github.com/opencontainers/runtime-spec/specs-go" "github.com/sirupsen/logrus" + "go.podman.io/buildah/util" "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/bind/mount_unsupported.go b/vendor/go.podman.io/buildah/bind/mount_unsupported.go similarity index 100% rename from vendor/github.com/containers/buildah/bind/mount_unsupported.go rename to vendor/go.podman.io/buildah/bind/mount_unsupported.go diff --git a/vendor/github.com/containers/buildah/bind/util.go b/vendor/go.podman.io/buildah/bind/util.go similarity index 100% rename from vendor/github.com/containers/buildah/bind/util.go rename to vendor/go.podman.io/buildah/bind/util.go diff --git a/vendor/github.com/containers/buildah/btrfs_installed_tag.sh b/vendor/go.podman.io/buildah/btrfs_installed_tag.sh similarity index 100% rename from vendor/github.com/containers/buildah/btrfs_installed_tag.sh rename to vendor/go.podman.io/buildah/btrfs_installed_tag.sh diff --git a/vendor/github.com/containers/buildah/buildah.go b/vendor/go.podman.io/buildah/buildah.go similarity index 99% rename from vendor/github.com/containers/buildah/buildah.go rename to vendor/go.podman.io/buildah/buildah.go index 44a7864923..cfc47bf648 100644 --- a/vendor/github.com/containers/buildah/buildah.go +++ b/vendor/go.podman.io/buildah/buildah.go @@ -11,11 +11,11 @@ import ( "sort" "time" - "github.com/containers/buildah/define" - "github.com/containers/buildah/docker" encconfig "github.com/containers/ocicrypt/config" v1 "github.com/opencontainers/image-spec/specs-go/v1" "github.com/sirupsen/logrus" + "go.podman.io/buildah/define" + "go.podman.io/buildah/docker" nettypes "go.podman.io/common/libnetwork/types" "go.podman.io/image/v5/types" "go.podman.io/storage" diff --git a/vendor/github.com/containers/buildah/changelog.txt b/vendor/go.podman.io/buildah/changelog.txt similarity index 100% rename from vendor/github.com/containers/buildah/changelog.txt rename to vendor/go.podman.io/buildah/changelog.txt diff --git a/vendor/github.com/containers/buildah/chroot/run_common.go b/vendor/go.podman.io/buildah/chroot/run_common.go similarity index 99% rename from vendor/github.com/containers/buildah/chroot/run_common.go rename to vendor/go.podman.io/buildah/chroot/run_common.go index c6d4825be5..85eb157ed4 100644 --- a/vendor/github.com/containers/buildah/chroot/run_common.go +++ b/vendor/go.podman.io/buildah/chroot/run_common.go @@ -18,11 +18,11 @@ import ( "sync" "syscall" - "github.com/containers/buildah/bind" - "github.com/containers/buildah/internal/pty" - "github.com/containers/buildah/util" "github.com/opencontainers/runtime-spec/specs-go" "github.com/sirupsen/logrus" + "go.podman.io/buildah/bind" + "go.podman.io/buildah/internal/pty" + "go.podman.io/buildah/util" "go.podman.io/storage/pkg/ioutils" "go.podman.io/storage/pkg/reexec" "go.podman.io/storage/pkg/unshare" diff --git a/vendor/github.com/containers/buildah/chroot/run_freebsd.go b/vendor/go.podman.io/buildah/chroot/run_freebsd.go similarity index 99% rename from vendor/github.com/containers/buildah/chroot/run_freebsd.go rename to vendor/go.podman.io/buildah/chroot/run_freebsd.go index e87605446d..a539f70f4a 100644 --- a/vendor/github.com/containers/buildah/chroot/run_freebsd.go +++ b/vendor/go.podman.io/buildah/chroot/run_freebsd.go @@ -13,9 +13,9 @@ import ( "strings" "syscall" - "github.com/containers/buildah/pkg/jail" "github.com/opencontainers/runtime-spec/specs-go" "github.com/sirupsen/logrus" + "go.podman.io/buildah/pkg/jail" "go.podman.io/storage/pkg/fileutils" "go.podman.io/storage/pkg/mount" "go.podman.io/storage/pkg/unshare" diff --git a/vendor/github.com/containers/buildah/chroot/run_linux.go b/vendor/go.podman.io/buildah/chroot/run_linux.go similarity index 99% rename from vendor/github.com/containers/buildah/chroot/run_linux.go rename to vendor/go.podman.io/buildah/chroot/run_linux.go index 59c439d0f9..8dad3899e9 100644 --- a/vendor/github.com/containers/buildah/chroot/run_linux.go +++ b/vendor/go.podman.io/buildah/chroot/run_linux.go @@ -13,11 +13,11 @@ import ( "syscall" "time" - "github.com/containers/buildah/copier" "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/buildah/copier" "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/seccomp.go b/vendor/go.podman.io/buildah/chroot/seccomp.go similarity index 100% rename from vendor/github.com/containers/buildah/chroot/seccomp.go rename to vendor/go.podman.io/buildah/chroot/seccomp.go diff --git a/vendor/github.com/containers/buildah/chroot/seccomp_freebsd.go b/vendor/go.podman.io/buildah/chroot/seccomp_freebsd.go similarity index 100% rename from vendor/github.com/containers/buildah/chroot/seccomp_freebsd.go rename to vendor/go.podman.io/buildah/chroot/seccomp_freebsd.go diff --git a/vendor/github.com/containers/buildah/chroot/seccomp_unsupported.go b/vendor/go.podman.io/buildah/chroot/seccomp_unsupported.go similarity index 100% rename from vendor/github.com/containers/buildah/chroot/seccomp_unsupported.go rename to vendor/go.podman.io/buildah/chroot/seccomp_unsupported.go diff --git a/vendor/github.com/containers/buildah/chroot/selinux.go b/vendor/go.podman.io/buildah/chroot/selinux.go similarity index 100% rename from vendor/github.com/containers/buildah/chroot/selinux.go rename to vendor/go.podman.io/buildah/chroot/selinux.go diff --git a/vendor/github.com/containers/buildah/chroot/selinux_unsupported.go b/vendor/go.podman.io/buildah/chroot/selinux_unsupported.go similarity index 100% rename from vendor/github.com/containers/buildah/chroot/selinux_unsupported.go rename to vendor/go.podman.io/buildah/chroot/selinux_unsupported.go diff --git a/vendor/github.com/containers/buildah/chroot/unsupported.go b/vendor/go.podman.io/buildah/chroot/unsupported.go similarity index 100% rename from vendor/github.com/containers/buildah/chroot/unsupported.go rename to vendor/go.podman.io/buildah/chroot/unsupported.go diff --git a/vendor/github.com/containers/buildah/commit.go b/vendor/go.podman.io/buildah/commit.go similarity index 99% rename from vendor/github.com/containers/buildah/commit.go rename to vendor/go.podman.io/buildah/commit.go index 642e57fb56..4e7b82f09e 100644 --- a/vendor/github.com/containers/buildah/commit.go +++ b/vendor/go.podman.io/buildah/commit.go @@ -10,13 +10,13 @@ import ( "strings" "time" - "github.com/containers/buildah/internal/metadata" - "github.com/containers/buildah/pkg/blobcache" - "github.com/containers/buildah/util" encconfig "github.com/containers/ocicrypt/config" digest "github.com/opencontainers/go-digest" v1 "github.com/opencontainers/image-spec/specs-go/v1" "github.com/sirupsen/logrus" + "go.podman.io/buildah/internal/metadata" + "go.podman.io/buildah/pkg/blobcache" + "go.podman.io/buildah/util" "go.podman.io/common/libimage" "go.podman.io/common/libimage/manifests" "go.podman.io/image/v5/docker" diff --git a/vendor/github.com/containers/buildah/common.go b/vendor/go.podman.io/buildah/common.go similarity index 98% rename from vendor/github.com/containers/buildah/common.go rename to vendor/go.podman.io/buildah/common.go index fe734cfc39..99773714eb 100644 --- a/vendor/github.com/containers/buildah/common.go +++ b/vendor/go.podman.io/buildah/common.go @@ -7,8 +7,8 @@ import ( "path/filepath" "time" - "github.com/containers/buildah/define" encconfig "github.com/containers/ocicrypt/config" + "go.podman.io/buildah/define" "go.podman.io/common/pkg/retry" cp "go.podman.io/image/v5/copy" "go.podman.io/image/v5/docker" diff --git a/vendor/github.com/containers/buildah/config.go b/vendor/go.podman.io/buildah/config.go similarity index 99% rename from vendor/github.com/containers/buildah/config.go rename to vendor/go.podman.io/buildah/config.go index a3f3b60447..84326fa3a5 100644 --- a/vendor/github.com/containers/buildah/config.go +++ b/vendor/go.podman.io/buildah/config.go @@ -11,11 +11,11 @@ import ( "time" "github.com/containerd/platforms" - "github.com/containers/buildah/define" - "github.com/containers/buildah/docker" - internalUtil "github.com/containers/buildah/internal/util" ociv1 "github.com/opencontainers/image-spec/specs-go/v1" "github.com/sirupsen/logrus" + "go.podman.io/buildah/define" + "go.podman.io/buildah/docker" + internalUtil "go.podman.io/buildah/internal/util" "go.podman.io/image/v5/manifest" "go.podman.io/image/v5/pkg/compression" "go.podman.io/image/v5/transports" diff --git a/vendor/github.com/containers/buildah/convertcw.go b/vendor/go.podman.io/buildah/convertcw.go similarity index 98% rename from vendor/github.com/containers/buildah/convertcw.go rename to vendor/go.podman.io/buildah/convertcw.go index 0793838b09..e5da49dfdd 100644 --- a/vendor/github.com/containers/buildah/convertcw.go +++ b/vendor/go.podman.io/buildah/convertcw.go @@ -6,11 +6,11 @@ import ( "io" "time" - "github.com/containers/buildah/define" - "github.com/containers/buildah/internal/mkcw" encconfig "github.com/containers/ocicrypt/config" "github.com/opencontainers/go-digest" "github.com/sirupsen/logrus" + "go.podman.io/buildah/define" + "go.podman.io/buildah/internal/mkcw" "go.podman.io/image/v5/docker/reference" "go.podman.io/image/v5/types" "go.podman.io/storage" diff --git a/vendor/github.com/containers/buildah/copier/copier.go b/vendor/go.podman.io/buildah/copier/copier.go similarity index 99% rename from vendor/github.com/containers/buildah/copier/copier.go rename to vendor/go.podman.io/buildah/copier/copier.go index 30f9b8bbff..e1f7b07921 100644 --- a/vendor/github.com/containers/buildah/copier/copier.go +++ b/vendor/go.podman.io/buildah/copier/copier.go @@ -1375,7 +1375,12 @@ func copierHandlerGet(bulkWriter io.Writer, req request, pm *fileutils.PatternMa } addedParents[parentName] = struct{}{} - if err := copierHandlerGetOne(parentInfo, "", parentName, parent, req.GetOptions, tw, hardlinkChecker, idMappings); err != nil { + parentSymlinkTarget, err := getTargetIfSymlink(parent, parentInfo) + if err != nil { + return fmt.Errorf("copier: get: %w", err) + } + + if err := copierHandlerGetOne(parentInfo, parentSymlinkTarget, parentName, parent, req.GetOptions, tw, hardlinkChecker, idMappings); err != nil { if req.GetOptions.IgnoreUnreadable && errorIsPermission(err) { continue } else if errors.Is(err, os.ErrNotExist) { @@ -1535,7 +1540,12 @@ func copierHandlerGet(bulkWriter io.Writer, req request, pm *fileutils.PatternMa } } - if err := copierHandlerGetOne(info, "", name, item, req.GetOptions, tw, hardlinkChecker, idMappings); err != nil { + symlinkTarget, err := getTargetIfSymlink(item, info) + if err != nil { + return fmt.Errorf("copier: get: %w", err) + } + + if err := copierHandlerGetOne(info, symlinkTarget, name, item, req.GetOptions, tw, hardlinkChecker, idMappings); err != nil { if req.GetOptions.IgnoreUnreadable && errorIsPermission(err) { continue } @@ -1598,6 +1608,14 @@ func mapWithPrefixedKeysWithoutKeyPrefix[K any](m map[string]K, p string) map[st return cloned } +func getTargetIfSymlink(path string, info os.FileInfo) (string, error) { + if info.Mode()&os.ModeType == os.ModeSymlink { + return os.Readlink(path) + } + + return "", nil +} + func copierHandlerGetOne(srcfi os.FileInfo, symlinkTarget, name, contentPath string, options GetOptions, tw *tar.Writer, hardlinkChecker *hardlinkChecker, idMappings *idtools.IDMappings) error { // build the header using the name provided hdr, err := tar.FileInfoHeader(srcfi, symlinkTarget) diff --git a/vendor/github.com/containers/buildah/copier/hardlink_not_uint64.go b/vendor/go.podman.io/buildah/copier/hardlink_not_uint64.go similarity index 100% rename from vendor/github.com/containers/buildah/copier/hardlink_not_uint64.go rename to vendor/go.podman.io/buildah/copier/hardlink_not_uint64.go diff --git a/vendor/github.com/containers/buildah/copier/hardlink_uint64.go b/vendor/go.podman.io/buildah/copier/hardlink_uint64.go similarity index 100% rename from vendor/github.com/containers/buildah/copier/hardlink_uint64.go rename to vendor/go.podman.io/buildah/copier/hardlink_uint64.go diff --git a/vendor/github.com/containers/buildah/copier/hardlink_unix.go b/vendor/go.podman.io/buildah/copier/hardlink_unix.go similarity index 100% rename from vendor/github.com/containers/buildah/copier/hardlink_unix.go rename to vendor/go.podman.io/buildah/copier/hardlink_unix.go diff --git a/vendor/github.com/containers/buildah/copier/hardlink_windows.go b/vendor/go.podman.io/buildah/copier/hardlink_windows.go similarity index 100% rename from vendor/github.com/containers/buildah/copier/hardlink_windows.go rename to vendor/go.podman.io/buildah/copier/hardlink_windows.go diff --git a/vendor/github.com/containers/buildah/copier/mknod_int.go b/vendor/go.podman.io/buildah/copier/mknod_int.go similarity index 100% rename from vendor/github.com/containers/buildah/copier/mknod_int.go rename to vendor/go.podman.io/buildah/copier/mknod_int.go diff --git a/vendor/github.com/containers/buildah/copier/mknod_uint64.go b/vendor/go.podman.io/buildah/copier/mknod_uint64.go similarity index 100% rename from vendor/github.com/containers/buildah/copier/mknod_uint64.go rename to vendor/go.podman.io/buildah/copier/mknod_uint64.go diff --git a/vendor/github.com/containers/buildah/copier/syscall_unix.go b/vendor/go.podman.io/buildah/copier/syscall_unix.go similarity index 100% rename from vendor/github.com/containers/buildah/copier/syscall_unix.go rename to vendor/go.podman.io/buildah/copier/syscall_unix.go diff --git a/vendor/github.com/containers/buildah/copier/syscall_windows.go b/vendor/go.podman.io/buildah/copier/syscall_windows.go similarity index 100% rename from vendor/github.com/containers/buildah/copier/syscall_windows.go rename to vendor/go.podman.io/buildah/copier/syscall_windows.go diff --git a/vendor/github.com/containers/buildah/copier/xattrs.go b/vendor/go.podman.io/buildah/copier/xattrs.go similarity index 100% rename from vendor/github.com/containers/buildah/copier/xattrs.go rename to vendor/go.podman.io/buildah/copier/xattrs.go diff --git a/vendor/github.com/containers/buildah/copier/xattrs_unsupported.go b/vendor/go.podman.io/buildah/copier/xattrs_unsupported.go similarity index 100% rename from vendor/github.com/containers/buildah/copier/xattrs_unsupported.go rename to vendor/go.podman.io/buildah/copier/xattrs_unsupported.go diff --git a/vendor/github.com/containers/buildah/define/build.go b/vendor/go.podman.io/buildah/define/build.go similarity index 100% rename from vendor/github.com/containers/buildah/define/build.go rename to vendor/go.podman.io/buildah/define/build.go diff --git a/vendor/github.com/containers/buildah/define/isolation.go b/vendor/go.podman.io/buildah/define/isolation.go similarity index 100% rename from vendor/github.com/containers/buildah/define/isolation.go rename to vendor/go.podman.io/buildah/define/isolation.go diff --git a/vendor/github.com/containers/buildah/define/mount_freebsd.go b/vendor/go.podman.io/buildah/define/mount_freebsd.go similarity index 100% rename from vendor/github.com/containers/buildah/define/mount_freebsd.go rename to vendor/go.podman.io/buildah/define/mount_freebsd.go diff --git a/vendor/github.com/containers/buildah/define/mount_linux.go b/vendor/go.podman.io/buildah/define/mount_linux.go similarity index 100% rename from vendor/github.com/containers/buildah/define/mount_linux.go rename to vendor/go.podman.io/buildah/define/mount_linux.go diff --git a/vendor/github.com/containers/buildah/define/mount_unsupported.go b/vendor/go.podman.io/buildah/define/mount_unsupported.go similarity index 100% rename from vendor/github.com/containers/buildah/define/mount_unsupported.go rename to vendor/go.podman.io/buildah/define/mount_unsupported.go diff --git a/vendor/github.com/containers/buildah/define/namespace.go b/vendor/go.podman.io/buildah/define/namespace.go similarity index 100% rename from vendor/github.com/containers/buildah/define/namespace.go rename to vendor/go.podman.io/buildah/define/namespace.go diff --git a/vendor/github.com/containers/buildah/define/pull.go b/vendor/go.podman.io/buildah/define/pull.go similarity index 100% rename from vendor/github.com/containers/buildah/define/pull.go rename to vendor/go.podman.io/buildah/define/pull.go diff --git a/vendor/github.com/containers/buildah/define/types.go b/vendor/go.podman.io/buildah/define/types.go similarity index 100% rename from vendor/github.com/containers/buildah/define/types.go rename to vendor/go.podman.io/buildah/define/types.go diff --git a/vendor/github.com/containers/buildah/define/types_unix.go b/vendor/go.podman.io/buildah/define/types_unix.go similarity index 100% rename from vendor/github.com/containers/buildah/define/types_unix.go rename to vendor/go.podman.io/buildah/define/types_unix.go diff --git a/vendor/github.com/containers/buildah/define/types_unsupported.go b/vendor/go.podman.io/buildah/define/types_unsupported.go similarity index 100% rename from vendor/github.com/containers/buildah/define/types_unsupported.go rename to vendor/go.podman.io/buildah/define/types_unsupported.go diff --git a/vendor/github.com/containers/buildah/delete.go b/vendor/go.podman.io/buildah/delete.go similarity index 100% rename from vendor/github.com/containers/buildah/delete.go rename to vendor/go.podman.io/buildah/delete.go diff --git a/vendor/github.com/containers/buildah/developmentplan.md b/vendor/go.podman.io/buildah/developmentplan.md similarity index 100% rename from vendor/github.com/containers/buildah/developmentplan.md rename to vendor/go.podman.io/buildah/developmentplan.md diff --git a/vendor/github.com/containers/buildah/digester.go b/vendor/go.podman.io/buildah/digester.go similarity index 100% rename from vendor/github.com/containers/buildah/digester.go rename to vendor/go.podman.io/buildah/digester.go diff --git a/vendor/github.com/containers/buildah/docker/AUTHORS b/vendor/go.podman.io/buildah/docker/AUTHORS similarity index 100% rename from vendor/github.com/containers/buildah/docker/AUTHORS rename to vendor/go.podman.io/buildah/docker/AUTHORS diff --git a/vendor/github.com/containers/buildah/docker/types.go b/vendor/go.podman.io/buildah/docker/types.go similarity index 100% rename from vendor/github.com/containers/buildah/docker/types.go rename to vendor/go.podman.io/buildah/docker/types.go diff --git a/vendor/github.com/containers/buildah/image.go b/vendor/go.podman.io/buildah/image.go similarity index 99% rename from vendor/github.com/containers/buildah/image.go rename to vendor/go.podman.io/buildah/image.go index 659675727c..ba30389d7b 100644 --- a/vendor/github.com/containers/buildah/image.go +++ b/vendor/go.podman.io/buildah/image.go @@ -17,16 +17,16 @@ import ( "syscall" "time" - "github.com/containers/buildah/copier" - "github.com/containers/buildah/define" - "github.com/containers/buildah/docker" - "github.com/containers/buildah/internal/config" - "github.com/containers/buildah/internal/mkcw" - "github.com/containers/buildah/internal/tmpdir" 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/buildah/copier" + "go.podman.io/buildah/define" + "go.podman.io/buildah/docker" + "go.podman.io/buildah/internal/config" + "go.podman.io/buildah/internal/mkcw" + "go.podman.io/buildah/internal/tmpdir" "go.podman.io/image/v5/docker/reference" "go.podman.io/image/v5/image" "go.podman.io/image/v5/manifest" diff --git a/vendor/github.com/containers/buildah/imagebuildah/build.go b/vendor/go.podman.io/buildah/imagebuildah/build.go similarity index 99% rename from vendor/github.com/containers/buildah/imagebuildah/build.go rename to vendor/go.podman.io/buildah/imagebuildah/build.go index 94b5e1121d..00cf2be9bd 100644 --- a/vendor/github.com/containers/buildah/imagebuildah/build.go +++ b/vendor/go.podman.io/buildah/imagebuildah/build.go @@ -20,18 +20,18 @@ import ( "time" "github.com/containerd/platforms" - "github.com/containers/buildah" - "github.com/containers/buildah/define" - "github.com/containers/buildah/internal" - internalUtil "github.com/containers/buildah/internal/util" - "github.com/containers/buildah/pkg/parse" - "github.com/containers/buildah/util" "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/buildah" + "go.podman.io/buildah/define" + "go.podman.io/buildah/internal" + internalUtil "go.podman.io/buildah/internal/util" + "go.podman.io/buildah/pkg/parse" + "go.podman.io/buildah/util" "go.podman.io/common/libimage" "go.podman.io/common/pkg/config" "go.podman.io/image/v5/docker" diff --git a/vendor/github.com/containers/buildah/imagebuildah/build_linux.go b/vendor/go.podman.io/buildah/imagebuildah/build_linux.go similarity index 96% rename from vendor/github.com/containers/buildah/imagebuildah/build_linux.go rename to vendor/go.podman.io/buildah/imagebuildah/build_linux.go index 50ce8ab1e6..be29bd4031 100644 --- a/vendor/github.com/containers/buildah/imagebuildah/build_linux.go +++ b/vendor/go.podman.io/buildah/imagebuildah/build_linux.go @@ -8,11 +8,11 @@ import ( "path/filepath" "slices" - "github.com/containers/buildah/define" - "github.com/containers/buildah/internal/tmpdir" - "github.com/containers/buildah/pkg/overlay" "github.com/opencontainers/selinux/go-selinux/label" "github.com/sirupsen/logrus" + "go.podman.io/buildah/define" + "go.podman.io/buildah/internal/tmpdir" + "go.podman.io/buildah/pkg/overlay" "go.podman.io/storage" "golang.org/x/sys/unix" ) diff --git a/vendor/github.com/containers/buildah/imagebuildah/build_notlinux.go b/vendor/go.podman.io/buildah/imagebuildah/build_notlinux.go similarity index 95% rename from vendor/github.com/containers/buildah/imagebuildah/build_notlinux.go rename to vendor/go.podman.io/buildah/imagebuildah/build_notlinux.go index 37a66e1114..ea6ba11d61 100644 --- a/vendor/github.com/containers/buildah/imagebuildah/build_notlinux.go +++ b/vendor/go.podman.io/buildah/imagebuildah/build_notlinux.go @@ -3,7 +3,7 @@ package imagebuildah import ( - "github.com/containers/buildah/define" + "go.podman.io/buildah/define" "go.podman.io/storage" ) diff --git a/vendor/github.com/containers/buildah/imagebuildah/executor.go b/vendor/go.podman.io/buildah/imagebuildah/executor.go similarity index 99% rename from vendor/github.com/containers/buildah/imagebuildah/executor.go rename to vendor/go.podman.io/buildah/imagebuildah/executor.go index ec5fd6d185..e3d49f034e 100644 --- a/vendor/github.com/containers/buildah/imagebuildah/executor.go +++ b/vendor/go.podman.io/buildah/imagebuildah/executor.go @@ -13,21 +13,21 @@ import ( "sync" "time" - "github.com/containers/buildah" - "github.com/containers/buildah/define" - "github.com/containers/buildah/internal" - "github.com/containers/buildah/internal/metadata" - internalUtil "github.com/containers/buildah/internal/util" - "github.com/containers/buildah/pkg/parse" - "github.com/containers/buildah/pkg/sourcepolicy" - "github.com/containers/buildah/pkg/sshagent" - "github.com/containers/buildah/util" encconfig "github.com/containers/ocicrypt/config" 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/buildah" + "go.podman.io/buildah/define" + "go.podman.io/buildah/internal" + "go.podman.io/buildah/internal/metadata" + internalUtil "go.podman.io/buildah/internal/util" + "go.podman.io/buildah/pkg/parse" + "go.podman.io/buildah/pkg/sourcepolicy" + "go.podman.io/buildah/pkg/sshagent" + "go.podman.io/buildah/util" "go.podman.io/common/libimage" nettypes "go.podman.io/common/libnetwork/types" "go.podman.io/common/pkg/config" diff --git a/vendor/github.com/containers/buildah/imagebuildah/stage_executor.go b/vendor/go.podman.io/buildah/imagebuildah/stage_executor.go similarity index 99% rename from vendor/github.com/containers/buildah/imagebuildah/stage_executor.go rename to vendor/go.podman.io/buildah/imagebuildah/stage_executor.go index edd8bfd48e..e12a0c0e05 100644 --- a/vendor/github.com/containers/buildah/imagebuildah/stage_executor.go +++ b/vendor/go.podman.io/buildah/imagebuildah/stage_executor.go @@ -14,20 +14,6 @@ import ( "strings" "time" - "github.com/containers/buildah" - "github.com/containers/buildah/copier" - "github.com/containers/buildah/define" - buildahdocker "github.com/containers/buildah/docker" - "github.com/containers/buildah/internal" - "github.com/containers/buildah/internal/metadata" - "github.com/containers/buildah/internal/output" - "github.com/containers/buildah/internal/sanitize" - "github.com/containers/buildah/internal/tmpdir" - internalUtil "github.com/containers/buildah/internal/util" - "github.com/containers/buildah/pkg/parse" - "github.com/containers/buildah/pkg/rusage" - "github.com/containers/buildah/pkg/sourcepolicy" - "github.com/containers/buildah/util" docker "github.com/fsouza/go-dockerclient" buildkitparser "github.com/moby/buildkit/frontend/dockerfile/parser" digest "github.com/opencontainers/go-digest" @@ -37,6 +23,20 @@ import ( "github.com/openshift/imagebuilder/dockerfile/command" "github.com/openshift/imagebuilder/dockerfile/parser" "github.com/sirupsen/logrus" + "go.podman.io/buildah" + "go.podman.io/buildah/copier" + "go.podman.io/buildah/define" + buildahdocker "go.podman.io/buildah/docker" + "go.podman.io/buildah/internal" + "go.podman.io/buildah/internal/metadata" + "go.podman.io/buildah/internal/output" + "go.podman.io/buildah/internal/sanitize" + "go.podman.io/buildah/internal/tmpdir" + internalUtil "go.podman.io/buildah/internal/util" + "go.podman.io/buildah/pkg/parse" + "go.podman.io/buildah/pkg/rusage" + "go.podman.io/buildah/pkg/sourcepolicy" + "go.podman.io/buildah/util" config "go.podman.io/common/pkg/config" cp "go.podman.io/image/v5/copy" imagedocker "go.podman.io/image/v5/docker" @@ -356,6 +356,20 @@ func (s *stageExecutor) volumeCacheRestore() error { return s.volumeCacheRestoreVFS() } +func joinExcludePatternWithCopySource(srcNorm, excl string) string { + if srcNorm == "." { + return excl + } + if strings.HasPrefix(excl, "!") { + rest := strings.TrimPrefix(excl, "!") + if rest == "" { + return excl + } + return "!" + path.Join(srcNorm, rest) + } + return path.Join(srcNorm, excl) +} + // Copy copies data into the working tree. The "Download" field is how // imagebuilder tells us the instruction was "ADD" and not "COPY". func (s *stageExecutor) Copy(excludes []string, copies ...imagebuilder.Copy) error { @@ -374,6 +388,12 @@ func (s *stageExecutor) Copy(excludes []string, copies ...imagebuilder.Copy) err } if len(cp.Excludes) > 0 { excludes = append(slices.Clone(excludes), cp.Excludes...) + for _, src := range cp.Src { + srcNorm := path.Clean(filepath.ToSlash(src)) + for _, excl := range cp.Excludes { + excludes = append(excludes, joinExcludePatternWithCopySource(srcNorm, excl)) + } + } } } s.builder.ContentDigester.Restart() diff --git a/vendor/github.com/containers/buildah/imagebuildah/util.go b/vendor/go.podman.io/buildah/imagebuildah/util.go similarity index 98% rename from vendor/github.com/containers/buildah/imagebuildah/util.go rename to vendor/go.podman.io/buildah/imagebuildah/util.go index eb0f6c6336..6d55242ceb 100644 --- a/vendor/github.com/containers/buildah/imagebuildah/util.go +++ b/vendor/go.podman.io/buildah/imagebuildah/util.go @@ -8,8 +8,8 @@ import ( "strings" "time" - "github.com/containers/buildah" digest "github.com/opencontainers/go-digest" + "go.podman.io/buildah" ) type mountInfo struct { diff --git a/vendor/github.com/containers/buildah/import.go b/vendor/go.podman.io/buildah/import.go similarity index 97% rename from vendor/github.com/containers/buildah/import.go rename to vendor/go.podman.io/buildah/import.go index 961936dc22..16988592e6 100644 --- a/vendor/github.com/containers/buildah/import.go +++ b/vendor/go.podman.io/buildah/import.go @@ -5,10 +5,10 @@ import ( "errors" "fmt" - "github.com/containers/buildah/define" - "github.com/containers/buildah/docker" - "github.com/containers/buildah/util" digest "github.com/opencontainers/go-digest" + "go.podman.io/buildah/define" + "go.podman.io/buildah/docker" + "go.podman.io/buildah/util" "go.podman.io/image/v5/image" "go.podman.io/image/v5/manifest" is "go.podman.io/image/v5/storage" diff --git a/vendor/github.com/containers/buildah/info.go b/vendor/go.podman.io/buildah/info.go similarity index 96% rename from vendor/github.com/containers/buildah/info.go rename to vendor/go.podman.io/buildah/info.go index 31c9000215..54ef4d7da3 100644 --- a/vendor/github.com/containers/buildah/info.go +++ b/vendor/go.podman.io/buildah/info.go @@ -9,11 +9,11 @@ import ( "strconv" "strings" - internalUtil "github.com/containers/buildah/internal/util" - putil "github.com/containers/buildah/pkg/util" - "github.com/containers/buildah/util" v1 "github.com/opencontainers/image-spec/specs-go/v1" "github.com/sirupsen/logrus" + internalUtil "go.podman.io/buildah/internal/util" + putil "go.podman.io/buildah/pkg/util" + "go.podman.io/buildah/util" "go.podman.io/common/pkg/cgroups" "go.podman.io/storage" "go.podman.io/storage/pkg/system" diff --git a/vendor/github.com/containers/buildah/install.md b/vendor/go.podman.io/buildah/install.md similarity index 100% rename from vendor/github.com/containers/buildah/install.md rename to vendor/go.podman.io/buildah/install.md diff --git a/vendor/github.com/containers/buildah/internal/config/convert.go b/vendor/go.podman.io/buildah/internal/config/convert.go similarity index 100% rename from vendor/github.com/containers/buildah/internal/config/convert.go rename to vendor/go.podman.io/buildah/internal/config/convert.go diff --git a/vendor/github.com/containers/buildah/internal/config/executor.go b/vendor/go.podman.io/buildah/internal/config/executor.go similarity index 100% rename from vendor/github.com/containers/buildah/internal/config/executor.go rename to vendor/go.podman.io/buildah/internal/config/executor.go diff --git a/vendor/github.com/containers/buildah/internal/config/override.go b/vendor/go.podman.io/buildah/internal/config/override.go similarity index 99% rename from vendor/github.com/containers/buildah/internal/config/override.go rename to vendor/go.podman.io/buildah/internal/config/override.go index 55933de468..406a60c5b0 100644 --- a/vendor/github.com/containers/buildah/internal/config/override.go +++ b/vendor/go.podman.io/buildah/internal/config/override.go @@ -7,9 +7,9 @@ import ( "slices" "strings" - "github.com/containers/buildah/docker" v1 "github.com/opencontainers/image-spec/specs-go/v1" "github.com/openshift/imagebuilder" + "go.podman.io/buildah/docker" "go.podman.io/image/v5/manifest" ) diff --git a/vendor/github.com/containers/buildah/internal/metadata/metadata.go b/vendor/go.podman.io/buildah/internal/metadata/metadata.go similarity index 95% rename from vendor/github.com/containers/buildah/internal/metadata/metadata.go rename to vendor/go.podman.io/buildah/internal/metadata/metadata.go index 28b2de4f96..3797ae73b7 100644 --- a/vendor/github.com/containers/buildah/internal/metadata/metadata.go +++ b/vendor/go.podman.io/buildah/internal/metadata/metadata.go @@ -1,9 +1,9 @@ package metadata import ( - "github.com/containers/buildah/docker" "github.com/opencontainers/go-digest" v1 "github.com/opencontainers/image-spec/specs-go/v1" + "go.podman.io/buildah/docker" ) // Build constructs a map containing the passed-in information about a just-committed or reused-as-cache image. diff --git a/vendor/github.com/containers/buildah/internal/mkcw/archive.go b/vendor/go.podman.io/buildah/internal/mkcw/archive.go similarity index 99% rename from vendor/github.com/containers/buildah/internal/mkcw/archive.go rename to vendor/go.podman.io/buildah/internal/mkcw/archive.go index d136298658..7728af660a 100644 --- a/vendor/github.com/containers/buildah/internal/mkcw/archive.go +++ b/vendor/go.podman.io/buildah/internal/mkcw/archive.go @@ -17,13 +17,13 @@ import ( "strings" "time" - "github.com/containers/buildah/internal/tmpdir" - "github.com/containers/buildah/pkg/overlay" "github.com/containers/luksy" "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/buildah/internal/tmpdir" + "go.podman.io/buildah/pkg/overlay" "go.podman.io/storage/pkg/idtools" "go.podman.io/storage/pkg/ioutils" "go.podman.io/storage/pkg/mount" @@ -64,11 +64,15 @@ type chainRetrievalError struct { func (c chainRetrievalError) Error() string { if trimmed := strings.TrimSpace(c.stderr); trimmed != "" { - return fmt.Sprintf("retrieving SEV certificate chain: sevctl: %v: %v", strings.TrimSpace(c.stderr), c.err) + return fmt.Sprintf("retrieving SEV certificate chain: sevctl: %v: %v", trimmed, c.err) } return fmt.Sprintf("retrieving SEV certificate chain: sevctl: %v", c.err) } +func (c chainRetrievalError) Unwrap() error { + return c.err +} + // Archive generates a WorkloadConfig for a specified directory and produces a // tar archive of a container image's rootfs with the expected contents. func Archive(rootfsPath string, ociConfig *v1.Image, options ArchiveOptions) (io.ReadCloser, WorkloadConfig, error) { diff --git a/vendor/github.com/containers/buildah/internal/mkcw/attest.go b/vendor/go.podman.io/buildah/internal/mkcw/attest.go similarity index 95% rename from vendor/github.com/containers/buildah/internal/mkcw/attest.go rename to vendor/go.podman.io/buildah/internal/mkcw/attest.go index d93bcc17a8..8ab1511eb7 100644 --- a/vendor/github.com/containers/buildah/internal/mkcw/attest.go +++ b/vendor/go.podman.io/buildah/internal/mkcw/attest.go @@ -14,8 +14,8 @@ import ( "path/filepath" "strings" - types "github.com/containers/buildah/internal/mkcw/types" "github.com/sirupsen/logrus" + types "go.podman.io/buildah/internal/mkcw/types" "go.podman.io/storage/pkg/fileutils" ) @@ -34,6 +34,10 @@ func (m measurementError) Error() string { return fmt.Sprintf("generating measurement for attestation: %v", m.err) } +func (m measurementError) Unwrap() error { + return m.err +} + type attestationError struct { err error } @@ -42,6 +46,10 @@ func (a attestationError) Error() string { return fmt.Sprintf("registering workload: %v", a.err) } +func (a attestationError) Unwrap() error { + return a.err +} + type httpError struct { statusCode int } @@ -64,7 +72,7 @@ func SendRegistrationRequest(workloadConfig WorkloadConfig, diskEncryptionPassph measurement, err := GenerateMeasurement(workloadConfig, firmwareLibrary) if err != nil { if !ignoreAttestationErrors { - return &measurementError{err} + return measurementError{err} } logger.Warnf("generating measurement for attestation: %v", err) } @@ -145,16 +153,16 @@ func SendRegistrationRequest(workloadConfig WorkloadConfig, diskEncryptionPassph switch resp.StatusCode { default: if !ignoreAttestationErrors { - return &attestationError{&httpError{resp.StatusCode}} + return attestationError{httpError{resp.StatusCode}} } - logger.Warn(attestationError{&httpError{resp.StatusCode}}.Error()) + logger.Warn(attestationError{httpError{resp.StatusCode}}.Error()) case http.StatusOK, http.StatusAccepted: // great! } } if err != nil { if !ignoreAttestationErrors { - return &attestationError{err} + return attestationError{err} } logger.Warn(attestationError{err}.Error()) } diff --git a/vendor/go.podman.io/buildah/internal/mkcw/embed/entrypoint_amd64.gz b/vendor/go.podman.io/buildah/internal/mkcw/embed/entrypoint_amd64.gz new file mode 100644 index 0000000000..c2399f9e90 Binary files /dev/null and b/vendor/go.podman.io/buildah/internal/mkcw/embed/entrypoint_amd64.gz differ diff --git a/vendor/github.com/containers/buildah/internal/mkcw/entrypoint.go b/vendor/go.podman.io/buildah/internal/mkcw/entrypoint.go similarity index 100% rename from vendor/github.com/containers/buildah/internal/mkcw/entrypoint.go rename to vendor/go.podman.io/buildah/internal/mkcw/entrypoint.go diff --git a/vendor/github.com/containers/buildah/internal/mkcw/luks.go b/vendor/go.podman.io/buildah/internal/mkcw/luks.go similarity index 100% rename from vendor/github.com/containers/buildah/internal/mkcw/luks.go rename to vendor/go.podman.io/buildah/internal/mkcw/luks.go diff --git a/vendor/github.com/containers/buildah/internal/mkcw/makefs.go b/vendor/go.podman.io/buildah/internal/mkcw/makefs.go similarity index 100% rename from vendor/github.com/containers/buildah/internal/mkcw/makefs.go rename to vendor/go.podman.io/buildah/internal/mkcw/makefs.go diff --git a/vendor/github.com/containers/buildah/internal/mkcw/types/attest.go b/vendor/go.podman.io/buildah/internal/mkcw/types/attest.go similarity index 100% rename from vendor/github.com/containers/buildah/internal/mkcw/types/attest.go rename to vendor/go.podman.io/buildah/internal/mkcw/types/attest.go diff --git a/vendor/github.com/containers/buildah/internal/mkcw/types/workload.go b/vendor/go.podman.io/buildah/internal/mkcw/types/workload.go similarity index 97% rename from vendor/github.com/containers/buildah/internal/mkcw/types/workload.go rename to vendor/go.podman.io/buildah/internal/mkcw/types/workload.go index 4f6d658c7e..41c4affa21 100644 --- a/vendor/github.com/containers/buildah/internal/mkcw/types/workload.go +++ b/vendor/go.podman.io/buildah/internal/mkcw/types/workload.go @@ -1,6 +1,6 @@ package mkcwtypes -import "github.com/containers/buildah/define" +import "go.podman.io/buildah/define" // WorkloadConfig is the data type which is encoded and stored in /krun-sev.json in a container // image, and included directly in the disk image. diff --git a/vendor/github.com/containers/buildah/internal/mkcw/workload.go b/vendor/go.podman.io/buildah/internal/mkcw/workload.go similarity index 98% rename from vendor/github.com/containers/buildah/internal/mkcw/workload.go rename to vendor/go.podman.io/buildah/internal/mkcw/workload.go index fe8ea248b6..7c2a79475e 100644 --- a/vendor/github.com/containers/buildah/internal/mkcw/workload.go +++ b/vendor/go.podman.io/buildah/internal/mkcw/workload.go @@ -9,8 +9,8 @@ import ( "io" "os" - "github.com/containers/buildah/define" - types "github.com/containers/buildah/internal/mkcw/types" + "go.podman.io/buildah/define" + types "go.podman.io/buildah/internal/mkcw/types" ) type ( diff --git a/vendor/github.com/containers/buildah/internal/open/open.go b/vendor/go.podman.io/buildah/internal/open/open.go similarity index 100% rename from vendor/github.com/containers/buildah/internal/open/open.go rename to vendor/go.podman.io/buildah/internal/open/open.go diff --git a/vendor/github.com/containers/buildah/internal/open/open_linux.go b/vendor/go.podman.io/buildah/internal/open/open_linux.go similarity index 100% rename from vendor/github.com/containers/buildah/internal/open/open_linux.go rename to vendor/go.podman.io/buildah/internal/open/open_linux.go diff --git a/vendor/github.com/containers/buildah/internal/open/open_types.go b/vendor/go.podman.io/buildah/internal/open/open_types.go similarity index 100% rename from vendor/github.com/containers/buildah/internal/open/open_types.go rename to vendor/go.podman.io/buildah/internal/open/open_types.go diff --git a/vendor/github.com/containers/buildah/internal/open/open_unix.go b/vendor/go.podman.io/buildah/internal/open/open_unix.go similarity index 100% rename from vendor/github.com/containers/buildah/internal/open/open_unix.go rename to vendor/go.podman.io/buildah/internal/open/open_unix.go diff --git a/vendor/github.com/containers/buildah/internal/open/open_unsupported.go b/vendor/go.podman.io/buildah/internal/open/open_unsupported.go similarity index 100% rename from vendor/github.com/containers/buildah/internal/open/open_unsupported.go rename to vendor/go.podman.io/buildah/internal/open/open_unsupported.go diff --git a/vendor/github.com/containers/buildah/internal/output/build_output.go b/vendor/go.podman.io/buildah/internal/output/build_output.go similarity index 100% rename from vendor/github.com/containers/buildah/internal/output/build_output.go rename to vendor/go.podman.io/buildah/internal/output/build_output.go diff --git a/vendor/github.com/containers/buildah/internal/parsevolume/parse.go b/vendor/go.podman.io/buildah/internal/parsevolume/parse.go similarity index 100% rename from vendor/github.com/containers/buildah/internal/parsevolume/parse.go rename to vendor/go.podman.io/buildah/internal/parsevolume/parse.go diff --git a/vendor/github.com/containers/buildah/internal/pty/pty_posix.go b/vendor/go.podman.io/buildah/internal/pty/pty_posix.go similarity index 100% rename from vendor/github.com/containers/buildah/internal/pty/pty_posix.go rename to vendor/go.podman.io/buildah/internal/pty/pty_posix.go diff --git a/vendor/github.com/containers/buildah/internal/pty/pty_ptmx.go b/vendor/go.podman.io/buildah/internal/pty/pty_ptmx.go similarity index 100% rename from vendor/github.com/containers/buildah/internal/pty/pty_ptmx.go rename to vendor/go.podman.io/buildah/internal/pty/pty_ptmx.go diff --git a/vendor/github.com/containers/buildah/internal/pty/pty_unsupported.go b/vendor/go.podman.io/buildah/internal/pty/pty_unsupported.go similarity index 100% rename from vendor/github.com/containers/buildah/internal/pty/pty_unsupported.go rename to vendor/go.podman.io/buildah/internal/pty/pty_unsupported.go diff --git a/vendor/github.com/containers/buildah/internal/sanitize/sanitize.go b/vendor/go.podman.io/buildah/internal/sanitize/sanitize.go similarity index 100% rename from vendor/github.com/containers/buildah/internal/sanitize/sanitize.go rename to vendor/go.podman.io/buildah/internal/sanitize/sanitize.go diff --git a/vendor/github.com/containers/buildah/internal/sbom/merge.go b/vendor/go.podman.io/buildah/internal/sbom/merge.go similarity index 99% rename from vendor/github.com/containers/buildah/internal/sbom/merge.go rename to vendor/go.podman.io/buildah/internal/sbom/merge.go index 57487b083b..0cbb3f3659 100644 --- a/vendor/github.com/containers/buildah/internal/sbom/merge.go +++ b/vendor/go.podman.io/buildah/internal/sbom/merge.go @@ -7,7 +7,7 @@ import ( "os" "sort" - "github.com/containers/buildah/define" + "go.podman.io/buildah/define" ) // getComponentNameVersionPurl extracts the "name", "version", and "purl" diff --git a/vendor/github.com/containers/buildah/internal/sbom/presets.go b/vendor/go.podman.io/buildah/internal/sbom/presets.go similarity index 98% rename from vendor/github.com/containers/buildah/internal/sbom/presets.go rename to vendor/go.podman.io/buildah/internal/sbom/presets.go index 43ea9a8147..d9807e2813 100644 --- a/vendor/github.com/containers/buildah/internal/sbom/presets.go +++ b/vendor/go.podman.io/buildah/internal/sbom/presets.go @@ -3,7 +3,7 @@ package sbom import ( "slices" - "github.com/containers/buildah/define" + "go.podman.io/buildah/define" ) // Preset returns a predefined SBOMScanOptions structure that has the passed-in diff --git a/vendor/github.com/containers/buildah/internal/tmpdir/tmpdir.go b/vendor/go.podman.io/buildah/internal/tmpdir/tmpdir.go similarity index 100% rename from vendor/github.com/containers/buildah/internal/tmpdir/tmpdir.go rename to vendor/go.podman.io/buildah/internal/tmpdir/tmpdir.go diff --git a/vendor/github.com/containers/buildah/internal/types.go b/vendor/go.podman.io/buildah/internal/types.go similarity index 100% rename from vendor/github.com/containers/buildah/internal/types.go rename to vendor/go.podman.io/buildah/internal/types.go diff --git a/vendor/github.com/containers/buildah/internal/util/util.go b/vendor/go.podman.io/buildah/internal/util/util.go similarity index 98% rename from vendor/github.com/containers/buildah/internal/util/util.go rename to vendor/go.podman.io/buildah/internal/util/util.go index f4414d0617..d36f2bdbfd 100644 --- a/vendor/github.com/containers/buildah/internal/util/util.go +++ b/vendor/go.podman.io/buildah/internal/util/util.go @@ -6,8 +6,8 @@ import ( "os" "path/filepath" - "github.com/containers/buildah/internal/output" v1 "github.com/opencontainers/image-spec/specs-go/v1" + "go.podman.io/buildah/internal/output" "go.podman.io/common/libimage" lplatform "go.podman.io/common/libimage/platform" "go.podman.io/image/v5/types" diff --git a/vendor/github.com/containers/buildah/internal/volumes/bind_linux.go b/vendor/go.podman.io/buildah/internal/volumes/bind_linux.go similarity index 98% rename from vendor/github.com/containers/buildah/internal/volumes/bind_linux.go rename to vendor/go.podman.io/buildah/internal/volumes/bind_linux.go index dfd5373ca9..a9a8e43cf6 100644 --- a/vendor/github.com/containers/buildah/internal/volumes/bind_linux.go +++ b/vendor/go.podman.io/buildah/internal/volumes/bind_linux.go @@ -5,8 +5,8 @@ import ( "fmt" "os" - "github.com/containers/buildah/internal/open" "github.com/sirupsen/logrus" + "go.podman.io/buildah/internal/open" "go.podman.io/storage/pkg/mount" "golang.org/x/sys/unix" ) diff --git a/vendor/github.com/containers/buildah/internal/volumes/bind_notlinux.go b/vendor/go.podman.io/buildah/internal/volumes/bind_notlinux.go similarity index 100% rename from vendor/github.com/containers/buildah/internal/volumes/bind_notlinux.go rename to vendor/go.podman.io/buildah/internal/volumes/bind_notlinux.go diff --git a/vendor/github.com/containers/buildah/internal/volumes/volumes.go b/vendor/go.podman.io/buildah/internal/volumes/volumes.go similarity index 98% rename from vendor/github.com/containers/buildah/internal/volumes/volumes.go rename to vendor/go.podman.io/buildah/internal/volumes/volumes.go index 2ab83837bf..2cb533d0b4 100644 --- a/vendor/github.com/containers/buildah/internal/volumes/volumes.go +++ b/vendor/go.podman.io/buildah/internal/volumes/volumes.go @@ -11,18 +11,18 @@ import ( "strconv" "strings" - "github.com/containers/buildah/copier" - "github.com/containers/buildah/define" - "github.com/containers/buildah/internal" - internalParse "github.com/containers/buildah/internal/parsevolume" - "github.com/containers/buildah/internal/tmpdir" - internalUtil "github.com/containers/buildah/internal/util" - "github.com/containers/buildah/pkg/overlay" - "github.com/containers/buildah/util" 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/buildah/copier" + "go.podman.io/buildah/define" + "go.podman.io/buildah/internal" + internalParse "go.podman.io/buildah/internal/parsevolume" + "go.podman.io/buildah/internal/tmpdir" + internalUtil "go.podman.io/buildah/internal/util" + "go.podman.io/buildah/pkg/overlay" + "go.podman.io/buildah/util" "go.podman.io/common/pkg/parse" "go.podman.io/image/v5/types" "go.podman.io/storage" diff --git a/vendor/github.com/containers/buildah/mount.go b/vendor/go.podman.io/buildah/mount.go similarity index 100% rename from vendor/github.com/containers/buildah/mount.go rename to vendor/go.podman.io/buildah/mount.go diff --git a/vendor/github.com/containers/buildah/new.go b/vendor/go.podman.io/buildah/new.go similarity index 99% rename from vendor/github.com/containers/buildah/new.go rename to vendor/go.podman.io/buildah/new.go index dbf5a9d3c2..5c345fe869 100644 --- a/vendor/github.com/containers/buildah/new.go +++ b/vendor/go.podman.io/buildah/new.go @@ -9,11 +9,11 @@ import ( "slices" "strings" - "github.com/containers/buildah/define" 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/buildah/define" "go.podman.io/common/libimage" "go.podman.io/common/pkg/config" "go.podman.io/image/v5/image" diff --git a/vendor/github.com/containers/buildah/pkg/binfmt/binfmt.go b/vendor/go.podman.io/buildah/pkg/binfmt/binfmt.go similarity index 100% rename from vendor/github.com/containers/buildah/pkg/binfmt/binfmt.go rename to vendor/go.podman.io/buildah/pkg/binfmt/binfmt.go diff --git a/vendor/github.com/containers/buildah/pkg/binfmt/binfmt_unsupported.go b/vendor/go.podman.io/buildah/pkg/binfmt/binfmt_unsupported.go similarity index 100% rename from vendor/github.com/containers/buildah/pkg/binfmt/binfmt_unsupported.go rename to vendor/go.podman.io/buildah/pkg/binfmt/binfmt_unsupported.go diff --git a/vendor/github.com/containers/buildah/pkg/blobcache/blobcache.go b/vendor/go.podman.io/buildah/pkg/blobcache/blobcache.go similarity index 100% rename from vendor/github.com/containers/buildah/pkg/blobcache/blobcache.go rename to vendor/go.podman.io/buildah/pkg/blobcache/blobcache.go diff --git a/vendor/github.com/containers/buildah/pkg/chrootuser/user.go b/vendor/go.podman.io/buildah/pkg/chrootuser/user.go similarity index 100% rename from vendor/github.com/containers/buildah/pkg/chrootuser/user.go rename to vendor/go.podman.io/buildah/pkg/chrootuser/user.go diff --git a/vendor/github.com/containers/buildah/pkg/chrootuser/user_basic.go b/vendor/go.podman.io/buildah/pkg/chrootuser/user_basic.go similarity index 100% rename from vendor/github.com/containers/buildah/pkg/chrootuser/user_basic.go rename to vendor/go.podman.io/buildah/pkg/chrootuser/user_basic.go diff --git a/vendor/github.com/containers/buildah/pkg/chrootuser/user_unix.go b/vendor/go.podman.io/buildah/pkg/chrootuser/user_unix.go similarity index 100% rename from vendor/github.com/containers/buildah/pkg/chrootuser/user_unix.go rename to vendor/go.podman.io/buildah/pkg/chrootuser/user_unix.go diff --git a/vendor/github.com/containers/buildah/pkg/cli/build.go b/vendor/go.podman.io/buildah/pkg/cli/build.go similarity index 98% rename from vendor/github.com/containers/buildah/pkg/cli/build.go rename to vendor/go.podman.io/buildah/pkg/cli/build.go index 0ed121e264..aeb77f9d59 100644 --- a/vendor/github.com/containers/buildah/pkg/cli/build.go +++ b/vendor/go.podman.io/buildah/pkg/cli/build.go @@ -17,13 +17,13 @@ import ( "strings" "time" - "github.com/containers/buildah/define" - "github.com/containers/buildah/internal/output" - "github.com/containers/buildah/pkg/parse" - "github.com/containers/buildah/pkg/util" "github.com/opencontainers/runtime-spec/specs-go" "github.com/sirupsen/logrus" "github.com/spf13/cobra" + "go.podman.io/buildah/define" + "go.podman.io/buildah/internal/output" + "go.podman.io/buildah/pkg/parse" + "go.podman.io/buildah/pkg/util" "go.podman.io/common/pkg/auth" "go.podman.io/image/v5/docker/reference" "go.podman.io/image/v5/types" diff --git a/vendor/github.com/containers/buildah/pkg/cli/common.go b/vendor/go.podman.io/buildah/pkg/cli/common.go similarity index 99% rename from vendor/github.com/containers/buildah/pkg/cli/common.go rename to vendor/go.podman.io/buildah/pkg/cli/common.go index e610f83aa9..db5f1711b0 100644 --- a/vendor/github.com/containers/buildah/pkg/cli/common.go +++ b/vendor/go.podman.io/buildah/pkg/cli/common.go @@ -11,14 +11,14 @@ import ( "runtime" "strings" - "github.com/containers/buildah/define" - "github.com/containers/buildah/internal" - "github.com/containers/buildah/pkg/completion" - "github.com/containers/buildah/pkg/parse" encconfig "github.com/containers/ocicrypt/config" enchelpers "github.com/containers/ocicrypt/helpers" "github.com/opencontainers/runtime-spec/specs-go" "github.com/spf13/pflag" + "go.podman.io/buildah/define" + "go.podman.io/buildah/internal" + "go.podman.io/buildah/pkg/completion" + "go.podman.io/buildah/pkg/parse" commonComp "go.podman.io/common/pkg/completion" "go.podman.io/common/pkg/config" "go.podman.io/storage/pkg/unshare" diff --git a/vendor/github.com/containers/buildah/pkg/cli/exec_codes.go b/vendor/go.podman.io/buildah/pkg/cli/exec_codes.go similarity index 100% rename from vendor/github.com/containers/buildah/pkg/cli/exec_codes.go rename to vendor/go.podman.io/buildah/pkg/cli/exec_codes.go diff --git a/vendor/github.com/containers/buildah/pkg/completion/completion.go b/vendor/go.podman.io/buildah/pkg/completion/completion.go similarity index 100% rename from vendor/github.com/containers/buildah/pkg/completion/completion.go rename to vendor/go.podman.io/buildah/pkg/completion/completion.go diff --git a/vendor/github.com/containers/buildah/pkg/jail/jail.go b/vendor/go.podman.io/buildah/pkg/jail/jail.go similarity index 99% rename from vendor/github.com/containers/buildah/pkg/jail/jail.go rename to vendor/go.podman.io/buildah/pkg/jail/jail.go index ad37634863..e97edbd364 100644 --- a/vendor/github.com/containers/buildah/pkg/jail/jail.go +++ b/vendor/go.podman.io/buildah/pkg/jail/jail.go @@ -11,8 +11,8 @@ import ( "syscall" "unsafe" - "github.com/containers/buildah/pkg/util" "github.com/sirupsen/logrus" + "go.podman.io/buildah/pkg/util" "golang.org/x/sys/unix" ) diff --git a/vendor/github.com/containers/buildah/pkg/jail/jail_int32.go b/vendor/go.podman.io/buildah/pkg/jail/jail_int32.go similarity index 100% rename from vendor/github.com/containers/buildah/pkg/jail/jail_int32.go rename to vendor/go.podman.io/buildah/pkg/jail/jail_int32.go diff --git a/vendor/github.com/containers/buildah/pkg/jail/jail_int64.go b/vendor/go.podman.io/buildah/pkg/jail/jail_int64.go similarity index 100% rename from vendor/github.com/containers/buildah/pkg/jail/jail_int64.go rename to vendor/go.podman.io/buildah/pkg/jail/jail_int64.go diff --git a/vendor/github.com/containers/buildah/pkg/overlay/overlay.go b/vendor/go.podman.io/buildah/pkg/overlay/overlay.go similarity index 100% rename from vendor/github.com/containers/buildah/pkg/overlay/overlay.go rename to vendor/go.podman.io/buildah/pkg/overlay/overlay.go diff --git a/vendor/github.com/containers/buildah/pkg/overlay/overlay_freebsd.go b/vendor/go.podman.io/buildah/pkg/overlay/overlay_freebsd.go similarity index 100% rename from vendor/github.com/containers/buildah/pkg/overlay/overlay_freebsd.go rename to vendor/go.podman.io/buildah/pkg/overlay/overlay_freebsd.go diff --git a/vendor/github.com/containers/buildah/pkg/overlay/overlay_linux.go b/vendor/go.podman.io/buildah/pkg/overlay/overlay_linux.go similarity index 100% rename from vendor/github.com/containers/buildah/pkg/overlay/overlay_linux.go rename to vendor/go.podman.io/buildah/pkg/overlay/overlay_linux.go diff --git a/vendor/github.com/containers/buildah/pkg/overlay/overlay_unsupported.go b/vendor/go.podman.io/buildah/pkg/overlay/overlay_unsupported.go similarity index 100% rename from vendor/github.com/containers/buildah/pkg/overlay/overlay_unsupported.go rename to vendor/go.podman.io/buildah/pkg/overlay/overlay_unsupported.go diff --git a/vendor/github.com/containers/buildah/pkg/parse/parse.go b/vendor/go.podman.io/buildah/pkg/parse/parse.go similarity index 99% rename from vendor/github.com/containers/buildah/pkg/parse/parse.go rename to vendor/go.podman.io/buildah/pkg/parse/parse.go index 9ba17e1b00..579d712519 100644 --- a/vendor/github.com/containers/buildah/pkg/parse/parse.go +++ b/vendor/go.podman.io/buildah/pkg/parse/parse.go @@ -17,12 +17,6 @@ import ( "unicode" "github.com/containerd/platforms" - "github.com/containers/buildah/define" - mkcwtypes "github.com/containers/buildah/internal/mkcw/types" - internalParse "github.com/containers/buildah/internal/parsevolume" - "github.com/containers/buildah/internal/sbom" - "github.com/containers/buildah/internal/tmpdir" - "github.com/containers/buildah/pkg/sshagent" securejoin "github.com/cyphar/filepath-securejoin" units "github.com/docker/go-units" specs "github.com/opencontainers/runtime-spec/specs-go" @@ -31,6 +25,12 @@ import ( "github.com/sirupsen/logrus" "github.com/spf13/cobra" "github.com/spf13/pflag" + "go.podman.io/buildah/define" + mkcwtypes "go.podman.io/buildah/internal/mkcw/types" + internalParse "go.podman.io/buildah/internal/parsevolume" + "go.podman.io/buildah/internal/sbom" + "go.podman.io/buildah/internal/tmpdir" + "go.podman.io/buildah/pkg/sshagent" "go.podman.io/common/libnetwork/etchosts" "go.podman.io/common/pkg/auth" "go.podman.io/common/pkg/config" diff --git a/vendor/github.com/containers/buildah/pkg/parse/parse_unix.go b/vendor/go.podman.io/buildah/pkg/parse/parse_unix.go similarity index 97% rename from vendor/github.com/containers/buildah/pkg/parse/parse_unix.go rename to vendor/go.podman.io/buildah/pkg/parse/parse_unix.go index 8dee3f0cf2..b1aa21ddff 100644 --- a/vendor/github.com/containers/buildah/pkg/parse/parse_unix.go +++ b/vendor/go.podman.io/buildah/pkg/parse/parse_unix.go @@ -7,9 +7,9 @@ import ( "os" "path/filepath" - "github.com/containers/buildah/define" "github.com/opencontainers/cgroups/devices/config" "github.com/opencontainers/runc/libcontainer/devices" + "go.podman.io/buildah/define" ) func DeviceFromPath(device string) (define.ContainerDevices, error) { diff --git a/vendor/github.com/containers/buildah/pkg/parse/parse_unsupported.go b/vendor/go.podman.io/buildah/pkg/parse/parse_unsupported.go similarity index 87% rename from vendor/github.com/containers/buildah/pkg/parse/parse_unsupported.go rename to vendor/go.podman.io/buildah/pkg/parse/parse_unsupported.go index 329ac76f24..285e3f4a04 100644 --- a/vendor/github.com/containers/buildah/pkg/parse/parse_unsupported.go +++ b/vendor/go.podman.io/buildah/pkg/parse/parse_unsupported.go @@ -5,7 +5,7 @@ package parse //nolint:revive,nolintlint import ( "errors" - "github.com/containers/buildah/define" + "go.podman.io/buildah/define" ) func getDefaultProcessLimits() []string { diff --git a/vendor/github.com/containers/buildah/pkg/rusage/rusage.go b/vendor/go.podman.io/buildah/pkg/rusage/rusage.go similarity index 100% rename from vendor/github.com/containers/buildah/pkg/rusage/rusage.go rename to vendor/go.podman.io/buildah/pkg/rusage/rusage.go diff --git a/vendor/github.com/containers/buildah/pkg/rusage/rusage_unix.go b/vendor/go.podman.io/buildah/pkg/rusage/rusage_unix.go similarity index 100% rename from vendor/github.com/containers/buildah/pkg/rusage/rusage_unix.go rename to vendor/go.podman.io/buildah/pkg/rusage/rusage_unix.go diff --git a/vendor/github.com/containers/buildah/pkg/rusage/rusage_unsupported.go b/vendor/go.podman.io/buildah/pkg/rusage/rusage_unsupported.go similarity index 100% rename from vendor/github.com/containers/buildah/pkg/rusage/rusage_unsupported.go rename to vendor/go.podman.io/buildah/pkg/rusage/rusage_unsupported.go diff --git a/vendor/github.com/containers/buildah/pkg/sourcepolicy/policy.go b/vendor/go.podman.io/buildah/pkg/sourcepolicy/policy.go similarity index 100% rename from vendor/github.com/containers/buildah/pkg/sourcepolicy/policy.go rename to vendor/go.podman.io/buildah/pkg/sourcepolicy/policy.go diff --git a/vendor/github.com/containers/buildah/pkg/sshagent/sshagent.go b/vendor/go.podman.io/buildah/pkg/sshagent/sshagent.go similarity index 99% rename from vendor/github.com/containers/buildah/pkg/sshagent/sshagent.go rename to vendor/go.podman.io/buildah/pkg/sshagent/sshagent.go index 36ff656298..2c8e3ccd89 100644 --- a/vendor/github.com/containers/buildah/pkg/sshagent/sshagent.go +++ b/vendor/go.podman.io/buildah/pkg/sshagent/sshagent.go @@ -11,9 +11,9 @@ import ( "sync" "time" - "github.com/containers/buildah/internal/tmpdir" "github.com/opencontainers/selinux/go-selinux" "github.com/sirupsen/logrus" + "go.podman.io/buildah/internal/tmpdir" "golang.org/x/crypto/ssh" "golang.org/x/crypto/ssh/agent" ) diff --git a/vendor/github.com/containers/buildah/pkg/util/resource_unix.go b/vendor/go.podman.io/buildah/pkg/util/resource_unix.go similarity index 100% rename from vendor/github.com/containers/buildah/pkg/util/resource_unix.go rename to vendor/go.podman.io/buildah/pkg/util/resource_unix.go diff --git a/vendor/github.com/containers/buildah/pkg/util/resource_windows.go b/vendor/go.podman.io/buildah/pkg/util/resource_windows.go similarity index 100% rename from vendor/github.com/containers/buildah/pkg/util/resource_windows.go rename to vendor/go.podman.io/buildah/pkg/util/resource_windows.go diff --git a/vendor/github.com/containers/buildah/pkg/util/uptime_darwin.go b/vendor/go.podman.io/buildah/pkg/util/uptime_darwin.go similarity index 100% rename from vendor/github.com/containers/buildah/pkg/util/uptime_darwin.go rename to vendor/go.podman.io/buildah/pkg/util/uptime_darwin.go diff --git a/vendor/github.com/containers/buildah/pkg/util/uptime_freebsd.go b/vendor/go.podman.io/buildah/pkg/util/uptime_freebsd.go similarity index 100% rename from vendor/github.com/containers/buildah/pkg/util/uptime_freebsd.go rename to vendor/go.podman.io/buildah/pkg/util/uptime_freebsd.go diff --git a/vendor/github.com/containers/buildah/pkg/util/uptime_linux.go b/vendor/go.podman.io/buildah/pkg/util/uptime_linux.go similarity index 100% rename from vendor/github.com/containers/buildah/pkg/util/uptime_linux.go rename to vendor/go.podman.io/buildah/pkg/util/uptime_linux.go diff --git a/vendor/github.com/containers/buildah/pkg/util/uptime_netbsd.go b/vendor/go.podman.io/buildah/pkg/util/uptime_netbsd.go similarity index 100% rename from vendor/github.com/containers/buildah/pkg/util/uptime_netbsd.go rename to vendor/go.podman.io/buildah/pkg/util/uptime_netbsd.go diff --git a/vendor/github.com/containers/buildah/pkg/util/uptime_windows.go b/vendor/go.podman.io/buildah/pkg/util/uptime_windows.go similarity index 100% rename from vendor/github.com/containers/buildah/pkg/util/uptime_windows.go rename to vendor/go.podman.io/buildah/pkg/util/uptime_windows.go diff --git a/vendor/github.com/containers/buildah/pkg/util/util.go b/vendor/go.podman.io/buildah/pkg/util/util.go similarity index 98% rename from vendor/github.com/containers/buildah/pkg/util/util.go rename to vendor/go.podman.io/buildah/pkg/util/util.go index 6f2693caf1..ecc460968b 100644 --- a/vendor/github.com/containers/buildah/pkg/util/util.go +++ b/vendor/go.podman.io/buildah/pkg/util/util.go @@ -6,7 +6,7 @@ import ( "path/filepath" "strings" - "github.com/containers/buildah/pkg/parse" + "go.podman.io/buildah/pkg/parse" ) // Mirrors path to a tmpfile if path points to a diff --git a/vendor/github.com/containers/buildah/pkg/util/version_unix.go b/vendor/go.podman.io/buildah/pkg/util/version_unix.go similarity index 100% rename from vendor/github.com/containers/buildah/pkg/util/version_unix.go rename to vendor/go.podman.io/buildah/pkg/util/version_unix.go diff --git a/vendor/github.com/containers/buildah/pkg/util/version_windows.go b/vendor/go.podman.io/buildah/pkg/util/version_windows.go similarity index 100% rename from vendor/github.com/containers/buildah/pkg/util/version_windows.go rename to vendor/go.podman.io/buildah/pkg/util/version_windows.go diff --git a/vendor/github.com/containers/buildah/pkg/volumes/volumes.go b/vendor/go.podman.io/buildah/pkg/volumes/volumes.go similarity index 82% rename from vendor/github.com/containers/buildah/pkg/volumes/volumes.go rename to vendor/go.podman.io/buildah/pkg/volumes/volumes.go index aa469a2823..58e2373295 100644 --- a/vendor/github.com/containers/buildah/pkg/volumes/volumes.go +++ b/vendor/go.podman.io/buildah/pkg/volumes/volumes.go @@ -3,7 +3,7 @@ package volumes import ( "os" - "github.com/containers/buildah/internal/volumes" + "go.podman.io/buildah/internal/volumes" ) // CleanCacheMount gets the cache parent created by `--mount=type=cache` and removes it. diff --git a/vendor/github.com/containers/buildah/pull.go b/vendor/go.podman.io/buildah/pull.go similarity index 99% rename from vendor/github.com/containers/buildah/pull.go rename to vendor/go.podman.io/buildah/pull.go index 89a4defd54..bf8c2e9cc0 100644 --- a/vendor/github.com/containers/buildah/pull.go +++ b/vendor/go.podman.io/buildah/pull.go @@ -6,8 +6,8 @@ import ( "io" "time" - "github.com/containers/buildah/define" encconfig "github.com/containers/ocicrypt/config" + "go.podman.io/buildah/define" "go.podman.io/common/libimage" "go.podman.io/common/pkg/config" "go.podman.io/image/v5/types" diff --git a/vendor/github.com/containers/buildah/push.go b/vendor/go.podman.io/buildah/push.go similarity index 99% rename from vendor/github.com/containers/buildah/push.go rename to vendor/go.podman.io/buildah/push.go index 8d69ce8ca8..c316d4de1d 100644 --- a/vendor/github.com/containers/buildah/push.go +++ b/vendor/go.podman.io/buildah/push.go @@ -6,10 +6,10 @@ import ( "io" "time" - "github.com/containers/buildah/pkg/blobcache" encconfig "github.com/containers/ocicrypt/config" digest "github.com/opencontainers/go-digest" "github.com/sirupsen/logrus" + "go.podman.io/buildah/pkg/blobcache" "go.podman.io/common/libimage" "go.podman.io/image/v5/docker/reference" "go.podman.io/image/v5/manifest" diff --git a/vendor/github.com/containers/buildah/release.sh b/vendor/go.podman.io/buildah/release.sh similarity index 100% rename from vendor/github.com/containers/buildah/release.sh rename to vendor/go.podman.io/buildah/release.sh diff --git a/vendor/github.com/containers/buildah/run.go b/vendor/go.podman.io/buildah/run.go similarity index 98% rename from vendor/github.com/containers/buildah/run.go rename to vendor/go.podman.io/buildah/run.go index 0efa4d8b03..e6d7a0c1cb 100644 --- a/vendor/github.com/containers/buildah/run.go +++ b/vendor/go.podman.io/buildah/run.go @@ -5,12 +5,12 @@ import ( "io" "net" - "github.com/containers/buildah/copier" - "github.com/containers/buildah/define" - "github.com/containers/buildah/internal" - "github.com/containers/buildah/pkg/sshagent" "github.com/opencontainers/runtime-spec/specs-go" "github.com/sirupsen/logrus" + "go.podman.io/buildah/copier" + "go.podman.io/buildah/define" + "go.podman.io/buildah/internal" + "go.podman.io/buildah/pkg/sshagent" "go.podman.io/common/libnetwork/etchosts" "go.podman.io/image/v5/types" "go.podman.io/storage/pkg/idtools" diff --git a/vendor/github.com/containers/buildah/run_common.go b/vendor/go.podman.io/buildah/run_common.go similarity index 99% rename from vendor/github.com/containers/buildah/run_common.go rename to vendor/go.podman.io/buildah/run_common.go index 640e375c41..6f760b07e2 100644 --- a/vendor/github.com/containers/buildah/run_common.go +++ b/vendor/go.podman.io/buildah/run_common.go @@ -25,20 +25,20 @@ import ( "syscall" "time" - "github.com/containers/buildah/bind" - "github.com/containers/buildah/copier" - "github.com/containers/buildah/define" - "github.com/containers/buildah/internal" - "github.com/containers/buildah/internal/tmpdir" - "github.com/containers/buildah/internal/volumes" - "github.com/containers/buildah/pkg/overlay" - "github.com/containers/buildah/pkg/sshagent" - "github.com/containers/buildah/util" "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/buildah/bind" + "go.podman.io/buildah/copier" + "go.podman.io/buildah/define" + "go.podman.io/buildah/internal" + "go.podman.io/buildah/internal/tmpdir" + "go.podman.io/buildah/internal/volumes" + "go.podman.io/buildah/pkg/overlay" + "go.podman.io/buildah/pkg/sshagent" + "go.podman.io/buildah/util" "go.podman.io/common/libnetwork/etchosts" "go.podman.io/common/libnetwork/network" "go.podman.io/common/libnetwork/resolvconf" diff --git a/vendor/github.com/containers/buildah/run_freebsd.go b/vendor/go.podman.io/buildah/run_freebsd.go similarity index 97% rename from vendor/github.com/containers/buildah/run_freebsd.go rename to vendor/go.podman.io/buildah/run_freebsd.go index 5ecd0c6063..2461945b9e 100644 --- a/vendor/github.com/containers/buildah/run_freebsd.go +++ b/vendor/go.podman.io/buildah/run_freebsd.go @@ -11,21 +11,21 @@ import ( "strings" "unsafe" - "github.com/containers/buildah/bind" - "github.com/containers/buildah/chroot" - "github.com/containers/buildah/copier" - "github.com/containers/buildah/define" - "github.com/containers/buildah/internal" - "github.com/containers/buildah/internal/tmpdir" - "github.com/containers/buildah/pkg/jail" - "github.com/containers/buildah/pkg/overlay" - "github.com/containers/buildah/pkg/parse" - butil "github.com/containers/buildah/pkg/util" - "github.com/containers/buildah/util" "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/buildah/bind" + "go.podman.io/buildah/chroot" + "go.podman.io/buildah/copier" + "go.podman.io/buildah/define" + "go.podman.io/buildah/internal" + "go.podman.io/buildah/internal/tmpdir" + "go.podman.io/buildah/pkg/jail" + "go.podman.io/buildah/pkg/overlay" + "go.podman.io/buildah/pkg/parse" + butil "go.podman.io/buildah/pkg/util" + "go.podman.io/buildah/util" "go.podman.io/common/libnetwork/etchosts" "go.podman.io/common/libnetwork/resolvconf" nettypes "go.podman.io/common/libnetwork/types" diff --git a/vendor/github.com/containers/buildah/run_linux.go b/vendor/go.podman.io/buildah/run_linux.go similarity index 98% rename from vendor/github.com/containers/buildah/run_linux.go rename to vendor/go.podman.io/buildah/run_linux.go index cc466fc982..ba04bca4f5 100644 --- a/vendor/github.com/containers/buildah/run_linux.go +++ b/vendor/go.podman.io/buildah/run_linux.go @@ -14,22 +14,22 @@ import ( "sync" "syscall" - "github.com/containers/buildah/bind" - "github.com/containers/buildah/chroot" - "github.com/containers/buildah/copier" - "github.com/containers/buildah/define" - "github.com/containers/buildah/internal" - "github.com/containers/buildah/internal/tmpdir" - "github.com/containers/buildah/internal/volumes" - "github.com/containers/buildah/pkg/binfmt" - "github.com/containers/buildah/pkg/overlay" - "github.com/containers/buildah/pkg/parse" - butil "github.com/containers/buildah/pkg/util" - "github.com/containers/buildah/util" "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/buildah/bind" + "go.podman.io/buildah/chroot" + "go.podman.io/buildah/copier" + "go.podman.io/buildah/define" + "go.podman.io/buildah/internal" + "go.podman.io/buildah/internal/tmpdir" + "go.podman.io/buildah/internal/volumes" + "go.podman.io/buildah/pkg/binfmt" + "go.podman.io/buildah/pkg/overlay" + "go.podman.io/buildah/pkg/parse" + butil "go.podman.io/buildah/pkg/util" + "go.podman.io/buildah/util" "go.podman.io/common/libnetwork/etchosts" "go.podman.io/common/libnetwork/pasta" "go.podman.io/common/libnetwork/resolvconf" diff --git a/vendor/github.com/containers/buildah/run_unix.go b/vendor/go.podman.io/buildah/run_unix.go similarity index 96% rename from vendor/github.com/containers/buildah/run_unix.go rename to vendor/go.podman.io/buildah/run_unix.go index f2129aab17..4cd20016cc 100644 --- a/vendor/github.com/containers/buildah/run_unix.go +++ b/vendor/go.podman.io/buildah/run_unix.go @@ -5,8 +5,8 @@ package buildah import ( "errors" - "github.com/containers/buildah/define" "github.com/opencontainers/runtime-spec/specs-go" + "go.podman.io/buildah/define" nettypes "go.podman.io/common/libnetwork/types" "go.podman.io/storage" ) diff --git a/vendor/github.com/containers/buildah/run_unsupported.go b/vendor/go.podman.io/buildah/run_unsupported.go similarity index 100% rename from vendor/github.com/containers/buildah/run_unsupported.go rename to vendor/go.podman.io/buildah/run_unsupported.go diff --git a/vendor/github.com/containers/buildah/scan.go b/vendor/go.podman.io/buildah/scan.go similarity index 99% rename from vendor/github.com/containers/buildah/scan.go rename to vendor/go.podman.io/buildah/scan.go index c01baace17..7fe8768d0d 100644 --- a/vendor/github.com/containers/buildah/scan.go +++ b/vendor/go.podman.io/buildah/scan.go @@ -9,11 +9,11 @@ import ( "slices" "strings" - "github.com/containers/buildah/define" - "github.com/containers/buildah/internal/sbom" "github.com/mattn/go-shellwords" rspec "github.com/opencontainers/runtime-spec/specs-go" "github.com/sirupsen/logrus" + "go.podman.io/buildah/define" + "go.podman.io/buildah/internal/sbom" ) func stringSliceReplaceAll(slice []string, replacements map[string]string, important []string) (built []string, replacedAnImportantValue bool) { diff --git a/vendor/github.com/containers/buildah/seccomp.go b/vendor/go.podman.io/buildah/seccomp.go similarity index 100% rename from vendor/github.com/containers/buildah/seccomp.go rename to vendor/go.podman.io/buildah/seccomp.go diff --git a/vendor/github.com/containers/buildah/seccomp_unsupported.go b/vendor/go.podman.io/buildah/seccomp_unsupported.go similarity index 100% rename from vendor/github.com/containers/buildah/seccomp_unsupported.go rename to vendor/go.podman.io/buildah/seccomp_unsupported.go diff --git a/vendor/github.com/containers/buildah/selinux.go b/vendor/go.podman.io/buildah/selinux.go similarity index 100% rename from vendor/github.com/containers/buildah/selinux.go rename to vendor/go.podman.io/buildah/selinux.go diff --git a/vendor/github.com/containers/buildah/selinux_unsupported.go b/vendor/go.podman.io/buildah/selinux_unsupported.go similarity index 100% rename from vendor/github.com/containers/buildah/selinux_unsupported.go rename to vendor/go.podman.io/buildah/selinux_unsupported.go diff --git a/vendor/github.com/containers/buildah/troubleshooting.md b/vendor/go.podman.io/buildah/troubleshooting.md similarity index 100% rename from vendor/github.com/containers/buildah/troubleshooting.md rename to vendor/go.podman.io/buildah/troubleshooting.md diff --git a/vendor/github.com/containers/buildah/unmount.go b/vendor/go.podman.io/buildah/unmount.go similarity index 100% rename from vendor/github.com/containers/buildah/unmount.go rename to vendor/go.podman.io/buildah/unmount.go diff --git a/vendor/github.com/containers/buildah/util.go b/vendor/go.podman.io/buildah/util.go similarity index 99% rename from vendor/github.com/containers/buildah/util.go rename to vendor/go.podman.io/buildah/util.go index 5bb77f386b..e1a660b64f 100644 --- a/vendor/github.com/containers/buildah/util.go +++ b/vendor/go.podman.io/buildah/util.go @@ -8,11 +8,11 @@ import ( "path/filepath" "sync" - "github.com/containers/buildah/copier" 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/buildah/copier" "go.podman.io/image/v5/docker/reference" "go.podman.io/image/v5/pkg/sysregistriesv2" "go.podman.io/image/v5/types" diff --git a/vendor/github.com/containers/buildah/util/types.go b/vendor/go.podman.io/buildah/util/types.go similarity index 92% rename from vendor/github.com/containers/buildah/util/types.go rename to vendor/go.podman.io/buildah/util/types.go index c8ed3e5a26..554ff0930f 100644 --- a/vendor/github.com/containers/buildah/util/types.go +++ b/vendor/go.podman.io/buildah/util/types.go @@ -1,7 +1,7 @@ package util //nolint:revive,nolintlint import ( - "github.com/containers/buildah/define" + "go.podman.io/buildah/define" ) const ( diff --git a/vendor/github.com/containers/buildah/util/util.go b/vendor/go.podman.io/buildah/util/util.go similarity index 99% rename from vendor/github.com/containers/buildah/util/util.go rename to vendor/go.podman.io/buildah/util/util.go index a47aab8f48..e3cd555a63 100644 --- a/vendor/github.com/containers/buildah/util/util.go +++ b/vendor/go.podman.io/buildah/util/util.go @@ -12,11 +12,11 @@ import ( "strings" "syscall" - "github.com/containers/buildah/define" "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/buildah/define" "go.podman.io/common/libimage" "go.podman.io/common/pkg/config" "go.podman.io/image/v5/docker/reference" diff --git a/vendor/github.com/containers/buildah/util/util_unix.go b/vendor/go.podman.io/buildah/util/util_unix.go similarity index 100% rename from vendor/github.com/containers/buildah/util/util_unix.go rename to vendor/go.podman.io/buildah/util/util_unix.go diff --git a/vendor/github.com/containers/buildah/util/util_unsupported.go b/vendor/go.podman.io/buildah/util/util_unsupported.go similarity index 100% rename from vendor/github.com/containers/buildah/util/util_unsupported.go rename to vendor/go.podman.io/buildah/util/util_unsupported.go diff --git a/vendor/github.com/containers/buildah/util/util_windows.go b/vendor/go.podman.io/buildah/util/util_windows.go similarity index 100% rename from vendor/github.com/containers/buildah/util/util_windows.go rename to vendor/go.podman.io/buildah/util/util_windows.go diff --git a/vendor/modules.txt b/vendor/modules.txt index fd4d6639e7..34acb8a8c6 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -78,43 +78,6 @@ github.com/containerd/typeurl/v2 # github.com/containernetworking/plugins v1.9.1 ## explicit; go 1.24.2 github.com/containernetworking/plugins/pkg/ns -# github.com/containers/buildah v1.42.1-0.20260417103105-4e43fa8d9e07 -## explicit; go 1.25.6 -github.com/containers/buildah -github.com/containers/buildah/bind -github.com/containers/buildah/chroot -github.com/containers/buildah/copier -github.com/containers/buildah/define -github.com/containers/buildah/docker -github.com/containers/buildah/imagebuildah -github.com/containers/buildah/internal -github.com/containers/buildah/internal/config -github.com/containers/buildah/internal/metadata -github.com/containers/buildah/internal/mkcw -github.com/containers/buildah/internal/mkcw/types -github.com/containers/buildah/internal/open -github.com/containers/buildah/internal/output -github.com/containers/buildah/internal/parsevolume -github.com/containers/buildah/internal/pty -github.com/containers/buildah/internal/sanitize -github.com/containers/buildah/internal/sbom -github.com/containers/buildah/internal/tmpdir -github.com/containers/buildah/internal/util -github.com/containers/buildah/internal/volumes -github.com/containers/buildah/pkg/binfmt -github.com/containers/buildah/pkg/blobcache -github.com/containers/buildah/pkg/chrootuser -github.com/containers/buildah/pkg/cli -github.com/containers/buildah/pkg/completion -github.com/containers/buildah/pkg/jail -github.com/containers/buildah/pkg/overlay -github.com/containers/buildah/pkg/parse -github.com/containers/buildah/pkg/rusage -github.com/containers/buildah/pkg/sourcepolicy -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 ## explicit; go 1.23.3 github.com/containers/common/pkg/strongunits @@ -434,7 +397,7 @@ github.com/moby/moby/api/types/storage github.com/moby/moby/api/types/swarm github.com/moby/moby/api/types/system github.com/moby/moby/api/types/volume -# github.com/moby/moby/client v0.4.0 +# github.com/moby/moby/client v0.4.1 ## explicit; go 1.24 github.com/moby/moby/client github.com/moby/moby/client/internal @@ -733,6 +696,43 @@ 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/buildah v1.42.1-0.20260421143840-0acb6b8cca85 +## explicit; go 1.25.6 +go.podman.io/buildah +go.podman.io/buildah/bind +go.podman.io/buildah/chroot +go.podman.io/buildah/copier +go.podman.io/buildah/define +go.podman.io/buildah/docker +go.podman.io/buildah/imagebuildah +go.podman.io/buildah/internal +go.podman.io/buildah/internal/config +go.podman.io/buildah/internal/metadata +go.podman.io/buildah/internal/mkcw +go.podman.io/buildah/internal/mkcw/types +go.podman.io/buildah/internal/open +go.podman.io/buildah/internal/output +go.podman.io/buildah/internal/parsevolume +go.podman.io/buildah/internal/pty +go.podman.io/buildah/internal/sanitize +go.podman.io/buildah/internal/sbom +go.podman.io/buildah/internal/tmpdir +go.podman.io/buildah/internal/util +go.podman.io/buildah/internal/volumes +go.podman.io/buildah/pkg/binfmt +go.podman.io/buildah/pkg/blobcache +go.podman.io/buildah/pkg/chrootuser +go.podman.io/buildah/pkg/cli +go.podman.io/buildah/pkg/completion +go.podman.io/buildah/pkg/jail +go.podman.io/buildah/pkg/overlay +go.podman.io/buildah/pkg/parse +go.podman.io/buildah/pkg/rusage +go.podman.io/buildah/pkg/sourcepolicy +go.podman.io/buildah/pkg/sshagent +go.podman.io/buildah/pkg/util +go.podman.io/buildah/pkg/volumes +go.podman.io/buildah/util # go.podman.io/common v0.67.2-0.20260420103546-618304d6f83d ## explicit; go 1.25.6 go.podman.io/common/internal