diff --git a/go.mod b/go.mod index c4e4e048..f0090125 100644 --- a/go.mod +++ b/go.mod @@ -3,7 +3,7 @@ module github.com/vanilla-os/abroot go 1.18 require ( - github.com/containers/buildah v1.31.1 + github.com/containers/buildah v1.31.2 github.com/containers/storage v1.48.0 github.com/shirou/gopsutil v3.21.11+incompatible github.com/spf13/cobra v1.7.0 @@ -28,7 +28,7 @@ require ( github.com/containerd/stargz-snapshotter/estargz v0.14.3 // indirect github.com/containernetworking/cni v1.1.2 // indirect github.com/containernetworking/plugins v1.3.0 // indirect - github.com/containers/common v0.55.2 // indirect + github.com/containers/common v0.55.3 // indirect github.com/containers/image/v5 v5.26.1 // indirect github.com/containers/libtrust v0.0.0-20230121012942-c1716e8a8d01 // indirect github.com/containers/ocicrypt v1.1.7 // indirect diff --git a/go.sum b/go.sum index 640c1c37..4cef4010 100644 --- a/go.sum +++ b/go.sum @@ -107,10 +107,10 @@ github.com/containernetworking/cni v1.1.2 h1:wtRGZVv7olUHMOqouPpn3cXJWpJgM6+EUl3 github.com/containernetworking/cni v1.1.2/go.mod h1:sDpYKmGVENF3s6uvMvGgldDWeG8dMxakj/u+i9ht9vw= 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 h1:4wYQW7sMupuWwXrK5aAU+DICYEm2oIBa2Wf6R7Lv9BY= -github.com/containers/buildah v1.31.1/go.mod h1:9XVi3wjyxjfzSL1Hqew7i93YGEGFwLRENvkfW6qBYyA= -github.com/containers/common v0.55.2 h1:Cd+vmkUPDrPvL2v4Te1Wew6SIZdn4/XiyiBRT9IbcGg= -github.com/containers/common v0.55.2/go.mod h1:ZKPllYOZ2xj2rgWRdnHHVvWg6ru4BT28En8mO8DMMPk= +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/image/v5 v5.26.1 h1:8y3xq8GO/6y8FR+nAedHPsAFiAtOrab9qHTBpbqaX8g= github.com/containers/image/v5 v5.26.1/go.mod h1:IwlOGzTkGnmfirXxt0hZeJlzv1zVukE03WZQ203Z9GA= github.com/containers/libtrust v0.0.0-20230121012942-c1716e8a8d01 h1:Qzk5C6cYglewc+UyGf6lc8Mj2UaPTHy/iF2De0/77CA= diff --git a/vendor/github.com/containers/buildah/.packit.yaml b/vendor/github.com/containers/buildah/.packit.yaml index 605dc55c..80f8a05e 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 9939d91c..6dbad20d 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 53c00b4d..408e48fe 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 53bbd5dd..2c86df5a 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/github.com/containers/common/pkg/config/config.go b/vendor/github.com/containers/common/pkg/config/config.go index a408b4fd..b5f95011 100644 --- a/vendor/github.com/containers/common/pkg/config/config.go +++ b/vendor/github.com/containers/common/pkg/config/config.go @@ -51,7 +51,7 @@ const ( BoltDBStateStore RuntimeStateStore = iota ) -var validImageVolumeModes = []string{"bind", "tmpfs", "ignore"} +var validImageVolumeModes = []string{_typeBind, "tmpfs", "ignore"} // ProxyEnv is a list of Proxy Environment variables var ProxyEnv = []string{ diff --git a/vendor/github.com/containers/common/pkg/config/config_darwin.go b/vendor/github.com/containers/common/pkg/config/config_darwin.go index 18c46621..eb83733d 100644 --- a/vendor/github.com/containers/common/pkg/config/config_darwin.go +++ b/vendor/github.com/containers/common/pkg/config/config_darwin.go @@ -14,6 +14,9 @@ const ( // DefaultSignaturePolicyPath is the default value for the // policy.json file. DefaultSignaturePolicyPath = "/etc/containers/policy.json" + + // Mount type for mounting host dir + _typeBind = "bind" ) // podman remote clients on darwin cannot use unshare.isRootless() to determine the configuration file locations. diff --git a/vendor/github.com/containers/common/pkg/config/config_freebsd.go b/vendor/github.com/containers/common/pkg/config/config_freebsd.go index 903f0b47..48bb0994 100644 --- a/vendor/github.com/containers/common/pkg/config/config_freebsd.go +++ b/vendor/github.com/containers/common/pkg/config/config_freebsd.go @@ -14,6 +14,9 @@ const ( // DefaultSignaturePolicyPath is the default value for the // policy.json file. DefaultSignaturePolicyPath = "/usr/local/etc/containers/policy.json" + + // Mount type for mounting host dir + _typeBind = "nullfs" ) // podman remote clients on freebsd cannot use unshare.isRootless() to determine the configuration file locations. diff --git a/vendor/github.com/containers/common/pkg/config/config_linux.go b/vendor/github.com/containers/common/pkg/config/config_linux.go index 4ce5d032..f294402a 100644 --- a/vendor/github.com/containers/common/pkg/config/config_linux.go +++ b/vendor/github.com/containers/common/pkg/config/config_linux.go @@ -17,6 +17,9 @@ const ( // DefaultSignaturePolicyPath is the default value for the // policy.json file. DefaultSignaturePolicyPath = "/etc/containers/policy.json" + + // Mount type for mounting host dir + _typeBind = "bind" ) func selinuxEnabled() bool { diff --git a/vendor/github.com/containers/common/pkg/config/config_windows.go b/vendor/github.com/containers/common/pkg/config/config_windows.go index b5838072..67f0aab2 100644 --- a/vendor/github.com/containers/common/pkg/config/config_windows.go +++ b/vendor/github.com/containers/common/pkg/config/config_windows.go @@ -12,6 +12,9 @@ const ( // DefaultSignaturePolicyPath is the default value for the // policy.json file. DefaultSignaturePolicyPath = "/etc/containers/policy.json" + + // Mount type for mounting host dir + _typeBind = "bind" ) // podman remote clients on windows cannot use unshare.isRootless() to determine the configuration file locations. diff --git a/vendor/github.com/containers/common/pkg/config/containers.conf b/vendor/github.com/containers/common/pkg/config/containers.conf index ec881f2f..a106fd68 100644 --- a/vendor/github.com/containers/common/pkg/config/containers.conf +++ b/vendor/github.com/containers/common/pkg/config/containers.conf @@ -377,7 +377,7 @@ default_sysctls = [ #active_service = "production" # The compression format to use when pushing an image. -# Valid options are: `gzip`, `zstd` and `zstd:chunked`. +# Valid options are: `gzip` and `zstd`. # #compression_format = "gzip" diff --git a/vendor/github.com/containers/common/pkg/config/containers.conf-freebsd b/vendor/github.com/containers/common/pkg/config/containers.conf-freebsd index 5e187893..10586d60 100644 --- a/vendor/github.com/containers/common/pkg/config/containers.conf-freebsd +++ b/vendor/github.com/containers/common/pkg/config/containers.conf-freebsd @@ -307,7 +307,7 @@ default_sysctls = [ #active_service = production # The compression format to use when pushing an image. -# Valid options are: `gzip`, `zstd` and `zstd:chunked`. +# Valid options are: `gzip` and `zstd`. # #compression_format = "gzip" diff --git a/vendor/github.com/containers/common/pkg/config/default.go b/vendor/github.com/containers/common/pkg/config/default.go index 12792099..98533576 100644 --- a/vendor/github.com/containers/common/pkg/config/default.go +++ b/vendor/github.com/containers/common/pkg/config/default.go @@ -28,7 +28,7 @@ const ( _defaultTransport = "docker://" // _defaultImageVolumeMode is a mode to handle built-in image volumes. - _defaultImageVolumeMode = "bind" + _defaultImageVolumeMode = _typeBind ) var ( diff --git a/vendor/github.com/containers/common/version/version.go b/vendor/github.com/containers/common/version/version.go index 71d6aafa..0831bdea 100644 --- a/vendor/github.com/containers/common/version/version.go +++ b/vendor/github.com/containers/common/version/version.go @@ -1,4 +1,4 @@ package version // Version is the version of the build. -const Version = "0.55.2" +const Version = "0.55.3" diff --git a/vendor/modules.txt b/vendor/modules.txt index f81f9467..3492682b 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -102,7 +102,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 +# github.com/containers/buildah v1.31.2 ## explicit; go 1.18 github.com/containers/buildah github.com/containers/buildah/bind @@ -123,7 +123,7 @@ github.com/containers/buildah/pkg/rusage github.com/containers/buildah/pkg/sshagent github.com/containers/buildah/pkg/util github.com/containers/buildah/util -# github.com/containers/common v0.55.2 +# github.com/containers/common v0.55.3 ## explicit; go 1.18 github.com/containers/common/libimage github.com/containers/common/libimage/define