WARNING: THIS SITE IS A MIRROR OF GITHUB.COM / IT CANNOT LOGIN OR REGISTER ACCOUNTS / THE CONTENTS ARE PROVIDED AS-IS / THIS SITE ASSUMES NO RESPONSIBILITY FOR ANY DISPLAYED CONTENT OR LINKS / IF YOU FOUND SOMETHING MAY NOT GOOD FOR EVERYONE, CONTACT ADMIN AT ilovescratch@foxmail.com
Skip to content

Commit 3809ca0

Browse files
Merge pull request #26771 from TomSweeneyRedHat/dev/tsweeney/buildahv1.41.1_v5.6
[v5.6] Bump Buildah to v1.41.1
2 parents 626a5ba + 57493f6 commit 3809ca0

File tree

15 files changed

+216
-58
lines changed

15 files changed

+216
-58
lines changed

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ require (
1111
github.com/checkpoint-restore/checkpointctl v1.3.0
1212
github.com/checkpoint-restore/go-criu/v7 v7.2.0
1313
github.com/containernetworking/plugins v1.7.1
14-
github.com/containers/buildah v1.41.0
14+
github.com/containers/buildah v1.41.1
1515
github.com/containers/common v0.64.1
1616
github.com/containers/conmon v2.0.20+incompatible
1717
github.com/containers/gvisor-tap-vsock v0.8.6

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,8 @@ github.com/containernetworking/cni v1.3.0 h1:v6EpN8RznAZj9765HhXQrtXgX+ECGebEYEm
6262
github.com/containernetworking/cni v1.3.0/go.mod h1:Bs8glZjjFfGPHMw6hQu82RUgEPNGEaBb9KS5KtNMnJ4=
6363
github.com/containernetworking/plugins v1.7.1 h1:CNAR0jviDj6FS5Vg85NTgKWLDzZPfi/lj+VJfhMDTIs=
6464
github.com/containernetworking/plugins v1.7.1/go.mod h1:xuMdjuio+a1oVQsHKjr/mgzuZ24leAsqUYRnzGoXHy0=
65-
github.com/containers/buildah v1.41.0 h1:GU350UeX6BkZrgCE3SB/d1Hu4xBaHUX07ayiJTvJD54=
66-
github.com/containers/buildah v1.41.0/go.mod h1:1Ds26B4E4Z3NeLdi3xjjk8S72KVv2/xiFYYpwfFDgXI=
65+
github.com/containers/buildah v1.41.1 h1:WiFZsxLbnPgo00gAX4pVwFa+e3Kypx0IoC9ubFMlQDs=
66+
github.com/containers/buildah v1.41.1/go.mod h1:vVIYC6f5gbPNfhprdMZh9lkOJzzM7lta0romUtBFSw0=
6767
github.com/containers/common v0.64.1 h1:E8vSiL+B84/UCsyVSb70GoxY9cu+0bseLujm4EKF6GE=
6868
github.com/containers/common v0.64.1/go.mod h1:CtfQNHoCAZqWeXMwdShcsxmMJSeGRgKKMqAwRKmWrHE=
6969
github.com/containers/conmon v2.0.20+incompatible h1:YbCVSFSCqFjjVwHTPINGdMX1F6JXHGTUje2ZYobNrkg=

test/buildah-bud/apply-podman-deltas

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -330,6 +330,11 @@ skip "FIXME: 2024-05-28 new VMs from #338" \
330330
skip_if_remote "FIXME: 2025-04-01 git related errors returning wrong exit code" \
331331
"bud with ADD with git repository source"
332332

333+
# 2025-08-07 test needs to be fixed in buildah repo, unknown issue, fixing to get v5.6 RC2 out
334+
# https://github.com/containers/podman/issues/26773
335+
skip "FIXME: 2025-08-07 Buildah v1.41.1 vendor into Podman for v5.6 RC2" \
336+
"bud should include excluded pulled up parent directories in squashed images"
337+
333338
# END temporary workarounds that must be reevaluated periodically
334339
###############################################################################
335340

vendor/github.com/containers/buildah/CHANGELOG.md

Lines changed: 14 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/containers/buildah/changelog.txt

Lines changed: 13 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/containers/buildah/copier/copier.go

Lines changed: 55 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/containers/buildah/define/types.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/containers/buildah/image.go

Lines changed: 17 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/containers/buildah/imagebuildah/stage_executor.go

Lines changed: 52 additions & 15 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/containers/buildah/imagebuildah/util.go

Lines changed: 6 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)