From 3c7c8560de28bb166fec4f2d11fe4e4bbb6e9678 Mon Sep 17 00:00:00 2001 From: Ashley Cui Date: Thu, 10 Aug 2023 13:58:29 -0400 Subject: [PATCH] Vendor buildah v1.31.2 Signed-off-by: Ashley Cui --- go.mod | 2 +- go.sum | 4 +- .../containers/buildah/.packit.yaml | 37 ++++++++++--------- .../containers/buildah/CHANGELOG.md | 8 ++++ .../containers/buildah/changelog.txt | 8 ++++ .../containers/buildah/define/types.go | 2 +- vendor/modules.txt | 2 +- 7 files changed, 41 insertions(+), 22 deletions(-) diff --git a/go.mod b/go.mod index 408295de9e..22e37c4cf0 100644 --- a/go.mod +++ b/go.mod @@ -12,7 +12,7 @@ require ( github.com/container-orchestrated-devices/container-device-interface v0.5.4 github.com/containernetworking/cni v1.1.2 github.com/containernetworking/plugins v1.3.0 - github.com/containers/buildah v1.31.0 + github.com/containers/buildah v1.31.2 github.com/containers/common v0.55.3 github.com/containers/conmon v2.0.20+incompatible github.com/containers/image/v5 v5.26.1 diff --git a/go.sum b/go.sum index 1885179946..9821e55f57 100644 --- a/go.sum +++ b/go.sum @@ -239,8 +239,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.0 h1:NgVtEyTsR7e/XLTSJElbInnGPjdDGNHqLKADPHzaUGg= -github.com/containers/buildah v1.31.0/go.mod h1:tcgXcGhqw3kw49RapUS7tskEhxKLG4eVFJKA/QzgwNU= +github.com/containers/buildah v1.31.2 h1:Pfbuzq5dtbLYtj95zDu1rLbVo9bnboknv18ZmlfXVA4= +github.com/containers/buildah v1.31.2/go.mod h1:EnrujxgRtUi0+2DrxXAzyQ/GybLliqT0+06PMLSTlvw= github.com/containers/common v0.55.3 h1:mhNQRU4OgW1wpmmKMFSYRn42+hr8SEVSPFdKML3WZik= github.com/containers/common v0.55.3/go.mod h1:ZKPllYOZ2xj2rgWRdnHHVvWg6ru4BT28En8mO8DMMPk= github.com/containers/conmon v2.0.20+incompatible h1:YbCVSFSCqFjjVwHTPINGdMX1F6JXHGTUje2ZYobNrkg= diff --git a/vendor/github.com/containers/buildah/.packit.yaml b/vendor/github.com/containers/buildah/.packit.yaml index 605dc55c89..80f8a05e48 100644 --- a/vendor/github.com/containers/buildah/.packit.yaml +++ b/vendor/github.com/containers/buildah/.packit.yaml @@ -2,38 +2,41 @@ # See the documentation for more information: # https://packit.dev/docs/configuration/ -# Build targets can be found at: -# https://copr.fedorainfracloud.org/coprs/rhcontainerbot/packit-builds/ -# and -# https://copr.fedorainfracloud.org/coprs/rhcontainerbot/podman-next/ - specfile_path: rpm/buildah.spec upstream_tag_template: v{version} +srpm_build_deps: + - make + jobs: - - &copr - job: copr_build + - job: copr_build trigger: pull_request - owner: rhcontainerbot - project: packit-builds + # keep in sync with https://copr.fedorainfracloud.org/coprs/rhcontainerbot/podman-next enable_net: true - srpm_build_deps: - - make + targets: + - fedora-all-x86_64 + - fedora-all-aarch64 + - fedora-eln-x86_64 + - fedora-eln-aarch64 + - centos-stream+epel-next-8-x86_64 + - centos-stream+epel-next-8-aarch64 + - centos-stream+epel-next-9-x86_64 + - centos-stream+epel-next-9-aarch64 + additional_repos: + - "copr://rhcontainerbot/podman-next" - - <<: *copr - # Run on commit to main branch + # Run on commit to main branch + - job: copr_build trigger: commit - branch: main + owner: rhcontainerbot project: podman-next + enable_net: true - job: propose_downstream trigger: release update_release: false dist_git_branches: - fedora-all - actions: - pre-sync: - - "bash rpm/update-spec-provides.sh" - job: koji_build trigger: commit diff --git a/vendor/github.com/containers/buildah/CHANGELOG.md b/vendor/github.com/containers/buildah/CHANGELOG.md index 9939d91c8c..6dbad20d5a 100644 --- a/vendor/github.com/containers/buildah/CHANGELOG.md +++ b/vendor/github.com/containers/buildah/CHANGELOG.md @@ -2,6 +2,14 @@ # Changelog +## v1.31.2 (2023-08-10) + [release-1.31] Bump to v1.31.2 + +## v1.31.1 (2023-08-09) + [release-1.31] Remove zstd:chunked from man, bump c/common to v0.55.3 + CI:BUILD] RPM: define gobuild macro for rhel/centos stream + [release-1.31] Bump c/common + ## 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/changelog.txt b/vendor/github.com/containers/buildah/changelog.txt index 53c00b4ddf..408e48fe83 100644 --- a/vendor/github.com/containers/buildah/changelog.txt +++ b/vendor/github.com/containers/buildah/changelog.txt @@ -1,3 +1,11 @@ +-Changelog for v1.31.2 (2023-08-10) + * [release-1.31] Bump to v1.31.2 + +- Changelog for v1.31.1 (2023-08-09) + *[release-1.31] Remove zstd:chunked from man, bump c/common to v0.55.3 + * CI:BUILD] RPM: define gobuild macro for rhel/centos stream + * [release-1.31] Bump c/common + - 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 53bbd5dd20..2c86df5a4b 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.31.0" + Version = "1.31.2" // DefaultRuntime if containers.conf fails. DefaultRuntime = "runc" diff --git a/vendor/modules.txt b/vendor/modules.txt index 41ee00324a..f86b2e179c 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -105,7 +105,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.0 +# github.com/containers/buildah v1.31.2 ## explicit; go 1.18 github.com/containers/buildah github.com/containers/buildah/bind