diff --git a/go.mod b/go.mod
index 95d66b23da..5b3fc30704 100644
--- a/go.mod
+++ b/go.mod
@@ -12,7 +12,7 @@ require (
github.com/container-orchestrated-devices/container-device-interface v0.6.1
github.com/containernetworking/cni v1.1.2
github.com/containernetworking/plugins v1.3.0
- github.com/containers/buildah v1.31.1-0.20230914090547-70d8ab94953a
+ github.com/containers/buildah v1.32.0
github.com/containers/common v0.56.0
github.com/containers/conmon v2.0.20+incompatible
github.com/containers/image/v5 v5.28.0
diff --git a/go.sum b/go.sum
index e27ad16e25..5d52318500 100644
--- a/go.sum
+++ b/go.sum
@@ -247,8 +247,8 @@ github.com/containernetworking/plugins v0.8.6/go.mod h1:qnw5mN19D8fIwkqW7oHHYDHV
github.com/containernetworking/plugins v0.9.1/go.mod h1:xP/idU2ldlzN6m4p5LmGiwRDjeJr6FLK6vuiUwoH7P8=
github.com/containernetworking/plugins v1.3.0 h1:QVNXMT6XloyMUoO2wUOqWTC1hWFV62Q6mVDp5H1HnjM=
github.com/containernetworking/plugins v1.3.0/go.mod h1:Pc2wcedTQQCVuROOOaLBPPxrEXqqXBFt3cZ+/yVg6l0=
-github.com/containers/buildah v1.31.1-0.20230914090547-70d8ab94953a h1:2vUJdbZUfOcS0ehO16gEKZ6dPKoM+PEw7CKCdEOsoSc=
-github.com/containers/buildah v1.31.1-0.20230914090547-70d8ab94953a/go.mod h1:sN3rA3DbnqekNz3bNdkqWduuirYDuMs54LUCOZOomBE=
+github.com/containers/buildah v1.32.0 h1:uz5Rcf7lGeStj7iPTBgO4UdhQYZqMMzyt9suDf16k1k=
+github.com/containers/buildah v1.32.0/go.mod h1:sN3rA3DbnqekNz3bNdkqWduuirYDuMs54LUCOZOomBE=
github.com/containers/common v0.56.0 h1:hysHUsEai1EkMXanU26UV55wMXns/a6AYmaFqJ4fEMY=
github.com/containers/common v0.56.0/go.mod h1:IjaDdfUtcs2CfCcJMZxuut4XlvkTkY9Nlqkso9xCOq4=
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 9939d91c8c..d766e3248b 100644
--- a/vendor/github.com/containers/buildah/CHANGELOG.md
+++ b/vendor/github.com/containers/buildah/CHANGELOG.md
@@ -2,6 +2,91 @@
# Changelog
+## v1.32.0 (2023-09-14)
+
+ GetTmpDir is not using ImageCopyTmpdir correctly
+ Run codespell on code
+ Bump vendor containers/(common, storage, image)
+ Cirrus: Remove multi-arch buildah image builds
+ fix(deps): update module github.com/containerd/containerd to v1.7.6
+ Split GetTempDir from internal/util
+ Move most of internal/parse to internal/volumes
+ copier: remove libimage dependency via util package
+ Add some docs for `build --cw`, `commit --cw`, and `mkcw`
+ Add `buildah mkcw`, add `--cw` to `buildah commit` and `buildah build`
+ Make sure that pathnames picked up from the environment are absolute
+ fix(deps): update module github.com/cyphar/filepath-securejoin to v0.2.4
+ fix(deps): update module github.com/docker/docker to v24.0.6+incompatible
+ Don't try to look up names when committing images
+ fix(deps): update module golang.org/x/crypto to v0.13.0
+ docs: use valid github repo
+ fix(deps): update module golang.org/x/sys to v0.12.0
+ vendor containers/common@12405381ff45
+ push: --force-compression should be true with --compression-format
+ Update module github.com/containerd/containerd to v1.7.5
+ [skip-ci] Update tim-actions/commit-message-checker-with-regex action to v0.3.2
+ docs: add reference to oci-hooks
+ Support passing of ULimits as -1 to mean max
+ GHA: Attempt to fix discussion_lock workflow
+ Fixing the owner of the storage.conf.
+ pkg/chrootuser: Ignore comments when parsing /etc/group on FreeBSD
+ Use buildah repo rather then podman repo
+ GHA: Closed issue/PR comment-lock test
+ fix(deps): update module github.com/containers/storage to v1.49.0
+ chore(deps): update dependency containers/automation_images to v20230816
+ Replace troff code with markdown in buildah-{copy,add}.1.md
+ [CI:BUILD] rpm: spdx compatible license field
+ executor: build-arg warnings must honor global args
+ fix(deps): update module github.com/containers/ocicrypt to v1.1.8
+ chroot: `setSeccomp` add support for `ArchPARISC(64)` and `ArchRISCV64`
+ make,cross: restore loong64
+ Clear CommonBuildOpts when loading Builder status
+ buildah/push/manifest-push: add support for --force-compression
+ vendor: bump c/common to v0.55.1-0.20230811093040-524b4d5c12f9
+ chore(deps): update dependency containers/automation_images to v20230809
+ [CI:BUILD] RPM: fix buildtags
+ fix(deps): update module github.com/opencontainers/runc to v1.1.9
+ chore(deps): update dependency ubuntu to v22
+ chore(deps): update dependency containers/automation_images to v20230807
+ [CI:BUILD] Packit: add fedora-eln targets
+ [CI:BUILD] RPM: build docs with vendored go-md2man
+ packit: Build PRs into default packit COPRs
+ Update install.md
+ Update install.md changes current Debian stable version name
+ fix(deps): update module golang.org/x/term to v0.11.0
+ fix(deps): update module golang.org/x/crypto to v0.12.0
+ tests: fix layer-label tests
+ buildah: add --layer-label for setting labels on layers
+ Cirrus: container/rootless env. var. passthrough
+ Cirrus: Remove duplicate env. var. definitions
+ fix(deps): update github.com/containers/storage digest to c3da76f
+ Add a missing .Close() call on an ImageSource
+ Create only a reference when that's all we need
+ Add a missing .Close() call on an ImageDestination
+ CI:BUILD] RPM: define gobuild macro for rhel/centos stream
+ manifest/push: add support for --add-compression
+ manifest/inspect: add support for tls-verify and authfile
+ vendor: bump c/common to v0.55.1-0.20230727095721-647ed1d4d79a
+ vendor: bump c/image to v5.26.1-0.20230726142307-8c387a14f4ac
+ fix(deps): update module github.com/containerd/containerd to v1.7.3
+ fix(deps): update module github.com/onsi/gomega to v1.27.10
+ fix(deps): update module github.com/docker/docker to v24.0.5+incompatible
+ fix(deps): update module github.com/containers/image/v5 to v5.26.1
+ fix(deps): update module github.com/opencontainers/runtime-spec to v1.1.0
+ Update vendor of containers/(storage,image,common)
+ fix(deps): update module github.com/opencontainers/runc to v1.1.8
+ [CI:BUILD] Packit: remove pre-sync action
+ fix(deps): update module github.com/containers/common to v0.55.2
+ [CI:BUILD] Packit: downstream task script needs GOPATH
+ Vendor in containers/(common, image, storage)
+ fix(deps): update module golang.org/x/term to v0.10.0
+ [CI:BUILD] Packit: fix pre-sync action for downstream tasks
+ contrib/buildahimage: set config correctly for rootless build user
+ fix(deps): update module github.com/opencontainers/image-spec to v1.1.0-rc4
+ Bump to v1.32.0-dev
+ Update debian install instructions
+ pkg/overlay: add limited support for FreeBSD
+
## v1.31.0 (2023-06-30)
Bump c/common to 0.55.1 and c/image to 5.26.1
diff --git a/vendor/github.com/containers/buildah/Makefile b/vendor/github.com/containers/buildah/Makefile
index 7de55571c0..81ffc93758 100644
--- a/vendor/github.com/containers/buildah/Makefile
+++ b/vendor/github.com/containers/buildah/Makefile
@@ -125,7 +125,7 @@ gopath:
test $(shell pwd) = $(shell cd ../../../../src/github.com/containers/buildah ; pwd)
codespell:
- codespell -S Makefile,buildah.spec.rpkg,AUTHORS,bin,vendor,.git,go.mod,go.sum,CHANGELOG.md,changelog.txt,seccomp.json,.cirrus.yml,"*.xz,*.gz,*.tar,*.tgz,*ico,*.png,*.1,*.5,*.orig,*.rej" -L uint,iff,od,erro -w
+ codespell -S Makefile,buildah.spec.rpkg,AUTHORS,bin,vendor,.git,go.mod,go.sum,CHANGELOG.md,changelog.txt,seccomp.json,.cirrus.yml,"*.xz,*.gz,*.tar,*.tgz,*ico,*.png,*.1,*.5,*.orig,*.rej" -L passt,bu,uint,iff,od,erro -w
.PHONY: validate
validate: install.tools
diff --git a/vendor/github.com/containers/buildah/buildah.go b/vendor/github.com/containers/buildah/buildah.go
index ac4ed11973..e4ed5dcd5c 100644
--- a/vendor/github.com/containers/buildah/buildah.go
+++ b/vendor/github.com/containers/buildah/buildah.go
@@ -349,10 +349,10 @@ type BuilderOptions struct {
ProcessLabel string
// MountLabel is the SELinux mount label associated with the container
MountLabel string
- // PreserveBaseImageAnn[otation]s indicates that we should preserve base
- // image information that was present in our base image, instead of
- // overwriting them with information about the base image itself. This
- // is mainly useful as an internal implementation detail of multistage
+ // PreserveBaseImageAnns indicates that we should preserve base
+ // image information (Annotations) that are present in our base image,
+ // rather than overwriting them with information about the base image
+ // itself. Useful as an internal implementation detail of multistage
// builds, and does not need to be set by most callers.
PreserveBaseImageAnns bool
}
diff --git a/vendor/github.com/containers/buildah/changelog.txt b/vendor/github.com/containers/buildah/changelog.txt
index 53c00b4ddf..5cd3d0c01d 100644
--- a/vendor/github.com/containers/buildah/changelog.txt
+++ b/vendor/github.com/containers/buildah/changelog.txt
@@ -1,3 +1,87 @@
+- Changelog for v1.32.0 (2023-09-14)
+ * GetTmpDir is not using ImageCopyTmpdir correctly
+ * Run codespell on code
+ * Bump vendor containers/(common, storage, image)
+ * Cirrus: Remove multi-arch buildah image builds
+ * fix(deps): update module github.com/containerd/containerd to v1.7.6
+ * Split GetTempDir from internal/util
+ * Move most of internal/parse to internal/volumes
+ * copier: remove libimage dependency via util package
+ * Add some docs for `build --cw`, `commit --cw`, and `mkcw`
+ * Add `buildah mkcw`, add `--cw` to `buildah commit` and `buildah build`
+ * Make sure that pathnames picked up from the environment are absolute
+ * fix(deps): update module github.com/cyphar/filepath-securejoin to v0.2.4
+ * fix(deps): update module github.com/docker/docker to v24.0.6+incompatible
+ * Don't try to look up names when committing images
+ * fix(deps): update module golang.org/x/crypto to v0.13.0
+ * docs: use valid github repo
+ * fix(deps): update module golang.org/x/sys to v0.12.0
+ * vendor containers/common@12405381ff45
+ * push: --force-compression should be true with --compression-format
+ * Update module github.com/containerd/containerd to v1.7.5
+ * [skip-ci] Update tim-actions/commit-message-checker-with-regex action to v0.3.2
+ * docs: add reference to oci-hooks
+ * Support passing of ULimits as -1 to mean max
+ * GHA: Attempt to fix discussion_lock workflow
+ * Fixing the owner of the storage.conf.
+ * pkg/chrootuser: Ignore comments when parsing /etc/group on FreeBSD
+ * Use buildah repo rather then podman repo
+ * GHA: Closed issue/PR comment-lock test
+ * fix(deps): update module github.com/containers/storage to v1.49.0
+ * chore(deps): update dependency containers/automation_images to v20230816
+ * Replace troff code with markdown in buildah-{copy,add}.1.md
+ * [CI:BUILD] rpm: spdx compatible license field
+ * executor: build-arg warnings must honor global args
+ * fix(deps): update module github.com/containers/ocicrypt to v1.1.8
+ * chroot: `setSeccomp` add support for `ArchPARISC(64)` and `ArchRISCV64`
+ * make,cross: restore loong64
+ * Clear CommonBuildOpts when loading Builder status
+ * buildah/push/manifest-push: add support for --force-compression
+ * vendor: bump c/common to v0.55.1-0.20230811093040-524b4d5c12f9
+ * chore(deps): update dependency containers/automation_images to v20230809
+ * [CI:BUILD] RPM: fix buildtags
+ * fix(deps): update module github.com/opencontainers/runc to v1.1.9
+ * chore(deps): update dependency ubuntu to v22
+ * chore(deps): update dependency containers/automation_images to v20230807
+ * [CI:BUILD] Packit: add fedora-eln targets
+ * [CI:BUILD] RPM: build docs with vendored go-md2man
+ * packit: Build PRs into default packit COPRs
+ * Update install.md
+ * Update install.md changes current Debian stable version name
+ * fix(deps): update module golang.org/x/term to v0.11.0
+ * fix(deps): update module golang.org/x/crypto to v0.12.0
+ * tests: fix layer-label tests
+ * buildah: add --layer-label for setting labels on layers
+ * Cirrus: container/rootless env. var. passthrough
+ * Cirrus: Remove duplicate env. var. definitions
+ * fix(deps): update github.com/containers/storage digest to c3da76f
+ * Add a missing .Close() call on an ImageSource
+ * Create only a reference when that's all we need
+ * Add a missing .Close() call on an ImageDestination
+ * CI:BUILD] RPM: define gobuild macro for rhel/centos stream
+ * manifest/push: add support for --add-compression
+ * manifest/inspect: add support for tls-verify and authfile
+ * vendor: bump c/common to v0.55.1-0.20230727095721-647ed1d4d79a
+ * vendor: bump c/image to v5.26.1-0.20230726142307-8c387a14f4ac
+ * fix(deps): update module github.com/containerd/containerd to v1.7.3
+ * fix(deps): update module github.com/onsi/gomega to v1.27.10
+ * fix(deps): update module github.com/docker/docker to v24.0.5+incompatible
+ * fix(deps): update module github.com/containers/image/v5 to v5.26.1
+ * fix(deps): update module github.com/opencontainers/runtime-spec to v1.1.0
+ * Update vendor of containers/(storage,image,common)
+ * fix(deps): update module github.com/opencontainers/runc to v1.1.8
+ * [CI:BUILD] Packit: remove pre-sync action
+ * fix(deps): update module github.com/containers/common to v0.55.2
+ * [CI:BUILD] Packit: downstream task script needs GOPATH
+ * Vendor in containers/(common, image, storage)
+ * fix(deps): update module golang.org/x/term to v0.10.0
+ * [CI:BUILD] Packit: fix pre-sync action for downstream tasks
+ * contrib/buildahimage: set config correctly for rootless build user
+ * fix(deps): update module github.com/opencontainers/image-spec to v1.1.0-rc4
+ * Bump to v1.32.0-dev
+ * Update debian install instructions
+ * pkg/overlay: add limited support for FreeBSD
+
- Changelog for v1.31.0 (2023-06-30)
* Bump c/common to 0.55.1 and c/image to 5.26.1
* Bump c/image to 5.26.0 and c/common to 0.54.0
diff --git a/vendor/github.com/containers/buildah/define/types.go b/vendor/github.com/containers/buildah/define/types.go
index 01d38544d0..8bd1d07958 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.32.0-dev"
+ Version = "1.32.0"
// DefaultRuntime if containers.conf fails.
DefaultRuntime = "runc"
diff --git a/vendor/github.com/containers/buildah/internal/tmpdir/tmpdir.go b/vendor/github.com/containers/buildah/internal/tmpdir/tmpdir.go
index 9cfde4e72c..b33b0fee2c 100644
--- a/vendor/github.com/containers/buildah/internal/tmpdir/tmpdir.go
+++ b/vendor/github.com/containers/buildah/internal/tmpdir/tmpdir.go
@@ -17,10 +17,8 @@ func GetTempDir() string {
}
logrus.Warnf("ignoring TMPDIR from environment, evaluating it: %v", err)
}
- containerConfig, err := config.Default()
- if err != nil {
- tmpdir, err := containerConfig.ImageCopyTmpDir()
- if err != nil {
+ if containerConfig, err := config.Default(); err == nil {
+ if tmpdir, err := containerConfig.ImageCopyTmpDir(); err == nil {
return tmpdir
}
}
diff --git a/vendor/github.com/containers/buildah/run_common.go b/vendor/github.com/containers/buildah/run_common.go
index eaaf0522cb..ec51e93d55 100644
--- a/vendor/github.com/containers/buildah/run_common.go
+++ b/vendor/github.com/containers/buildah/run_common.go
@@ -1496,7 +1496,7 @@ func checkIfMountDestinationPreExists(root string, dest string) (bool, error) {
// We created exact path for globbing so it will
// return only one result.
if statResults[0].Error != "" && len(statResults[0].Globbed) == 0 {
- // Path do not exsits.
+ // Path do not exist.
return false, nil
}
// Path exists.
diff --git a/vendor/modules.txt b/vendor/modules.txt
index 0dfcc9e40e..19a3123e3a 100644
--- a/vendor/modules.txt
+++ b/vendor/modules.txt
@@ -136,7 +136,7 @@ github.com/containernetworking/cni/pkg/version
# github.com/containernetworking/plugins v1.3.0
## explicit; go 1.20
github.com/containernetworking/plugins/pkg/ns
-# github.com/containers/buildah v1.31.1-0.20230914090547-70d8ab94953a
+# github.com/containers/buildah v1.32.0
## explicit; go 1.18
github.com/containers/buildah
github.com/containers/buildah/bind