Merge pull request #11311 from containers/dependabot/go_modules/github.com/containers/buildah-1.22.3

Bump github.com/containers/buildah from 1.22.0 to 1.22.3
2025-09-06 22:37:37 +00:00 · 2021-08-23 15:00:21 -04:00
parent 90cf78b199 fe4dc452ec
commit d1137664fe
10 changed files with 42 additions and 237 deletions
--- a/go.mod
+++ b/go.mod
@@ -11,7 +11,7 @@ require (
 	github.com/container-orchestrated-devices/container-device-interface v0.0.0-20210325223243-f99e8b6c10b9
 	github.com/containernetworking/cni v0.8.1
 	github.com/containernetworking/plugins v0.9.1
-	github.com/containers/buildah v1.22.0
+	github.com/containers/buildah v1.22.3
 	github.com/containers/common v0.42.1
 	github.com/containers/conmon v2.0.20+incompatible
 	github.com/containers/image/v5 v5.15.2
--- a/go.sum
+++ b/go.sum
@@ -238,14 +238,13 @@ github.com/containernetworking/plugins v0.8.6/go.mod h1:qnw5mN19D8fIwkqW7oHHYDHV
 github.com/containernetworking/plugins v0.8.7/go.mod h1:R7lXeZaBzpfqapcAbHRW8/CYwm0dHzbz0XEjofx0uB0=
 github.com/containernetworking/plugins v0.9.1 h1:FD1tADPls2EEi3flPc2OegIY1M9pUa9r2Quag7HMLV8=
 github.com/containernetworking/plugins v0.9.1/go.mod h1:xP/idU2ldlzN6m4p5LmGiwRDjeJr6FLK6vuiUwoH7P8=
-github.com/containers/buildah v1.22.0 h1:VwDrweEEUkfIB0t+hVhwE6FdoV0PZjCTz9sVkaZyv2g=
-github.com/containers/buildah v1.22.0/go.mod h1:a6JsF0iNlJJ5GsiVy16e2fgiUV4S3gWZymrpyqzhar0=
+github.com/containers/buildah v1.22.3 h1:RomxwUa24jMcqzXQetpw4wGMfNlNZLhc9qwyoWHblwc=
+github.com/containers/buildah v1.22.3/go.mod h1:JVXRyx5Rkp5w5jwvaXe45kuHtyoxpERMjXrR45+3Wfg=
 github.com/containers/common v0.42.1 h1:ADOZrVAS8ZY5hBAvr/GoRoPv5Z7TBkxWgxQEXQjlqac=
 github.com/containers/common v0.42.1/go.mod h1:AaF3ipZfgezsctDuhzLkq4Vl+LkEy7J74ikh2HSXDsg=
 github.com/containers/conmon v2.0.20+incompatible h1:YbCVSFSCqFjjVwHTPINGdMX1F6JXHGTUje2ZYobNrkg=
 github.com/containers/conmon v2.0.20+incompatible/go.mod h1:hgwZ2mtuDrppv78a/cOBNiCm6O0UMWGx1mu7P00nu5I=
 github.com/containers/image/v5 v5.14.0/go.mod h1:SxiBKOcKuT+4yTjD0AskjO+UwFvNcVOJ9qlAw1HNSPU=
-github.com/containers/image/v5 v5.15.0/go.mod h1:gzdBcooi6AFdiqfzirUqv90hUyHyI0MMdaqKzACKr2s=
 github.com/containers/image/v5 v5.15.2 h1:DKicmVr0h1HGkzs9muoErX+fVbV9sV9W5TyMy5perLE=
 github.com/containers/image/v5 v5.15.2/go.mod h1:8jejVSzTDfyPwr/HXp9rri34n/vbdavYk6IzTiB3TBw=
 github.com/containers/libtrust v0.0.0-20190913040956-14b96171aa3b h1:Q8ePgVfHDplZ7U33NwHZkrVELsZP5fYj9pM5WBZB2GE=
@@ -259,7 +258,6 @@ github.com/containers/psgo v1.5.2 h1:3aoozst/GIwsrr/5jnFy3FrJay98uujPCu9lTuSZ/Cw
 github.com/containers/psgo v1.5.2/go.mod h1:2ubh0SsreMZjSXW1Hif58JrEcFudQyIy9EzPUWfawVU=
 github.com/containers/storage v1.23.5/go.mod h1:ha26Q6ngehFNhf3AWoXldvAvwI4jFe3ETQAf/CeZPyM=
 github.com/containers/storage v1.32.6/go.mod h1:mdB+b89p+jU8zpzLTVXA0gWMmIo0WrkfGMh1R8O2IQw=
-github.com/containers/storage v1.33.0/go.mod h1:FUZPF4nJijX8ixdhByZJXf02cvbyLi6dyDwXdIe8QVY=
 github.com/containers/storage v1.33.1/go.mod h1:FUZPF4nJijX8ixdhByZJXf02cvbyLi6dyDwXdIe8QVY=
 github.com/containers/storage v1.34.1 h1:PsBGMH7hwuQ3MOr7qTgPznFrE8ebfIbwQbg2gKvg0lE=
 github.com/containers/storage v1.34.1/go.mod h1:FY2TcbfgCLMU4lYoKnlZeZXeH353TOTbpDEA+sAcqAY=
--- a/vendor/github.com/containers/buildah/.cirrus.yml
+++ b/vendor/github.com/containers/buildah/.cirrus.yml
@@ -6,7 +6,7 @@ env:
    #### Global variables used for all tasks
    ####
    # Name of the ultimate destination branch for this CI run, PR or post-merge.
-    DEST_BRANCH: "main"
+    DEST_BRANCH: "release-1.22"
    GOPATH: "/var/tmp/go"
    GOSRC: "${GOPATH}/src/github.com/containers/buildah"
    # Overrides default location (/tmp/cirrus) for repo clone
@@ -120,7 +120,7 @@ vendor_task:

    # Runs within Cirrus's "community cluster"
    container:
-        image: docker.io/library/golang:1.13
+        image: docker.io/library/golang:1.16
        cpu: 1
        memory: 1

--- a/vendor/github.com/containers/buildah/CHANGELOG.md
+++ b/vendor/github.com/containers/buildah/CHANGELOG.md
@@ -1,225 +1,17 @@
 ![buildah logo](https://cdn.rawgit.com/containers/buildah/main/logos/buildah-logo_large.png)

 # Changelog
-## v1.21.0 (2021-05-19)
-    Don't blow up if cpp detects errors
-    Vendor in containers/common v0.38.4
-    Remove 'buildah run --security-opt' from completion
-    update c/common
-    Fix handling of --default-mounts-file
-    update vendor of containers/storage v1.31.1
-    Bump github.com/containers/storage from 1.30.3 to 1.31.0
-    Send logrus messages back to caller when building
-    github: Fix bad repo. ref in workflow config
-    Check earlier for bad image tags name
-    buildah bud: fix containers/podman/issues/10307
-    Bump github.com/containers/storage from 1.30.1 to 1.30.3
-    Cirrus: Support [CI:DOCS] test skipping
-    Notification email for cirrus-cron build failures
-    Bump github.com/opencontainers/runc from 1.0.0-rc93 to 1.0.0-rc94
-    Fix race condition
-    Fix copy race while walking paths
-    Preserve ownership of lower directory when doing an overlay mount
-    Bump github.com/onsi/gomega from 1.11.0 to 1.12.0
-    Update nix pin with `make nixpkgs`
-    codespell cleanup
-    Multi-arch github-action workflow unification
-    Bump github.com/containers/image/v5 from 5.11.1 to 5.12.0
-    Bump github.com/onsi/ginkgo from 1.16.1 to 1.16.2
-    imagebuildah: ignore signatures when tagging images
-    update to latest libimage
-    Bump github.com/containers/common from 0.37.0 to 0.37.1
-    Bump github.com/containers/storage from 1.30.0 to 1.30.1
-    Upgrade to GitHub-native Dependabot
-    Document location of auth.json file if XDG_RUNTIME_DIR is not set
-    run.bats: fix flake in run-user test
-    Cirrus: Update F34beta -> F34
-    pr-should-include-tests: try to make work in buildah
-    runUsingRuntime: when relaying error from the runtime, mention that
-    Run(): avoid Mkdir() into the rootfs
-    imagebuildah: replace archive with chrootarchive
-    imagebuildah.StageExecutor.volumeCacheSaveVFS(): set up bind mounts
-    conformance: use :Z with transient mounts when SELinux is enabled
-    bud.bats: fix a bats warning
-    imagebuildah: create volume directories when using overlays
-    imagebuildah: drop resolveSymlink()
-    namespaces test - refactoring and cleanup
-    Refactor 'idmapping' system test
-    Cirrus: Update Ubuntu images to 21.04
-    Tiny fixes in bud system tests
-    Add compabitility wrappers for removed packages
-    Fix expected message at pulling image
-    Fix system tests of 'bud' subcommand
-    [CI:DOCS] Update steps for CentOS runc users
-    Add support for secret mounts
-    Add buildah manifest rm command
-    restore push/pull and util API
-    [CI:DOCS] Remove older distro docs
-    Rename rhel secrets to subscriptions
-    vendor in openshift/imagebuilder
-    Remove buildah bud --loglevel ...
-    use new containers/common/libimage package
-    Fix copier when using globs
-    Test namespace flags of 'bud' subcommand
-    Add system test of 'bud' subcommand
-    Output names of multiple tags in buildah bud
-    push to docker test: don't get fooled by podman
-    copier: add Remove()
-    build(deps): bump github.com/containers/image/v5 from 5.10.5 to 5.11.1
-    Restore log timestamps
-    Add system test of 'buildah help' with a tiny fix
-    tests: copy.bats: fix infinite hang
-    Do not force hard code to crun in rootless mode
-    build(deps): bump github.com/openshift/imagebuilder from 1.2.0 to 1.2.1
-    build(deps): bump github.com/containers/ocicrypt from 1.1.0 to 1.1.1
-    build(deps): bump github.com/containers/common from 0.35.4 to 0.36.0
-    Fix arg missing warning in bud
-    Check without flag in 'from --cgroup-parent' test
-    Minor fixes to Buildah as a library tutorial documentation
-    Add system test of 'buildah version' for packaged buildah
-    Add a few system tests of 'buildah from'
-    Log the final error with %+v at logging level "trace"
-    copier: add GetOptions.NoCrossDevice
-    Update nix pin with `make nixpkgs`
-    Bump to v1.20.2-dev
+## v1.22.3 (2021-08-20)
+  * [release-1.22] bump to v1.22.3

-## v1.20.1 (2021-04-13)
-    Run container with isolation type set at 'from'
-    bats helpers.bash - minor refactoring
-    Bump containers/storage vendor to v1.29.0
-    build(deps): bump github.com/onsi/ginkgo from 1.16.0 to 1.16.1
-    Cirrus: Update VMs w/ F34beta
-    CLI add/copy: add a --from option
-    build(deps): bump github.com/onsi/ginkgo from 1.15.2 to 1.16.0
-    Add authentication system tests for 'commit' and 'bud'
-    fix local image lookup for custom platform
-    Double-check existence of OCI runtimes
-    Cirrus: Make use of shared get_ci_vm container
-    Add system tests of "buildah run"
-    Update nix pin with `make nixpkgs`
-    Remove some stuttering on returns errors
-    Setup alias for --tty to --terminal
-    Add conformance tests for COPY /...
-    Put a few more minutes on the clock for the CI conformance test
-    Add a conformance test for COPY --from $symlink
-    Add conformance tests for COPY ""
-    Check for symlink in builtin volume
-    Sort all mounts by destination directory
-    System-test cleanup
-    Export parse.Platform string to be used by podman-remote
-    blobcache: fix sequencing error
-    build(deps): bump github.com/containers/common from 0.35.3 to 0.35.4
-    Fix URL in demos/buildah_multi_stage.sh
-    Add a few system tests
-    [NO TESTS NEEDED] Use --recurse-modules when building git context
-    Bump to v1.20.1-dev
+## v1.22.2 (2021-08-19)
+  * [release-1.22] bump c/image to v5.15.2

-## v1.20.0 (2021-03-25)
-  * vendor in containers/storage v1.28.1
-  * build(deps): bump github.com/containers/common from 0.35.2 to 0.35.3
-  * tests: prefetch: use buildah, not podman, for pulls
-  * Use faster way to check image tag existence during multi-arch build
-  * Add information about multi-arch images to the Readme
-  * COPY --chown: expand the conformance test
-  * pkg/chrootuser: use a bufio.Scanner
-  * [CI:DOCS] Fix rootful typo in docs
-  * build(deps): bump github.com/onsi/ginkgo from 1.15.1 to 1.15.2
-  * Add documentation and testing for .containerignore
-  * build(deps): bump github.com/sirupsen/logrus from 1.8.0 to 1.8.1
-  * build(deps): bump github.com/hashicorp/go-multierror from 1.1.0 to 1.1.1
-  * Lookup Containerfile if user specifies a directory
-  * Add Tag format placeholder to docs
-  * copier: ignore sockets
-  * image: propagate errors from extractRootfs
-  * Remove system test of 'buildah containers -a'
-  * Clarify userns options are usable only as root in man pages
-  * Fix system test of 'containers -a'
-  * Remove duplicated code in addcopy
-  * build(deps): bump github.com/onsi/ginkgo from 1.15.0 to 1.15.1
-  * build(deps): bump github.com/onsi/gomega from 1.10.5 to 1.11.0
-  * build(deps): bump github.com/fsouza/go-dockerclient from 1.7.1 to 1.7.2
-  * Update multi-arch buildah build setup with new logic
-  * Update nix pin with `make nixpkgs`
-  * overlay.bats: fix the "overlay source permissions" test
-  * imagebuildah: use overlay for volumes when using overlay
-  * Make PolicyMap and PullPolicy names align
-  * copier: add GetOptions.IgnoreUnreadable
-  * Check local image to match system context
-  * fix: Containerfiles - smaller set of userns u/gids
-  * Set upperdir permissions based on source
-  * Shrink the vendoring size of pkc/cli
-  * Clarify image name match failure message
-  * ADD/COPY: create the destination directory first, chroot to it
-  * copier.GetOptions: add NoDerefSymLinks
-  * copier: add an Eval function
-  * Update system test for 'from --cap-add/drop'
-  * copier: fix a renaming bug
-  * copier: return child process stderr if we can't JSON decode the response
-  * Add some system tests
-  * build(deps): bump github.com/containers/storage from 1.26.0 to 1.27.0
-  * complement add/copy --chmod documentation
-  * buildah login and logout, do not need to enter user namespace
-  * Add multi-arch image build
-  * chmod/chown added/fixed in bash completions
-  * OWNERS: add @lsm5
-  * buildah add/copy --chmod dockerfile implementation
-  * bump github.com/openshift/imagebuilder from 1.1.8 to 1.2.0
-  * buildah add/copy --chmod cli implementation for files and urls
-  * Make sure we set the buildah version label
-  * Isolation strings, should match user input
-  * [CI:DOCS] buildah-from.md: remove dup arch,os
-  * build(deps): bump github.com/containers/image/v5 from 5.10.2 to 5.10.3
-  * Cirrus: Temp. disable prior-fedora (F32) testing
-  * pr-should-include-tests: recognized "renamed" tests
-  * build(deps): bump github.com/sirupsen/logrus from 1.7.0 to 1.8.0
-  * build(deps): bump github.com/fsouza/go-dockerclient from 1.7.0 to 1.7.1
-  * build(deps): bump github.com/containers/common from 0.34.2 to 0.35.0
-  * Fix reaping of stages with no instructions
-  * add stale bot
-  * Add base image name to comment
-  * build(deps): bump github.com/spf13/cobra from 1.1.1 to 1.1.3
-  * Don't fail copy to emptydir
-  * buildah: use volatile containers
-  * vendor: update containers/storage
-  * Eliminate the use of containers/building import in pkg subdirs
-  * Add more support for removing config
-  * Improve messages about --cache-from not being supported
-  * Revert patch to allow COPY/ADD of empty dirs.
-  * Don't fail copy to emptydir
-  * Fix tutorial for rootless mode
-  * Fix caching layers with build args
-  * Vendor in containers/image v5.10.2
-  * build(deps): bump github.com/containers/common from 0.34.0 to 0.34.2
-  * build(deps): bump github.com/onsi/ginkgo from 1.14.2 to 1.15.0
-  * 'make validate': require PRs to include tests
-  * build(deps): bump github.com/onsi/gomega from 1.10.4 to 1.10.5
-  * build(deps): bump github.com/containers/storage from 1.24.5 to 1.25.0
-  * Use chown function for U volume flag from containers/common repository
-  * --iidfile: print hash prefix
-  * bump containernetworking/cni to v0.8.1 - fix for CVE-2021-20206
-  * run: fix check for host pid namespace
-  * Finish plumbing for buildah bud --manifest
-  * buildah manifest add localimage should work
-  * Stop testing directory permissions with latest docker
-  * Fix build arg check
-  * build(deps): bump github.com/containers/ocicrypt from 1.0.3 to 1.1.0
-  * [ci:docs] Fix man page for buildah push
-  * Update nix pin with `make nixpkgs`
-  * Bump to containers/image v5.10.1
-  * Rebuild layer if a change in ARG is detected
-  * Bump golang.org/x/crypto to the latest
-  * Add Ashley and Urvashi to Approvers
-  * local image lookup by digest
-  * Use build-arg ENV val from local environment if set
-  * Pick default OCI Runtime from containers.conf
-  * Added required devel packages
-  * Cirrus: Native OSX Build
-  * Cirrus: Two minor cleanup items
-  * Workaround for RHEL gating test failure
-  * build(deps): bump github.com/stretchr/testify from 1.6.1 to 1.7.0
-  * build(deps): bump github.com/mattn/go-shellwords from 1.0.10 to 1.0.11
-  * Reset upstream branch to dev version
-  * If destination does not exists, do not throw error
+## v1.22.1 (2021-08-17)
+  * [release-1.22] Bump c/storage to v1.34.1
+  * Post-branch commit
+  * [release-1.22] Accept repositories on login/logout
+  * [CI:DOCS][release-1.22] Fix CHANGELOG.md

 ## v1.22.0 (2021-08-02)
    c/image, c/storage, c/common vendor before Podman 3.3 release
--- a/vendor/github.com/containers/buildah/Makefile
+++ b/vendor/github.com/containers/buildah/Makefile
@@ -171,7 +171,7 @@ test-unit: tests/testreport/testreport
 	$(GO_TEST) -v -tags "$(STORAGETAGS) $(SECURITYTAGS)" -cover -race ./cmd/buildah -args --root $$tmp/root --runroot $$tmp/runroot --storage-driver vfs --signature-policy $(shell pwd)/tests/policy.json --registries-conf $(shell pwd)/tests/registries.conf

 vendor-in-container:
-	podman run --privileged --rm --env HOME=/root -v `pwd`:/src -w /src docker.io/library/golang:1.13 make vendor
+	podman run --privileged --rm --env HOME=/root -v `pwd`:/src -w /src docker.io/library/golang:1.16 make vendor

 .PHONY: vendor
 vendor:
--- a/vendor/github.com/containers/buildah/changelog.txt
+++ b/vendor/github.com/containers/buildah/changelog.txt
@@ -1,3 +1,15 @@
+- Changelog for v1.22.3 (2021-08-20)
+  * [release-1.22] bump to v1.22.3
+
+- Changelog for v1.22.2 (2021-08-19)
+  * [release-1.22] bump c/image to v5.15.2
+
+- Changelog for v1.22.1 (2021-08-17)
+  * [release-1.22] Bump c/storage to v1.34.1
+  * Post-branch commit
+  * [release-1.22] Accept repositories on login/logout
+  * [CI:DOCS][release-1.22] Fix CHANGELOG.md
+
 - Changelog for v1.22.0 (2021-08-02)
  * c/image, c/storage, c/common vendor before Podman 3.3 release
  * WIP: tests: new assert()
--- a/vendor/github.com/containers/buildah/define/types.go
+++ b/vendor/github.com/containers/buildah/define/types.go
@@ -28,7 +28,7 @@ const (
 	Package = "buildah"
 	// Version for the Package.  Bump version in contrib/rpm/buildah.spec
 	// too.
-	Version = "1.22.0"
+	Version = "1.22.3"

 	// DefaultRuntime if containers.conf fails.
 	DefaultRuntime = "runc"
--- a/vendor/github.com/containers/buildah/go.mod
+++ b/vendor/github.com/containers/buildah/go.mod
@@ -5,9 +5,9 @@ go 1.12
 require (
 	github.com/containernetworking/cni v0.8.1
 	github.com/containers/common v0.42.1
-	github.com/containers/image/v5 v5.15.0
+	github.com/containers/image/v5 v5.15.2
 	github.com/containers/ocicrypt v1.1.2
-	github.com/containers/storage v1.33.1
+	github.com/containers/storage v1.34.1
 	github.com/docker/distribution v2.7.1+incompatible
 	github.com/docker/go-units v0.4.0
 	github.com/docker/libnetwork v0.8.0-dev.2.0.20190625141545-5a177b73e316
@@ -24,7 +24,7 @@ require (
 	github.com/opencontainers/runc v1.0.1
 	github.com/opencontainers/runtime-spec v1.0.3-0.20210326190908-1c3f411f0417
 	github.com/opencontainers/runtime-tools v0.9.0
-	github.com/opencontainers/selinux v1.8.2
+	github.com/opencontainers/selinux v1.8.4
 	github.com/openshift/imagebuilder v1.2.2-0.20210415181909-87f3e48c2656
 	github.com/pkg/errors v0.9.1
 	github.com/seccomp/libseccomp-golang v0.9.2-0.20200616122406-847368b35ebf
--- a/vendor/github.com/containers/buildah/go.sum
+++ b/vendor/github.com/containers/buildah/go.sum
@@ -53,8 +53,9 @@ github.com/Azure/go-autorest/autorest/mocks v0.4.0/go.mod h1:LTp+uSrOhSkaKrUy935
 github.com/Azure/go-autorest/autorest/mocks v0.4.1/go.mod h1:LTp+uSrOhSkaKrUy935gNZuuIPPVsHlr9DSOxSayd+k=
 github.com/Azure/go-autorest/logger v0.2.0/go.mod h1:T9E3cAhj2VqvPOtCYAvby9aBXkZmbF5NWuPV8+WeEW8=
 github.com/Azure/go-autorest/tracing v0.6.0/go.mod h1:+vhtPC754Xsa23ID7GlGsrdKBpUA79WCAKPPZVC2DeU=
-github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
+github.com/BurntSushi/toml v0.4.1 h1:GaI7EiDXDRfa8VshkTj7Fym7ha+y8/XxIgD2okUIjLw=
+github.com/BurntSushi/toml v0.4.1/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ=
 github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
 github.com/Microsoft/go-winio v0.4.11/go.mod h1:VhR8bwka0BXejwEJY73c50VrPtXAaKcyvVC4A4RozmA=
 github.com/Microsoft/go-winio v0.4.14/go.mod h1:qXqCSQ3Xa7+6tgxaGTIe4Kpcdsi+P8jBhyzoq1bpyYA=
@@ -226,8 +227,8 @@ github.com/containernetworking/plugins v0.9.1/go.mod h1:xP/idU2ldlzN6m4p5LmGiwRD
 github.com/containers/common v0.42.1 h1:ADOZrVAS8ZY5hBAvr/GoRoPv5Z7TBkxWgxQEXQjlqac=
 github.com/containers/common v0.42.1/go.mod h1:AaF3ipZfgezsctDuhzLkq4Vl+LkEy7J74ikh2HSXDsg=
 github.com/containers/image/v5 v5.14.0/go.mod h1:SxiBKOcKuT+4yTjD0AskjO+UwFvNcVOJ9qlAw1HNSPU=
-github.com/containers/image/v5 v5.15.0 h1:NduhN20ptHNlf0uRny5iTJa2OodB9SLMEB4hKKbzBBs=
-github.com/containers/image/v5 v5.15.0/go.mod h1:gzdBcooi6AFdiqfzirUqv90hUyHyI0MMdaqKzACKr2s=
+github.com/containers/image/v5 v5.15.2 h1:DKicmVr0h1HGkzs9muoErX+fVbV9sV9W5TyMy5perLE=
+github.com/containers/image/v5 v5.15.2/go.mod h1:8jejVSzTDfyPwr/HXp9rri34n/vbdavYk6IzTiB3TBw=
 github.com/containers/libtrust v0.0.0-20190913040956-14b96171aa3b h1:Q8ePgVfHDplZ7U33NwHZkrVELsZP5fYj9pM5WBZB2GE=
 github.com/containers/libtrust v0.0.0-20190913040956-14b96171aa3b/go.mod h1:9rfv8iPl1ZP7aqh9YA68wnZv2NUDbXdcdPHVz0pFbPY=
 github.com/containers/ocicrypt v1.0.1/go.mod h1:MeJDzk1RJHv89LjsH0Sp5KTY3ZYkjXO/C+bKAeWFIrc=
@@ -236,9 +237,9 @@ github.com/containers/ocicrypt v1.1.1/go.mod h1:Dm55fwWm1YZAjYRaJ94z2mfZikIyIN4B
 github.com/containers/ocicrypt v1.1.2 h1:Ez+GAMP/4GLix5Ywo/fL7O0nY771gsBIigiqUm1aXz0=
 github.com/containers/ocicrypt v1.1.2/go.mod h1:Dm55fwWm1YZAjYRaJ94z2mfZikIyIN4B0oB3dj3jFxY=
 github.com/containers/storage v1.32.6/go.mod h1:mdB+b89p+jU8zpzLTVXA0gWMmIo0WrkfGMh1R8O2IQw=
-github.com/containers/storage v1.33.0/go.mod h1:FUZPF4nJijX8ixdhByZJXf02cvbyLi6dyDwXdIe8QVY=
-github.com/containers/storage v1.33.1 h1:RHUPZ7vQxwoeOoMoKUDsVun4f9Wi8BTXmr/wQiruBYU=
 github.com/containers/storage v1.33.1/go.mod h1:FUZPF4nJijX8ixdhByZJXf02cvbyLi6dyDwXdIe8QVY=
+github.com/containers/storage v1.34.1 h1:PsBGMH7hwuQ3MOr7qTgPznFrE8ebfIbwQbg2gKvg0lE=
+github.com/containers/storage v1.34.1/go.mod h1:FY2TcbfgCLMU4lYoKnlZeZXeH353TOTbpDEA+sAcqAY=
 github.com/coreos/bbolt v1.3.2/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk=
 github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE=
 github.com/coreos/go-iptables v0.4.5/go.mod h1:/mVI274lEDI2ns62jHCDnCyBF9Iwsmekav8Dbxlm1MU=
@@ -514,8 +515,9 @@ github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI
 github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
 github.com/klauspost/compress v1.11.3/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs=
 github.com/klauspost/compress v1.11.13/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs=
-github.com/klauspost/compress v1.13.1 h1:wXr2uRxZTJXHLly6qhJabee5JqIhTRoLBhDOA74hDEQ=
 github.com/klauspost/compress v1.13.1/go.mod h1:8dP1Hq4DHOhN9w426knH3Rhby4rFm6D8eO+e+Dq5Gzg=
+github.com/klauspost/compress v1.13.4 h1:0zhec2I8zGnjWcKyLl6i3gPqKANCCn5e9xmviEEeX6s=
+github.com/klauspost/compress v1.13.4/go.mod h1:8dP1Hq4DHOhN9w426knH3Rhby4rFm6D8eO+e+Dq5Gzg=
 github.com/klauspost/pgzip v1.2.5 h1:qnWYvvKqedOF2ulHpMG72XQol4ILEJ8k2wwRl/Km8oE=
 github.com/klauspost/pgzip v1.2.5/go.mod h1:Ch1tH69qFZu15pkjo5kYi6mth2Zzwzt50oCQKQE9RUs=
 github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
@@ -649,8 +651,9 @@ github.com/opencontainers/runtime-tools v0.9.0 h1:FYgwVsKRI/H9hU32MJ/4MLOzXWodKK
 github.com/opencontainers/runtime-tools v0.9.0/go.mod h1:r3f7wjNzSs2extwzU3Y+6pKfobzPh+kKFJ3ofN+3nfs=
 github.com/opencontainers/selinux v1.6.0/go.mod h1:VVGKuOLlE7v4PJyT6h7mNWvq1rzqiriPsEqVhc+svHE=
 github.com/opencontainers/selinux v1.8.0/go.mod h1:RScLhm78qiWa2gbVCcGkC7tCGdgk3ogry1nUQF8Evvo=
-github.com/opencontainers/selinux v1.8.2 h1:c4ca10UMgRcvZ6h0K4HtS15UaVSBEaE+iln2LVpAuGc=
 github.com/opencontainers/selinux v1.8.2/go.mod h1:MUIHuUEvKB1wtJjQdOyYRgOnLD2xAPP8dBsCoU0KuF8=
+github.com/opencontainers/selinux v1.8.4 h1:krlgQ6/j9CkCXT5oW0yVXdQFOME3NjKuuAZXuR6O7P4=
+github.com/opencontainers/selinux v1.8.4/go.mod h1:HTvjPFoGMbpQsG886e3lQwnsRWtE4TC1OF3OUvG9FAo=
 github.com/openshift/imagebuilder v1.2.2-0.20210415181909-87f3e48c2656 h1:WaxyNFpmIDu4i6so9r6LVFIbSaXqsj8oitMitt86ae4=
 github.com/openshift/imagebuilder v1.2.2-0.20210415181909-87f3e48c2656/go.mod h1:9aJRczxCH0mvT6XQ+5STAQaPWz7OsWcU5/mRkt8IWeo=
 github.com/ostreedev/ostree-go v0.0.0-20190702140239-759a8c1ac913 h1:TnbXhKzrTOyuvWrjI8W6pcoI9XPbLHFXCdN2dtUw7Rw=
--- a/vendor/modules.txt
+++ b/vendor/modules.txt
@@ -78,7 +78,7 @@ github.com/containernetworking/plugins/pkg/utils/hwaddr
 github.com/containernetworking/plugins/pkg/utils/sysctl
 github.com/containernetworking/plugins/plugins/ipam/host-local/backend
 github.com/containernetworking/plugins/plugins/ipam/host-local/backend/allocator
-# github.com/containers/buildah v1.22.0
+# github.com/containers/buildah v1.22.3
 github.com/containers/buildah
 github.com/containers/buildah/bind
 github.com/containers/buildah/chroot