Merge pull request containers#6439 from TomSweeneyRedHat/dev/tsweeney/buildah_v1.42.0

Bump Buildah to v1.42.0, storage v1.61.0, image v5.38.0, common v0.66.0

Author: openshift-merge-bot[bot]

CHANGELOG.md

@@ -2,6 +2,96 @@
 
 # Changelog
 
+## v1.42.0 (2025-10-17)
+
+    Bump to storage v1.61.0, image v5.38.0, common v0.66.0
+    fix(deps): update module github.com/openshift/imagebuilder to v1.2.19
+    fix(deps): update module github.com/openshift/imagebuilder to v1.2.18
+    copier: ignore user.overlay.* xattrs
+    commit: always return the config digest as the image ID
+    fix(deps): update module golang.org/x/crypto to v0.43.0
+    fix(deps): update module golang.org/x/sys to v0.37.0
+    fix(deps): update module github.com/docker/docker to v28.5.1+incompatible
+    fix(deps): update module github.com/moby/buildkit to v0.25.1
+    fix(deps): update module github.com/opencontainers/runc to v1.3.2
+    fix(deps): update module github.com/docker/docker to v28.5.0+incompatible
+    fix(deps): update module github.com/moby/buildkit to v0.25.0
+    fix(deps): update github.com/containers/luksy digest to 2cf5bc9
+    Make some test files different from each other
+    Revert "fix(deps): update module github.com/cyphar/filepath-securejoin to v0.5.0"
+    Also run integration tests with the Sequoia backend
+    Allow users to build against podman-sequoia in non-default locations
+    fix(deps): update module github.com/cyphar/filepath-securejoin to v0.5.0
+    .cirrus.yml: Test Vendoring bump golang
+    vendor: bump go.podman.io/{common,image,storage} to main
+    fix(deps): update module golang.org/x/crypto to v0.42.0
+    fix(deps): update module github.com/docker/docker to v28.4.0+incompatible
+    fix(deps): update module github.com/moby/buildkit to v0.24.0
+    fix(deps): update module github.com/spf13/pflag to v1.0.10
+    fix(deps): update module github.com/fsouza/go-dockerclient to v1.12.2
+    fix(deps): update module github.com/opencontainers/runc to v1.3.1
+    fix(deps): update module github.com/opencontainers/cgroups to v0.0.5
+    fix(deps): update module golang.org/x/sync to v0.17.0
+    tests/run.bats: "run masks" test: accept "unreadable" masked directories
+    Run: create parent directories of mount targets with mode 0755
+    tests/run.bats: "run masks" test: accept "unreadable" masked directories
+    New VM images
+    Suppress a linter warning
+    modernize: JSON doesn't do "omitempty" structs, so stop asking
+    modernize: use maps.Copy() instead of iterating over a map to copy it
+    modernize: use strings.CutPrefix/SplitSeq/FieldsSeq
+    Update expected/minimum version of Go to 1.24
+    chroot: use $PATH when finding commands
+    [skip-ci] Update actions/stale action to v10
+    Update module github.com/ulikunitz/xz to v0.5.15 [SECURITY]
+    Update go.sum
+    New VM images
+    Update module github.com/openshift/imagebuilder to v1
+    Update module github.com/spf13/cobra to v1.10.1
+    Switch common, storage and image to monorepo.
+    Update module github.com/stretchr/testify to v1.11.1
+    Update module go.etcd.io/bbolt to v1.4.3
+    Handle tagged+digested references when processing --all-platforms
+    Update module github.com/stretchr/testify to v1.11.0
+    Add --transient-store global option
+    Support "--imagestore" global flags
+    Commit: don't depend on MountImage(), because .imagestore
+    Adding mohanboddu as community manager to MAINTAINERS.md
+    Rework how we decide what to filter out of layer diffs
+    Note that we have to build `true` first for the sake of its tests
+    copier.Stat(): return owner UID and GID if available
+    copier.Get(): ensure that directory entries end in "/"
+    copier.Get(): strip user and group names from entries
+    imagebuildah.Executor/StageExecutor: check numeric --from= values
+    Losen the dependency on go-connections/tlsconfig
+    fix(deps): update module golang.org/x/crypto to v0.41.0
+    fix(deps): update module golang.org/x/term to v0.34.0
+    fix(deps): update module github.com/docker/go-connections to v0.6.0
+    fix(deps): update module golang.org/x/sys to v0.35.0
+    copy: assume a destination with basename "." is a directory
+    generatePathChecksum: ignore ModTime, AccessTime and ChangeTime
+    fix(deps): update module github.com/seccomp/libseccomp-golang to v0.11.1
+    fix(deps): update module github.com/containers/common to v0.64.1
+    History should note unset-label, timestamp, and rewrite-timestamp
+    pkg/cli.GenBuildOptions(): don't hardwire optional bools
+    fix(deps): update module github.com/containers/image/v5 to v5.36.1
+    imagebuildah.StageExecutor.Execute: commit more "no instructions" cases
+    fix(deps): update module github.com/containers/storage to v1.59.1
+    Only suppress "noted" items when not squashing
+    Reap stray processes
+    fix(deps): update github.com/containers/luksy digest to 8fccf78
+    fix(deps): update module github.com/docker/docker to v28.3.3+incompatible
+    Restore the default meaning of `--pull` (should be `always`).
+    Test that pulled up parent directories are excluded at commit
+    Exclude pulled up parent directories at commit-time
+    copier.Ensure(): also return parent directories
+    copier.MkdirOptions: add ModTimeNew
+    fix(deps): update module github.com/containers/common to v0.64.0
+    Bump to Buildah v1.42.0-dev
+    fix(deps): update module github.com/spf13/pflag to v1.0.7
+    CI: make runc tests non-blocking
+    build,add: add support for corporate proxies
+
 ## v1.41.0 (2025-07-16)
 
     Bump to c/storage v1.59.0, c/image v5.36.0, ... c/common v0.64.0

changelog.txt

@@ -1,3 +1,92 @@
+- Changelog for v1.42.0 (2025-10-17)
+  * Bump to storage v1.61.0, image v5.38.0, common v0.66.0
+  * fix(deps): update module github.com/openshift/imagebuilder to v1.2.19
+  * fix(deps): update module github.com/openshift/imagebuilder to v1.2.18
+  * copier: ignore user.overlay.* xattrs
+  * commit: always return the config digest as the image ID
+  * fix(deps): update module golang.org/x/crypto to v0.43.0
+  * fix(deps): update module golang.org/x/sys to v0.37.0
+  * fix(deps): update module github.com/docker/docker to v28.5.1+incompatible
+  * fix(deps): update module github.com/moby/buildkit to v0.25.1
+  * fix(deps): update module github.com/opencontainers/runc to v1.3.2
+  * fix(deps): update module github.com/docker/docker to v28.5.0+incompatible
+  * fix(deps): update module github.com/moby/buildkit to v0.25.0
+  * fix(deps): update github.com/containers/luksy digest to 2cf5bc9
+  * Make some test files different from each other
+  * Revert "fix(deps): update module github.com/cyphar/filepath-securejoin to v0.5.0"
+  * Also run integration tests with the Sequoia backend
+  * Allow users to build against podman-sequoia in non-default locations
+  * fix(deps): update module github.com/cyphar/filepath-securejoin to v0.5.0
+  * .cirrus.yml: Test Vendoring bump golang
+  * vendor: bump go.podman.io/{common,image,storage} to main
+  * fix(deps): update module golang.org/x/crypto to v0.42.0
+  * fix(deps): update module github.com/docker/docker to v28.4.0+incompatible
+  * fix(deps): update module github.com/moby/buildkit to v0.24.0
+  * fix(deps): update module github.com/spf13/pflag to v1.0.10
+  * fix(deps): update module github.com/fsouza/go-dockerclient to v1.12.2
+  * fix(deps): update module github.com/opencontainers/runc to v1.3.1
+  * fix(deps): update module github.com/opencontainers/cgroups to v0.0.5
+  * fix(deps): update module golang.org/x/sync to v0.17.0
+  * tests/run.bats: "run masks" test: accept "unreadable" masked directories
+  * Run: create parent directories of mount targets with mode 0755
+  * tests/run.bats: "run masks" test: accept "unreadable" masked directories
+  * New VM images
+  * Suppress a linter warning
+  * modernize: JSON doesn't do "omitempty" structs, so stop asking
+  * modernize: use maps.Copy() instead of iterating over a map to copy it
+  * modernize: use strings.CutPrefix/SplitSeq/FieldsSeq
+  * Update expected/minimum version of Go to 1.24
+  * chroot: use $PATH when finding commands
+  * [skip-ci] Update actions/stale action to v10
+  * Update module github.com/ulikunitz/xz to v0.5.15 [SECURITY]
+  * Update go.sum
+  * New VM images
+  * Update module github.com/openshift/imagebuilder to v1
+  * Update module github.com/spf13/cobra to v1.10.1
+  * Switch common, storage and image to monorepo.
+  * Update module github.com/stretchr/testify to v1.11.1
+  * Update module go.etcd.io/bbolt to v1.4.3
+  * Handle tagged+digested references when processing --all-platforms
+  * Update module github.com/stretchr/testify to v1.11.0
+  * Add --transient-store global option
+  * Support "--imagestore" global flags
+  * Commit: don't depend on MountImage(), because .imagestore
+  * Adding mohanboddu as community manager to MAINTAINERS.md
+  * Rework how we decide what to filter out of layer diffs
+  * Note that we have to build `true` first for the sake of its tests
+  * copier.Stat(): return owner UID and GID if available
+  * copier.Get(): ensure that directory entries end in "/"
+  * copier.Get(): strip user and group names from entries
+  * imagebuildah.Executor/StageExecutor: check numeric --from= values
+  * Losen the dependency on go-connections/tlsconfig
+  * fix(deps): update module golang.org/x/crypto to v0.41.0
+  * fix(deps): update module golang.org/x/term to v0.34.0
+  * fix(deps): update module github.com/docker/go-connections to v0.6.0
+  * fix(deps): update module golang.org/x/sys to v0.35.0
+  * copy: assume a destination with basename "." is a directory
+  * generatePathChecksum: ignore ModTime, AccessTime and ChangeTime
+  * fix(deps): update module github.com/seccomp/libseccomp-golang to v0.11.1
+  * fix(deps): update module github.com/containers/common to v0.64.1
+  * History should note unset-label, timestamp, and rewrite-timestamp
+  * pkg/cli.GenBuildOptions(): don't hardwire optional bools
+  * fix(deps): update module github.com/containers/image/v5 to v5.36.1
+  * imagebuildah.StageExecutor.Execute: commit more "no instructions" cases
+  * fix(deps): update module github.com/containers/storage to v1.59.1
+  * Only suppress "noted" items when not squashing
+  * Reap stray processes
+  * fix(deps): update github.com/containers/luksy digest to 8fccf78
+  * fix(deps): update module github.com/docker/docker to v28.3.3+incompatible
+  * Restore the default meaning of `--pull` (should be `always`).
+  * Test that pulled up parent directories are excluded at commit
+  * Exclude pulled up parent directories at commit-time
+  * copier.Ensure(): also return parent directories
+  * copier.MkdirOptions: add ModTimeNew
+  * fix(deps): update module github.com/containers/common to v0.64.0
+  * Bump to Buildah v1.42.0-dev
+  * fix(deps): update module github.com/spf13/pflag to v1.0.7
+  * CI: make runc tests non-blocking
+  * build,add: add support for corporate proxies
+
 - Changelog for v1.41.0 (2025-07-16)
   * Bump to c/storage v1.59.0, c/image v5.36.0, ... c/common v0.64.0
   * stage_executor: check platform of cache candidates

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.42.0-dev"
+	Version = "1.43.0-dev"
 
 	// DefaultRuntime if containers.conf fails.
 	DefaultRuntime = "runc"

go.mod

@@ -34,9 +34,9 @@ require (
 	github.com/spf13/pflag v1.0.10
 	github.com/stretchr/testify v1.11.1
 	go.etcd.io/bbolt v1.4.3
-	go.podman.io/common v0.65.1-0.20250916163606-92222dcd3da4
-	go.podman.io/image/v5 v5.37.1-0.20250916163606-92222dcd3da4
-	go.podman.io/storage v1.60.1-0.20250916163606-92222dcd3da4
+	go.podman.io/common v0.66.0
+	go.podman.io/image/v5 v5.38.0
+	go.podman.io/storage v1.61.0
 	golang.org/x/crypto v0.43.0
 	golang.org/x/sync v0.17.0
 	golang.org/x/sys v0.37.0
@@ -65,7 +65,7 @@ require (
 	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
 	github.com/disiqueira/gotree/v3 v3.0.2 // indirect
 	github.com/distribution/reference v0.6.0 // indirect
-	github.com/docker/docker-credential-helpers v0.9.3 // indirect
+	github.com/docker/docker-credential-helpers v0.9.4 // indirect
 	github.com/felixge/httpsnoop v1.0.4 // indirect
 	github.com/fsnotify/fsnotify v1.9.0 // indirect
 	github.com/go-jose/go-jose/v4 v4.0.5 // indirect
@@ -89,7 +89,7 @@ require (
 	github.com/mattn/go-runewidth v0.0.16 // indirect
 	github.com/mattn/go-sqlite3 v1.14.32 // indirect
 	github.com/miekg/pkcs11 v1.1.1 // indirect
-	github.com/mistifyio/go-zfs/v3 v3.0.1 // indirect
+	github.com/mistifyio/go-zfs/v3 v3.1.0 // indirect
 	github.com/moby/docker-image-spec v1.3.1 // indirect
 	github.com/moby/go-archive v0.1.0 // indirect
 	github.com/moby/patternmatcher v0.6.0 // indirect

go.sum

@@ -72,14 +72,14 @@ github.com/disiqueira/gotree/v3 v3.0.2 h1:ik5iuLQQoufZBNPY518dXhiO5056hyNBIK9lWh
 github.com/disiqueira/gotree/v3 v3.0.2/go.mod h1:ZuyjE4+mUQZlbpkI24AmruZKhg3VHEgPLDY8Qk+uUu8=
 github.com/distribution/reference v0.6.0 h1:0IXCQ5g4/QMHHkarYzh5l+u8T3t73zM5QvfrDyIgxBk=
 github.com/distribution/reference v0.6.0/go.mod h1:BbU0aIcezP1/5jX/8MP0YiH4SdvB5Y4f/wlDRiLyi3E=
-github.com/docker/cli v28.4.0+incompatible h1:RBcf3Kjw2pMtwui5V0DIMdyeab8glEw5QY0UUU4C9kY=
-github.com/docker/cli v28.4.0+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8=
+github.com/docker/cli v28.5.1+incompatible h1:ESutzBALAD6qyCLqbQSEf1a/U8Ybms5agw59yGVc+yY=
+github.com/docker/cli v28.5.1+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8=
 github.com/docker/distribution v2.8.3+incompatible h1:AtKxIZ36LoNK51+Z6RpzLpddBirtxJnzDrHLEKxTAYk=
 github.com/docker/distribution v2.8.3+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
 github.com/docker/docker v28.5.1+incompatible h1:Bm8DchhSD2J6PsFzxC35TZo4TLGR2PdW/E69rU45NhM=
 github.com/docker/docker v28.5.1+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
-github.com/docker/docker-credential-helpers v0.9.3 h1:gAm/VtF9wgqJMoxzT3Gj5p4AqIjCBS4wrsOh9yRqcz8=
-github.com/docker/docker-credential-helpers v0.9.3/go.mod h1:x+4Gbw9aGmChi3qTLZj8Dfn0TD20M/fuWy0E5+WDeCo=
+github.com/docker/docker-credential-helpers v0.9.4 h1:76ItO69/AP/V4yT9V4uuuItG0B1N8hvt0T0c0NN/DzI=
+github.com/docker/docker-credential-helpers v0.9.4/go.mod h1:v1S+hepowrQXITkEfw6o4+BMbGot02wiKpzWhGUZK6c=
 github.com/docker/go-connections v0.6.0 h1:LlMG9azAe1TqfR7sO+NJttz1gy6KO7VJBh+pMmjSD94=
 github.com/docker/go-connections v0.6.0/go.mod h1:AahvXYshr6JgfUJGdDCs2b5EZG/vmaMAntpSFH5BFKE=
 github.com/docker/go-metrics v0.0.1 h1:AgB/0SvBxihN0X8OR4SjsblXkbMvalQ8cjmtKQ2rQV8=
@@ -162,8 +162,8 @@ github.com/mattn/go-sqlite3 v1.14.32 h1:JD12Ag3oLy1zQA+BNn74xRgaBbdhbNIDYvQUEuuE
 github.com/mattn/go-sqlite3 v1.14.32/go.mod h1:Uh1q+B4BYcTPb+yiD3kU8Ct7aC0hY9fxUwlHK0RXw+Y=
 github.com/miekg/pkcs11 v1.1.1 h1:Ugu9pdy6vAYku5DEpVWVFPYnzV+bxB+iRdbuFSu7TvU=
 github.com/miekg/pkcs11 v1.1.1/go.mod h1:XsNlhZGX73bx86s2hdc/FuaLm2CPZJemRLMA+WTFxgs=
-github.com/mistifyio/go-zfs/v3 v3.0.1 h1:YaoXgBePoMA12+S1u/ddkv+QqxcfiZK4prI6HPnkFiU=
-github.com/mistifyio/go-zfs/v3 v3.0.1/go.mod h1:CzVgeB0RvF2EGzQnytKVvVSDwmKJXxkOTUGbNrTja/k=
+github.com/mistifyio/go-zfs/v3 v3.1.0 h1:FZaylcg0hjUp27i23VcJJQiuBeAZjrC8lPqCGM1CopY=
+github.com/mistifyio/go-zfs/v3 v3.1.0/go.mod h1:CzVgeB0RvF2EGzQnytKVvVSDwmKJXxkOTUGbNrTja/k=
 github.com/moby/buildkit v0.25.1 h1:j7IlVkeNbEo+ZLoxdudYCHpmTsbwKvhgc/6UJ/mY/o8=
 github.com/moby/buildkit v0.25.1/go.mod h1:phM8sdqnvgK2y1dPDnbwI6veUCXHOZ6KFSl6E164tkc=
 github.com/moby/docker-image-spec v1.3.1 h1:jMKff3w6PgbfSa69GfNg+zN/XLhfXJGnEx3Nl2EsFP0=
@@ -195,8 +195,8 @@ github.com/morikuni/aec v1.0.0 h1:nP9CBfwrvYnBRgY6qfDQkygYDmYwOilePFkwzv4dU8A=
 github.com/morikuni/aec v1.0.0/go.mod h1:BbKIizmSmc5MMPqRYbxO4ZU0S0+P200+tUnFx7PXmsc=
 github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA=
 github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
-github.com/onsi/ginkgo/v2 v2.25.3 h1:Ty8+Yi/ayDAGtk4XxmmfUy4GabvM+MegeB4cDLRi6nw=
-github.com/onsi/ginkgo/v2 v2.25.3/go.mod h1:43uiyQC4Ed2tkOzLsEYm7hnrb7UJTWHYNsuy3bG/snE=
+github.com/onsi/ginkgo/v2 v2.26.0 h1:1J4Wut1IlYZNEAWIV3ALrT9NfiaGW2cDCJQSFQMs/gE=
+github.com/onsi/ginkgo/v2 v2.26.0/go.mod h1:qhEywmzWTBUY88kfO0BRvX4py7scov9yR+Az2oavUzw=
 github.com/onsi/gomega v1.38.2 h1:eZCjf2xjZAqe+LeWvKb5weQ+NcPwX84kqJ0cZNxok2A=
 github.com/onsi/gomega v1.38.2/go.mod h1:W2MJcYxRGV63b418Ai34Ud0hEdTVXq9NW9+Sx6uXf3k=
 github.com/opencontainers/cgroups v0.0.5 h1:DRITAqcOnY0uSBzIpt1RYWLjh5DPDiqUs4fY6Y0ktls=
@@ -317,12 +317,12 @@ go.opentelemetry.io/otel/trace v1.36.0 h1:ahxWNuqZjpdiFAyrIoQ4GIiAIhxAunQR6MUoKr
 go.opentelemetry.io/otel/trace v1.36.0/go.mod h1:gQ+OnDZzrybY4k4seLzPAWNwVBBVlF2szhehOBB/tGA=
 go.opentelemetry.io/proto/otlp v1.5.0 h1:xJvq7gMzB31/d406fB8U5CBdyQGw4P399D1aQWU/3i4=
 go.opentelemetry.io/proto/otlp v1.5.0/go.mod h1:keN8WnHxOy8PG0rQZjJJ5A2ebUoafqWp0eVQ4yIXvJ4=
-go.podman.io/common v0.65.1-0.20250916163606-92222dcd3da4 h1:YjBqTOxz4cqfpifcd71VoBl1FTQL2U2La5NgMqmRRqU=
-go.podman.io/common v0.65.1-0.20250916163606-92222dcd3da4/go.mod h1:DyOdwtkwzYA8lE0TueJnxRju4Lmsrx6ZAC/ATAkYYck=
-go.podman.io/image/v5 v5.37.1-0.20250916163606-92222dcd3da4 h1:hfc3lZaxi6KGnWN3IusIaCkcMPR4rTR+vWZzakeD1EA=
-go.podman.io/image/v5 v5.37.1-0.20250916163606-92222dcd3da4/go.mod h1:cGWb3IyBziJGxhFikTOlt9Ap+zo6s3rz9Qd1rbzqs4s=
-go.podman.io/storage v1.60.1-0.20250916163606-92222dcd3da4 h1:jo0PSKh6muU7rmhXXqOV9aK+HrA8koqs47KhBsZf6LY=
-go.podman.io/storage v1.60.1-0.20250916163606-92222dcd3da4/go.mod h1:AeZXAN8Qu1gTlAEHIc6mVhxk+61oMSM3K3iLx5UAQWE=
+go.podman.io/common v0.66.0 h1:KElE3HKLFdMdJL+jv5ExBiX2Dh4Qcv8ovmzaBGRsyZM=
+go.podman.io/common v0.66.0/go.mod h1:aNd2a0S7pY+fx1X5kpQYuF4hbwLU8ZOccuVrhu7h1Xc=
+go.podman.io/image/v5 v5.38.0 h1:aUKrCANkPvze1bnhLJsaubcfz0d9v/bSDLnwsXJm6G4=
+go.podman.io/image/v5 v5.38.0/go.mod h1:hSIoIUzgBnmc4DjoIdzk63aloqVbD7QXDMkSE/cvG90=
+go.podman.io/storage v1.61.0 h1:5hD/oyRYt1f1gxgvect+8syZBQhGhV28dCw2+CZpx0Q=
+go.podman.io/storage v1.61.0/go.mod h1:A3UBK0XypjNZ6pghRhuxg62+2NIm5lcUGv/7XyMhMUI=
 go.uber.org/automaxprocs v1.6.0 h1:O3y2/QNTOdbF+e/dpXNNW7Rx2hZ4sTIPyybbxyNqTUs=
 go.uber.org/automaxprocs v1.6.0/go.mod h1:ifeIMSnPZuznNm6jmdzmU3/bfk01Fe2fotchwEFJ8r8=
 go.yaml.in/yaml/v2 v2.4.2 h1:DzmwEr2rDGHl7lsFgAHxmNz/1NlQ7xLIrlN2h5d1eGI=