buildah-1.18.0-0.24.dev.gitd3a01d0.el9

- update to https://github.com/containers/buildah/releases/tag/v1.18.0

Signed-off-by: Jindrich Novy <jnovy@redhat.com>
This commit is contained in:
Jindrich Novy 2020-11-23 09:55:20 +01:00
parent 2a992c9bcd
commit f26ad45d4b
5 changed files with 135 additions and 618 deletions

512
.gitignore vendored
View File

@ -1,511 +1 @@
/buildah-a0a5333.tar.gz
/buildah-597d2ab.tar.gz
/buildah-ac2aad6.tar.gz
/buildah-b37a981.tar.gz
/buildah-b9b2a8a.tar.gz
/buildah-9cbccf8.tar.gz
/buildah-35afa1c.tar.gz
/buildah-f7dc659.tar.gz
/buildah-de0fb93.tar.gz
/buildah-b7e3320.tar.gz
/buildah-bf40000.tar.gz
/buildah-04ea079.tar.gz
/buildah-979c945.tar.gz
/buildah-129fb10.tar.gz
/buildah-6bad262.tar.gz
/buildah-8badcc2.tar.gz
/buildah-ef0ca9c.tar.gz
/buildah-d1330a5.tar.gz
/buildah-82529cd.tar.gz
/buildah-4339223.tar.gz
/buildah-83d7d10.tar.gz
/buildah-6421399.tar.gz
/buildah-45a4b81.tar.gz
/buildah-28a27a3.tar.gz
/buildah-e008b73.tar.gz
/buildah-d84f05a.tar.gz
/buildah-b16a1ea.tar.gz
/buildah-fdc3998.tar.gz
/buildah-49abf82.tar.gz
/buildah-ca1704f.tar.gz
/buildah-c50c287.tar.gz
/buildah-adb8e6f.tar.gz
/buildah-e130f2b.tar.gz
/buildah-a4f5707.tar.gz
/buildah-6fe2b55.tar.gz
/buildah-45772e8.tar.gz
/buildah-dd02e70.tar.gz
/buildah-1ab80bc.tar.gz
/buildah-906ee37.tar.gz
/buildah-fe204e4.tar.gz
/buildah-2ea3e11.tar.gz
/buildah-b9a1041.tar.gz
/buildah-ce8d467.tar.gz
/buildah-8515867.tar.gz
/buildah-3e320b9.tar.gz
/buildah-2749191.tar.gz
/buildah-25f4e8e.tar.gz
/buildah-88affbd.tar.gz
/buildah-ebb0d8e.tar.gz
/buildah-5595d4d.tar.gz
/buildah-73bfd79.tar.gz
/buildah-03686e5.tar.gz
/buildah-70641ee.tar.gz
/buildah-f90b6c0.tar.gz
/buildah-d3d097b.tar.gz
/buildah-c306342.tar.gz
/buildah-f449b28.tar.gz
/buildah-fbf46d3.tar.gz
/buildah-b9983a6.tar.gz
/buildah-94c1e6d.tar.gz
/buildah-6c4bef7.tar.gz
/buildah-73820fc.tar.gz
/buildah-fc438bb.tar.gz
/buildah-93d8606.tar.gz
/buildah-2064b29.tar.gz
/buildah-da7be32.tar.gz
/buildah-2441ff4.tar.gz
/buildah-0143a44.tar.gz
/buildah-2ac95ea.tar.gz
/buildah-16a33bd.tar.gz
/buildah-146c185.tar.gz
/buildah-1acccce.tar.gz
/buildah-b965fc4.tar.gz
/buildah-704adec.tar.gz
/buildah-6f72599.tar.gz
/buildah-5cd9be6.tar.gz
/buildah-5c11c34.tar.gz
/buildah-a59fb7a.tar.gz
/buildah-733cd20.tar.gz
/buildah-a885bc6.tar.gz
/buildah-8be2b62.tar.gz
/buildah-3fb864b.tar.gz
/buildah-a9895bd.tar.gz
/buildah-1215b16.tar.gz
/buildah-826733a.tar.gz
/buildah-e5f7539.tar.gz
/buildah-4976d8c.tar.gz
/buildah-c18724e.tar.gz
/buildah-be03809.tar.gz
/buildah-02f54e4.tar.gz
/buildah-0a7389c.tar.gz
/buildah-87239ae.tar.gz
/buildah-7341758.tar.gz
/buildah-0ae8b51.tar.gz
/buildah-74e0b6f.tar.gz
/buildah-9add3c8.tar.gz
/buildah-fb2b2bd.tar.gz
/buildah-dac7819.tar.gz
/buildah-d7e0993.tar.gz
/buildah-18309de.tar.gz
/buildah-c9cb148.tar.gz
/buildah-2ac987a.tar.gz
/buildah-25d89b4.tar.gz
/buildah-d5a3c52.tar.gz
/buildah-4126176.tar.gz
/buildah-93d8b9f.tar.gz
/buildah-6e00183.tar.gz
/buildah-2b582d3.tar.gz
/buildah-b68a8e1.tar.gz
/buildah-9c65e56.tar.gz
/buildah-01f9ae2.tar.gz
/buildah-5cca1d6.tar.gz
/buildah-9c1d273.tar.gz
/buildah-1e1dc14.tar.gz
/buildah-dd0f4f1.tar.gz
/buildah-90ea890.tar.gz
/buildah-de7f480.tar.gz
/buildah-96c68db.tar.gz
/buildah-dd3dff5.tar.gz
/buildah-4674656.tar.gz
/buildah-eebbba2.tar.gz
/buildah-e55a9f3.tar.gz
/buildah-579f1d5.tar.gz
/buildah-8f05aa6.tar.gz
/buildah-bb710f3.tar.gz
/buildah-a4200ae.tar.gz
/buildah-48b44e5.tar.gz
/buildah-169a923.tar.gz
/buildah-1ef527c.tar.gz
/buildah-5d22f3c.tar.gz
/buildah-f6a0258.tar.gz
/buildah-fa86533.tar.gz
/buildah-fe7e09c.tar.gz
/buildah-d7e530e.tar.gz
/buildah-66ff1dd.tar.gz
/buildah-0f114e9.tar.gz
/buildah-5f95bd9.tar.gz
/buildah-7a85ca7.tar.gz
/buildah-9b9ed1d.tar.gz
/buildah-4bcddb7.tar.gz
/buildah-f1cec50.tar.gz
/buildah-e702872.tar.gz
/buildah-03f6247.tar.gz
/buildah-973bb88.tar.gz
/buildah-ad24f28.tar.gz
/buildah-50539b5.tar.gz
/buildah-310363c.tar.gz
/buildah-711f9ea.tar.gz
/buildah-e4c4d46.tar.gz
/buildah-40d4d59.tar.gz
/buildah-80fcb24.tar.gz
/buildah-146a0fc.tar.gz
/buildah-1b02a7e.tar.gz
/buildah-db6e7bb.tar.gz
/buildah-873f001.tar.gz
/buildah-8c3d8b1.tar.gz
/buildah-6c1a4cc.tar.gz
/buildah-95a5089.tar.gz
/buildah-8b1d11f.tar.gz
/buildah-11dd219.tar.gz
/buildah-3afba37.tar.gz
/buildah-0a8ec97.tar.gz
/buildah-984ea9b.tar.gz
/buildah-36605c2.tar.gz
/buildah-3ba8822.tar.gz
/buildah-3b497ff.tar.gz
/buildah-c691d09.tar.gz
/buildah-a986f34.tar.gz
/buildah-1ba9201.tar.gz
/buildah-9d6da3a.tar.gz
/buildah-be0c8d2.tar.gz
/buildah-c6ae5c5.tar.gz
/buildah-d1c75ea.tar.gz
/buildah-03fae01.tar.gz
/buildah-3d74031.tar.gz
/buildah-c933fe4.tar.gz
/buildah-a9bd025.tar.gz
/buildah-13d9142.tar.gz
/buildah-9e1967a.tar.gz
/buildah-ac66d78.tar.gz
/buildah-29a6c81.tar.gz
/buildah-25b7c11.tar.gz
/buildah-610eb7a.tar.gz
/buildah-021d607.tar.gz
/buildah-316bd0a.tar.gz
/buildah-d43787b.tar.gz
/buildah-fcc12bd.tar.gz
/buildah-d8fe400.tar.gz
/buildah-e879079.tar.gz
/buildah-135542e.tar.gz
/buildah-2f0179f.tar.gz
/buildah-b466cbd.tar.gz
/buildah-bdbedfd.tar.gz
/buildah-ddbd805.tar.gz
/buildah-0e30da6.tar.gz
/buildah-78fb869.tar.gz
/buildah-59da11d.tar.gz
/buildah-e9184ea.tar.gz
/buildah-c654b18.tar.gz
/buildah-ab8678a.tar.gz
/buildah-74a3195.tar.gz
/buildah-7ae362b.tar.gz
/buildah-4c6b09c.tar.gz
/buildah-c0633e3.tar.gz
/buildah-63808f9.tar.gz
/buildah-3bf8547.tar.gz
/buildah-7793c51.tar.gz
/buildah-bcc5e51.tar.gz
/buildah-bc9c276.tar.gz
/buildah-00f5164.tar.gz
/buildah-4e1ca7c.tar.gz
/buildah-8e48a65.tar.gz
/buildah-ed77a92.tar.gz
/buildah-fa7f030.tar.gz
/buildah-2a962f1.tar.gz
/buildah-53be3d3.tar.gz
/buildah-3104ddf.tar.gz
/buildah-7016ce6.tar.gz
/buildah-a086ec8.tar.gz
/buildah-aa06a77.tar.gz
/buildah-e0306bb.tar.gz
/buildah-ad4f235.tar.gz
/buildah-2da8755.tar.gz
/buildah-d172dd9.tar.gz
/buildah-4ae0a69.tar.gz
/buildah-78dcf2f.tar.gz
/buildah-dcbf193.tar.gz
/buildah-2191ba6.tar.gz
/buildah-dc7b50c.tar.gz
/buildah-77fa9dd.tar.gz
/buildah-0b84b23.tar.gz
/buildah-2c4f388.tar.gz
/buildah-c22957b.tar.gz
/buildah-07aaf5e.tar.gz
/buildah-1d11851.tar.gz
/buildah-e160a63.tar.gz
/buildah-5d723ff.tar.gz
/buildah-d419737.tar.gz
/buildah-2249ba3.tar.gz
/buildah-bb5cbf1.tar.gz
/buildah-16e3010.tar.gz
/buildah-b33b87b.tar.gz
/buildah-be51b9b.tar.gz
/buildah-8da4cb4.tar.gz
/buildah-4ae0e14.tar.gz
/buildah-5da3c8c.tar.gz
/buildah-d7dec37.tar.gz
/buildah-2110f05.tar.gz
/buildah-555b5a5.tar.gz
/buildah-6bd0551.tar.gz
/buildah-73401a4.tar.gz
/buildah-6b214d2.tar.gz
/buildah-a74bdd3.tar.gz
/buildah-4ccb343.tar.gz
/buildah-5bab9b0.tar.gz
/buildah-b7a0ed0.tar.gz
/buildah-677b771.tar.gz
/buildah-c00f548.tar.gz
/buildah-4d017d6.tar.gz
/buildah-3117f5e.tar.gz
/buildah-ac5031d.tar.gz
/buildah-1de958d.tar.gz
/buildah-232f7c6.tar.gz
/buildah-bafcf88.tar.gz
/buildah-03aa807.tar.gz
/buildah-f4cfe9c.tar.gz
/buildah-95cb061.tar.gz
/buildah-f892eb6.tar.gz
/buildah-c953216.tar.gz
/buildah-60c0088.tar.gz
/buildah-60d5480.tar.gz
/buildah-0dfb6f5.tar.gz
/buildah-7180312.tar.gz
/buildah-96a136e.tar.gz
/buildah-2df08f0.tar.gz
/buildah-a99139c.tar.gz
/buildah-3f5436f.tar.gz
/buildah-5c98d3c.tar.gz
/buildah-d88c26b.tar.gz
/buildah-1ce1130.tar.gz
/buildah-ab0286f.tar.gz
/buildah-36dcedb.tar.gz
/buildah-ebf6f51.tar.gz
/buildah-c2c52ba.tar.gz
/buildah-51415ec.tar.gz
/buildah-c1a2d4f.tar.gz
/buildah-b288b7a.tar.gz
/buildah-fa68ed6.tar.gz
/buildah-3ad937b.tar.gz
/buildah-5a1c733.tar.gz
/buildah-376e52e.tar.gz
/buildah-ff72568.tar.gz
/buildah-6b5f8ba.tar.gz
/buildah-689f8ed.tar.gz
/buildah-5671417.tar.gz
/buildah-ecf5b72.tar.gz
/buildah-e930951.tar.gz
/buildah-57db70c.tar.gz
/buildah-1a1a728.tar.gz
/buildah-15773bd.tar.gz
/buildah-b643073.tar.gz
/buildah-cc80ccc.tar.gz
/buildah-34f1ae6.tar.gz
/buildah-4da1d5d.tar.gz
/buildah-9f2a682.tar.gz
/buildah-3f6ad0f.tar.gz
/buildah-f54c965.tar.gz
/buildah-9bf6b5e.tar.gz
/buildah-20a33e0.tar.gz
/buildah-9cac447.tar.gz
/buildah-4ce6fba.tar.gz
/buildah-10b0e7a.tar.gz
/buildah-e9969bc.tar.gz
/buildah-6abc01c.tar.gz
/buildah-d2c1fd8.tar.gz
/buildah-04150e0.tar.gz
/buildah-c3b1ec6.tar.gz
/buildah-61e32a5.tar.gz
/buildah-a32fc96.tar.gz
/buildah-d3d9cec.tar.gz
/buildah-fc06a4d.tar.gz
/buildah-bf04bf1.tar.gz
/buildah-cf933c8.tar.gz
/buildah-e2c33f3.tar.gz
/buildah-c771c56.tar.gz
/buildah-96f9993.tar.gz
/buildah-e400691.tar.gz
/buildah-f50b55d.tar.gz
/buildah-b298906.tar.gz
/buildah-797e618.tar.gz
/buildah-7a7e1f0.tar.gz
/buildah-13330a4.tar.gz
/buildah-68b2aa5.tar.gz
/buildah-d6f11ba.tar.gz
/buildah-389d49b.tar.gz
/buildah-0f7148b.tar.gz
/buildah-120c37f.tar.gz
/buildah-1d3db17.tar.gz
/buildah-049fdf4.tar.gz
/buildah-fa4eec7.tar.gz
/buildah-cddb66e.tar.gz
/buildah-691c394.tar.gz
/buildah-c2dc46a.tar.gz
/buildah-66701d4.tar.gz
/buildah-b023cde.tar.gz
/buildah-751f92e.tar.gz
/buildah-999fa43.tar.gz
/buildah-eaad6b4.tar.gz
/buildah-1ff7043.tar.gz
/buildah-8e26456.tar.gz
/buildah-332a889.tar.gz
/buildah-141b5a1.tar.gz
/buildah-20e92ff.tar.gz
/buildah-1967973.tar.gz
/buildah-fba62fd.tar.gz
/buildah-ec970d5.tar.gz
/buildah-89bc2a6.tar.gz
/buildah-147d106.tar.gz
/buildah-f995696.tar.gz
/buildah-a880001.tar.gz
/buildah-e3bb278.tar.gz
/buildah-7535655.tar.gz
/buildah-85ab067.tar.gz
/buildah-985e8dc.tar.gz
/buildah-c5244fe.tar.gz
/buildah-9ff68b3.tar.gz
/buildah-6a555a0.tar.gz
/buildah-1e6a70c.tar.gz
/buildah-cd88667.tar.gz
/buildah-92ff215.tar.gz
/buildah-8fd3148.tar.gz
/buildah-4cf37c2.tar.gz
/buildah-ed0a329.tar.gz
/buildah-d55a9f8.tar.gz
/buildah-357d4ae.tar.gz
/buildah-2a82d07.tar.gz
/buildah-e47145c.tar.gz
/buildah-c038827.tar.gz
/buildah-8fc5b01.tar.gz
/buildah-8d6869b.tar.gz
/buildah-bc8feee.tar.gz
/buildah-70b101f.tar.gz
/buildah-db59421.tar.gz
/buildah-e28c43d.tar.gz
/buildah-068b6f5.tar.gz
/buildah-acc7c35.tar.gz
/buildah-0662a4e.tar.gz
/buildah-188269a.tar.gz
/buildah-2959a6b.tar.gz
/buildah-e6815a1.tar.gz
/buildah-9588a82.tar.gz
/buildah-41b7852.tar.gz
/buildah-6941254.tar.gz
/buildah-726e24d.tar.gz
/buildah-8d41b83.tar.gz
/buildah-c42f440.tar.gz
/buildah-20c2a54.tar.gz
/buildah-d792c70.tar.gz
/buildah-45543bf.tar.gz
/buildah-dbec497.tar.gz
/buildah-e7be041.tar.gz
/buildah-b555b7d.tar.gz
/buildah-a3dec02.tar.gz
/buildah-47ce18b.tar.gz
/buildah-55fa8f5.tar.gz
/buildah-4e23b7a.tar.gz
/buildah-3af1491.tar.gz
/buildah-9def9c0.tar.gz
/buildah-f7731c2.tar.gz
/buildah-b7e6731.tar.gz
/buildah-720e5d6.tar.gz
/buildah-bf14e6c.tar.gz
/buildah-09d1c24.tar.gz
/buildah-b09fdc3.tar.gz
/buildah-c46f6e0.tar.gz
/buildah-ca0819f.tar.gz
/buildah-a925f79.tar.gz
/buildah-2055fe9.tar.gz
/buildah-0c3234f.tar.gz
/buildah-6417a9a.tar.gz
/buildah-6e277a2.tar.gz
/buildah-ec4bbe6.tar.gz
/buildah-0a063c4.tar.gz
/buildah-82ff48a.tar.gz
/buildah-4131dfa.tar.gz
/buildah-3177db5.tar.gz
/buildah-f89b081.tar.gz
/buildah-f1cf92b.tar.gz
/buildah-843d15d.tar.gz
/buildah-665dc2f.tar.gz
/buildah-10542ed.tar.gz
/buildah-3b9c6a3.tar.gz
/buildah-aba0d4d.tar.gz
/buildah-c61925b.tar.gz
/buildah-a5fabab.tar.gz
/buildah-e54da62.tar.gz
/buildah-e48ff81.tar.gz
/buildah-11ad04e.tar.gz
/buildah-d3804fa.tar.gz
/buildah-c18e043.tar.gz
/buildah-17ceb60.tar.gz
/buildah-1db2cde.tar.gz
/buildah-25c294c.tar.gz
/buildah-912ca5a.tar.gz
/buildah-2fc064e.tar.gz
/buildah-e9a6703.tar.gz
/buildah-31a01b4.tar.gz
/buildah-9c031e0.tar.gz
/buildah-20e41b7.tar.gz
/buildah-c3070ba.tar.gz
/buildah-310c02b.tar.gz
/buildah-f5dbfc1.tar.gz
/buildah-c554675.tar.gz
/buildah-e48fa75.tar.gz
/buildah-f7ff4c1.tar.gz
/buildah-7a88d7e.tar.gz
/buildah-c404c89.tar.gz
/buildah-db3ced9.tar.gz
/buildah-81e2659.tar.gz
/buildah-f4970e6.tar.gz
/buildah-0d5ab1d.tar.gz
/buildah-0b9a534.tar.gz
/buildah-bea8692.tar.gz
/buildah-8169acd.tar.gz
/buildah-3af27b4.tar.gz
/buildah-63567cb.tar.gz
/buildah-42a48f9.tar.gz
/buildah-f35e7d4.tar.gz
/buildah-7b0dfb8.tar.gz
/buildah-7610123.tar.gz
/buildah-828035f.tar.gz
/buildah-b438050.tar.gz
/buildah-6a7ace0.tar.gz
/buildah-f80da42.tar.gz
/buildah-0f6c2a9.tar.gz
/buildah-3184920.tar.gz
/buildah-9bd70ac.tar.gz
/buildah-7957c13.tar.gz
/buildah-4fc49ce.tar.gz
/buildah-ab1adf1.tar.gz
/buildah-75e94a2.tar.gz
/buildah-de0f541.tar.gz
/buildah-dbf0777.tar.gz
/buildah-0ac2a67.tar.gz
/buildah-f7a3515.tar.gz
/buildah-2c46b4b.tar.gz
/buildah-ac0182c.tar.gz
/buildah-fce9668.tar.gz
/buildah-58e6b4f.tar.gz
/buildah-28d7d44.tar.gz
/buildah-d83657c.tar.gz
/buildah-49a5768.tar.gz
/buildah-555eb26.tar.gz
/buildah-2928303.tar.gz
/buildah-bfe6da5.tar.gz
/buildah-efc5ec2.tar.gz
/buildah-aa3128e.tar.gz
/buildah-33768fc.tar.gz
/buildah-1f8bf4d.tar.gz
/buildah-b47ffb9.tar.gz
/buildah-d0f43a0.tar.gz
/buildah-552cbd3.tar.gz
/buildah-17bb22f.tar.gz
/buildah-58541a3.tar.gz
/buildah-678da1d.tar.gz
/buildah-411a885.tar.gz
/buildah-d273b9e.tar.gz
/buildah-0f4a259.tar.gz
/buildah-f2f857a.tar.gz
/buildah-0e06e45.tar.gz
/buildah-b3f6ed8.tar.gz
/*.tar.gz

View File

@ -1,76 +1,55 @@
%global with_bundled 1
%if 0%{?fedora}
%global with_debug 1
%else
%global with_debug 0
%endif
%global with_bundled 1
%if 0%{?with_debug}
%global _find_debuginfo_dwz_opts %{nil}
%global _dwz_low_mem_die_limit 0
%else
%global debug_package %{nil}
%global debug_package %{nil}
%endif
%if 0%{?rhel} > 7 && ! 0%{?fedora}
%define gobuild(o:) \
go build -buildmode pie -compiler gc -tags="rpm_crashtraceback libtrust_openssl ${BUILDTAGS:-}" -ldflags "${LDFLAGS:-} -compressdwarf=false -B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \\n') -extldflags '%__global_ldflags'" -a -v -x %{?**};
%else
%if ! 0%{?gobuild:1}
%define gobuild(o:) GO111MODULE=off go build -buildmode pie -compiler gc -tags="rpm_crashtraceback ${BUILDTAGS:-}" -ldflags "${LDFLAGS:-} -B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \\n') -extldflags '-Wl,-z,relro -Wl,-z,now -specs=/usr/lib/rpm/redhat/redhat-hardened-ld '" -a -v -x %{?**};
%endif
%endif
%global provider github
%global provider_tld com
%global project containers
%global repo buildah
# https://github.com/containers/buildah
%global import_path %{provider}.%{provider_tld}/%{project}/%{repo}
%global git0 https://%{import_path}
%global commit0 b3f6ed83a51034d6d7ad95b2adf1fac4b506d53b
%global import_path github.com/containers/buildah
#%%global branch release-1.16
%global commit0 d3a01d0041789ab5967acd04f5c4501a0ba78f64
%global shortcommit0 %(c=%{commit0}; echo ${c:0:7})
# Used for comparing with latest upstream tag
# to decide whether to autobuild (non-rawhide only)
%define built_tag v1.16.2
%define built_tag_strip %(b=%{built_tag}; echo ${b:1})
%define download_url https://%{import_path}/archive/%{built_tag}.tar.gz
Name: %{repo}
Version: 1.17.0
Release: 0.23.dev.git%{shortcommit0}%{?dist}
Name: buildah
Version: 1.18.0
Release: 1%{?dist}
Summary: A command line tool used for creating OCI Images
License: ASL 2.0
URL: https://%{name}.io
Source: %{git0}/archive/%{commit0}/%{name}-%{shortcommit0}.tar.gz
BuildRequires: device-mapper-devel
BuildRequires: golang
# Build fails with: No matching package to install: 'golang >= 1.12.12-4' on i686
ExcludeArch: i686
%if 0%{?branch:1}
Source0: https://%{import_path}/tarball/%{commit0}/%{branch}-%{shortcommit0}.tar.gz
%else
Source0: https://%{import_path}/archive/%{commit0}/%{name}-%{version}-%{shortcommit0}.tar.gz
%endif
BuildRequires: golang >= 1.12.12-4
BuildRequires: git
BuildRequires: glib2-devel
BuildRequires: libseccomp-devel
BuildRequires: ostree-devel
BuildRequires: glibc-static
BuildRequires: go-md2man
BuildRequires: gpgme-devel
BuildRequires: device-mapper-devel
BuildRequires: libassuan-devel
BuildRequires: make
Requires: runc >= 1.0.0-26
Requires: containers-common
# No ostree for centos 7
%if 0%{?fedora} || 0%{?centos} >= 8
BuildRequires: ostree-devel
%endif
# No btrfs for centos 8
%if 0%{?fedora} || 0%{?centos} <= 7
BuildRequires: btrfs-progs-devel
%endif
%if 0%{?fedora}
BuildRequires: libseccomp-static
Requires: libseccomp >= 2.4.1-0
Requires: crun >= 0.10-1
Recommends: container-selinux
Recommends: slirp4netns >= 0.3-0
Recommends: fuse-overlayfs
%else
BuildRequires: libseccomp-devel
Requires: libseccomp
Requires: container-selinux
Requires: slirp4netns >= 0.3-0
%endif
%description
The %{name} package provides a command line tool which can be used to
@ -83,15 +62,11 @@ or
%package tests
Summary: Tests for %{name}
Requires: %{name} = %{version}-%{release}
Requires: bats
Requires: bzip2
Requires: podman
Requires: golang
Requires: jq
Requires: httpd-tools
Requires: openssl
%description tests
%{summary}
@ -99,36 +74,39 @@ Requires: openssl
This package contains system tests for %{name}
%prep
%if 0%{?branch:1}
%autosetup -Sgit -n containers-%{name}-%{shortcommit0}
%else
%autosetup -Sgit -n %{name}-%{commit0}
%endif
sed -i 's/GOMD2MAN =/GOMD2MAN ?=/' docs/Makefile
sed -i '/docs install/d' Makefile
%build
mkdir _build
pushd _build
mkdir -p src/%{provider}.%{provider_tld}/%{project}
mkdir -p src/github.com/containers
ln -s $(dirs +1 -l) src/%{import_path}
popd
mv vendor src
export GOPATH=$(pwd)/_build:$(pwd)
export BUILDTAGS='seccomp selinux'
%if 0%{?centos} >= 8
export BUILDTAGS+=' exclude_graphdriver_btrfs'
%endif
export BUILDTAGS='seccomp selinux btrfs_noversion exclude_graphdriver_btrfs'
export GO111MODULE=off
export CGO_CFLAGS="%{optflags} -D_GNU_SOURCE -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64"
rm -f src/github.com/containers/storage/drivers/register/register_btrfs.go
%gobuild -o bin/%{name} %{import_path}/cmd/%{name}
%gobuild -o bin/imgtype %{import_path}/tests/imgtype
%gobuild -o imgtype %{import_path}/tests/imgtype
GOMD2MAN=go-md2man %{__make} -C docs
%install
export GOPATH=$(pwd)/_build:$(pwd):%{gopath}
make DESTDIR=%{buildroot} PREFIX=%{_prefix} install install.completions
make DESTDIR=%{buildroot} PREFIX=%{_prefix} -C docs install
install -d -p %{buildroot}/%{_datadir}/%{name}/test/system
cp -pav tests/. %{buildroot}/%{_datadir}/%{name}/test/system
cp bin/imgtype %{buildroot}/%{_bindir}/%{name}-imgtype
cp imgtype %{buildroot}/%{_bindir}/%{name}-imgtype
make DESTDIR=%{buildroot} PREFIX=%{_prefix} -C docs install
#define license tag if not already defined
%{!?_licensedir:%global license %doc}
@ -148,6 +126,9 @@ cp bin/imgtype %{buildroot}/%{_bindir}/%{name}-imgtype
%{_datadir}/%{name}/test
%changelog
* Mon Nov 23 2020 Jindrich Novy <jnovy@redhat.com> - 1.18.0-1
- update to https://github.com/containers/buildah/releases/tag/v1.18.0
* Fri Sep 25 2020 RH Container Bot <rhcontainerbot@fedoraproject.org> - 1.17.0-0.23.dev.gitb3f6ed8
- autobuilt b3f6ed8

View File

@ -1 +1 @@
SHA512 (buildah-b3f6ed8.tar.gz) = 1d740109134e64a4a974dce71bec42bb3074340360d2575ed49820f013dbde987f32fd44a2e6da38c4d043b7918bce301799cf852935c3001bbf323f890376c8
8f920cb81f18671bcb3043ac505e3200 buildah-1.18.0-d3a01d0.tar.gz

View File

@ -1,26 +1,21 @@
#!/bin/bash -e
#!/bin/bash
#
# Simple buildah tests
#
# Log program and kernel versions
echo "Important package versions:"
(
uname -r
rpm -qa | egrep 'buildah|podman|conmon|crun|runc|iptable|slirp|systemd' | sort
) | sed -e 's/^/ /'
export PATH=/usr/local/bin:/usr/sbin:/usr/bin
export TMPDIR=/var/tmp
# Log environment; or at least the useful bits
echo "Environment:"
env | grep -v LS_COLORS= | sort | sed -e 's/^/ /'
TEST_LOG=/tmp/test.$(id -un).log
FULL_LOG=/tmp/test.$(id -un).debug.log
rm -f $TEST_LOG $FULL_LOG
export BUILDAH_BINARY=/usr/bin/buildah
export IMGTYPE_BINARY=/usr/bin/buildah-imgtype
# Log program versions
rpm -q buildah buildah-tests > $FULL_LOG
###############################################################################
# BEGIN setup/teardown
# Start a registry
pre_bats_setup() {
REGISTRY_FQIN=docker.io/library/registry:2
cd /usr/share/buildah/test/system || exit 1
start_registry() {
AUTHDIR=/tmp/buildah-tests-auth.$$
mkdir -p $AUTHDIR
@ -29,15 +24,14 @@ pre_bats_setup() {
openssl req -newkey rsa:4096 -nodes -sha256 \
-keyout $AUTHDIR/domain.key -x509 -days 2 \
-out $AUTHDIR/domain.crt \
-subj "/C=US/ST=Foo/L=Bar/O=Red Hat, Inc./CN=registry host certificate" \
-addext subjectAltName=DNS:localhost
-subj "/C=US/ST=Foo/L=Bar/O=Red Hat, Inc./CN=localhost"
fi
if [ ! -e $AUTHDIR/htpasswd ]; then
htpasswd -Bbn testuser testpassword > $AUTHDIR/htpasswd
podman run --entrypoint htpasswd registry:2 \
-Bbn testuser testpassword > $AUTHDIR/htpasswd
fi
podman rm -f registry || true
podman run -d -p 5000:5000 \
--name registry \
-v $AUTHDIR:/auth:Z \
@ -46,20 +40,21 @@ pre_bats_setup() {
-e REGISTRY_AUTH_HTPASSWD_PATH=/auth/htpasswd \
-e REGISTRY_HTTP_TLS_CERTIFICATE=/auth/domain.crt \
-e REGISTRY_HTTP_TLS_KEY=/auth/domain.key \
$REGISTRY_FQIN
registry:2
}
post_bats_teardown() {
podman rm -f registry
}
# END setup/teardown
###############################################################################
# BEGIN actual test
export BUILDAH_BINARY=/usr/bin/buildah
export IMGTYPE_BINARY=/usr/bin/buildah-imgtype
pre_bats_setup
bats /usr/share/buildah/test/system
start_registry >> $FULL_LOG 2>&1
bats . &> $TEST_LOG
rc=$?
post_bats_teardown
echo "------------------------------" >> $FULL_LOG
echo "bats completed with status $rc" >> $FULL_LOG
podman rm -f registry >> $FULL_LOG
exit $rc

View File

@ -1,17 +1,68 @@
---
- hosts: localhost
environment:
TMPDIR: /var/tmp
roles:
- role: standard-test-basic
tags:
- classic
- container
required_packages:
- buildah
- buildah-tests
tests:
- root-test:
dir: ./
run: ./test_buildah.sh
timeout: 60m
vars:
- artifacts: ./artifacts
# FIXME! It would be cleaner to include 'buildah' in this list; but the
# dnf module is broken in ansible <= 2.8, it doesn't report failures
# to install as long as _one_ package installs! So if buildah installs
# but buildah-tests doesn't, the `dnf` stanza succeeds, then the test
# one fails with a less-than-helpful error.
#
# See https://github.com/ansible/ansible/pull/49760
- required_packages:
- buildah-tests
tags:
- classic
- name: install packages
dnf: name="{{ required_packages }}" state=installed
# Sigh; RHEL8 doesn't have BATS
- name: bats | fetch and unpack tarball
unarchive:
src: https://github.com/bats-core/bats-core/archive/v1.1.0.tar.gz
dest: /root
remote_src: true
- name: bats | install
command: ./install.sh /usr/local
args:
chdir: /root/bats-core-1.1.0
## - name: local registry | setup
- name: create nonroot user
user:
name: testuser
shell: /bin/bash
- block:
- name: root | run test
script: ./test_buildah.sh
always:
- name: root | pull out logs
fetch:
src: "/tmp/{{ item }}"
dest: "{{ artifacts }}/{{ item }}"
flat: yes
with_items:
- test.root.log
- test.root.debug.log
- block:
- name: nonroot | run test
script: ./test_buildah.sh
args:
chdir: /home/testuser
become: yes
become_user: testuser
always:
- name: nonroot | pull out logs
fetch:
src: "/tmp/{{ item }}"
dest: "{{ artifacts }}/{{ item }}"
flat: yes
with_items:
- test.testuser.log
- test.testuser.debug.log
when: false