diff --git a/.gitignore b/.gitignore index ba79c3d..a24c5e7 100644 --- a/.gitignore +++ b/.gitignore @@ -96,3 +96,166 @@ /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-28a2bf8.tar.gz +/libpod-c3a0874.tar.gz +/libpod-af791f3.tar.gz +/cri-o-2cbe48b.tar.gz +/libpod-e7e81e6.tar.gz +/libpod-da5c894.tar.gz +/cri-o-a30f93c.tar.gz +/libpod-db08685.tar.gz +/libpod-4955572.tar.gz +/libpod-e9f8aed.tar.gz +/libpod-672f572.tar.gz +/libpod-a4adfe5.tar.gz +/libpod-f5473c6.tar.gz +/libpod-78e6d8e.tar.gz +/libpod-7965716.tar.gz +/libpod-97bded4.tar.gz +/libpod-236408b.tar.gz +/libpod-cd5742f.tar.gz +/libpod-ea928f2.tar.gz +/libpod-23feb0d.tar.gz +/libpod-1fdfeb8.tar.gz +/libpod-78604c3.tar.gz +/libpod-e3ece3b.tar.gz +/libpod-3956050.tar.gz +/libpod-3af62f6.tar.gz +/libpod-6b8f89d.tar.gz +/libpod-41f250c.tar.gz +/libpod-5f6ad82.tar.gz +/libpod-320085a.tar.gz +/libpod-75b19ca.tar.gz +/libpod-a387c72.tar.gz +/libpod-1f547b2.tar.gz +/libpod-235a630.tar.gz +/libpod-8a3361f.tar.gz +/libpod-508388b.tar.gz +/libpod-93b5ccf.tar.gz +/libpod-c086118.tar.gz +/libpod-b21d474.tar.gz +/libpod-68414c5.tar.gz +/libpod-c8eaf59.tar.gz +/libpod-6b059a5.tar.gz +/libpod-fa998f2.tar.gz +/libpod-fe186c6.tar.gz +/libpod-792f109.tar.gz +/libpod-8fe3050.tar.gz +/libpod-c50332d.tar.gz +/libpod-1aa55ed.tar.gz +/libpod-7438b7b.tar.gz +/libpod-098c134.tar.gz +/libpod-9ffd480.tar.gz +/libpod-4e0c0ec.tar.gz +/libpod-b83b07c.tar.gz +/libpod-faa2462.tar.gz +/libpod-c9d63fe.tar.gz +/libpod-0f6535c.tar.gz +/libpod-5c86efb.tar.gz +/libpod-140ae25.tar.gz +/libpod-6301f6a.tar.gz +/libpod-1b2f752.tar.gz +/libpod-0e3264a.tar.gz +/libpod-e3dc660.tar.gz +/libpod-0d4bfb0.tar.gz +/libpod-579fc0f.tar.gz +/libpod-ef2f6f9.tar.gz +/libpod-ec96987.tar.gz +/libpod-7838a13.tar.gz +/libpod-c9e1f36.tar.gz +/libpod-ebe9297.tar.gz +/libpod-ad5579e.tar.gz +/libpod-805c6d9.tar.gz +/libpod-e97dc8e.tar.gz +/libpod-e6426af.tar.gz +/libpod-d5593b8.tar.gz +/libpod-778f986.tar.gz +/libpod-650e242.tar.gz +/libpod-f250745.tar.gz +/libpod-962850c.tar.gz +/libpod-afd4d5f.tar.gz +/libpod-c86e8f1.tar.gz +/libpod-8923703.tar.gz +/libpod-ee27c39.tar.gz +/libpod-dfc64e1.tar.gz +/libpod-81ace5c.tar.gz +/libpod-0a521e1.tar.gz +/libpod-1cb16bd.tar.gz +/libpod-3f32eae.tar.gz +/libpod-228d1cb.tar.gz +/libpod-3b88c73.tar.gz +/libpod-4934bf2.tar.gz +/libpod-1788add.tar.gz +/libpod-b223d4e.tar.gz +/libpod-cc4addd.tar.gz +/libpod-553ac80.tar.gz +/libpod-cf52144.tar.gz +/libpod-623fcfa.tar.gz +/libpod-5afae0b.tar.gz +/libpod-9137315.tar.gz +/libpod-9adcda7.tar.gz +/libpod-f3a3d8e.tar.gz +/libpod-4b80517.tar.gz +/libpod-40f7843.tar.gz +/libpod-614409f.tar.gz +/libpod-1b2f867.tar.gz +/libpod-9b21f14.tar.gz +/libpod-d95f97a.tar.gz +/libpod-de0192a.tar.gz +/libpod-883566f.tar.gz +/libpod-7426d4f.tar.gz +/libpod-31f11a8.tar.gz +/libpod-6aa8078.tar.gz +/libpod-ac523cb.tar.gz +/libpod-537c382.tar.gz +/libpod-c230f0c.tar.gz +/libpod-68e3df3.tar.gz +/libpod-0458daf.tar.gz +/libpod-d0c6a35.tar.gz +/libpod-fc546d4.tar.gz +/libpod-850326c.tar.gz +/libpod-fdf979a.tar.gz +/libpod-7b73974.tar.gz +/libpod-833204d.tar.gz +/libpod-cd35e20.tar.gz +/libpod-ad467ba.tar.gz +/libpod-4bda537.tar.gz +/libpod-bda28c6.tar.gz +/libpod-bc320be.tar.gz +/libpod-c94903a.tar.gz +/libpod-60ef8f8.tar.gz +/libpod-6cd6eb6.tar.gz +/libpod-387d601.tar.gz +/libpod-1572367.tar.gz +/libpod-b926005.tar.gz +/libpod-167ce59.tar.gz +/libpod-c1e2b58.tar.gz +/libpod-a87cf6f.tar.gz +/libpod-bf5ffda.tar.gz +/libpod-e4947e5.tar.gz +/libpod-9f92b21.tar.gz +/libpod-d652c86.tar.gz +/libpod-b01fdcb.tar.gz +/libpod-9ae3221.tar.gz +/libpod-7210727.tar.gz +/conmon-5995229.tar.gz +/libpod-41365a8.tar.gz +/libpod-6d285b8.tar.gz +/libpod-9b6a98c.tar.gz +/libpod-7fd6528.tar.gz +/libpod-2371158.tar.gz +/libpod-b3f10c8.tar.gz +/conmon-1de71ad.tar.gz +/conmon-e217fdf.tar.gz +/libpod-54b394b.tar.gz +/libpod-0005792.tar.gz +/libpod-ca5ff03.tar.gz +/libpod-9181c65.tar.gz +/libpod-b02b072.tar.gz +/libpod-a2fdb6e.tar.gz +/libpod-233d95f.tar.gz +/libpod-4d653f0.tar.gz +/libpod-f3ffda1.tar.gz diff --git a/podman.spec b/podman.spec index 94f9f6a..12811cc 100644 --- a/podman.spec +++ b/podman.spec @@ -1,15 +1,12 @@ +%{?python_enable_dependency_generator} %global with_devel 0 %global with_bundled 1 %global with_debug 1 %global with_check 0 %global with_unit_test 0 -%if 0%{?fedora} >= 28 %bcond_without varlink %define gogenerate go generate -%else -%bcond_with varlink -%endif %if 0%{?with_debug} %global _find_debuginfo_dwz_opts %{nil} @@ -20,35 +17,30 @@ %global provider github %global provider_tld com -%global project projectatomic +%global project containers %global repo libpod -# https://github.com/projectatomic/libpod +# https://github.com/containers/libpod %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} %global git0 https://%{provider}.%{provider_tld}/%{project}/%{repo} -%global commit0 3d55721fc4879cba166a9afb5acfeb8e1cdd6272 +%global commit0 f3ffda1e08f19e9a6a88484136b5eed76533f21a %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) +# Used for comparing with latest upstream tag +# to decide whether to autobuild (non-rawhide only) +%global built_tag v1.6.2 + 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 -%endif -Version: 0.8.3 -Release: 4.dev.git%{shortcommit0}%{?dist} +Epoch: 2 +Version: 1.6.2 +Release: 2%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 -URL: %{git_podman} +URL: https://%{name}.io/ Source0: %{git0}/archive/%{commit0}/%{repo}-%{shortcommit0}.tar.gz -Patch: rootless.patch -# 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 @@ -62,19 +54,21 @@ BuildRequires: libselinux-devel BuildRequires: ostree-devel BuildRequires: pkgconfig BuildRequires: make -Requires: runc +BuildRequires: systemd +BuildRequires: systemd-devel +Requires: runc >= 2:1.0.0-57 +Requires: conmon Requires: containers-common -Requires: containernetworking-plugins >= 0.7.3-1 +Requires: containernetworking-plugins >= 0.7.5-1 Requires: iptables Requires: nftables -Requires: atomic-registries -Requires: oci-systemd-hook -Requires: conmon +Requires: libseccomp >= 2.4.1 +Recommends: %{name}-manpages = %{epoch}:%{version}-%{release} Recommends: container-selinux -Recommends: slirp4netns -%if 0%{?fedora} > 28 -Recommends: fuse-overlayfs -%endif +Recommends: slirp4netns >= 0.3.0-2 +Recommends: fuse-overlayfs >= 0.3-8 +Recommends: libvarlink-util >= 18-1 +Requires: runc >= 2:1.0.0-57 # vendored libraries # awk '{print "Provides: bundled(golang("$1")) = "$2}' vendor.conf | sort @@ -84,13 +78,14 @@ 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)) = 77e628511d924b13a77cebdc73b757a47f6d751b +Provides: bundled(golang(github.com/containerd/cgroups)) = 58556f5ad8448d99a6f7bea69ea4bdb7747cfeb0 Provides: bundled(golang(github.com/containerd/continuity)) = master -Provides: bundled(golang(github.com/containernetworking/cni)) = v0.7.0-alpha1 +#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)) = 382fc951fe0a8aba62043862ce1a56f77524db87 -Provides: bundled(golang(github.com/containers/storage)) = 17c7d1fee5603ccf6dd97edc14162fc1510e7e23 +Provides: bundled(golang(github.com/containers/image)) = 85d7559d44fd71f30e46e43d809bfbf88d11d916 +Provides: bundled(golang(github.com/containers/psgo)) = 5dde6da0bc8831b35243a847625bcf18183bd1ee +Provides: bundled(golang(github.com/containers/storage)) = 243c4cd616afdf06b4a975f18c4db083d26b1641 +Provides: bundled(golang(github.com/coreos/go-iptables)) = 25d087f3cffd9aedc0c2b7eff25f23cbf3c20fe1 Provides: bundled(golang(github.com/coreos/go-systemd)) = v14 Provides: bundled(golang(github.com/cri-o/ocicni)) = master Provides: bundled(golang(github.com/cyphar/filepath-securejoin)) = v0.2.1 @@ -121,6 +116,7 @@ Provides: bundled(golang(github.com/hashicorp/go-multierror)) = 83588e72410abfbe Provides: bundled(golang(github.com/imdario/mergo)) = 0.2.2 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)) = 03f2033d19d5860aef995fe360ac7d395cd8ce65 Provides: bundled(golang(github.com/mattn/go-runewidth)) = v0.0.1 Provides: bundled(golang(github.com/Microsoft/go-winio)) = 78439966b38d69bf38227fbf57ac8a6fee70f69a Provides: bundled(golang(github.com/Microsoft/hcsshim)) = 43f9725307998e09f2e3816c2c0c36dc98f0c982 @@ -128,18 +124,18 @@ Provides: bundled(golang(github.com/mistifyio/go-zfs)) = v2.1.1 Provides: bundled(golang(github.com/mrunalp/fileutils)) = master Provides: bundled(golang(github.com/mtrmac/gpgme)) = b2432428689ca58c2b8e8dea9449d3295cf96fc9 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/go-digest)) = v1.0.0-rc0 Provides: bundled(golang(github.com/opencontainers/image-spec)) = v1.0.0 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/runtime-spec)) = d810dbc60d8c5aeeb3d054bd1132fab2121968ce +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/projectatomic/buildah)) = 35a37f36d37bf84397d7f79f6bb8649f728c19f1 +Provides: bundled(golang(github.com/projectatomic/buildah)) = af5bbde0180026ae87b7fc81c2dc124aa73ec959 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 @@ -149,8 +145,7 @@ Provides: bundled(golang(github.com/syndtr/gocapability)) = e7cb7fa329f456b38551 Provides: bundled(golang(github.com/tchap/go-patricia)) = v2.2.6 Provides: bundled(golang(github.com/ulikunitz/xz)) = v0.5.4 Provides: bundled(golang(github.com/ulule/deepcopier)) = master -# no '-' in version -#Provides: bundled(golang(github.com/urfave/cli)) = fix-short-opts-parsing +Provides: bundled(golang(github.com/urfave/cli)) = 934abfb2f102315b5794e15ebc7949e4ca253920 Provides: bundled(golang(github.com/varlink/go)) = master Provides: bundled(golang(github.com/vbatts/tar-split)) = v0.10.2 Provides: bundled(golang(github.com/vishvananda/netlink)) = master @@ -178,62 +173,57 @@ Provides: bundled(golang(k8s.io/kube-openapi)) = 275e2ce91dec4c05a4094a7b1daee55 Provides: bundled(golang(k8s.io/utils)) = 258e2a2fa64568210fbd6267cf1d8fd87c3cb86e %description +%{name} (Pod Manager) is a fully featured container engine that is a simple daemonless tool. %{name} provides a Docker-CLI comparable command line that eases the transition from other container engines and allows the management of pods, containers and images. Simply put: alias docker=%{name}. Most %{name} commands can be run as a regular user, without requiring additional privileges. + +%{name} uses Buildah(1) internally to create container images. Both tools share image (not container) storage, hence each can use or manipulate images (but not containers) created by the other. + %{summary} -%{repo} provides a library for applications looking to use -the Container Pod concept popularized by Kubernetes. - -%if %{with varlink} -%package -n python3-%{name} -BuildArch: noarch -BuildRequires: python3-devel -BuildRequires: python3-setuptools -BuildRequires: python3-varlink -Requires: python3-setuptools -Requires: python3-varlink -Requires: python3-dateutil -Requires: python3-humanize -Requires: python3-psutil -Provides: python3-%{name} = %{version}-%{release} -Summary: Python 3 bindings for %{name} - -%description -n python3-%{name} -This package contains Python 3 bindings for %{name}. - -%package -n python3-py%{name} -BuildArch: noarch -BuildRequires: python3-devel -BuildRequires: python3-setuptools -BuildRequires: python3-varlink -Requires: python3-setuptools -Requires: python3-varlink -Requires: python3-dateutil -Requires: python3-psutil -Summary: Python 3 tool for %{name} - -%description -n python3-py%{name} -This package contains Python 3 tool for %{name}. -%endif # varlink +%{repo} Simple management tool for pods, containers and images %package docker -Summary: Emulate Docker CLI using podman +Summary: Emulate Docker CLI using %{name} BuildArch: noarch -Requires: %{name} = %{version}-%{release} +Requires: %{name} = %{epoch}:%{version}-%{release} Conflicts: docker Conflicts: docker-latest Conflicts: docker-ce Conflicts: docker-ee -Conflicts: moby-engine +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. +executes %{name} commands, it also creates links between all Docker CLI man +pages and %{name}. + +%package manpages +Summary: Man pages for the %{name} commands +BuildArch: noarch + +%description manpages +Man pages for the %{name} commands + +%files manpages +%{_mandir}/man1/%{name}*.1* + +%package remote +Summary: (Experimental) Remote client for managing %{name} containers +Recommends: %{name}-manpages = %{epoch}:%{version}-%{release} + +%description remote +Remote client for managing %{name} containers. + +This experimental remote client is under heavy development. Please do not +run %{name}-remote in production. + +%{name}-remote uses the varlink connection to connect to a %{name} client to +manage pods, containers and container images. %{name}-remote supports ssh +connections as well. %if 0%{?with_devel} %package devel -Summary: Library for applications looking to use Container Pods -BuildArch: noarch -Provides: %{repo}-devel = %{version}-%{release} +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) @@ -341,18 +331,18 @@ 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 %{summary} @@ -364,14 +354,14 @@ 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) @@ -389,12 +379,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}-%{commit0} -sed -i '/\/bin\/env/d' completions/bash/%{name} -sed -i 's/0.0.0/%{version}/' contrib/python/%{name}/setup.py -sed -i 's/0.0.0/%{version}/' contrib/python/py%{name}/setup.py -mv pkg/hooks/README.md pkg/hooks/README-hooks.md + +sed -i 's/install.remote: podman-remote/install.remote:/' Makefile +sed -i 's/install.bin: podman/install.bin:/' Makefile %build mkdir _build @@ -403,36 +404,33 @@ mkdir -p src/%{provider}.%{provider_tld}/%{project} ln -s ../../../../ src/%{import_path} popd ln -s vendor src -export GOPATH=$(pwd)/_build:$(pwd):$(pwd):%{gopath} -export BUILDTAGS="varlink selinux seccomp $(hack/btrfs_installed_tag.sh) $(hack/btrfs_tag.sh) $(hack/libdm_tag.sh)" +export GOPATH=$(pwd)/_build:$(pwd) + +export GO111MODULE=off %gogenerate ./cmd/%{name}/varlink/... + +# build %%{name} +export BUILDTAGS="systemd varlink seccomp exclude_graphdriver_devicemapper $(hack/btrfs_installed_tag.sh) $(hack/btrfs_tag.sh) $(hack/libdm_tag.sh) $(hack/ostree_tag.sh) $(hack/selinux_tag.sh)" %gobuild -o bin/%{name} %{import_path}/cmd/%{name} -%if %{with varlink} -#install python-podman -pushd contrib/python/podman -%py3_build -popd +# build %%{name}-remote +export GO111MODULE=off +export BUILDTAGS="remoteclient systemd varlink seccomp exclude_graphdriver_devicemapper $(hack/btrfs_installed_tag.sh) $(hack/btrfs_tag.sh) $(hack/libdm_tag.sh) $(hack/ostree_tag.sh) $(hack/selinux_tag.sh)" +export GO111MODULE=off +%gobuild -o bin/%{name}-remote %{import_path}/cmd/%{name} -#install python-pypodman -pushd contrib/python/pypodman -%py3_build -popd - -%endif # varlink %install install -dp %{buildroot}%{_unitdir} -%{__make} PREFIX=%{buildroot}%{_prefix} ETCDIR=%{buildroot}%{_sysconfdir} \ +PODMAN_VERSION=%{version} %{__make} PREFIX=%{buildroot}%{_prefix} ETCDIR=%{buildroot}%{_sysconfdir} \ install.bin \ + install.remote \ install.man \ install.cni \ install.systemd \ install.completions \ install.docker -%if %{with varlink} -%{__make} DESTDIR=%{buildroot} install.python -%endif # varlink +mv pkg/hooks/README.md pkg/hooks/README-hooks.md # install libpod.conf install -dp %{buildroot}%{_datadir}/containers @@ -495,13 +493,20 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %if ! 0%{?gotest:1} %global gotest go test %endif - + %gotest %{import_path}/cmd/%{name} %gotest %{import_path}/libkpod %gotest %{import_path}/libpod %gotest %{import_path}/pkg/registrar %endif +install -d -p %{buildroot}/%{_datadir}/%{name}/test/system +cp -pav test/system %{buildroot}/%{_datadir}/%{name}/test/ + +%triggerpostun -- %{name} < 1.1 +%{_bindir}/%{name} system renumber +exit 0 + #define license tag if not already defined %{!?_licensedir:%global license %doc} @@ -509,32 +514,20 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %license LICENSE %doc README.md CONTRIBUTING.md pkg/hooks/README-hooks.md install.md code-of-conduct.md transfer.md %{_bindir}/%{name} -%{_mandir}/man1/podman*.1* %{_mandir}/man5/*.5* %{_datadir}/bash-completion/completions/* +# By "owning" the site-functions dir, we don't need to Require zsh +%{_datadir}/zsh/site-functions +%{_datadir}/zsh/site-functions/* %config(noreplace) %{_sysconfdir}/cni/net.d/87-%{name}-bridge.conflist %{_datadir}/containers/%{repo}.conf %{_unitdir}/io.%{name}.service %{_unitdir}/io.%{name}.socket +%{_userunitdir}/io.%{name}.service +%{_userunitdir}/io.%{name}.socket + %{_usr}/lib/tmpfiles.d/%{name}.conf -%if %{with varlink} -%files -n python3-%{name} -%license LICENSE -%doc README.md CONTRIBUTING.md pkg/hooks/README-hooks.md install.md code-of-conduct.md transfer.md -%dir %{python3_sitelib}/%{name} -%{python3_sitelib}/%{name}/* -%{python3_sitelib}/%{name}*.egg-info - -%files -n python3-py%{name} -%license LICENSE -%doc README.md CONTRIBUTING.md pkg/hooks/README-hooks.md install.md code-of-conduct.md transfer.md -%dir %{python3_sitelib}/py%{name} -%{python3_sitelib}/py%{name}/* -%{python3_sitelib}/py%{name}*.egg-info -%{_bindir}/py%{name} -%endif # varlink - %files docker %{_bindir}/docker %{_mandir}/man1/docker*.1* @@ -552,7 +545,414 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %doc README.md CONTRIBUTING.md pkg/hooks/README-hooks.md install.md code-of-conduct.md transfer.md %endif +%files remote +%{_bindir}/%{name}-remote + +%files tests +%license LICENSE +%{_datadir}/%{name}/test + %changelog +* Thu Oct 17 2019 RH Container Bot - 2:1.6.2-2 +- bump to v1.6.2 +- autobuilt f3ffda1 + +* Wed Oct 16 2019 RH Container Bot - 2:1.6.2-0.2.rc1 +- bump to v1.6.2-rc1 +- autobuilt 4d653f0 + +* Wed Oct 02 2019 RH Container Bot - 2:1.6.1-2 +- bump to v1.6.1 +- autobuilt 233d95f + +* Wed Oct 02 2019 RH Container Bot - 2:1.6.1-0.2.rc1 +- bump to v1.6.1-rc1 +- autobuilt a2fdb6e + +* Tue Oct 01 2019 Lokesh Mandvekar - 2:1.6.0-3 +- bump release tag + +* Tue Oct 01 2019 RH Container Bot - 2:1.6.0-2 +- bump to v1.6.0 +- autobuilt b02b072 + +* Wed Sep 25 2019 RH Container Bot - 2:1.6.0-0.2.rc2 +- bump to v1.6.0-rc2 +- autobuilt 9181c65 + +* Tue Sep 17 2019 Lokesh Mandvekar (Bot) - 2:1.6.0-2 +- bump to v1.6.0-rc1 +- autobuilt ca5ff03 + +* Fri Aug 16 2019 Lokesh Mandvekar - 2:1.5.1-3 +- list unitfiles in /usr/lib/systemd/user + +* Thu Aug 15 2019 Lokesh Mandvekar (Bot) - 2:1.5.1-2 +- bump to v1.5.1 +- autobuilt 0005792 + +* Fri Aug 09 2019 Lokesh Mandvekar (Bot) - 2:1.5.0-2 +- bump to v1.5.0 +- autobuilt 54b394b + +* Wed Jul 17 2019 Lokesh Mandvekar - 2:1.4.4-4 +- use conmon v1.0.0-rc2 + +* Mon Jul 08 2019 bbaude - 2:1.4.4-3 +- correct 1.4.4 commit + +* Mon Jul 08 2019 bbaude - 2:1.4.4-2 +- add runtime depend for libssecomp + +* Tue Jul 02 2019 bbaude - 2:1.4.4-1 +- Bump to v1.4.4 + +* Wed Jun 26 2019 Dan Walsh - 2:1.4.3-1 +- Bump to v1.4.3 + +* Wed Jun 19 2019 Dan Walsh - 2:1.4.2-1 +- Bump to v1.4.2 + +* Tue Jun 11 2019 Lokesh Mandvekar - 2:1.4.0-2 +- do not install /usr/libexec/crio - conflicts with crio + +* Mon Jun 10 2019 Lokesh Mandvekar - 2:1.4.0-1 +- Resolves: #1715668 - CVE-2019-10152 +- bump to v1.4.0 + +* Fri May 17 2019 Dan Walsh - 2:1.3.1-1.git7210727 +- New Release of podman + +* Mon Apr 1 2019 Dan Walsh - 2:1.2.0-2.git6aa8078 +- New Release of podman + +* Mon Mar 18 2019 Eduardo Santiago - 2:1.1.2-4.dev.git6aa8078 +- include zsh completion + +* Wed Mar 13 2019 Eduardo Santiago - 2:1.1.2-3.dev.gitb33a00e +- new -tests subpackage + +* Tue Mar 12 2019 Lokesh Mandvekar - 2:1.1.2-2.dev.git0ad9b6b +- missed the system renumber scriptlet in the previous build + +* Tue Mar 12 2019 Lokesh Mandvekar - 2:1.1.2-1.dev.git0ad9b6b +- bump to v1.1.2 + +* Tue Mar 12 2019 Lokesh Mandvekar - 2:1.0.1-32.dev.git228d1cb +- Resolves: #1686636 - do not depend on conmon (conmon moved to modules) + +* Tue Feb 19 2019 Lokesh Mandvekar (Bot) - 2:1.0.1-31.dev.git228d1cb +- autobuilt 228d1cb + +* Mon Feb 18 2019 Lokesh Mandvekar (Bot) - 2:1.0.1-30.dev.git3f32eae +- autobuilt 3f32eae + +* Sun Feb 17 2019 Lokesh Mandvekar (Bot) - 2:1.0.1-29.dev.git1cb16bd +- autobuilt 1cb16bd + +* Sat Feb 16 2019 Lokesh Mandvekar (Bot) - 2:1.0.1-28.dev.git0a521e1 +- autobuilt 0a521e1 + +* Fri Feb 15 2019 Lokesh Mandvekar (Bot) - 2:1.0.1-27.dev.git81ace5c +- autobuilt 81ace5c + +* Thu Feb 14 2019 Lokesh Mandvekar (Bot) - 2:1.0.1-26.dev.gitdfc64e1 +- autobuilt dfc64e1 + +* Wed Feb 13 2019 Lokesh Mandvekar (Bot) - 2:1.0.1-25.dev.gitee27c39 +- autobuilt ee27c39 + +* Tue Feb 12 2019 Lokesh Mandvekar (Bot) - 2:1.0.1-24.dev.git8923703 +- autobuilt 8923703 + +* Sun Feb 10 2019 Lokesh Mandvekar (Bot) - 2:1.0.1-23.dev.gitc86e8f1 +- autobuilt c86e8f1 + +* Sat Feb 09 2019 Lokesh Mandvekar (Bot) - 2:1.0.1-22.dev.gitafd4d5f +- autobuilt afd4d5f + +* Fri Feb 08 2019 Lokesh Mandvekar (Bot) - 2:1.0.1-21.dev.git962850c +- autobuilt 962850c + +* Thu Feb 07 2019 Lokesh Mandvekar (Bot) - 2:1.0.1-20.dev.gitf250745 +- autobuilt f250745 + +* Wed Feb 06 2019 Lokesh Mandvekar (Bot) - 2:1.0.1-19.dev.git650e242 +- autobuilt 650e242 + +* Tue Feb 05 2019 Lokesh Mandvekar (Bot) - 2:1.0.1-18.dev.git778f986 +- autobuilt 778f986 + +* Sun Feb 03 2019 Lokesh Mandvekar (Bot) - 2:1.0.1-17.dev.gitd5593b8 +- autobuilt d5593b8 + +* Sat Feb 02 2019 Lokesh Mandvekar (Bot) - 2:1.0.1-16.dev.gite6426af +- autobuilt e6426af + +* Fri Feb 01 2019 Lokesh Mandvekar (Bot) - 2:1.0.1-15.dev.gite97dc8e +- autobuilt e97dc8e + +* Thu Jan 31 2019 Lokesh Mandvekar (Bot) - 2:1.0.1-14.dev.git805c6d9 +- autobuilt 805c6d9 + +* Wed Jan 30 2019 Lokesh Mandvekar (Bot) - 2:1.0.1-13.dev.gitad5579e +- autobuilt ad5579e + +* Tue Jan 29 2019 Lokesh Mandvekar (Bot) - 2:1.0.1-12.dev.gitebe9297 +- autobuilt ebe9297 + +* Thu Jan 24 2019 Lokesh Mandvekar (Bot) - 2:1.0.1-11.dev.gitc9e1f36 +- autobuilt c9e1f36 + +* Wed Jan 23 2019 Lokesh Mandvekar (Bot) - 2:1.0.1-10.dev.git7838a13 +- autobuilt 7838a13 + +* Tue Jan 22 2019 Lokesh Mandvekar (Bot) - 2:1.0.1-9.dev.gitec96987 +- autobuilt ec96987 + +* Mon Jan 21 2019 Lokesh Mandvekar (Bot) - 2:1.0.1-8.dev.gitef2f6f9 +- autobuilt ef2f6f9 + +* Sun Jan 20 2019 Lokesh Mandvekar (Bot) - 2:1.0.1-7.dev.git579fc0f +- autobuilt 579fc0f + +* Sat Jan 19 2019 Lokesh Mandvekar (Bot) - 2:1.0.1-6.dev.git0d4bfb0 +- autobuilt 0d4bfb0 + +* Fri Jan 18 2019 Lokesh Mandvekar (Bot) - 2:1.0.1-5.dev.gite3dc660 +- autobuilt e3dc660 + +* Thu Jan 17 2019 Lokesh Mandvekar (Bot) - 2:1.0.1-4.dev.git0e3264a +- autobuilt 0e3264a + +* Wed Jan 16 2019 Lokesh Mandvekar (Bot) - 2:1.0.1-3.dev.git1b2f752 +- autobuilt 1b2f752 + +* Tue Jan 15 2019 Lokesh Mandvekar (Bot) - 2:1.0.1-2.dev.git6301f6a +- bump to 1.0.1 +- autobuilt 6301f6a + +* Mon Jan 14 2019 Lokesh Mandvekar (Bot) - 2:0.12.2-3.dev.git140ae25 +- autobuilt 140ae25 + +* Sat Jan 12 2019 Lokesh Mandvekar (Bot) - 2:0.12.2-2.dev.git5c86efb +- bump to 0.12.2 +- autobuilt 5c86efb + +* Fri Jan 11 2019 bbaude - 1:1.0.0-1.dev.git82e8011 +- Upstream 1.0.0 release + +* Thu Jan 10 2019 Lokesh Mandvekar (Bot) - 2:0.12.2-27.dev.git0f6535c +- autobuilt 0f6535c + +* Wed Jan 09 2019 Lokesh Mandvekar (Bot) - 2:0.12.2-26.dev.gitc9d63fe +- autobuilt c9d63fe + +* Tue Jan 08 2019 Lokesh Mandvekar (Bot) - 2:0.12.2-25.dev.gitfaa2462 +- autobuilt faa2462 + +* Mon Jan 07 2019 Lokesh Mandvekar (Bot) - 2:0.12.2-24.dev.gitb83b07c +- autobuilt b83b07c + +* Sat Jan 05 2019 Lokesh Mandvekar (Bot) - 2:0.12.2-23.dev.git4e0c0ec +- autobuilt 4e0c0ec + +* Fri Jan 04 2019 Lokesh Mandvekar (Bot) - 2:0.12.2-22.dev.git9ffd480 +- autobuilt 9ffd480 + +* Thu Jan 03 2019 Lokesh Mandvekar (Bot) - 2:0.12.2-21.dev.git098c134 +- autobuilt 098c134 + +* Tue Jan 01 2019 Lokesh Mandvekar (Bot) - 2:0.12.2-20.dev.git7438b7b +- autobuilt 7438b7b + +* Sat Dec 29 2018 Lokesh Mandvekar (Bot) - 2:0.12.2-1.nightly.git5c86efb9.dev.git1aa55ed +- autobuilt 1aa55ed + +* Thu Dec 27 2018 Igor Gnatenko - 2:0.12.2-1.nightly.git5c86efb8.dev.gitc50332d +- Enable python dependency generator + +* Tue Dec 25 2018 Lokesh Mandvekar (Bot) - 2:0.12.2-1.nightly.git5c86efb7.dev.gitc50332d +- autobuilt c50332d + +* Mon Dec 24 2018 Lokesh Mandvekar (Bot) - 2:0.12.2-1.nightly.git5c86efb6.dev.git8fe3050 +- autobuilt 8fe3050 + +* Sun Dec 23 2018 Lokesh Mandvekar (Bot) - 2:0.12.2-1.nightly.git5c86efb5.dev.git792f109 +- autobuilt 792f109 + +* Sat Dec 22 2018 Lokesh Mandvekar (Bot) - 2:0.12.2-1.nightly.git5c86efb4.dev.gitfe186c6 +- autobuilt fe186c6 + +* Fri Dec 21 2018 Lokesh Mandvekar (Bot) - 2:0.12.2-1.nightly.git5c86efb3.dev.gitfa998f2 +- autobuilt fa998f2 + +* Thu Dec 20 2018 Lokesh Mandvekar (Bot) - 2:0.12.2-1.nightly.git5c86efb2.dev.git6b059a5 +- autobuilt 6b059a5 + +* Wed Dec 19 2018 Lokesh Mandvekar (Bot) - 2:0.12.2-1.nightly.git5c86efb1.dev.gitc8eaf59 +- autobuilt c8eaf59 + +* Tue Dec 18 2018 Lokesh Mandvekar (Bot) - 2:0.12.2-1.nightly.git5c86efb0.dev.git68414c5 +- autobuilt 68414c5 + +* Mon Dec 17 2018 Lokesh Mandvekar (Bot) - 2:0.12.2-9.dev.gitb21d474 +- autobuilt b21d474 + +* Sat Dec 15 2018 Lokesh Mandvekar (Bot) - 2:0.12.2-8.dev.gitc086118 +- autobuilt c086118 + +* Fri Dec 14 2018 Lokesh Mandvekar (Bot) - 2:0.12.2-7.dev.git93b5ccf +- autobuilt 93b5ccf + +* Thu Dec 13 2018 Lokesh Mandvekar (Bot) - 2:0.12.2-6.dev.git508388b +- autobuilt 508388b + +* Wed Dec 12 2018 Lokesh Mandvekar (Bot) - 2:0.12.2-5.dev.git8a3361f +- autobuilt 8a3361f + +* Tue Dec 11 2018 Lokesh Mandvekar (Bot) - 2:0.12.2-4.dev.git235a630 +- autobuilt 235a630 + +* Sat Dec 08 2018 Lokesh Mandvekar (Bot) - 2:0.12.2-3.dev.git1f547b2 +- autobuilt 1f547b2 + +* Fri Dec 07 2018 Lokesh Mandvekar (Bot) - 2:0.12.2-2.dev.gita387c72 +- bump to 0.12.2 +- autobuilt a387c72 + +* Thu Dec 06 2018 Lokesh Mandvekar (Bot) - 2:0.11.2-15.dev.git75b19ca +- autobuilt 75b19ca + +* Wed Dec 05 2018 Lokesh Mandvekar (Bot) - 2:0.11.2-14.dev.git320085a +- autobuilt 320085a + +* Tue Dec 04 2018 Lokesh Mandvekar (Bot) - 2:0.11.2-13.dev.git5f6ad82 +- autobuilt 5f6ad82 + +* Sun Dec 02 2018 Lokesh Mandvekar (Bot) - 2:0.11.2-12.dev.git41f250c +- autobuilt 41f250c + +* Sat Dec 01 2018 Lokesh Mandvekar (Bot) - 2:0.11.2-11.dev.git6b8f89d +- autobuilt 6b8f89d + +* Thu Nov 29 2018 Lokesh Mandvekar (Bot) - 2:0.11.2-10.dev.git3af62f6 +- autobuilt 3af62f6 + +* Tue Nov 27 2018 Lokesh Mandvekar (Bot) - 2:0.11.2-9.dev.git3956050 +- autobuilt 3956050 + +* Mon Nov 26 2018 Lokesh Mandvekar (Bot) - 2:0.11.2-8.dev.gite3ece3b +- autobuilt e3ece3b + +* Sat Nov 24 2018 Lokesh Mandvekar (Bot) - 2:0.11.2-7.dev.git78604c3 +- autobuilt 78604c3 + +* Thu Nov 22 2018 Lokesh Mandvekar (Bot) - 2:0.11.2-6.dev.git1fdfeb8 +- autobuilt 1fdfeb8 + +* Wed Nov 21 2018 Lokesh Mandvekar (Bot) - 2:0.11.2-5.dev.git23feb0d +- autobuilt 23feb0d + +* Tue Nov 20 2018 Lokesh Mandvekar (Bot) - 2:0.11.2-4.dev.gitea928f2 +- autobuilt ea928f2 + +* Sat Nov 17 2018 Lokesh Mandvekar (Bot) - 2:0.11.2-3.dev.gitcd5742f +- autobuilt cd5742f + +* Fri Nov 16 2018 Lokesh Mandvekar (Bot) - 2:0.11.2-2.dev.git236408b +- autobuilt 236408b + +* Wed Nov 14 2018 Lokesh Mandvekar - 2:0.11.2-1.dev.git97bded4 +- bump epoch cause previous version was messed up +- built 97bded4 + +* Tue Nov 13 2018 Lokesh Mandvekar (Bot) - 1:0.11.20.11.2-1.dev.git79657161 +- bump to 0.11.2 +- autobuilt 7965716 + +* Sat Nov 10 2018 Dan Walsh - 1:0.11.20.11.2-2.dev.git78e6d8e1 +- Remove dirty flag from podman version + + +* Sat Nov 10 2018 Lokesh Mandvekar (Bot) - 1:0.11.20.11.2-1.dev.git7965716.dev.git78e6d8e1 +- bump to 0.11.2 +- autobuilt 78e6d8e + +* Fri Nov 09 2018 Lokesh Mandvekar (Bot) - 1:0.11.20.11.2-1.dev.git7965716.dev.git78e6d8e.dev.gitf5473c61 +- bump to 0.11.2 +- autobuilt f5473c6 + +* Thu Nov 08 2018 baude - 1:0.11.1-1.dev.gita4adfe5 +- Upstream 0.11.1-1 + +* Thu Nov 08 2018 Lokesh Mandvekar (Bot) - 1:0.10.2-3.dev.git672f572 +- autobuilt 672f572 + +* Wed Nov 07 2018 Lokesh Mandvekar (Bot) - 1:0.10.2-2.dev.gite9f8aed +- autobuilt e9f8aed + +* Sun Oct 28 2018 Lokesh Mandvekar - 1:0.10.2-1.dev.git4955572 +- Resolves: #1643744 - build podman with ostree support +- bump to v0.10.2 +- built commit 4955572 + +* Fri Oct 19 2018 Lokesh Mandvekar - 1:0.10.1.3-3.dev.gitdb08685 +- consistent epoch:version-release in changelog + +* Thu Oct 18 2018 Lokesh Mandvekar - 1:0.10.1.3-2.dev.gitdb08685 +- correct epoch mentions + +* Thu Oct 18 2018 Lokesh Mandvekar - 1:0.10.1.3-1.dev.gitdb08685 +- bump to v0.10.1.3 + +* Thu Oct 11 2018 baude - 1:0.10.1-1.gitda5c894 +- Upstream v0.10.1 release + +* Fri Sep 28 2018 Lokesh Mandvekar - 1:0.9.4-3.dev.gite7e81e6 +- built libpod commit e7e81e6 +- built conmon from cri-o commit 2cbe48b + +* 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.4-1.dev.gitaf791f3 +- bump to v0.9.4 +- built af791f3 + +* Wed Sep 19 2018 Lokesh Mandvekar - 1:0.9.3-2.dev.gitc3a0874 +- autobuilt c3a0874 + +* Mon Sep 17 2018 Lokesh Mandvekar - 1:0.9.3-1.dev.git28a2bf8 +- bump to v0.9.3 +- built commit 28a2bf82 + +* 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 + +* Tue Sep 4 2018 Dan Walsh - 1:0.8.5-5.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 - 1:0.8.5-2.dev.git65c31d4 +- Add a specific version of runc or later to require + +* Thu Aug 30 2018 Lokesh Mandvekar - 1:0.8.5-1.dev.git65c31d4 +- bump to v0.8.5-dev +- built commit 65c31d4 +- correct min dep on containernetworking-plugins for upgrade from +containernetworking-cni + * 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 @@ -957,4 +1357,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/rootless.patch b/rootless.patch deleted file mode 100644 index aac01b3..0000000 --- a/rootless.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/cmd/podman/libpodruntime/runtime.go b/cmd/podman/libpodruntime/runtime.go -index 9d1347cc..f1f2b963 100644 ---- a/cmd/podman/libpodruntime/runtime.go -+++ b/cmd/podman/libpodruntime/runtime.go -@@ -105,6 +105,10 @@ func GetRuntimeWithStorageOpts(c *cli.Context, storageOpts *storage.StoreOptions - - if c.GlobalIsSet("cgroup-manager") { - options = append(options, libpod.WithCgroupManager(c.GlobalString("cgroup-manager"))) -+ } else { -+ if rootless.IsRootless() { -+ options = append(options, libpod.WithCgroupManager("cgroupfs")) -+ } - } - - // TODO flag to set libpod static dir? diff --git a/sources b/sources index 651c884..88750c6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libpod-3d55721.tar.gz) = 78366d0f6cb63d83bfbd49dc59b9206494eef9aa72d8a8d7e937f875bc05fb245d3ff8ae3ca6b7f6397d8ee094b5e48a37c750dfb9278033d204fda769aa7420 +SHA512 (libpod-f3ffda1.tar.gz) = 05cedc0b58c5a3eac74d687ebca4ce4ffa3fe348deae89b3127e4edb5b1ce76d94c0b94df6ebae6c38ce0902cfab21dafe1f6fac752c0f67cfb001258727650c diff --git a/tests/test_podman.sh b/tests/test_podman.sh new file mode 100755 index 0000000..1f7b3f7 --- /dev/null +++ b/tests/test_podman.sh @@ -0,0 +1,17 @@ +#!/bin/bash -e +# +# Simple podman tests +# + +# Log program and kernel versions +echo "Important package versions:" +( + uname -r + rpm -qa | egrep 'podman|conmon|crun|runc|iptable|slirp|systemd' | sort +) | sed -e 's/^/ /' + +# Log environment; or at least the useful bits +echo "Environment:" +env | grep -v LS_COLORS= | sort | sed -e 's/^/ /' + +bats /usr/share/podman/test/system diff --git a/tests/test_podman.yml b/tests/test_podman.yml new file mode 100644 index 0000000..7002972 --- /dev/null +++ b/tests/test_podman.yml @@ -0,0 +1,22 @@ +--- +- hosts: localhost + roles: + - role: standard-test-basic + tags: + - classic + - container + required_packages: + - bats + - podman + - podman-tests + tests: + - root-test: + dir: ./ + run: ./test_podman.sh + timeout: 15m + - rootless-test: + # running the test with su doesn't create the directory for fedora user on /run/user/ + # so create it manually + dir: ./ + run: loginctl enable-linger fedora; su -c ${PWD}/test_podman.sh - fedora + timeout: 15m 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