From aa5595391de86bf721b0e55dd0bfad67ee2c1d90 Mon Sep 17 00:00:00 2001 From: Ashley Cui Date: Mon, 29 Sep 2025 15:24:03 -0400 Subject: [PATCH] Vendor buildah@v1.41.5 Signed-off-by: Ashley Cui --- go.mod | 2 +- go.sum | 4 ++-- vendor/github.com/containers/buildah/CHANGELOG.md | 5 +++++ vendor/github.com/containers/buildah/changelog.txt | 5 +++++ vendor/github.com/containers/buildah/define/types.go | 2 +- vendor/github.com/containers/buildah/run_common.go | 6 ++++++ vendor/modules.txt | 2 +- 7 files changed, 21 insertions(+), 5 deletions(-) diff --git a/go.mod b/go.mod index da96c90359..9807718fd6 100644 --- a/go.mod +++ b/go.mod @@ -11,7 +11,7 @@ require ( github.com/checkpoint-restore/checkpointctl v1.3.0 github.com/checkpoint-restore/go-criu/v7 v7.2.0 github.com/containernetworking/plugins v1.7.1 - github.com/containers/buildah v1.41.4 + github.com/containers/buildah v1.41.5 github.com/containers/common v0.64.2 github.com/containers/conmon v2.0.20+incompatible github.com/containers/gvisor-tap-vsock v0.8.6 diff --git a/go.sum b/go.sum index 65c0df9932..b365dba180 100644 --- a/go.sum +++ b/go.sum @@ -62,8 +62,8 @@ github.com/containernetworking/cni v1.3.0 h1:v6EpN8RznAZj9765HhXQrtXgX+ECGebEYEm github.com/containernetworking/cni v1.3.0/go.mod h1:Bs8glZjjFfGPHMw6hQu82RUgEPNGEaBb9KS5KtNMnJ4= github.com/containernetworking/plugins v1.7.1 h1:CNAR0jviDj6FS5Vg85NTgKWLDzZPfi/lj+VJfhMDTIs= github.com/containernetworking/plugins v1.7.1/go.mod h1:xuMdjuio+a1oVQsHKjr/mgzuZ24leAsqUYRnzGoXHy0= -github.com/containers/buildah v1.41.4 h1:IHYWex7rwhsOwtRXQ+VMEQr96gUbSbSvxJcX6AoiDeA= -github.com/containers/buildah v1.41.4/go.mod h1:IFW8MbAgXYiUBCcAFExlHkPfE41DJWVBCbDZWZ9WEng= +github.com/containers/buildah v1.41.5 h1:tdxtsb+SctAQ0/vdAJg5AMArVypeN2DmIjHV1bkoMO4= +github.com/containers/buildah v1.41.5/go.mod h1:IFW8MbAgXYiUBCcAFExlHkPfE41DJWVBCbDZWZ9WEng= github.com/containers/common v0.64.2 h1:1xepE7QwQggUXxmyQ1Dbh6Cn0yd7ktk14sN3McSWf5I= github.com/containers/common v0.64.2/go.mod h1:o29GfYy4tefUuShm8mOn2AiL5Mpzdio+viHI7n24KJ4= github.com/containers/conmon v2.0.20+incompatible h1:YbCVSFSCqFjjVwHTPINGdMX1F6JXHGTUje2ZYobNrkg= diff --git a/vendor/github.com/containers/buildah/CHANGELOG.md b/vendor/github.com/containers/buildah/CHANGELOG.md index 6add1058f9..475580549d 100644 --- a/vendor/github.com/containers/buildah/CHANGELOG.md +++ b/vendor/github.com/containers/buildah/CHANGELOG.md @@ -2,6 +2,11 @@ # Changelog +## v1.41.5 (2025-09-29) + + [release-1.41] Run: create parent directories of mount targets with mode 0755 + [release-1.41] tests/run.bats: "run masks" test: accept "unreadable" masked directories + ## v1.41.4 (2025-09-03) [release-1.41] c/common to v0.64.2, ulikunitz/xv v0.5.12, docker/docker v28.3.3 diff --git a/vendor/github.com/containers/buildah/changelog.txt b/vendor/github.com/containers/buildah/changelog.txt index b4e5fd4a76..a2b8970419 100644 --- a/vendor/github.com/containers/buildah/changelog.txt +++ b/vendor/github.com/containers/buildah/changelog.txt @@ -1,3 +1,8 @@ +- Changelog for v1.41.5 (2025-09-29) + + [release-1.41] Run: create parent directories of mount targets with mode 0755 + [release-1.41] tests/run.bats: "run masks" test: accept "unreadable" masked directories + - Changelog for v1.41.4 (2025-09-03) * [release-1.41] c/common to v0.64.2, ulikunitz/xv v0.5.12, docker/docker v28.3.3 diff --git a/vendor/github.com/containers/buildah/define/types.go b/vendor/github.com/containers/buildah/define/types.go index e194aac73c..fd6ba965b3 100644 --- a/vendor/github.com/containers/buildah/define/types.go +++ b/vendor/github.com/containers/buildah/define/types.go @@ -29,7 +29,7 @@ const ( // identify working containers. Package = "buildah" // Version for the Package. Also used by .packit.sh for Packit builds. - Version = "1.41.4" + Version = "1.41.5" // DefaultRuntime if containers.conf fails. DefaultRuntime = "runc" diff --git a/vendor/github.com/containers/buildah/run_common.go b/vendor/github.com/containers/buildah/run_common.go index a52d0ad871..b9a010d6ad 100644 --- a/vendor/github.com/containers/buildah/run_common.go +++ b/vendor/github.com/containers/buildah/run_common.go @@ -2102,6 +2102,12 @@ func (b *Builder) createMountTargets(spec *specs.Spec) ([]copier.ConditionalRemo // forced permissions mode = &perms } + if mode == nil && destination != cleanedDestination { + // parent directories default to 0o755, for + // the sake of commands running as UID != 0 + perms := os.FileMode(0o755) + mode = &perms + } targets.Paths = append(targets.Paths, copier.EnsurePath{ Path: destination, Typeflag: typeFlag, diff --git a/vendor/modules.txt b/vendor/modules.txt index 119f4ff6c2..e589d2d013 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -108,7 +108,7 @@ github.com/containernetworking/cni/pkg/version # github.com/containernetworking/plugins v1.7.1 ## explicit; go 1.23.0 github.com/containernetworking/plugins/pkg/ns -# github.com/containers/buildah v1.41.4 +# github.com/containers/buildah v1.41.5 ## explicit; go 1.23.3 github.com/containers/buildah github.com/containers/buildah/bind