diff --git a/.gitignore b/.gitignore index 913e118..12cb321 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,115 @@ /libpod-3d0100b.tar.gz /libpod-3723cec.tar.gz /libpod-525e3b1.tar.gz +/libpod-c187538.tar.gz +/libpod-98b95ff.tar.gz +/libpod-f79a39a.tar.gz +/cri-o-712f3b8.tar.gz +/libpod-bc358eb.tar.gz +/libpod-b47fc0d.tar.gz +/libpod-57b403e.tar.gz +/libpod-304bf53.tar.gz +/libpod-db6bf9e.tar.gz +/libpod-998fd2e.tar.gz +/libpod-864b9c0.tar.gz +/libpod-77a1665.tar.gz +/libpod-6f51a5b.tar.gz +/libpod-191da31.tar.gz +/libpod-62b59df.tar.gz +/libpod-fa8442e.tar.gz +/libpod-6c5ebb0.tar.gz +/libpod-96d1162.tar.gz +/libpod-6a9dbf3.tar.gz +/libpod-f2658ec.tar.gz +/libpod-228732d.tar.gz +/libpod-9b457e3.tar.gz +/libpod-cf1d884.tar.gz +/libpod-398133e.tar.gz +/libpod-bef93de.tar.gz +/libpod-58cb8f7.tar.gz +/libpod-39a7a77.tar.gz +/libpod-6774425.tar.gz +/libpod-eda0fd7.tar.gz +/libpod-7a0a855.tar.gz +/libpod-970eaf0.tar.gz +/libpod-64dc803.tar.gz +/libpod-5ae940a.tar.gz +/libpod-bb0e754.tar.gz +/libpod-fa4705c.tar.gz +/libpod-faa8c3e.tar.gz +/libpod-2526355.tar.gz +/libpod-cc1bad8.tar.gz +/libpod-07253fc.tar.gz +/libpod-45838b9.tar.gz +/libpod-0613844.tar.gz +/libpod-9fcc475.tar.gz +/libpod-624660c.tar.gz +/libpod-c54b423.tar.gz +/libpod-44d1c1c.tar.gz +/libpod-8ee0f2b.tar.gz +/libpod-a127b4f.tar.gz +/libpod-a9e9fd4.tar.gz +/libpod-22e6f11.tar.gz +/libpod-13f7450.tar.gz +/libpod-cae49fc.tar.gz +/libpod-14cf6d2.tar.gz +/libpod-7b2b2bc.tar.gz +/libpod-b1ebad9.tar.gz +/libpod-1cbce85.tar.gz +/libpod-b78e7e4.tar.gz +/libpod-1e9e530.tar.gz +/libpod-ab72130.tar.gz +/libpod-95ea3d4.tar.gz +/libpod-65033b5.tar.gz +/libpod-6bdf023.tar.gz +/libpod-b43677c.tar.gz +/libpod-9e13457.tar.gz +/libpod-5645789.tar.gz +/libpod-f228cf7.tar.gz +/libpod-6804fde.tar.gz +/libpod-4bd0f22.tar.gz +/libpod-7182339.tar.gz +/libpod-e89bbd6.tar.gz +/libpod-208b9a6.tar.gz +/libpod-56133f7.tar.gz +/libpod-fd12c89.tar.gz +/libpod-d61d8a3.tar.gz +/libpod-b96be3a.tar.gz +/libpod-767b3dd.tar.gz +/libpod-6d8fac8.tar.gz +/libpod-f2462ca.tar.gz +/libpod-99959e5.tar.gz +/libpod-ca6ffbc.tar.gz +/libpod-0660108.tar.gz +/libpod-f661e1d.tar.gz +/libpod-c7424b6.tar.gz +/libpod-4f9b1ae.tar.gz +/libpod-84cfdb2.tar.gz +/libpod-86154b6.tar.gz +/libpod-9a18681.tar.gz +/libpod-c90b740.tar.gz +/libpod-9c806a4.tar.gz +/libpod-3dd577e.tar.gz +/libpod-87d8edb.tar.gz +/libpod-433cbd5.tar.gz +/libpod-5a4e590.tar.gz +/libpod-1a439f9.tar.gz +/libpod-3d55721.tar.gz +/libpod-65c31d4.tar.gz +/libpod-123de30.tar.gz +/libpod-95dbcad.tar.gz +/libpod-19cb754.tar.gz +/libpod-81df604.tar.gz +/libpod-a723353.tar.gz +/libpod-1cd906d.tar.gz +/libpod-e4a1553.tar.gz +/cri-o-a30f93c.tar.gz +/libpod-db08685.tar.gz +/libpod-a4adfe5.tar.gz +/libpod-7ba215f.tar.gz +/libpod-66d3499.tar.gz +/libpod-9551f6b.tar.gz +/libpod-82e8011.tar.gz +/libpod-006206a.tar.gz +/libpod-0ad9b6b.tar.gz +/libpod-b33a00e.tar.gz diff --git a/podman.spec b/podman.spec index f21a88c..b773399 100644 --- a/podman.spec +++ b/podman.spec @@ -1,198 +1,210 @@ -# If any of the following macros should be set otherwise, -# you can wrap any of them with the following conditions: -# - %%if 0%%{centos} == 7 -# - %%if 0%%{?rhel} == 7 -# - %%if 0%%{?fedora} == 23 -# Or just test for particular distribution: -# - %%if 0%%{centos} -# - %%if 0%%{?rhel} -# - %%if 0%%{?fedora} -# -# Be aware, on centos, both %%rhel and %%centos are set. If you want to test -# rhel specific macros, you can use %%if 0%%{?rhel} && 0%%{?centos} == 0 condition. -# (Don't forget to replace double percentage symbol with single one in order to apply a condition) - -# Generate devel rpm %global with_devel 0 -# Build project from bundled dependencies %global with_bundled 1 -# Build with debug info rpm %global with_debug 1 -# Run tests in check section %global with_check 0 -# Generate unit-test rpm %global with_unit_test 0 +%define gogenerate go generate + %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% {?gobuild:1} -%define gobuild(o:) go build -tags="$BUILDTAGS selinux seccomp" -ldflags "${LDFLAGS:-} -B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \\n')" -a -v -x %{?**}; -#% endif - -%global provider github -%global provider_tld com -%global project projectatomic -%global repo libpod -# https://github.com/projectatomic/libpod +%global provider github +%global provider_tld com +%global project containers +%global repo libpod +# https://github.com/containers/libpod %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} -%global import_path %{provider_prefix} -%global commit 525e3b17e4723afeebf45a1a24f00b2af17ddedf -%global shortcommit %(c=%{commit}; echo ${c:0:7}) +%global import_path %{provider_prefix} +%global git0 https://%{provider}.%{provider_tld}/%{project}/%{repo} +%global commit0 b33a00ef96601d7ce2389ac634e86847239d7d2e +%global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) -Name: podman -Version: 0.2.2 -Release: 2.git%{shortcommit}%{?dist} -Summary: Manage Pods, Containers and Container Images -License: ASL 2.0 -URL: https://%{provider_prefix} -Source0: https://%{provider_prefix}/archive/%{commit}/%{repo}-%{shortcommit}.tar.gz +%global import_path_conmon github.com/kubernetes-sigs/cri-o +%global git_conmon https://%{import_path_conmon} +%global commit_conmon a30f93ca229c7fc68fb1d8c7a3342de3c3f54ae5 +%global shortcommit_conmon %(c=%{commit_conmon}; echo ${c:0:7}) +Name: podman +# Version string is wrong but only written as such to avoid epoch bumps +# Will be fixed once upstream moves to 0.8.11-dev +%if 0%{?fedora} > 28 +Epoch: 1 +%else +Epoch: 0 +%endif +Version: 1.1.2 +Release: 2.git%{shortcommit0}%{?dist} +Summary: Manage Pods, Containers and Container Images +License: ASL 2.0 +URL: https://podman.io/ +Source0: %{git0}/archive/%{commit0}/%{repo}-%{shortcommit0}.tar.gz +Source1: %{git_conmon}/archive/%{commit_conmon}/cri-o-%{shortcommit_conmon}.tar.gz # e.g. el6 has ppc64 arch without gcc-go, so EA tag is required #ExclusiveArch: %%{?go_arches:%%{go_arches}}%%{!?go_arches:%%{ix86} x86_64 aarch64 %%{arm}} ExclusiveArch: aarch64 %{arm} ppc64le s390x x86_64 # If go_compiler is not set to 1, there is no virtual provide. Use golang instead. -BuildRequires: %{?go_compiler:compiler(go-compiler)}%{!?go_compiler:golang} -BuildRequires: btrfs-progs-devel -BuildRequires: device-mapper-devel -BuildRequires: glib2-devel -BuildRequires: glibc-devel -BuildRequires: glibc-static -BuildRequires: git -BuildRequires: go-md2man -BuildRequires: gpgme-devel -BuildRequires: libassuan-devel -BuildRequires: libgpg-error-devel -BuildRequires: libseccomp-devel -BuildRequires: libselinux-devel -BuildRequires: pkgconfig -BuildRequires: runc -BuildRequires: skopeo-containers -Requires: runc -Requires: skopeo-containers -Requires: conmon -Requires: buildah -Requires: containernetworking-cni > 0.6 -Requires: iptables -Requires: atomic-registries +BuildRequires: %{?go_compiler:compiler(go-compiler)}%{!?go_compiler:golang} +BuildRequires: btrfs-progs-devel +BuildRequires: glib2-devel +BuildRequires: glibc-devel +BuildRequires: glibc-static +BuildRequires: git +BuildRequires: go-md2man +BuildRequires: gpgme-devel +BuildRequires: libassuan-devel +BuildRequires: libgpg-error-devel +BuildRequires: libseccomp-devel +BuildRequires: libselinux-devel +BuildRequires: ostree-devel +BuildRequires: pkgconfig +BuildRequires: make +BuildRequires: systemd +Requires: runc >= 2:1.0.0-57 +Requires: containers-common +Requires: containernetworking-plugins >= 0.7.3-2 +Requires: iptables +Requires: nftables +#Requires: conmon +Recommends: container-selinux >= 2:2.71 +Recommends: slirp4netns >= 0.3-0 +%if 0%{?fedora} > 28 +Recommends: fuse-overlayfs +%endif # vendored libraries -# awk '{print "Provides: bundled(golang("$1")) = "$2}' containerd-*/vendor.conf | sort +# awk '{print "Provides: bundled(golang("$1")) = "$2}' vendor.conf | sort # [thanks to Carl George for containerd.spec] -Provides: bundled(golang(github.com/asaskevich/govalidator)) = v6 Provides: bundled(golang(github.com/Azure/go-ansiterm)) = 19f72df4d05d31cbe1c56bfc8045c96babff6c7e -Provides: bundled(golang(github.com/beorn7/perks)) = 3ac7bf7a47d159a033b107610db8a1b6575507a4 Provides: bundled(golang(github.com/blang/semver)) = v3.5.0 +Provides: bundled(golang(github.com/boltdb/bolt)) = master Provides: bundled(golang(github.com/buger/goterm)) = 2f8dfbc7dbbff5dd1d391ed91482c24df243b2d3 Provides: bundled(golang(github.com/BurntSushi/toml)) = v0.2.0 -Provides: bundled(golang(github.com/containerd/cgroups)) = 7a5fdd8330119dc70d850260db8f3594d89d6943 +Provides: bundled(golang(github.com/containerd/cgroups)) = 77e628511d924b13a77cebdc73b757a47f6d751b Provides: bundled(golang(github.com/containerd/continuity)) = master -Provides: bundled(golang(github.com/containernetworking/cni)) = v0.4.0 -Provides: bundled(golang(github.com/containers/image)) = 9b4510f6d1627c8e53c3303a8fe48ca7842c2ace -Provides: bundled(golang(github.com/containers/storage)) = 1824cf917a6b42d8c41179e807bb20a5fd6c0f0a +#Provides: bundled(golang(github.com/containernetworking/cni)) = v0.7.0-alpha1 +Provides: bundled(golang(github.com/containernetworking/plugins)) = 1562a1e60ed101aacc5e08ed9dbeba8e9f3d4ec1 +Provides: bundled(golang(github.com/containers/image)) = 134f99bed228d6297dc01d152804f6f09f185418 +Provides: bundled(golang(github.com/containers/psgo)) = 5dde6da0bc8831b35243a847625bcf18183bd1ee +Provides: bundled(golang(github.com/containers/storage)) = 17c7d1fee5603ccf6dd97edc14162fc1510e7e23 Provides: bundled(golang(github.com/coreos/go-systemd)) = v14 -Provides: bundled(golang(github.com/coreos/pkg)) = v3 +Provides: bundled(golang(github.com/cri-o/ocicni)) = master +Provides: bundled(golang(github.com/cyphar/filepath-securejoin)) = v0.2.1 Provides: bundled(golang(github.com/davecgh/go-spew)) = v1.1.0 -Provides: bundled(golang(github.com/dgrijalva/jwt-go)) = v3.0.0 Provides: bundled(golang(github.com/docker/distribution)) = 7a8efe719e55bbfaff7bc5718cdf0ed51ca821df -Provides: bundled(golang(github.com/docker/docker)) = ce452fb72ffcdb7605ce98bde9302238f47c63c5 +Provides: bundled(golang(github.com/docker/docker)) = 86f080cff0914e9694068ed78d503701667c4c00 Provides: bundled(golang(github.com/docker/docker-credential-helpers)) = d68f9aeca33f5fd3f08eeae5e9d175edf4e731d1 Provides: bundled(golang(github.com/docker/go-connections)) = 3ede32e2033de7505e6500d6c868c2b9ed9f169d Provides: bundled(golang(github.com/docker/go-units)) = v0.3.2 Provides: bundled(golang(github.com/docker/libtrust)) = aabc10ec26b754e797f9028f4589c5b7bd90dc20 Provides: bundled(golang(github.com/docker/spdystream)) = ed496381df8283605c435b86d4fdd6f4f20b8c6e -Provides: bundled(golang(github.com/emicklei/go-restful)) = ff4f55a206334ef123e4f79bbf348980da81ca46 -Provides: bundled(golang(github.com/emicklei/go-restful-swagger12)) = 1.0.1 -Provides: bundled(golang(github.com/exponent-io/jsonpath)) = d6023ce2651d8eafb5c75bb0c7167536102ec9f5 Provides: bundled(golang(github.com/fatih/camelcase)) = f6a740d52f961c60348ebb109adde9f4635d7540 +Provides: bundled(golang(github.com/fsnotify/fsnotify)) = 7d7316ed6e1ed2de075aab8dfc76de5d158d66e1 +Provides: bundled(golang(github.com/fsouza/go-dockerclient)) = master Provides: bundled(golang(github.com/ghodss/yaml)) = 04f313413ffd65ce25f2541bfd2b2ceec5c0908c Provides: bundled(golang(github.com/godbus/dbus)) = a389bdde4dd695d414e47b755e95e72b7826432c -Provides: bundled(golang(github.com/gogo/protobuf)) = v0.3 +Provides: bundled(golang(github.com/gogo/protobuf)) = c0656edd0d9eab7c66d1eb0c568f9039345796f7 Provides: bundled(golang(github.com/golang/glog)) = 23def4e6c14b4da8ac2ed8007337bc5eb5007998 Provides: bundled(golang(github.com/golang/groupcache)) = b710c8433bd175204919eb38776e944233235d03 -Provides: bundled(golang(github.com/golang/protobuf)) = 748d386b5c1ea99658fd69fe9f03991ce86a90c1 +Provides: bundled(golang(github.com/golang/protobuf)) = 4bd1920723d7b7c925de087aa32e2187708897f7 +Provides: bundled(golang(github.com/googleapis/gnostic)) = 0c5108395e2debce0d731cf0287ddf7242066aba Provides: bundled(golang(github.com/google/gofuzz)) = 44d81051d367757e1c7c6a5a86423ece9afcf63c -Provides: bundled(golang(github.com/go-openapi/analysis)) = b44dc874b601d9e4e2f6e19140e794ba24bead3b -Provides: bundled(golang(github.com/go-openapi/errors)) = d24ebc2075bad502fac3a8ae27aa6dd58e1952dc -Provides: bundled(golang(github.com/go-openapi/jsonpointer)) = 779f45308c19820f1a69e9a4cd965f496e0da10f -Provides: bundled(golang(github.com/go-openapi/jsonreference)) = 36d33bfe519efae5632669801b180bf1a245da3b -Provides: bundled(golang(github.com/go-openapi/loads)) = 18441dfa706d924a39a030ee2c3b1d8d81917b38 -Provides: bundled(golang(github.com/go-openapi/spec)) = 6aced65f8501fe1217321abf0749d354824ba2ff -Provides: bundled(golang(github.com/go-openapi/strfmt)) = 93a31ef21ac23f317792fff78f9539219dd74619 -Provides: bundled(golang(github.com/go-openapi/swag)) = 1d0bd113de87027671077d3c71eb3ac5d7dbba72 Provides: bundled(golang(github.com/gorilla/context)) = v1.1 Provides: bundled(golang(github.com/gorilla/mux)) = v1.3.0 Provides: bundled(golang(github.com/hashicorp/errwrap)) = 7554cd9344cec97297fa6649b055a8c98c2a1e55 Provides: bundled(golang(github.com/hashicorp/golang-lru)) = 0a025b7e63adc15a622f29b0b2c4c3848243bbf6 Provides: bundled(golang(github.com/hashicorp/go-multierror)) = 83588e72410abfbe4df460eeb6f30841ae47d4c4 -Provides: bundled(golang(github.com/hpcloud/tail)) = v1.0.0 Provides: bundled(golang(github.com/imdario/mergo)) = 0.2.2 -Provides: bundled(golang(github.com/juju/ratelimit)) = 5b9ff866471762aa2ab2dced63c9fb6f53921342 +Provides: bundled(golang(github.com/json-iterator/go)) = 1.0.0 Provides: bundled(golang(github.com/kr/pty)) = v1.0.0 -Provides: bundled(golang(github.com/mailru/easyjson)) = 99e922cf9de1bc0ab38310c277cff32c2147e747 +Provides: bundled(golang(github.com/mailru/easyjson)) = 03f2033d19d5860aef995fe360ac7d395cd8ce65 Provides: bundled(golang(github.com/mattn/go-runewidth)) = v0.0.1 -Provides: bundled(golang(github.com/matttproud/golang_protobuf_extensions)) = fc2b8d3a73c4867e51861bbdd5ae3c1f0869dd6a Provides: bundled(golang(github.com/Microsoft/go-winio)) = 78439966b38d69bf38227fbf57ac8a6fee70f69a Provides: bundled(golang(github.com/Microsoft/hcsshim)) = 43f9725307998e09f2e3816c2c0c36dc98f0c982 Provides: bundled(golang(github.com/mistifyio/go-zfs)) = v2.1.1 -Provides: bundled(golang(github.com/mitchellh/mapstructure)) = d0303fe809921458f417bcf828397a65db30a7e4 Provides: bundled(golang(github.com/mrunalp/fileutils)) = master Provides: bundled(golang(github.com/mtrmac/gpgme)) = b2432428689ca58c2b8e8dea9449d3295cf96fc9 -Provides: bundled(golang(github.com/opencontainers/go-digest)) = v1.0.0-rc0 +Provides: bundled(golang(github.com/Nvveen/Gotty)) = master +#Provides: bundled(golang(github.com/opencontainers/go-digest)) = v1.0.0-rc0 Provides: bundled(golang(github.com/opencontainers/image-spec)) = v1.0.0 -Provides: bundled(golang(github.com/opencontainers/runc)) = 45bde006ca8c90e089894508708bcf0e2cdf9e13 +Provides: bundled(golang(github.com/opencontainers/runc)) = b4e2ecb452d9ee4381137cc0a7e6715b96bed6de Provides: bundled(golang(github.com/opencontainers/runtime-spec)) = v1.0.0 -Provides: bundled(golang(github.com/opencontainers/runtime-tools)) = 625e2322645b151a7cbb93a8b42920933e72167f -Provides: bundled(golang(github.com/opencontainers/selinux)) = b29023b86e4a69d1b46b7e7b4e2b6fda03f0b9cd +Provides: bundled(golang(github.com/opencontainers/runtime-tools)) = master +Provides: bundled(golang(github.com/opencontainers/selinux)) = b6fa367ed7f534f9ba25391cc2d467085dbb445a +Provides: bundled(golang(github.com/openshift/imagebuilder)) = master Provides: bundled(golang(github.com/ostreedev/ostree-go)) = master Provides: bundled(golang(github.com/pkg/errors)) = v0.8.0 Provides: bundled(golang(github.com/pmezard/go-difflib)) = 792786c7400a136282c1664665ae0a8db921c6c2 Provides: bundled(golang(github.com/pquerna/ffjson)) = d49c2bc1aa135aad0c6f4fc2056623ec78f5d5ac -Provides: bundled(golang(github.com/prometheus/client_golang)) = e7e903064f5e9eb5da98208bae10b475d4db0f8c -Provides: bundled(golang(github.com/prometheus/client_model)) = fa8ad6fec33561be4280a8f0514318c79d7f6cb6 -Provides: bundled(golang(github.com/prometheus/common)) = 13ba4ddd0caa9c28ca7b7bffe1dfa9ed8d5ef207 -Provides: bundled(golang(github.com/prometheus/procfs)) = 65c1f6f8f0fc1e2185eb9863a3bc751496404259 -Provides: bundled(golang(github.com/PuerkitoBio/purell)) = v1.1.0 -Provides: bundled(golang(github.com/PuerkitoBio/urlesc)) = 5bd2802263f21d8788851d5305584c82a5c75d7e -Provides: bundled(golang(github.com/renstrom/dedent)) = v1.0.0 +Provides: bundled(golang(github.com/projectatomic/buildah)) = 745bf7e56bda740ce7cfc55318da08529e5ed519 +Provides: bundled(golang(github.com/seccomp/containers-golang)) = master Provides: bundled(golang(github.com/seccomp/libseccomp-golang)) = v0.9.0 Provides: bundled(golang(github.com/sirupsen/logrus)) = v1.0.0 Provides: bundled(golang(github.com/spf13/pflag)) = 9ff6c6923cfffbcd502984b8e0c80539a94968b7 Provides: bundled(golang(github.com/stretchr/testify)) = 4d4bfba8f1d1027c4fdbe371823030df51419987 Provides: bundled(golang(github.com/syndtr/gocapability)) = e7cb7fa329f456b3855136a2642b197bad7366ba Provides: bundled(golang(github.com/tchap/go-patricia)) = v2.2.6 -Provides: bundled(golang(github.com/ugorji/go)) = d23841a297e5489e787e72fceffabf9d2994b52a -Provides: bundled(golang(github.com/urfave/cli)) = 39908eb08fee7c10d842622a114a5c133fb0a3c6 +Provides: bundled(golang(github.com/ulikunitz/xz)) = v0.5.4 +Provides: bundled(golang(github.com/ulule/deepcopier)) = master +Provides: bundled(golang(github.com/urfave/cli)) = 934abfb2f102315b5794e15ebc7949e4ca253920 Provides: bundled(golang(github.com/vbatts/tar-split)) = v0.10.2 Provides: bundled(golang(github.com/vishvananda/netlink)) = master Provides: bundled(golang(github.com/vishvananda/netns)) = master Provides: bundled(golang(github.com/xeipuuv/gojsonpointer)) = master Provides: bundled(golang(github.com/xeipuuv/gojsonreference)) = master Provides: bundled(golang(github.com/xeipuuv/gojsonschema)) = master -Provides: bundled(golang(golang.org/x/crypto)) = 3fbbcd23f1cb824e69491a5930cfeff09b12f4d2 +Provides: bundled(golang(golang.org/x/crypto)) = 81e90905daefcd6fd217b62423c0908922eadb30 Provides: bundled(golang(golang.org/x/net)) = c427ad74c6d7a814201695e9ffde0c5d400a7674 -Provides: bundled(golang(golang.org/x/sys)) = 9aade4d3a3b7e6d876cd3823ad20ec45fc035402 +Provides: bundled(golang(golang.org/x/sys)) = master Provides: bundled(golang(golang.org/x/text)) = f72d8390a633d5dfb0cc84043294db9f6c935756 +Provides: bundled(golang(golang.org/x/time)) = f51c12702a4d776e4c1fa9b0fabab841babae631 Provides: bundled(golang(google.golang.org/grpc)) = v1.0.4 Provides: bundled(golang(gopkg.in/cheggaaa/pb.v1)) = v1.0.7 -Provides: bundled(golang(gopkg.in/fsnotify.v1)) = v1.4.2 Provides: bundled(golang(gopkg.in/inf.v0)) = v0.9.0 Provides: bundled(golang(gopkg.in/mgo.v2)) = v2 -Provides: bundled(golang(gopkg.in/tomb.v1)) = v1 +Provides: bundled(golang(gopkg.in/square/go-jose.v2)) = v2.1.3 Provides: bundled(golang(gopkg.in/yaml.v2)) = v2 +Provides: bundled(golang(k8s.io/api)) = 5ce4aa0bf2f097f6021127b3d879eeda82026be8 +Provides: bundled(golang(k8s.io/apiextensions-apiserver)) = 1b31e26d82f1ec2e945c560790e98f34bb5f2e63 +Provides: bundled(golang(k8s.io/apimachinery)) = 616b23029fa3dc3e0ccefd47963f5651a6543d94 +Provides: bundled(golang(k8s.io/apiserver)) = 4d1163080139f1f9094baf8a3a6099e85e1867f6 +Provides: bundled(golang(k8s.io/client-go)) = 7cd1d3291b7d9b1e2d54d4b69eb65995eaf8888e +Provides: bundled(golang(k8s.io/kube-openapi)) = 275e2ce91dec4c05a4094a7b1daee5560b555ac9 +Provides: bundled(golang(k8s.io/utils)) = 258e2a2fa64568210fbd6267cf1d8fd87c3cb86e %description %{summary} -libpod provides a library for applications looking to use +%{repo} provides a library for applications looking to use the Container Pod concept popularized by Kubernetes. +%package docker +Summary: Emulate Docker CLI using podman +BuildArch: noarch +Requires: %{name} = %{epoch}:%{version}-%{release} +Conflicts: docker +Conflicts: docker-latest +Conflicts: docker-ce +Conflicts: docker-ee +Conflicts: moby-engine + +%description docker +This package installs a script named docker that emulates the Docker CLI by +executes podman commands, it also creates links between all Docker CLI man +pages and podman. + +%files docker +%{_bindir}/docker +%{_mandir}/man1/docker*.1* + %if 0%{?with_devel} -%package -n libpod-devel +%package devel Summary: Library for applications looking to use Container Pods BuildArch: noarch +Provides: %{repo}-devel = %{epoch}:%{version}-%{release} %if 0%{?with_check} && ! 0%{?with_bundled} BuildRequires: golang(github.com/BurntSushi/toml) @@ -248,72 +260,72 @@ BuildRequires: golang(k8s.io/client-go/tools/remotecommand) BuildRequires: golang(k8s.io/kubernetes/pkg/kubelet/container) %endif -Requires: golang(github.com/BurntSushi/toml) -Requires: golang(github.com/containerd/cgroups) -Requires: golang(github.com/containernetworking/plugins/pkg/ns) -Requires: golang(github.com/containers/image/copy) -Requires: golang(github.com/containers/image/directory) -Requires: golang(github.com/containers/image/docker) -Requires: golang(github.com/containers/image/docker/archive) -Requires: golang(github.com/containers/image/docker/reference) -Requires: golang(github.com/containers/image/docker/tarfile) -Requires: golang(github.com/containers/image/image) -Requires: golang(github.com/containers/image/oci/archive) -Requires: golang(github.com/containers/image/pkg/strslice) -Requires: golang(github.com/containers/image/pkg/sysregistries) -Requires: golang(github.com/containers/image/signature) -Requires: golang(github.com/containers/image/storage) -Requires: golang(github.com/containers/image/tarball) -Requires: golang(github.com/containers/image/transports/alltransports) -Requires: golang(github.com/containers/image/types) -Requires: golang(github.com/containers/storage) -Requires: golang(github.com/containers/storage/pkg/archive) -Requires: golang(github.com/containers/storage/pkg/idtools) -Requires: golang(github.com/containers/storage/pkg/reexec) -Requires: golang(github.com/coreos/go-systemd/dbus) -Requires: golang(github.com/cri-o/ocicni/pkg/ocicni) -Requires: golang(github.com/docker/distribution/reference) -Requires: golang(github.com/docker/docker/daemon/caps) -Requires: golang(github.com/docker/docker/pkg/mount) -Requires: golang(github.com/docker/docker/pkg/namesgenerator) -Requires: golang(github.com/docker/docker/pkg/stringid) -Requires: golang(github.com/docker/docker/pkg/system) -Requires: golang(github.com/docker/docker/pkg/term) -Requires: golang(github.com/docker/docker/pkg/truncindex) -Requires: golang(github.com/ghodss/yaml) -Requires: golang(github.com/godbus/dbus) -Requires: golang(github.com/mattn/go-sqlite3) -Requires: golang(github.com/mrunalp/fileutils) -Requires: golang(github.com/opencontainers/go-digest) -Requires: golang(github.com/opencontainers/image-spec/specs-go/v1) -Requires: golang(github.com/opencontainers/runc/libcontainer) -Requires: golang(github.com/opencontainers/runtime-spec/specs-go) -Requires: golang(github.com/opencontainers/runtime-tools/generate) -Requires: golang(github.com/opencontainers/selinux/go-selinux) -Requires: golang(github.com/opencontainers/selinux/go-selinux/label) -Requires: golang(github.com/pkg/errors) -Requires: golang(github.com/sirupsen/logrus) -Requires: golang(github.com/ulule/deepcopier) -Requires: golang(golang.org/x/crypto/ssh/terminal) -Requires: golang(golang.org/x/sys/unix) -Requires: golang(k8s.io/apimachinery/pkg/util/wait) -Requires: golang(k8s.io/client-go/tools/remotecommand) -Requires: golang(k8s.io/kubernetes/pkg/kubelet/container) +Requires: golang(github.com/BurntSushi/toml) +Requires: golang(github.com/containerd/cgroups) +Requires: golang(github.com/containernetworking/plugins/pkg/ns) +Requires: golang(github.com/containers/image/copy) +Requires: golang(github.com/containers/image/directory) +Requires: golang(github.com/containers/image/docker) +Requires: golang(github.com/containers/image/docker/archive) +Requires: golang(github.com/containers/image/docker/reference) +Requires: golang(github.com/containers/image/docker/tarfile) +Requires: golang(github.com/containers/image/image) +Requires: golang(github.com/containers/image/oci/archive) +Requires: golang(github.com/containers/image/pkg/strslice) +Requires: golang(github.com/containers/image/pkg/sysregistries) +Requires: golang(github.com/containers/image/signature) +Requires: golang(github.com/containers/image/storage) +Requires: golang(github.com/containers/image/tarball) +Requires: golang(github.com/containers/image/transports/alltransports) +Requires: golang(github.com/containers/image/types) +Requires: golang(github.com/containers/storage) +Requires: golang(github.com/containers/storage/pkg/archive) +Requires: golang(github.com/containers/storage/pkg/idtools) +Requires: golang(github.com/containers/storage/pkg/reexec) +Requires: golang(github.com/coreos/go-systemd/dbus) +Requires: golang(github.com/cri-o/ocicni/pkg/ocicni) +Requires: golang(github.com/docker/distribution/reference) +Requires: golang(github.com/docker/docker/daemon/caps) +Requires: golang(github.com/docker/docker/pkg/mount) +Requires: golang(github.com/docker/docker/pkg/namesgenerator) +Requires: golang(github.com/docker/docker/pkg/stringid) +Requires: golang(github.com/docker/docker/pkg/system) +Requires: golang(github.com/docker/docker/pkg/term) +Requires: golang(github.com/docker/docker/pkg/truncindex) +Requires: golang(github.com/ghodss/yaml) +Requires: golang(github.com/godbus/dbus) +Requires: golang(github.com/mattn/go-sqlite3) +Requires: golang(github.com/mrunalp/fileutils) +Requires: golang(github.com/opencontainers/go-digest) +Requires: golang(github.com/opencontainers/image-spec/specs-go/v1) +Requires: golang(github.com/opencontainers/runc/libcontainer) +Requires: golang(github.com/opencontainers/runtime-spec/specs-go) +Requires: golang(github.com/opencontainers/runtime-tools/generate) +Requires: golang(github.com/opencontainers/selinux/go-selinux) +Requires: golang(github.com/opencontainers/selinux/go-selinux/label) +Requires: golang(github.com/pkg/errors) +Requires: golang(github.com/sirupsen/logrus) +Requires: golang(github.com/ulule/deepcopier) +Requires: golang(golang.org/x/crypto/ssh/terminal) +Requires: golang(golang.org/x/sys/unix) +Requires: golang(k8s.io/apimachinery/pkg/util/wait) +Requires: golang(k8s.io/client-go/tools/remotecommand) +Requires: golang(k8s.io/kubernetes/pkg/kubelet/container) -Provides: golang(%{import_path}/cmd/%{name}/docker) = %{version}-%{release} -Provides: golang(%{import_path}/cmd/%{name}/formats) = %{version}-%{release} -Provides: golang(%{import_path}/libkpod) = %{version}-%{release} -Provides: golang(%{import_path}/libpod) = %{version}-%{release} -Provides: golang(%{import_path}/libpod/common) = %{version}-%{release} -Provides: golang(%{import_path}/libpod/driver) = %{version}-%{release} -Provides: golang(%{import_path}/libpod/layers) = %{version}-%{release} -Provides: golang(%{import_path}/pkg/annotations) = %{version}-%{release} -Provides: golang(%{import_path}/pkg/chrootuser) = %{version}-%{release} -Provides: golang(%{import_path}/pkg/registrar) = %{version}-%{release} -Provides: golang(%{import_path}/pkg/storage) = %{version}-%{release} -Provides: golang(%{import_path}/utils) = %{version}-%{release} +Provides: golang(%{import_path}/cmd/%{name}/docker) = %{epoch}:%{version}-%{release} +Provides: golang(%{import_path}/cmd/%{name}/formats) = %{epoch}:%{version}-%{release} +Provides: golang(%{import_path}/libkpod) = %{epoch}:%{version}-%{release} +Provides: golang(%{import_path}/libpod) = %{epoch}:%{version}-%{release} +Provides: golang(%{import_path}/libpod/common) = %{epoch}:%{version}-%{release} +Provides: golang(%{import_path}/libpod/driver) = %{epoch}:%{version}-%{release} +Provides: golang(%{import_path}/libpod/layers) = %{epoch}:%{version}-%{release} +Provides: golang(%{import_path}/pkg/annotations) = %{epoch}:%{version}-%{release} +Provides: golang(%{import_path}/pkg/chrootuser) = %{epoch}:%{version}-%{release} +Provides: golang(%{import_path}/pkg/registrar) = %{epoch}:%{version}-%{release} +Provides: golang(%{import_path}/pkg/storage) = %{epoch}:%{version}-%{release} +Provides: golang(%{import_path}/utils) = %{epoch}:%{version}-%{release} -%description -n libpod-devel +%description -n libpod-devel %{summary} This package contains library source intended for @@ -323,22 +335,22 @@ building other packages which use import path with %if 0%{?with_unit_test} && 0%{?with_devel} %package unit-test-devel -Summary: Unit tests for %{name} package +Summary: Unit tests for %{name} package %if 0%{?with_check} #Here comes all BuildRequires: PACKAGE the unit tests #in %%check section need for running %endif # test subpackage tests code from devel subpackage -Requires: %{name}-devel = %{version}-%{release} +Requires: %{name}-devel = %{epoch}:%{version}-%{release} %if 0%{?with_check} && ! 0%{?with_bundled} BuildRequires: golang(github.com/stretchr/testify/assert) BuildRequires: golang(github.com/urfave/cli) %endif -Requires: golang(github.com/stretchr/testify/assert) -Requires: golang(github.com/urfave/cli) +Requires: golang(github.com/stretchr/testify/assert) +Requires: golang(github.com/urfave/cli) %description unit-test-devel %{summary} @@ -348,9 +360,23 @@ This package contains unit tests for project providing packages with %{import_path} prefix. %endif +%package tests +Summary: Tests for %{name} + +Requires: %{name} = %{epoch}:%{version}-%{release} +Requires: bats +Requires: jq + +%description tests +%{summary} + +This package contains system tests for %{name} + %prep -%autosetup -Sgit -n %{repo}-%{commit} -sed -i '/\/bin\/bash/d' completions/bash/%{name} +%autosetup -Sgit -n %{repo}-%{commit0} + +# untar cri-o +tar zxf %{SOURCE1} %build mkdir _build @@ -360,13 +386,41 @@ ln -s ../../../../ src/%{import_path} popd ln -s vendor src export GOPATH=$(pwd)/_build:$(pwd):$(pwd):%{gopath} -export BUILDTAGS="selinux seccomp $(hack/btrfs_installed_tag.sh) $(hack/btrfs_tag.sh) $(hack/libdm_tag.sh) containers_image_ostree_stub" +export BUILDTAGS="varlink seccomp $(hack/btrfs_installed_tag.sh) $(hack/btrfs_tag.sh) $(hack/libdm_tag.sh) $(hack/ostree_tag.sh) $(hack/selinux_tag.sh) exclude_graphdriver_devicemapper" +%gogenerate ./cmd/%{name}/varlink/... +BUILDTAGS=$BUILDTAGS make binaries docs -GOPATH=$GOPATH BUILDTAGS=$BUILDTAGS %gobuild -o bin/%{name} %{import_path}/cmd/%{name} -BUILDTAGS=$BUILDTAGS make docs +# build conmon +pushd cri-o-%{commit_conmon} +mkdir _output +pushd _output +mkdir -p src/%{provider}.%{provider_tld}/{kubernetes-sigs,opencontainers} +ln -s $(dirs +1 -l) src/%{import_path_conmon} +popd +ln -s vendor src +export GOPATH=$(pwd)/_output:$(pwd):%{gopath} +export BUILDTAGS="selinux seccomp $(hack/btrfs_installed_tag.sh) $(hack/btrfs_tag.sh) containers_image_ostree_stub" +BUILDTAGS=$BUILDTAGS make -C conmon +popd +mv pkg/hooks/README.md pkg/hooks/README-hooks.md %install -%make_install PREFIX=%{buildroot}%{_prefix} install install.completions +install -dp %{buildroot}%{_unitdir} +PODMAN_VERSION=%{version} %{__make} PREFIX=%{buildroot}%{_prefix} ETCDIR=%{buildroot}%{_sysconfdir} \ + install.bin \ + install.man \ + install.cni \ + install.systemd \ + install.completions \ + install.docker + +# install libpod.conf +install -dp %{buildroot}%{_datadir}/containers +install -p -m 644 %{repo}.conf %{buildroot}%{_datadir}/containers + +# install conmon +install -dp %{buildroot}%{_libexecdir}/%{name} +install -p -m 755 cri-o-%{commit_conmon}/bin/conmon %{buildroot}%{_libexecdir}/%{name} # source codes for building projects %if 0%{?with_devel} @@ -432,31 +486,521 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %gotest %{import_path}/pkg/registrar %endif +install -d -p %{buildroot}/%{_datadir}/%{name}/test/system +cp -pav test/system %{buildroot}/%{_datadir}/%{name}/test/ + #define license tag if not already defined %{!?_licensedir:%global license %doc} %files %license LICENSE -%doc README.md CONTRIBUTING.md hooks.md install.md code-of-conduct.md transfer.md +%doc README.md CONTRIBUTING.md pkg/hooks/README-hooks.md install.md code-of-conduct.md transfer.md %{_bindir}/%{name} -%{_mandir}/man1/*.1* +%{_mandir}/man1/podman*.1* +%{_mandir}/man5/*.5* %{_datadir}/bash-completion/completions/* +%{_libexecdir}/%{name}/conmon %config(noreplace) %{_sysconfdir}/cni/net.d/87-%{name}-bridge.conflist +%{_datadir}/containers/%{repo}.conf +%{_unitdir}/io.%{name}.service +%{_unitdir}/io.%{name}.socket +%{_usr}/lib/tmpfiles.d/%{name}.conf %if 0%{?with_devel} %files -n libpod-devel -f devel.file-list %license LICENSE -%doc README.md CONTRIBUTING.md hooks.md install.md code-of-conduct.md transfer.md +%doc README.md CONTRIBUTING.md pkg/hooks/README-hooks.md install.md code-of-conduct.md transfer.md %dir %{gopath}/src/%{provider}.%{provider_tld}/%{project} %endif %if 0%{?with_unit_test} && 0%{?with_devel} %files unit-test-devel -f unit-test-devel.file-list %license LICENSE -%doc README.md CONTRIBUTING.md hooks.md install.md code-of-conduct.md transfer.md +%doc README.md CONTRIBUTING.md pkg/hooks/README-hooks.md install.md code-of-conduct.md transfer.md %endif +%triggerpostun -- %{name} < 1.1 +podman system renumber +exit 0 + +%files tests +%license LICENSE +%{_datadir}/%{name}/test + %changelog +* Mon Mar 11 2019 Eduardo Santiago - 1:1.1.2-2.git55dc783 +- new -tests subpackage + +* Tue Mar 5 2019 dwalsh - 1:1.1.2-1.git0ad9b6b +- Upstream 1.1.2 release + +* Wed Feb 27 2019 dwalsh - 1:1.1.0-1.git006206a +- Upstream 1.1.0 release + +* Sat Jan 12 2019 dwalsh - 1:1.0.0-1.git82e8011 +- Upstream 1.0.0 release + +* Thu Dec 13 2018 bbaude - 1:0.12.1.2-1.git9551f6b +- Upstream 0.12.1.2 release + +* Fri Dec 07 2018 Brent Baude - 1:0.12.1.1 -1.git66d3499 +- Upstream 0.12.1.1 release + +* Thu Dec 06 2018 Brent Baude - 1:0.12.1-2.git7ba215f +- Upstream 0.12.1 release + +* Sat Nov 10 2018 Dan Walsh - 1:0.11.1-2.gita4adfe5 +- Remove dirty flag from podman version + +* Thu Nov 08 2018 bbaude - 1:0.11.1-1.gita4adfe5 +- Upstream 0.11.1-1 + +* Sun Oct 28 2018 Lokesh Mandvekar - 1:0.10.1.3-4.gitdb08685 +- Correct bug id in previous changelog entry + +* Sun Oct 28 2018 Lokesh Mandvekar - 1:0.10.1.3-3.gitdb08685 +- Resolves: #1643744 - build podman with ostree support + +* Fri Oct 19 2018 Lokesh Mandvekar - 1:0.10.1.3-2.gitdb08685 +- consistent epoch:version-release in changelog + +* Thu Oct 18 2018 Lokesh Mandvekar - 1:0.10.1.3-1.gitdb08685 +- bump to v0.10.1.3 +- correct changelog and epoch mentions + +* Fri Oct 12 2018 Dan Walsh - 1:0.10.1-1.gite4a1553 +- Upstream v0.10.1 release + +* Tue Oct 2 2018 Dan Walsh - 1:0.9.3.1-2.git1cd906d +- Fix podman-docker to require proper version. + +* Tue Sep 25 2018 baude - 1:0.9.3.1-1.git1cd906d +- Upstream 0.9.3.1 upstream release + +* Tue Sep 25 2018 Dan Walsh - 1:0.9.4-2.dev.gitaf791f3 +- Fix required version of runc + +* Mon Sep 24 2018 Lokesh Mandvekar - 1:0.9.3-4.gita723353 +- ensure smooth upgrade path from f28 +- mention epoch number in changelogs + +* Sat Sep 22 2018 Dan Walsh - 1:0.9.3-1.gita723353 +- Upstream 0.9.3 + +* Mon Sep 17 2018 Dan Walsh - 1:0.9.2.1-1.git19cb754 +- Merge in fixes for podman build, to handle symbolic links and running sudo in Dockerfile + +* Sat Sep 15 2018 baude - 0.9.2-2.git81df604 +- Upstream 0.9.2 + +* Tue Sep 11 2018 Lokesh Mandvekar - 1:0.9.1.1-1.dev.git95dbcad +- bump to v0.9.1.1 +- built commit 95dbcad + +* Tue Sep 11 2018 baude - 1:0.9.1-1.dev.git123de30 +- Upstream release of 0.9.1 +- Do not build with devicemapper + +* Sun Sep 09 2018 baude - 0.9.1-3.gitaba58d1 +- Grab correct commit for podman-0.9.1 + +* Fri Sep 07 2018 baude - 0.9.1-1.gitc325a18 +- Upstream 0.9.1 release + +* Tue Sep 4 2018 Dan Walsh - 1:0.8.5-5.dev.git65c31d4 +- Fix required version of runc + +* Tue Sep 4 2018 Dan Walsh - 1:0.8.5-4.dev.git65c31d4 +- Fix rpm -qi podman to show the correct URL + +* Tue Sep 4 2018 Dan Walsh - 1:0.8.5-3.dev.git65c31d4 +- Fix required version of runc + +* Mon Sep 3 2018 Dan Walsh - 0.8.5-2.gitdc5a711 +- Add a specific version of runc or later to require + +* Fri Aug 31 2018 baude - 0.8.5-1.gitdc5a711 +- Upstream 0.8.5 release + +* Thu Aug 30 2018 Lokesh Mandvekar - 1:0.8.4-2.git9f9b8cf +- correct min dep on containernetworking-plugins +- update bundled provides + +* Mon Aug 20 2018 Lokesh Mandvekar - 1:0.8.3-4.dev.git3d55721f +- Resolves: #1619411 - python3-podman should require python3-psutil +- podman-docker should conflict with moby-engine +- require nftables +- recommend slirp4netns and fuse-overlayfs (latter only for kernel >= 4.18) + +* Sun Aug 12 2018 Dan Walsh - 1:0.8.3-3.dev.git3d55721f +- Add podman-docker support +- Force cgroupfs for non root podman + +* Sun Aug 12 2018 Lokesh Mandvekar - 1:0.8.3-2.dev.git3d55721f +- Requires: conmon +- use default %%gobuild + +* Sat Aug 11 2018 Lokesh Mandvekar - 1:0.8.3-1.dev.git3d55721f +- bump to v0.8.3-dev +- built commit 3d55721f +- bump Epoch to 1, cause my autobuilder messed up earlier + +* Wed Aug 01 2018 Lokesh Mandvekar (Bot) - 0.8.10.8.1-1.dev.git1a439f91 +- bump to 0.8.1 +- autobuilt 1a439f9 + +* Tue Jul 31 2018 Lokesh Mandvekar (Bot) - 0.8.10.8.1-1.dev.git1a439f9.dev.git5a4e5901 +- bump to 0.8.1 +- autobuilt 5a4e590 + +* Sun Jul 29 2018 Lokesh Mandvekar (Bot) - 0.8.10.8.1-1.dev.git1a439f9.dev.git5a4e590.dev.git433cbd51 +- bump to 0.8.1 +- autobuilt 433cbd5 + +* Sat Jul 28 2018 Lokesh Mandvekar (Bot) - 0.8.10.8.1-1.dev.git1a439f9.dev.git5a4e590.dev.git433cbd5.dev.git87d8edb1 +- bump to 0.8.1 +- autobuilt 87d8edb + +* Fri Jul 27 2018 Lokesh Mandvekar - 0.7.4-7.dev.git3dd577e +- fix python package version + +* Fri Jul 27 2018 Igor Gnatenko - 0.7.4-6.dev.git3dd577e +- Rebuild for new binutils + +* Fri Jul 27 2018 Lokesh Mandvekar (Bot) - 0.7.4-5.dev.git3dd577e +- autobuilt 3dd577e + +* Thu Jul 26 2018 Lokesh Mandvekar (Bot) - 0.7.4-4.dev.git9c806a4 +- autobuilt 9c806a4 + +* Wed Jul 25 2018 Lokesh Mandvekar (Bot) - 0.7.4-3.dev.gitc90b740 +- autobuilt c90b740 + +* Tue Jul 24 2018 Lokesh Mandvekar - 0.7.4-2.dev.git9a18681 +- pypodman package exists only if varlink + +* Mon Jul 23 2018 Lokesh Mandvekar - 0.7.4-1.dev.git9a18681 +- bump to v0.7.4-dev +- built commit 9a18681 + +* Mon Jul 23 2018 Dan Walsh - 0.7.3-2.dev.git06c546e +- Add Reccommeds container-selinux + +* Sun Jul 15 2018 Lokesh Mandvekar - 0.7.3-1.dev.git06c546e +- built commit 06c546e + +* Sat Jul 14 2018 Dan Walsh - 0.7.2-10.dev.git86154b6 +- Add install of pypodman + +* Fri Jul 13 2018 Fedora Release Engineering - 0.7.2-9.dev.git86154b6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Thu Jul 12 2018 Lokesh Mandvekar (Bot) - 0.7.2-8.dev.git86154b6 +- autobuilt 86154b6 + +* Wed Jul 11 2018 Lokesh Mandvekar (Bot) - 0.7.2-7.dev.git84cfdb2 +- autobuilt 84cfdb2 + +* Tue Jul 10 2018 Lokesh Mandvekar (Bot) - 0.7.2-6.dev.git4f9b1ae +- autobuilt 4f9b1ae + +* Mon Jul 09 2018 Lokesh Mandvekar (Bot) - 0.7.2-5.gitc7424b6 +- autobuilt c7424b6 + +* Mon Jul 09 2018 Dan Walsh - 0.7.2-4.gitf661e1d +- Add ostree support + +* Mon Jul 09 2018 Lokesh Mandvekar (Bot) - 0.7.2-3.gitf661e1d +- autobuilt f661e1d + +* Sun Jul 08 2018 Lokesh Mandvekar (Bot) - 0.7.2-2.git0660108 +- autobuilt 0660108 + +* Sat Jul 07 2018 Lokesh Mandvekar (Bot) - 0.7.2-1.gitca6ffbc +- bump to 0.7.2 +- autobuilt ca6ffbc + +* Fri Jul 06 2018 Lokesh Mandvekar (Bot) - 0.7.1-6.git99959e5 +- autobuilt 99959e5 + +* Thu Jul 05 2018 Lokesh Mandvekar (Bot) - 0.7.1-5.gitf2462ca +- autobuilt f2462ca + +* Wed Jul 04 2018 Lokesh Mandvekar (Bot) - 0.7.1-4.git6d8fac8 +- autobuilt 6d8fac8 + +* Tue Jul 03 2018 Lokesh Mandvekar (Bot) - 0.7.1-3.git767b3dd +- autobuilt 767b3dd + +* Mon Jul 02 2018 Miro Hrončok - 0.7.1-2.gitb96be3a +- Rebuilt for Python 3.7 + +* Sat Jun 30 2018 Lokesh Mandvekar (Bot) - 0.7.1-1.gitb96be3a +- bump to 0.7.1 +- autobuilt b96be3a + +* Fri Jun 29 2018 Lokesh Mandvekar (Bot) - 0.6.5-6.gitd61d8a3 +- autobuilt d61d8a3 + +* Thu Jun 28 2018 Lokesh Mandvekar (Bot) - 0.6.5-5.gitfd12c89 +- autobuilt fd12c89 + +* Wed Jun 27 2018 Lokesh Mandvekar (Bot) - 0.6.5-4.git56133f7 +- autobuilt 56133f7 + +* Tue Jun 26 2018 Lokesh Mandvekar (Bot) - 0.6.5-3.git208b9a6 +- autobuilt 208b9a6 + +* Mon Jun 25 2018 Lokesh Mandvekar (Bot) - 0.6.5-2.gite89bbd6 +- autobuilt e89bbd6 + +* Sat Jun 23 2018 Lokesh Mandvekar (Bot) - 0.6.5-1.git7182339 +- bump to 0.6.5 +- autobuilt 7182339 + +* Fri Jun 22 2018 Lokesh Mandvekar (Bot) - 0.6.4-7.git4bd0f22 +- autobuilt 4bd0f22 + +* Thu Jun 21 2018 Lokesh Mandvekar (Bot) - 0.6.4-6.git6804fde +- autobuilt 6804fde + +* Wed Jun 20 2018 Lokesh Mandvekar (Bot) - 0.6.4-5.gitf228cf7 +- autobuilt f228cf7 + +* Tue Jun 19 2018 Miro Hrončok - 0.6.4-4.git5645789 +- Rebuilt for Python 3.7 + +* Tue Jun 19 2018 Lokesh Mandvekar (Bot) - 0.6.4-3.git5645789 +- autobuilt 5645789 + +* Mon Jun 18 2018 Lokesh Mandvekar (Bot) - 0.6.4-2.git9e13457 +- autobuilt 9e13457 + +* Sat Jun 16 2018 Lokesh Mandvekar (Bot) - 0.6.4-1.gitb43677c +- bump to 0.6.4 +- autobuilt b43677c + +* Fri Jun 15 2018 Lokesh Mandvekar (Bot) - 0.6.3-6.git6bdf023 +- autobuilt 6bdf023 + +* Thu Jun 14 2018 Lokesh Mandvekar (Bot) - 0.6.3-5.git65033b5 +- autobuilt 65033b5 + +* Wed Jun 13 2018 Lokesh Mandvekar (Bot) - 0.6.3-4.git95ea3d4 +- autobuilt 95ea3d4 + +* Tue Jun 12 2018 Lokesh Mandvekar (Bot) - 0.6.3-3.gitab72130 +- autobuilt ab72130 + +* Mon Jun 11 2018 Lokesh Mandvekar (Bot) - 0.6.3-2.git1e9e530 +- autobuilt 1e9e530 + +* Sat Jun 09 2018 Lokesh Mandvekar (Bot) - 0.6.3-1.gitb78e7e4 +- bump to 0.6.3 +- autobuilt b78e7e4 + +* Fri Jun 08 2018 Lokesh Mandvekar (Bot) - 0.6.2-7.git1cbce85 +- autobuilt 1cbce85 + +* Thu Jun 07 2018 Lokesh Mandvekar (Bot) - 0.6.2-6.gitb1ebad9 +- autobuilt b1ebad9 + +* Wed Jun 06 2018 Lokesh Mandvekar (Bot) - 0.6.2-5.git7b2b2bc +- autobuilt 7b2b2bc + +* Tue Jun 05 2018 Lokesh Mandvekar (Bot) - 0.6.2-4.git14cf6d2 +- autobuilt 14cf6d2 + +* Mon Jun 04 2018 Lokesh Mandvekar (Bot) - 0.6.2-3.gitcae49fc +- autobuilt cae49fc + +* Sun Jun 03 2018 Lokesh Mandvekar (Bot) - 0.6.2-2.git13f7450 +- autobuilt 13f7450 + +* Sat Jun 02 2018 Lokesh Mandvekar (Bot) - 0.6.2-1.git22e6f11 +- bump to 0.6.2 +- autobuilt 22e6f11 + +* Fri Jun 01 2018 Lokesh Mandvekar (Bot) - 0.6.1-4.gita9e9fd4 +- autobuilt a9e9fd4 + +* Thu May 31 2018 Lokesh Mandvekar (Bot) - 0.6.1-3.gita127b4f +- autobuilt a127b4f + +* Wed May 30 2018 Lokesh Mandvekar (Bot) - 0.6.1-2.git8ee0f2b +- autobuilt 8ee0f2b + +* Sat May 26 2018 Lokesh Mandvekar (Bot) - 0.6.1-1.git44d1c1c +- bump to 0.6.1 +- autobuilt 44d1c1c + +* Fri May 18 2018 Lokesh Mandvekar - 0.5.3-7.gitc54b423 +- make python3-podman the same version as the main package +- build python3-podman only for fedora >= 28 + +* Fri May 18 2018 Lokesh Mandvekar (Bot) - 0.5.3-6.gitc54b423 +- autobuilt c54b423 + +* Wed May 16 2018 Lokesh Mandvekar - 0.5.3-5.git624660c +- built commit 624660c +- New subapackage: python3-podman + +* Wed May 16 2018 Lokesh Mandvekar (Bot) - 0.5.3-4.git9fcc475 +- autobuilt 9fcc475 + +* Wed May 16 2018 Lokesh Mandvekar (Bot) - 0.5.3-3.git0613844 +- autobuilt 0613844 + +* Tue May 15 2018 Lokesh Mandvekar (Bot) - 0.5.3-2.git45838b9 +- autobuilt 45838b9 + +* Fri May 11 2018 Lokesh Mandvekar - 0.5.3-1.git07253fc +- bump to v0.5.3 +- built commit 07253fc + +* Fri May 11 2018 Lokesh Mandvekar (Bot) - 0.5.2-5.gitcc1bad8 +- autobuilt cc1bad8 + +* Wed May 09 2018 Lokesh Mandvekar (Bot) - 0.5.2-4.git2526355 +- autobuilt 2526355 + +* Tue May 08 2018 Lokesh Mandvekar (Bot) - 0.5.2-3.gitfaa8c3e +- autobuilt faa8c3e + +* Sun May 06 2018 Lokesh Mandvekar (Bot) - 0.5.2-2.gitfa4705c +- autobuilt fa4705c + +* Sat May 05 2018 Lokesh Mandvekar (Bot) - 0.5.2-1.gitbb0e754 +- bump to 0.5.2 +- autobuilt bb0e754 + +* Fri May 04 2018 Lokesh Mandvekar (Bot) - 0.5.1-5.git5ae940a +- autobuilt 5ae940a + +* Wed May 02 2018 Lokesh Mandvekar (Bot) - 0.5.1-4.git64dc803 +- autobuilt commit 64dc803 + +* Wed May 02 2018 Lokesh Mandvekar (Bot) - 0.5.1-3.git970eaf0 +- autobuilt commit 970eaf0 + +* Tue May 01 2018 Lokesh Mandvekar (Bot) - 0.5.1-2.git7a0a855 +- autobuilt commit 7a0a855 + +* Sun Apr 29 2018 Lokesh Mandvekar - 0.5.1-1.giteda0fd7 +- reflect version number correctly +- my builder script error ended up picking the wrong version number previously + +* Sun Apr 29 2018 Lokesh Mandvekar (Bot) - 0.4.2-5.giteda0fd7 +- autobuilt commit eda0fd7 + +* Sat Apr 28 2018 Lokesh Mandvekar (Bot) - 0.4.2-4.git6774425 +- autobuilt commit 6774425 + +* Fri Apr 27 2018 Lokesh Mandvekar (Bot) - 0.4.2-3.git39a7a77 +- autobuilt commit 39a7a77 + +* Thu Apr 26 2018 Lokesh Mandvekar (Bot) - 0.4.2-2.git58cb8f7 +- autobuilt commit 58cb8f7 + +* Wed Apr 25 2018 Lokesh Mandvekar (Bot) - 0.4.2-1.gitbef93de +- bump to 0.4.2 +- autobuilt commit bef93de + +* Tue Apr 24 2018 Lokesh Mandvekar - 0.4.4-1.git398133e +- use correct version number + +* Tue Apr 24 2018 Lokesh Mandvekar (Bot) - 0.4.2-22.git398133e +- autobuilt commit 398133e + +* Sun Apr 22 2018 Lokesh Mandvekar (Bot) - 0.4.2-21.gitcf1d884 +- autobuilt commit cf1d884 + +* Fri Apr 20 2018 Lokesh Mandvekar (Bot) - 0.4.2-20.git9b457e3 +- autobuilt commit 9b457e3 + +* Fri Apr 20 2018 Lokesh Mandvekar (Bot) - 0.4.2-1.gitbef93de9.git228732d +- autobuilt commit 228732d + +* Thu Apr 19 2018 Lokesh Mandvekar (Bot) - 0.4.2-1.gitbef93de8.gitf2658ec +- autobuilt commit f2658ec + +* Thu Apr 19 2018 Lokesh Mandvekar (Bot) - 0.4.2-1.gitbef93de7.git6a9dbf3 +- autobuilt commit 6a9dbf3 + +* Tue Apr 17 2018 Lokesh Mandvekar (Bot) - 0.4.2-1.gitbef93de6.git96d1162 +- autobuilt commit 96d1162 + +* Tue Apr 17 2018 Lokesh Mandvekar (Bot) - 0.4.2-1.gitbef93de5.git96d1162 +- autobuilt commit 96d1162 + +* Mon Apr 16 2018 Lokesh Mandvekar (Bot) - 0.4.2-1.gitbef93de4.git6c5ebb0 +- autobuilt commit 6c5ebb0 + +* Mon Apr 16 2018 Lokesh Mandvekar (Bot) - 0.4.2-1.gitbef93de3.gitfa8442e +- autobuilt commit fa8442e + +* Mon Apr 16 2018 Lokesh Mandvekar (Bot) - 0.4.2-1.gitbef93de2.gitfa8442e +- autobuilt commit fa8442e + +* Sun Apr 15 2018 Lokesh Mandvekar (Bot) - 0.4.2-1.gitbef93de1.gitfa8442e +- autobuilt commit fa8442e + +* Sat Apr 14 2018 Lokesh Mandvekar (Bot) - 0.4.2-1.gitbef93de0.git62b59df +- autobuilt commit 62b59df + +* Fri Apr 13 2018 Lokesh Mandvekar (Bot) - 0.4.2-9.git191da31 +- autobuilt commit 191da31 + +* Thu Apr 12 2018 Lokesh Mandvekar (Bot) - 0.4.2-8.git6f51a5b +- autobuilt commit 6f51a5b + +* Wed Apr 11 2018 Lokesh Mandvekar (Bot) - 0.4.2-7.git77a1665 +- autobuilt commit 77a1665 + +* Tue Apr 10 2018 Lokesh Mandvekar (Bot) - 0.4.2-6.git864b9c0 +- autobuilt commit 864b9c0 + +* Tue Apr 10 2018 Lokesh Mandvekar (Bot) - 0.4.2-5.git864b9c0 +- autobuilt commit 864b9c0 + +* Tue Apr 10 2018 Lokesh Mandvekar (Bot) - 0.4.2-4.git998fd2e +- autobuilt commit 998fd2e + +* Sun Apr 08 2018 Lokesh Mandvekar (Bot) - 0.4.2-3.git998fd2e +- autobuilt commit 998fd2e + +* Sun Apr 08 2018 Lokesh Mandvekar - 0.4.2-2.git998fd2e +- autobuilt commit 998fd2e + +* Sun Apr 08 2018 Lokesh Mandvekar - 0.4.2-1.gitbef93de.git998fd2e +- bump to 0.4.2 +- autobuilt commit 998fd2e + +* Thu Mar 29 2018 baude - 0.3.5-2.gitdb6bf9e3 +- Upstream release 0.3.5 + +* Tue Mar 27 2018 Lokesh Mandvekar - 0.3.5-1.git304bf53 +- built commit 304bf53 + +* Fri Mar 23 2018 baude - 0.3.4-1.git57b403e +- Upstream release 0.3.4 + +* Fri Mar 16 2018 baude - 0.3.3-2.dev.gitbc358eb +- Upstream release 0.3.3 + +* Wed Mar 14 2018 Lokesh Mandvekar - 0.3.3-1.dev.gitbc358eb +- built podman commit bc358eb +- built conmon from cri-o commit 712f3b8 + +* Fri Mar 09 2018 baude - 0.3.2-1.gitf79a39a +- Release 0.3.2-1 + +* Sun Mar 04 2018 baude - 0.3.1-2.git98b95ff +- Correct RPM version + +* Fri Mar 02 2018 baude - 0.3.1-1-gitc187538 +- Release 0.3.1-1 + * Sun Feb 25 2018 Peter Robinson 0.2.2-2.git525e3b1 - Build on ARMv7 too (Fedora supports containers on that arch too) @@ -486,4 +1030,3 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} * Wed Jan 10 2018 Frantisek Kluknavsky - 0-0.1.gitc1b2278 - First package for Fedora - diff --git a/sources b/sources index 769f3d8..e6fc603 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ -SHA512 (libpod-525e3b1.tar.gz) = 0826e974cb84a1f82977a1adea97f622d1b6027076e3c2f367641c7f47bb101bcd7f1c88f5803bd122a41948be029780f34b27fe567e97d71114fb9899d3150e +SHA512 (cri-o-a30f93c.tar.gz) = 8bfa291fe3720259b63abaae5b0e50574a3437e1742c84fca36ff325d046ddd81a406a26fe0a3c4760b4c69a7e065a9b1ac550f2e061b45aadc7faf4702b798d +SHA512 (libpod-b33a00e.tar.gz) = a682d6e79d23f31ec9a969cacdf108f3c0b21cf61bd8f9cb329f272c237777a15f68e6b74b7217d99985d41e75b3b7d9b9bfe4c5c84c8194ba082a288f1bdce1 diff --git a/tests/test_podman.sh b/tests/test_podman.sh new file mode 100755 index 0000000..da220bf --- /dev/null +++ b/tests/test_podman.sh @@ -0,0 +1,13 @@ +#!/bin/bash +# +# Simple podman tests +# + +rm -f /tmp/test.log /tmp/test.debug.log + +# Log program versions +rpm -q podman podman-tests >/tmp/test.debug.log + +bats /usr/share/podman/test/system &> /tmp/test.log + +echo "bats completed with status $?" >>/tmp/test.debug.log diff --git a/tests/test_podman.yml b/tests/test_podman.yml new file mode 100644 index 0000000..694b6d6 --- /dev/null +++ b/tests/test_podman.yml @@ -0,0 +1,35 @@ +--- +- hosts: localhost + vars: + - artifacts: ./artifacts + # FIXME! It would be cleaner to include 'podman' 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 podman installs + # but podman-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: + - podman-tests + tags: + - classic + - container + + tasks: + - name: install packages + dnf: name="{{ required_packages }}" state=installed + enablerepo=updates-testing + + - block: + # FIXME: how to make two passes, one as root and one rootless? + - name: Run test + script: ./test_podman.sh + always: + - name: Pull out logs + fetch: + src: "/tmp/{{ item }}" + dest: "{{ artifacts }}/{{ item }}" + flat: yes + with_items: + - test.log + - test.debug.log diff --git a/tests/tests.yml b/tests/tests.yml new file mode 100644 index 0000000..80caee7 --- /dev/null +++ b/tests/tests.yml @@ -0,0 +1 @@ +- import_playbook: test_podman.yml