Skip to content

Commit 53be17d

Browse files
openshift-merge-bot[bot]openshift-merge-bot[bot]
authored
Merge pull request #25756 from danegsta/danegsta/buildahVendor
Update vendored c/buildah to `32d78c69be17`
2 parents 4b24725 + 684126e commit 53be17d

File tree

11 files changed

+43
-34
lines changed

11 files changed

+43
-34
lines changed

‎go.mod

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ require (
1212
github.com/checkpoint-restore/checkpointctl v1.3.0
1313
github.com/checkpoint-restore/go-criu/v7 v7.2.0
1414
github.com/containernetworking/plugins v1.6.2
15-
github.com/containers/buildah v1.39.1-0.20250324153001-6d9381d08265
15+
github.com/containers/buildah v1.39.1-0.20250401180830-32d78c69be17
1616
github.com/containers/common v0.62.4-0.20250401165412-9b0d134f392f
1717
github.com/containers/conmon v2.0.20+incompatible
1818
github.com/containers/gvisor-tap-vsock v0.8.5
@@ -151,7 +151,7 @@ require (
151151
github.com/miekg/pkcs11 v1.1.1 // indirect
152152
github.com/mistifyio/go-zfs/v3 v3.0.1 // indirect
153153
github.com/mitchellh/mapstructure v1.5.0 // indirect
154-
github.com/moby/buildkit v0.20.1 // indirect
154+
github.com/moby/buildkit v0.20.2 // indirect
155155
github.com/moby/docker-image-spec v1.3.1 // indirect
156156
github.com/moby/patternmatcher v0.6.0 // indirect
157157
github.com/moby/sys/mountinfo v0.7.2 // indirect

‎go.sum

+4-4
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,8 @@ github.com/containernetworking/cni v1.2.3 h1:hhOcjNVUQTnzdRJ6alC5XF+wd9mfGIUaj8F
6666
github.com/containernetworking/cni v1.2.3/go.mod h1:DuLgF+aPd3DzcTQTtp/Nvl1Kim23oFKdm2okJzBQA5M=
6767
github.com/containernetworking/plugins v1.6.2 h1:pqP8Mq923TLyef5g97XfJ/xpDeVek4yF8A4mzy9Tc4U=
6868
github.com/containernetworking/plugins v1.6.2/go.mod h1:SP5UG3jDO9LtmfbBJdP+nl3A1atOtbj2MBOYsnaxy64=
69-
github.com/containers/buildah v1.39.1-0.20250324153001-6d9381d08265 h1:3cFRoMP4Up4sN/f2TOcCKSxiX/mbHCN5FwqHc+rw2B8=
70-
github.com/containers/buildah v1.39.1-0.20250324153001-6d9381d08265/go.mod h1:8DuzWORynpU4q7coSL0aElpPVMDZFoCOnz9gzqU8Ics=
69+
github.com/containers/buildah v1.39.1-0.20250401180830-32d78c69be17 h1:mfnd0BqHdV8p6+pol7SelIEgG7NbJQYW4IPywGakmCY=
70+
github.com/containers/buildah v1.39.1-0.20250401180830-32d78c69be17/go.mod h1:AvIRsFvWfSuMNGoMm8hXFaOGvzhsnujWz1C38rk+mk4=
7171
github.com/containers/common v0.62.4-0.20250401165412-9b0d134f392f h1:gpfCIBHhMAzJGEPjCrCAS18Pop+RgQSK38Grre/+gqQ=
7272
github.com/containers/common v0.62.4-0.20250401165412-9b0d134f392f/go.mod h1:B6J/JCUcc9vgeoBFFzL5QGszpa7SoVK+mAyUNXSWI6s=
7373
github.com/containers/conmon v2.0.20+incompatible h1:YbCVSFSCqFjjVwHTPINGdMX1F6JXHGTUje2ZYobNrkg=
@@ -318,8 +318,8 @@ github.com/mistifyio/go-zfs/v3 v3.0.1 h1:YaoXgBePoMA12+S1u/ddkv+QqxcfiZK4prI6HPn
318318
github.com/mistifyio/go-zfs/v3 v3.0.1/go.mod h1:CzVgeB0RvF2EGzQnytKVvVSDwmKJXxkOTUGbNrTja/k=
319319
github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY=
320320
github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
321-
github.com/moby/buildkit v0.20.1 h1:sT0ZXhhNo5rVbMcYfgttma3TdUHfO5JjFA0UAL8p9fY=
322-
github.com/moby/buildkit v0.20.1/go.mod h1:Rq9nB/fJImdk6QeM0niKtOHJqwKeYMrK847hTTDVuA4=
321+
github.com/moby/buildkit v0.20.2 h1:qIeR47eQ1tzI1rwz0on3Xx2enRw/1CKjFhoONVcTlMA=
322+
github.com/moby/buildkit v0.20.2/go.mod h1:DhaF82FjwOElTftl0JUAJpH/SUIUx4UvcFncLeOtlDI=
323323
github.com/moby/docker-image-spec v1.3.1 h1:jMKff3w6PgbfSa69GfNg+zN/XLhfXJGnEx3Nl2EsFP0=
324324
github.com/moby/docker-image-spec v1.3.1/go.mod h1:eKmb5VW8vQEh/BAr2yvVNvuiJuY6UIocYsFu/DxxRpo=
325325
github.com/moby/patternmatcher v0.6.0 h1:GmP9lR19aU5GqSSFko+5pRqHi+Ohk1O69aFiKkVGiPk=

‎test/buildah-bud/apply-podman-deltas

+8
Original file line numberDiff line numberDiff line change
@@ -273,6 +273,10 @@ skip_if_remote "Weird. This used to work remote, until Ed set TMPDIR in #5804" \
273273
skip_if_remote "This test needs unique TMPDIR for the test and podman-remote does not propagates ENV from client-side to server-end" \
274274
"bud-with-mount-cache-like-buildkit"
275275

276+
# 2025-04-01 skip test as it is incompatible with compat API in podman-remote
277+
skip_if_remote "compat API does not support oci-archive tags" \
278+
"build-with-timestamp-applies-to-oci-archive"
279+
276280
###############################################################################
277281
# BEGIN tests which are skipped due to actual podman or podman-remote bugs.
278282

@@ -320,6 +324,10 @@ skip "FIXME: 2024-05-28 new VMs from #338" \
320324
"bud-git-context-subdirectory" \
321325
"bud using gitrepo and branch"
322326

327+
# 2025-04-01 FIXME wrong exit code from git related failures from #25756
328+
skip_if_remote "FIXME: 2025-04-01 git related errors returning wrong exit code" \
329+
"bud with ADD with git repository source"
330+
323331
# END temporary workarounds that must be reevaluated periodically
324332
###############################################################################
325333

‎vendor/github.com/containers/buildah/.cirrus.yml

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/containers/buildah/add.go

+5-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/containers/buildah/chroot/run_linux.go

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/containers/buildah/commit.go

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/containers/buildah/common.go

+2-1
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

+5-3
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

+12-17
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/modules.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ github.com/containernetworking/cni/pkg/version
110110
# github.com/containernetworking/plugins v1.6.2
111111
## explicit; go 1.23
112112
github.com/containernetworking/plugins/pkg/ns
113-
# github.com/containers/buildah v1.39.1-0.20250324153001-6d9381d08265
113+
# github.com/containers/buildah v1.39.1-0.20250401180830-32d78c69be17
114114
## explicit; go 1.23.0
115115
github.com/containers/buildah
116116
github.com/containers/buildah/bind
@@ -706,7 +706,7 @@ github.com/mistifyio/go-zfs/v3
706706
# github.com/mitchellh/mapstructure v1.5.0
707707
## explicit; go 1.14
708708
github.com/mitchellh/mapstructure
709-
# github.com/moby/buildkit v0.20.1
709+
# github.com/moby/buildkit v0.20.2
710710
## explicit; go 1.22.0
711711
github.com/moby/buildkit/frontend/dockerfile/command
712712
github.com/moby/buildkit/frontend/dockerfile/parser

0 commit comments

Comments
 (0)