From ae49d0a9febd08567eed0534289aa570384c3812 Mon Sep 17 00:00:00 2001 From: Daniel J Walsh Date: Tue, 13 Aug 2019 14:17:57 -0400 Subject: [PATCH 01/63] Add recommends libvarlink-util --- podman.spec | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/podman.spec b/podman.spec index 0c5bac4..e287abc 100644 --- a/podman.spec +++ b/podman.spec @@ -77,6 +77,7 @@ Requires: iptables Requires: nftables # #1686813 - conmon hasn't been made independent yet #Requires: conmon +Recommends: libvarlink-util %if 0%{?fedora} Recommends: %{name}-manpages = %{epoch}:%{version}-%{release} Recommends: container-selinux @@ -567,6 +568,8 @@ exit 0 %{_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 %files docker @@ -598,6 +601,9 @@ exit 0 %endif %changelog +* Tue Aug 13 2019 Dan Walsh - 2:1.5.1-1.14.dev.gitce64c14 +- Add recommends libvarlink-util + * Tue Aug 13 2019 Lokesh Mandvekar (Bot) - 2:1.5.1-0.14.dev.git031437b - autobuilt 031437b From 0a5dc0c786f50d2ce7ae21d590ca5712bfd10199 Mon Sep 17 00:00:00 2001 From: Daniel J Walsh Date: Tue, 13 Aug 2019 14:27:20 -0400 Subject: [PATCH 02/63] Add recommends libvarlink-util --- podman.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/podman.spec b/podman.spec index e287abc..383c61f 100644 --- a/podman.spec +++ b/podman.spec @@ -46,7 +46,7 @@ Epoch: 2 Version: 1.5.1 # Rawhide almost always ships unreleased builds, # so release tag should be of the form 0.N.blahblah -Release: 0.14.dev.git%{shortcommit0}%{?dist} +Release: 1.14.dev.git%{shortcommit0}%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ From 2fc6021c63e34924c00e2fcca5e03861d0f9ab25 Mon Sep 17 00:00:00 2001 From: Daniel J Walsh Date: Tue, 13 Aug 2019 15:05:20 -0400 Subject: [PATCH 03/63] Add recommends libvarlink-util --- .gitignore | 2 ++ podman.spec | 15 +++++++++++---- sources | 2 +- 3 files changed, 14 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 79459fb..c5cafd9 100644 --- a/.gitignore +++ b/.gitignore @@ -384,3 +384,5 @@ /libpod-f634fd3.tar.gz /libpod-c48243e.tar.gz /libpod-031437b.tar.gz +/libpod-7a859f0.tar.gz +/libpod-ce64c14.tar.gz diff --git a/podman.spec b/podman.spec index 383c61f..75dc8c9 100644 --- a/podman.spec +++ b/podman.spec @@ -27,7 +27,7 @@ %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} %global git0 https://%{provider}.%{provider_tld}/%{project}/%{repo} -%global commit0 031437bf5b19b5121224cdec301dd9945f38e610 +%global commit0 ce64c1403df0e4ca75be50e4a835cc0889b0c8ac %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) %global import_path_conmon github.com/containers/conmon @@ -46,7 +46,7 @@ Epoch: 2 Version: 1.5.1 # Rawhide almost always ships unreleased builds, # so release tag should be of the form 0.N.blahblah -Release: 1.14.dev.git%{shortcommit0}%{?dist} +Release: 1.16.dev.git%{shortcommit0}%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -75,9 +75,9 @@ Requires: containers-common Requires: containernetworking-plugins >= 0.7.5-1 Requires: iptables Requires: nftables +Recommends: libvarlink-util # #1686813 - conmon hasn't been made independent yet #Requires: conmon -Recommends: libvarlink-util %if 0%{?fedora} Recommends: %{name}-manpages = %{epoch}:%{version}-%{release} Recommends: container-selinux @@ -570,6 +570,7 @@ exit 0 %{_unitdir}/io.%{name}.socket %{_userunitdir}/io.%{name}.service %{_userunitdir}/io.%{name}.socket + %{_usr}/lib/tmpfiles.d/%{name}.conf %files docker @@ -601,9 +602,15 @@ exit 0 %endif %changelog -* Tue Aug 13 2019 Dan Walsh - 2:1.5.1-1.14.dev.gitce64c14 +* Tue Aug 13 2019 Dan Walsh - 2:1.5.1-1.16.dev.gitce64c14 - Add recommends libvarlink-util +* Tue Aug 13 2019 Lokesh Mandvekar (Bot) - 2:1.5.1-0.16.dev.gitce64c14 +- autobuilt ce64c14 + +* Tue Aug 13 2019 Lokesh Mandvekar (Bot) - 2:1.5.1-0.15.dev.git7a859f0 +- autobuilt 7a859f0 + * Tue Aug 13 2019 Lokesh Mandvekar (Bot) - 2:1.5.1-0.14.dev.git031437b - autobuilt 031437b diff --git a/sources b/sources index 426ac07..aac27c7 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (conmon-e217fdf.tar.gz) = aa75e0808e8c6fc535c8b2d8ee106fb8fde6d9ca7f8beb0c51013e83ff161c8005d2427a0366fed89c0d390462852b5a0b12a4e7bf0a44cec654a91328e85c78 -SHA512 (libpod-031437b.tar.gz) = fa811585bb8fbd4d68a21399e3adf68c7c868f1e38545c033acdf448201e666cb95cd260fdaefcab088ad13513199a1d8267d7910dfc91f72dffea2418743ace +SHA512 (libpod-ce64c14.tar.gz) = ab65d054d8049c66dad7cc936a307db64787e0dc0b62f81cbdc3950d51d74edff37e81176277c902cb797a3d4ac80382e31d0f2d1d70a588599a861ad42e6c3d From 201e671fc2b8bf55e20e77c1a6baa8d6f1237bf2 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Fri, 16 Aug 2019 17:38:24 +0530 Subject: [PATCH 04/63] update built_tag macro for autobuilds Signed-off-by: Lokesh Mandvekar --- podman.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/podman.spec b/podman.spec index 75dc8c9..2183aaa 100644 --- a/podman.spec +++ b/podman.spec @@ -37,7 +37,7 @@ # Used for comparing with latest upstream tag # to decide whether to autobuild (non-rawhide only) -%global built_tag v1.4.4 +%global built_tag v1.5.1 Name: podman %if 0%{?fedora} From 5a1e6e145f08658fa85128405d0f5c015b64deea Mon Sep 17 00:00:00 2001 From: Daniel J Walsh Date: Thu, 22 Aug 2019 14:10:11 -0400 Subject: [PATCH 05/63] Move man5 man pages into podman-manpage package --- podman.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/podman.spec b/podman.spec index 2183aaa..907e8bd 100644 --- a/podman.spec +++ b/podman.spec @@ -46,7 +46,7 @@ Epoch: 2 Version: 1.5.1 # Rawhide almost always ships unreleased builds, # so release tag should be of the form 0.N.blahblah -Release: 1.16.dev.git%{shortcommit0}%{?dist} +Release: 2.16.dev.git%{shortcommit0}%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -414,6 +414,7 @@ BuildArch: noarch %files manpages %{_mandir}/man1/%{name}*.1* +%{_mandir}/man5/*.5* %description manpages Man pages for the %{name} commands @@ -557,7 +558,6 @@ exit 0 %license LICENSE %doc README.md CONTRIBUTING.md pkg/hooks/README-hooks.md install.md code-of-conduct.md transfer.md %{_bindir}/%{name} -%{_mandir}/man5/*.5* %{_datadir}/bash-completion/completions/* # By "owning" the site-functions dir, we don't need to Require zsh %dir %{_datadir}/zsh/site-functions @@ -602,6 +602,9 @@ exit 0 %endif %changelog +* Thu Aug 22 2019 Daniel J Walsh - 2:1.5.1-2.16.dev.gitce64c14 +- Move man5 man pages into podman-manpage package + * Tue Aug 13 2019 Dan Walsh - 2:1.5.1-1.16.dev.gitce64c14 - Add recommends libvarlink-util From 70326cd69865dd31bf5d507eb3ba3ba361320680 Mon Sep 17 00:00:00 2001 From: Daniel J Walsh Date: Tue, 27 Aug 2019 16:04:08 -0400 Subject: [PATCH 06/63] Require crun rather then runc Switch to crun by default for cgroupsV2 support --- podman.spec | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/podman.spec b/podman.spec index 907e8bd..65eb0cd 100644 --- a/podman.spec +++ b/podman.spec @@ -46,7 +46,7 @@ Epoch: 2 Version: 1.5.1 # Rawhide almost always ships unreleased builds, # so release tag should be of the form 0.N.blahblah -Release: 2.16.dev.git%{shortcommit0}%{?dist} +Release: 2.17.dev.git%{shortcommit0}%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -70,7 +70,7 @@ BuildRequires: pkgconfig BuildRequires: make BuildRequires: systemd BuildRequires: systemd-devel -Requires: runc >= 2:1.0.0-57 +Requires: crun Requires: containers-common Requires: containernetworking-plugins >= 0.7.5-1 Requires: iptables @@ -421,14 +421,10 @@ Man pages for the %{name} commands %prep %autosetup -Sgit -n %{repo}-%{commit0} -rm -rf docs/containers-mounts.conf.5.md # untar conmon tar zxf %{SOURCE1} -sed -i 's/install.remote: podman-remote/install.remote:/' Makefile -sed -i 's/install.bin: podman/install.bin:/' Makefile - %build mkdir _build pushd _build @@ -457,6 +453,11 @@ pushd conmon-%{commit_conmon} popd %install +sed -s 's/^runtime[ =].*"runc/runtime = "crun/' libpod.conf -i +sed -i 's/install.remote: podman-remote/install.remote:/' Makefile +sed -i 's/install.bin: podman/install.bin:/' Makefile +rm -rf docs/containers-mounts.conf.5.md + install -dp %{buildroot}%{_unitdir} PODMAN_VERSION=%{version} %{__make} PREFIX=%{buildroot}%{_prefix} ETCDIR=%{buildroot}%{_sysconfdir} \ install.bin \ @@ -602,6 +603,10 @@ exit 0 %endif %changelog +* Tue Aug 27 2019 Daniel J Walsh - 2:1.5.1-2.17 +- Require crun rather then runc +- Switch to crun by default for cgroupsV2 support + * Thu Aug 22 2019 Daniel J Walsh - 2:1.5.1-2.16.dev.gitce64c14 - Move man5 man pages into podman-manpage package From 48f430129c5ed71cb4ae6e32e0e4914a9d208f0d Mon Sep 17 00:00:00 2001 From: Ed Santiago Date: Tue, 10 Sep 2019 14:53:39 -0600 Subject: [PATCH 07/63] Enable gating tests on f31 Signed-off-by: Ed Santiago --- gating.yaml | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 gating.yaml diff --git a/gating.yaml b/gating.yaml new file mode 100644 index 0000000..9571536 --- /dev/null +++ b/gating.yaml @@ -0,0 +1,6 @@ +--- !Policy +product_versions: + - fedora-* +decision_context: bodhi_update_push_testing +rules: + - !PassingTestCaseRule {test_case_name: org.centos.prod.ci.pipeline.allpackages-build.complete} From 38b752b0d6d89b8d59c6c64c9b7971d77be35209 Mon Sep 17 00:00:00 2001 From: Daniel J Walsh Date: Fri, 13 Sep 2019 11:01:01 -0400 Subject: [PATCH 08/63] Grab specific version of crun or newer. --- podman.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/podman.spec b/podman.spec index 65eb0cd..124cbef 100644 --- a/podman.spec +++ b/podman.spec @@ -46,7 +46,7 @@ Epoch: 2 Version: 1.5.1 # Rawhide almost always ships unreleased builds, # so release tag should be of the form 0.N.blahblah -Release: 2.17.dev.git%{shortcommit0}%{?dist} +Release: 2.18.dev.git%{shortcommit0}%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -70,7 +70,7 @@ BuildRequires: pkgconfig BuildRequires: make BuildRequires: systemd BuildRequires: systemd-devel -Requires: crun +Requires: crun >= 0.9.1-1 Requires: containers-common Requires: containernetworking-plugins >= 0.7.5-1 Requires: iptables @@ -603,6 +603,9 @@ exit 0 %endif %changelog +* Fri Sep 13 2019 Daniel J Walsh - 2:1.5.1-2.18 +- Grab specific version of crun or newer. + * Tue Aug 27 2019 Daniel J Walsh - 2:1.5.1-2.17 - Require crun rather then runc - Switch to crun by default for cgroupsV2 support From b8f783b7b686d84764c27b0b6c6bc220bb51b675 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Sun, 15 Sep 2019 04:30:13 +0530 Subject: [PATCH 09/63] podman-2:1.5.1-3.git0005792 - use v1.15.1 tag - use conmon package as runtime dep Signed-off-by: Lokesh Mandvekar --- .gitignore | 1 + podman.spec | 32 +++++++------------------------- sources | 3 +-- 3 files changed, 9 insertions(+), 27 deletions(-) diff --git a/.gitignore b/.gitignore index c5cafd9..fd6db91 100644 --- a/.gitignore +++ b/.gitignore @@ -386,3 +386,4 @@ /libpod-031437b.tar.gz /libpod-7a859f0.tar.gz /libpod-ce64c14.tar.gz +/libpod-0005792.tar.gz diff --git a/podman.spec b/podman.spec index 124cbef..6946557 100644 --- a/podman.spec +++ b/podman.spec @@ -27,14 +27,9 @@ %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} %global git0 https://%{provider}.%{provider_tld}/%{project}/%{repo} -%global commit0 ce64c1403df0e4ca75be50e4a835cc0889b0c8ac +%global commit0 00057929f5acfd98341964d85722383363376d52 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) -%global import_path_conmon github.com/containers/conmon -%global git_conmon https://%{import_path_conmon} -%global commit_conmon e217fdff82e0b1a6184a28c43043a4065083407f -%global shortcommit_conmon %(c=%{commit_conmon}; echo ${c:0:7}) - # Used for comparing with latest upstream tag # to decide whether to autobuild (non-rawhide only) %global built_tag v1.5.1 @@ -46,12 +41,11 @@ Epoch: 2 Version: 1.5.1 # Rawhide almost always ships unreleased builds, # so release tag should be of the form 0.N.blahblah -Release: 2.18.dev.git%{shortcommit0}%{?dist} +Release: 3.git%{shortcommit0}%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ Source0: %{git0}/archive/%{commit0}/%{repo}-%{shortcommit0}.tar.gz -Source1: %{git_conmon}/archive/%{commit_conmon}/conmon-%{shortcommit_conmon}.tar.gz # 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 @@ -76,8 +70,7 @@ Requires: containernetworking-plugins >= 0.7.5-1 Requires: iptables Requires: nftables Recommends: libvarlink-util -# #1686813 - conmon hasn't been made independent yet -#Requires: conmon +Requires: conmon %if 0%{?fedora} Recommends: %{name}-manpages = %{epoch}:%{version}-%{release} Recommends: container-selinux @@ -422,9 +415,6 @@ Man pages for the %{name} commands %prep %autosetup -Sgit -n %{repo}-%{commit0} -# untar conmon -tar zxf %{SOURCE1} - %build mkdir _build pushd _build @@ -447,11 +437,6 @@ export BUILDTAGS="remoteclient systemd varlink seccomp exclude_graphdriver_devic %gobuild -o bin/%{name}-remote %{import_path}/cmd/%{name} %endif -# build conmon -pushd conmon-%{commit_conmon} -%{__make} all -popd - %install sed -s 's/^runtime[ =].*"runc/runtime = "crun/' libpod.conf -i sed -i 's/install.remote: podman-remote/install.remote:/' Makefile @@ -476,11 +461,6 @@ mv pkg/hooks/README.md pkg/hooks/README-hooks.md install -dp %{buildroot}%{_datadir}/containers install -p -m 644 %{repo}.conf %{buildroot}%{_datadir}/containers -# install conmon -pushd conmon-%{commit_conmon} -%{__make} LIBEXECDIR=%{buildroot}%{_libexecdir} install.%{name} -popd - # source codes for building projects %if 0%{?with_devel} install -d -p %{buildroot}/%{gopath}/src/%{import_path}/ @@ -563,8 +543,6 @@ exit 0 # By "owning" the site-functions dir, we don't need to Require zsh %dir %{_datadir}/zsh/site-functions %{_datadir}/zsh/site-functions/_%{name} -%dir %{_libexecdir}/%{name} -%{_libexecdir}/%{name}/conmon %config(noreplace) %{_sysconfdir}/cni/net.d/87-%{name}-bridge.conflist %{_datadir}/containers/%{repo}.conf %{_unitdir}/io.%{name}.service @@ -603,6 +581,10 @@ exit 0 %endif %changelog +* Sat Sep 14 2019 Lokesh Mandvekar - 2:1.5.1-3.git0005792 +- use v1.5.1 tag +- use conmon package as runtime dep + * Fri Sep 13 2019 Daniel J Walsh - 2:1.5.1-2.18 - Grab specific version of crun or newer. diff --git a/sources b/sources index aac27c7..744efd7 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -SHA512 (conmon-e217fdf.tar.gz) = aa75e0808e8c6fc535c8b2d8ee106fb8fde6d9ca7f8beb0c51013e83ff161c8005d2427a0366fed89c0d390462852b5a0b12a4e7bf0a44cec654a91328e85c78 -SHA512 (libpod-ce64c14.tar.gz) = ab65d054d8049c66dad7cc936a307db64787e0dc0b62f81cbdc3950d51d74edff37e81176277c902cb797a3d4ac80382e31d0f2d1d70a588599a861ad42e6c3d +SHA512 (libpod-0005792.tar.gz) = 6b5209f1a495c0a5efb9bacb31390653cf8db983f402fc820572b31f5169dc368806aaa97eceae871643146b4dcf66fd776a0e6d4e7f27b9c76b04c1d6107214 From 0e6209bc573154524cb2392eb0141cba4fc90250 Mon Sep 17 00:00:00 2001 From: "Lokesh Mandvekar (Bot)" Date: Tue, 17 Sep 2019 19:07:07 +0000 Subject: [PATCH 10/63] podman-2:1.6.0-2.gitca5ff03 - bump to v1.6.0-rc1 - autobuilt ca5ff03 Signed-off-by: Lokesh Mandvekar (Bot) --- .gitignore | 1 + podman.spec | 12 ++++++++---- sources | 2 +- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index fd6db91..d20f10a 100644 --- a/.gitignore +++ b/.gitignore @@ -387,3 +387,4 @@ /libpod-7a859f0.tar.gz /libpod-ce64c14.tar.gz /libpod-0005792.tar.gz +/libpod-ca5ff03.tar.gz diff --git a/podman.spec b/podman.spec index 6946557..d60e4d2 100644 --- a/podman.spec +++ b/podman.spec @@ -27,21 +27,21 @@ %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} %global git0 https://%{provider}.%{provider_tld}/%{project}/%{repo} -%global commit0 00057929f5acfd98341964d85722383363376d52 +%global commit0 ca5ff03e2935c47288f7b28a2bae9212cbb83272 %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.5.1 +%global built_tag v1.6.0-rc1 Name: podman %if 0%{?fedora} Epoch: 2 %endif -Version: 1.5.1 +Version: 1.6.0 # Rawhide almost always ships unreleased builds, # so release tag should be of the form 0.N.blahblah -Release: 3.git%{shortcommit0}%{?dist} +Release: 2.git%{shortcommit0}%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -581,6 +581,10 @@ exit 0 %endif %changelog +* Tue Sep 17 2019 Lokesh Mandvekar (Bot) - 2:1.6.0-2.gitca5ff03 +- bump to v1.6.0-rc1 +- autobuilt ca5ff03 + * Sat Sep 14 2019 Lokesh Mandvekar - 2:1.5.1-3.git0005792 - use v1.5.1 tag - use conmon package as runtime dep diff --git a/sources b/sources index 744efd7..b05085a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libpod-0005792.tar.gz) = 6b5209f1a495c0a5efb9bacb31390653cf8db983f402fc820572b31f5169dc368806aaa97eceae871643146b4dcf66fd776a0e6d4e7f27b9c76b04c1d6107214 +SHA512 (libpod-ca5ff03.tar.gz) = 65894c42865fd11ab59989f9e658e162f17181fd86bc36099eb706b8a8ec1a242d0e8a077e1b70f87cb12c7a263b8b405d1777372bc51ff9c20c4838169bc55a From e5eeb0cea631f79a3c93a80638815129c457d3e7 Mon Sep 17 00:00:00 2001 From: RH Container Bot Date: Wed, 25 Sep 2019 19:27:38 +0000 Subject: [PATCH 11/63] podman-2:1.6.0-0.2.rc2.git9181c65 - bump to v1.6.0-rc2 - autobuilt 9181c65 Signed-off-by: RH Container Bot --- .gitignore | 1 + podman.spec | 10 +++++++--- sources | 2 +- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index d20f10a..d4f35af 100644 --- a/.gitignore +++ b/.gitignore @@ -388,3 +388,4 @@ /libpod-ce64c14.tar.gz /libpod-0005792.tar.gz /libpod-ca5ff03.tar.gz +/libpod-9181c65.tar.gz diff --git a/podman.spec b/podman.spec index d60e4d2..5d91aee 100644 --- a/podman.spec +++ b/podman.spec @@ -27,12 +27,12 @@ %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} %global git0 https://%{provider}.%{provider_tld}/%{project}/%{repo} -%global commit0 ca5ff03e2935c47288f7b28a2bae9212cbb83272 +%global commit0 9181c65b5d695fc480e4d1552887f3875e007821 %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.0-rc1 +%global built_tag v1.6.0-rc2 Name: podman %if 0%{?fedora} @@ -41,7 +41,7 @@ Epoch: 2 Version: 1.6.0 # Rawhide almost always ships unreleased builds, # so release tag should be of the form 0.N.blahblah -Release: 2.git%{shortcommit0}%{?dist} +Release: 0.2.rc2.git%{shortcommit0}%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -581,6 +581,10 @@ exit 0 %endif %changelog +* Wed Sep 25 2019 RH Container Bot - 2:1.6.0-0.2.rc2.git9181c65 +- bump to v1.6.0-rc2 +- autobuilt 9181c65 + * Tue Sep 17 2019 Lokesh Mandvekar (Bot) - 2:1.6.0-2.gitca5ff03 - bump to v1.6.0-rc1 - autobuilt ca5ff03 diff --git a/sources b/sources index b05085a..6df3385 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libpod-ca5ff03.tar.gz) = 65894c42865fd11ab59989f9e658e162f17181fd86bc36099eb706b8a8ec1a242d0e8a077e1b70f87cb12c7a263b8b405d1777372bc51ff9c20c4838169bc55a +SHA512 (libpod-9181c65.tar.gz) = a04769a2ad2802d46472cffd1c9fae568890a77a1b580b8e2a9301acee3c6262adbd4368480f63cc741aa703acdc6f1c49900953317791775c88178962bb6e06 From 3cb26646a57823d2fd7c536211b20c5c687d6273 Mon Sep 17 00:00:00 2001 From: RH Container Bot Date: Tue, 1 Oct 2019 18:16:55 +0000 Subject: [PATCH 12/63] podman-2:1.6.0-2 - bump to v1.6.0 - autobuilt b02b072 Signed-off-by: RH Container Bot --- .gitignore | 1 + podman.spec | 10 +++++++--- sources | 2 +- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index d4f35af..a0b4d8f 100644 --- a/.gitignore +++ b/.gitignore @@ -389,3 +389,4 @@ /libpod-0005792.tar.gz /libpod-ca5ff03.tar.gz /libpod-9181c65.tar.gz +/libpod-b02b072.tar.gz diff --git a/podman.spec b/podman.spec index 5d91aee..ecaf2af 100644 --- a/podman.spec +++ b/podman.spec @@ -27,12 +27,12 @@ %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} %global git0 https://%{provider}.%{provider_tld}/%{project}/%{repo} -%global commit0 9181c65b5d695fc480e4d1552887f3875e007821 +%global commit0 b02b072832cac26d7cc468d713303843d2935a36 %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.0-rc2 +%global built_tag v1.6.0 Name: podman %if 0%{?fedora} @@ -41,7 +41,7 @@ Epoch: 2 Version: 1.6.0 # Rawhide almost always ships unreleased builds, # so release tag should be of the form 0.N.blahblah -Release: 0.2.rc2.git%{shortcommit0}%{?dist} +Release: 2%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -581,6 +581,10 @@ exit 0 %endif %changelog +* 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.git9181c65 - bump to v1.6.0-rc2 - autobuilt 9181c65 diff --git a/sources b/sources index 6df3385..41d9b17 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libpod-9181c65.tar.gz) = a04769a2ad2802d46472cffd1c9fae568890a77a1b580b8e2a9301acee3c6262adbd4368480f63cc741aa703acdc6f1c49900953317791775c88178962bb6e06 +SHA512 (libpod-b02b072.tar.gz) = 5146a2220e4f778b5e164b9e53b166c6eacfa4efc73e17384f79bb5f4ebf266a9b36c200a0d381f025021a3af22eefcc2f518412d5c7d1b59800efe2a0d50a3c From 6afb9967fc9df4e57c0f37213a278468302ddaed Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Tue, 1 Oct 2019 14:27:06 -0400 Subject: [PATCH 13/63] bump release tag Signed-off-by: Lokesh Mandvekar --- podman.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/podman.spec b/podman.spec index ecaf2af..5e6b7f3 100644 --- a/podman.spec +++ b/podman.spec @@ -41,7 +41,7 @@ Epoch: 2 Version: 1.6.0 # Rawhide almost always ships unreleased builds, # so release tag should be of the form 0.N.blahblah -Release: 2%{?dist} +Release: 3%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -581,6 +581,9 @@ exit 0 %endif %changelog +* 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 From e086da63a39a0ff17839ac657cdd428648eaef48 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Tue, 1 Oct 2019 14:28:27 -0400 Subject: [PATCH 14/63] remove release tag warning for rawhide Signed-off-by: Lokesh Mandvekar --- podman.spec | 2 -- 1 file changed, 2 deletions(-) diff --git a/podman.spec b/podman.spec index 5e6b7f3..f5f7e58 100644 --- a/podman.spec +++ b/podman.spec @@ -39,8 +39,6 @@ Name: podman Epoch: 2 %endif Version: 1.6.0 -# Rawhide almost always ships unreleased builds, -# so release tag should be of the form 0.N.blahblah Release: 3%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 From 2c8ac7d50d52087359c42fc115fc51b45131e9a2 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Tue, 1 Oct 2019 15:50:44 -0400 Subject: [PATCH 15/63] Requires: crun >= 0.10-1 Signed-off-by: Lokesh Mandvekar --- podman.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/podman.spec b/podman.spec index f5f7e58..9cc3ad4 100644 --- a/podman.spec +++ b/podman.spec @@ -39,7 +39,7 @@ Name: podman Epoch: 2 %endif Version: 1.6.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -62,7 +62,7 @@ BuildRequires: pkgconfig BuildRequires: make BuildRequires: systemd BuildRequires: systemd-devel -Requires: crun >= 0.9.1-1 +Requires: crun >= 0.10-1 Requires: containers-common Requires: containernetworking-plugins >= 0.7.5-1 Requires: iptables @@ -579,6 +579,9 @@ exit 0 %endif %changelog +* Tue Oct 01 2019 Lokesh Mandvekar - 2:1.6.0-4 +- Requires: crun >= 0.10-1 + * Tue Oct 01 2019 Lokesh Mandvekar - 2:1.6.0-3 - bump release tag From 093482789d3cb4fae03940fb2949ef49381bb7e1 Mon Sep 17 00:00:00 2001 From: RH Container Bot Date: Wed, 2 Oct 2019 17:46:27 +0000 Subject: [PATCH 16/63] podman-2:1.6.1-0.2.rc1 - bump to v1.6.1-rc1 - autobuilt a2fdb6e Signed-off-by: RH Container Bot --- .gitignore | 1 + podman.spec | 12 ++++++++---- sources | 2 +- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index a0b4d8f..0bac0b7 100644 --- a/.gitignore +++ b/.gitignore @@ -390,3 +390,4 @@ /libpod-ca5ff03.tar.gz /libpod-9181c65.tar.gz /libpod-b02b072.tar.gz +/libpod-a2fdb6e.tar.gz diff --git a/podman.spec b/podman.spec index 9cc3ad4..2c7eef9 100644 --- a/podman.spec +++ b/podman.spec @@ -27,19 +27,19 @@ %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} %global git0 https://%{provider}.%{provider_tld}/%{project}/%{repo} -%global commit0 b02b072832cac26d7cc468d713303843d2935a36 +%global commit0 a2fdb6ea0236fa3b5ea9a88dc513af310f07c49c %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.0 +%global built_tag v1.6.1-rc1 Name: podman %if 0%{?fedora} Epoch: 2 %endif -Version: 1.6.0 -Release: 4%{?dist} +Version: 1.6.1 +Release: 0.2.rc1%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -579,6 +579,10 @@ exit 0 %endif %changelog +* 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-4 - Requires: crun >= 0.10-1 diff --git a/sources b/sources index 41d9b17..5a8c9a9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libpod-b02b072.tar.gz) = 5146a2220e4f778b5e164b9e53b166c6eacfa4efc73e17384f79bb5f4ebf266a9b36c200a0d381f025021a3af22eefcc2f518412d5c7d1b59800efe2a0d50a3c +SHA512 (libpod-a2fdb6e.tar.gz) = 713b8d25fecc5ef034d983c613c77c5662ce2e826beed12112849bc938cea526629aef297357a708c987c83f534c68ac8467bf5b7f4366076870e7e39681e46a From 5bea0ed1c379ea686e1f4b2dababdba51081a67c Mon Sep 17 00:00:00 2001 From: RH Container Bot Date: Wed, 2 Oct 2019 23:17:14 +0000 Subject: [PATCH 17/63] podman-2:1.6.1-2 - bump to v1.6.1 - autobuilt 233d95f Signed-off-by: RH Container Bot --- .gitignore | 1 + podman.spec | 10 +++++++--- sources | 2 +- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 0bac0b7..37890d6 100644 --- a/.gitignore +++ b/.gitignore @@ -391,3 +391,4 @@ /libpod-9181c65.tar.gz /libpod-b02b072.tar.gz /libpod-a2fdb6e.tar.gz +/libpod-233d95f.tar.gz diff --git a/podman.spec b/podman.spec index 2c7eef9..d4874de 100644 --- a/podman.spec +++ b/podman.spec @@ -27,19 +27,19 @@ %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} %global git0 https://%{provider}.%{provider_tld}/%{project}/%{repo} -%global commit0 a2fdb6ea0236fa3b5ea9a88dc513af310f07c49c +%global commit0 233d95f4f0a815f11d1c1ae9aba16781c4eb2700 %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.1-rc1 +%global built_tag v1.6.1 Name: podman %if 0%{?fedora} Epoch: 2 %endif Version: 1.6.1 -Release: 0.2.rc1%{?dist} +Release: 2%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -579,6 +579,10 @@ exit 0 %endif %changelog +* 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 diff --git a/sources b/sources index 5a8c9a9..d9bde40 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libpod-a2fdb6e.tar.gz) = 713b8d25fecc5ef034d983c613c77c5662ce2e826beed12112849bc938cea526629aef297357a708c987c83f534c68ac8467bf5b7f4366076870e7e39681e46a +SHA512 (libpod-233d95f.tar.gz) = def9bc0d35956a98cf1fbccdfe0a3f376eb27c95611ab8476455c6f9636383806cde80d271075ce99d85765ff645fd5888e7ab286e0f8aee9330699bf6964c82 From d229c2ff42ff295fafbdc9c8f069bb6c6c37c04f Mon Sep 17 00:00:00 2001 From: Ed Santiago Date: Thu, 3 Oct 2019 08:26:19 -0600 Subject: [PATCH 18/63] gating tests: log important package versions Signed-off-by: Ed Santiago --- tests/test_podman.sh | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/tests/test_podman.sh b/tests/test_podman.sh index 5a339e9..47c382f 100755 --- a/tests/test_podman.sh +++ b/tests/test_podman.sh @@ -3,7 +3,11 @@ # Simple podman tests # -# Log program versions -rpm -q podman 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/^/ /' bats /usr/share/podman/test/system From 93be2ffa71e9727edc8483f0e271dc9ac3814575 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Tue, 8 Oct 2019 13:22:53 -0400 Subject: [PATCH 19/63] podman-2:1.6.1-3 - add Recommends: runc for fedora Signed-off-by: Lokesh Mandvekar --- podman.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/podman.spec b/podman.spec index d4874de..22510f7 100644 --- a/podman.spec +++ b/podman.spec @@ -39,7 +39,7 @@ Name: podman Epoch: 2 %endif Version: 1.6.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -74,6 +74,7 @@ Recommends: %{name}-manpages = %{epoch}:%{version}-%{release} Recommends: container-selinux Recommends: slirp4netns >= 0.3.0-2 Recommends: fuse-overlayfs >= 0.3-8 +Recommends: runc %else #### DO NOT REMOVE - NEEDED FOR CENTOS Requires: %{name}-manpages = %{version}-%{release} @@ -579,6 +580,9 @@ exit 0 %endif %changelog +* Tue Oct 08 2019 Lokesh Mandvekar - 2:1.6.1-3 +- add Recommends: runc for fedora + * Wed Oct 02 2019 RH Container Bot - 2:1.6.1-2 - bump to v1.6.1 - autobuilt 233d95f From 0de3dfb40bf2985cdf2d292657da52f2d808b423 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Wed, 9 Oct 2019 08:45:17 -0400 Subject: [PATCH 20/63] podman-2:1.6.1-4 - Requires: crun >= 0.10.2-1 and polkit Signed-off-by: Lokesh Mandvekar --- podman.spec | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/podman.spec b/podman.spec index 22510f7..0621619 100644 --- a/podman.spec +++ b/podman.spec @@ -39,7 +39,7 @@ Name: podman Epoch: 2 %endif Version: 1.6.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -62,12 +62,12 @@ BuildRequires: pkgconfig BuildRequires: make BuildRequires: systemd BuildRequires: systemd-devel -Requires: crun >= 0.10-1 +Requires: crun >= 0.10.2-1 Requires: containers-common Requires: containernetworking-plugins >= 0.7.5-1 Requires: iptables Requires: nftables -Recommends: libvarlink-util +Requires: polkit Requires: conmon %if 0%{?fedora} Recommends: %{name}-manpages = %{epoch}:%{version}-%{release} @@ -75,12 +75,14 @@ Recommends: container-selinux Recommends: slirp4netns >= 0.3.0-2 Recommends: fuse-overlayfs >= 0.3-8 Recommends: runc +Recommends: libvarlink-util %else #### DO NOT REMOVE - NEEDED FOR CENTOS Requires: %{name}-manpages = %{version}-%{release} Requires: container-selinux Requires: slirp4netns >= 0.3.0-2 Requires: runc >= 1.0.0-57 +Requires: libvarlink-util %endif # vendored libraries @@ -580,6 +582,9 @@ exit 0 %endif %changelog +* Wed Oct 09 2019 Lokesh Mandvekar - 2:1.6.1-4 +- Requires: crun >= 0.10.2-1 and polkit + * Tue Oct 08 2019 Lokesh Mandvekar - 2:1.6.1-3 - add Recommends: runc for fedora From 342a69f147ab0add68f2c36562dd20f2ad65e2eb Mon Sep 17 00:00:00 2001 From: Ed Santiago Date: Wed, 9 Oct 2019 08:10:13 -0600 Subject: [PATCH 21/63] Gating tests: use loginctl, dump env - instead of hacky mkdir /run/user/, use loginctl enable-linger and hope that it has the same effect. reason: the mkdir doesn't seem to be 100% effective. There are cases in which the first rootless podman invocation fails with: Error: could not get runtime: cannot mkdir /run/user/1000/libpod: mkdir /run/user/1000/libpod: no such file or directory - for future spelunking, dump environment at start of each test (both root and rootless). Suggested by Giuseppe. Signed-off-by: Ed Santiago --- tests/test_podman.sh | 4 ++++ tests/test_podman.yml | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/tests/test_podman.sh b/tests/test_podman.sh index 47c382f..1f7b3f7 100755 --- a/tests/test_podman.sh +++ b/tests/test_podman.sh @@ -10,4 +10,8 @@ echo "Important package versions:" 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 index c73bf48..7002972 100644 --- a/tests/test_podman.yml +++ b/tests/test_podman.yml @@ -18,5 +18,5 @@ # running the test with su doesn't create the directory for fedora user on /run/user/ # so create it manually dir: ./ - run: mkdir /run/user/$(id -u fedora); su -c ${PWD}/test_podman.sh - fedora + run: loginctl enable-linger fedora; su -c ${PWD}/test_podman.sh - fedora timeout: 15m From 83bdcd3fba2929c4bed556a2d6b3eb61a1c3ab71 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Wed, 9 Oct 2019 11:49:14 -0400 Subject: [PATCH 22/63] remove polkit dependency for now Signed-off-by: Lokesh Mandvekar --- podman.spec | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/podman.spec b/podman.spec index 0621619..f329699 100644 --- a/podman.spec +++ b/podman.spec @@ -39,7 +39,7 @@ Name: podman Epoch: 2 %endif Version: 1.6.1 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -67,7 +67,6 @@ Requires: containers-common Requires: containernetworking-plugins >= 0.7.5-1 Requires: iptables Requires: nftables -Requires: polkit Requires: conmon %if 0%{?fedora} Recommends: %{name}-manpages = %{epoch}:%{version}-%{release} @@ -582,6 +581,9 @@ exit 0 %endif %changelog +* Wed Oct 09 2019 Lokesh Mandvekar - 2:1.6.1-5 +- remove polkit dependency for now + * Wed Oct 09 2019 Lokesh Mandvekar - 2:1.6.1-4 - Requires: crun >= 0.10.2-1 and polkit From 3af39e2b4ba39de77a44fa8bb368b73f8b7de516 Mon Sep 17 00:00:00 2001 From: RH Container Bot Date: Wed, 16 Oct 2019 20:47:57 +0000 Subject: [PATCH 23/63] podman-2:1.6.2-0.2.rc1 - bump to v1.6.2-rc1 - autobuilt 4d653f0 Signed-off-by: RH Container Bot --- .gitignore | 1 + podman.spec | 12 ++++++++---- sources | 2 +- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 37890d6..7c9b271 100644 --- a/.gitignore +++ b/.gitignore @@ -392,3 +392,4 @@ /libpod-b02b072.tar.gz /libpod-a2fdb6e.tar.gz /libpod-233d95f.tar.gz +/libpod-4d653f0.tar.gz diff --git a/podman.spec b/podman.spec index f329699..15fb065 100644 --- a/podman.spec +++ b/podman.spec @@ -27,19 +27,19 @@ %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} %global git0 https://%{provider}.%{provider_tld}/%{project}/%{repo} -%global commit0 233d95f4f0a815f11d1c1ae9aba16781c4eb2700 +%global commit0 4d653f07f3899aca8038e12574bfbffa45275181 %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.1 +%global built_tag v1.6.2-rc1 Name: podman %if 0%{?fedora} Epoch: 2 %endif -Version: 1.6.1 -Release: 5%{?dist} +Version: 1.6.2 +Release: 0.2.rc1%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -581,6 +581,10 @@ exit 0 %endif %changelog +* Wed Oct 16 2019 RH Container Bot - 2:1.6.2-0.2.rc1 +- bump to v1.6.2-rc1 +- autobuilt 4d653f0 + * Wed Oct 09 2019 Lokesh Mandvekar - 2:1.6.1-5 - remove polkit dependency for now diff --git a/sources b/sources index d9bde40..8fd79f6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libpod-233d95f.tar.gz) = def9bc0d35956a98cf1fbccdfe0a3f376eb27c95611ab8476455c6f9636383806cde80d271075ce99d85765ff645fd5888e7ab286e0f8aee9330699bf6964c82 +SHA512 (libpod-4d653f0.tar.gz) = ac36ddaac6c123a4dfb0777456bd0d04a024f98a63f03a3a758d2fff3e235c2c62a84bef4986f22545d8ff78abada2b6b1d1bc2859df350573d21c436a68d256 From 14a7b4e64da004a0fa9bd8fcde2ed44cb5df4838 Mon Sep 17 00:00:00 2001 From: RH Container Bot Date: Thu, 17 Oct 2019 22:16:51 +0000 Subject: [PATCH 24/63] podman-2:1.6.2-2 - bump to v1.6.2 - autobuilt f3ffda1 Signed-off-by: RH Container Bot --- .gitignore | 1 + podman.spec | 10 +++++++--- sources | 2 +- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 7c9b271..f550cff 100644 --- a/.gitignore +++ b/.gitignore @@ -393,3 +393,4 @@ /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 15fb065..9e49630 100644 --- a/podman.spec +++ b/podman.spec @@ -27,19 +27,19 @@ %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} %global git0 https://%{provider}.%{provider_tld}/%{project}/%{repo} -%global commit0 4d653f07f3899aca8038e12574bfbffa45275181 +%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-rc1 +%global built_tag v1.6.2 Name: podman %if 0%{?fedora} Epoch: 2 %endif Version: 1.6.2 -Release: 0.2.rc1%{?dist} +Release: 2%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -581,6 +581,10 @@ exit 0 %endif %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 diff --git a/sources b/sources index 8fd79f6..88750c6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libpod-4d653f0.tar.gz) = ac36ddaac6c123a4dfb0777456bd0d04a024f98a63f03a3a758d2fff3e235c2c62a84bef4986f22545d8ff78abada2b6b1d1bc2859df350573d21c436a68d256 +SHA512 (libpod-f3ffda1.tar.gz) = 05cedc0b58c5a3eac74d687ebca4ce4ffa3fe348deae89b3127e4edb5b1ce76d94c0b94df6ebae6c38ce0902cfab21dafe1f6fac752c0f67cfb001258727650c From 62e7cee1552196aa8d36441788f91a180c7c2653 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Wed, 30 Oct 2019 12:24:21 +0000 Subject: [PATCH 25/63] podman-1.6.2-3 - crun only for fedora ATM Signed-off-by: Lokesh Mandvekar --- podman.spec | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/podman.spec b/podman.spec index 9e49630..152e0a0 100644 --- a/podman.spec +++ b/podman.spec @@ -39,7 +39,7 @@ Name: podman Epoch: 2 %endif Version: 1.6.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -62,7 +62,10 @@ BuildRequires: pkgconfig BuildRequires: make BuildRequires: systemd BuildRequires: systemd-devel +# Not for CentOS yet +%if 0%{?fedora} Requires: crun >= 0.10.2-1 +%endif Requires: containers-common Requires: containernetworking-plugins >= 0.7.5-1 Requires: iptables @@ -581,6 +584,9 @@ exit 0 %endif %changelog +* Wed Oct 30 2019 Lokesh Mandvekar - 1.6.2-3 +- crun only for fedora ATM + * Thu Oct 17 2019 RH Container Bot - 2:1.6.2-2 - bump to v1.6.2 - autobuilt f3ffda1 From 30961a1dce8a8e8661c6754b21d5e44caf97d9f2 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Wed, 30 Oct 2019 12:29:10 +0000 Subject: [PATCH 26/63] go-md2man for CentOS Signed-off-by: Lokesh Mandvekar --- podman.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/podman.spec b/podman.spec index 152e0a0..a0c3042 100644 --- a/podman.spec +++ b/podman.spec @@ -51,7 +51,11 @@ BuildRequires: glib2-devel BuildRequires: glibc-devel BuildRequires: glibc-static BuildRequires: git +%if 0%{?fedora} BuildRequires: golang-github-cpuguy83-md2man +%else +BuildRequires: go-md2man +%endif BuildRequires: gpgme-devel BuildRequires: libassuan-devel BuildRequires: libgpg-error-devel From d0bbca11cb26437bf255b2ac7f88365f5bf22a6c Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Fri, 18 Oct 2019 09:02:37 -0400 Subject: [PATCH 27/63] package podman-plugins Signed-off-by: Lokesh Mandvekar --- podman.spec | 49 +++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 47 insertions(+), 2 deletions(-) diff --git a/podman.spec b/podman.spec index a0c3042..d2a47a7 100644 --- a/podman.spec +++ b/podman.spec @@ -30,6 +30,13 @@ %global commit0 f3ffda1e08f19e9a6a88484136b5eed76533f21a %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) +%global repo_plugins dnsname +# https://github.com/containers/libpod +%global import_path_plugins %%{provider}.%{provider_tld}/%{project}/%{repo_plugins} +%global git_plugins https://%{import_path_plugins} +%global commit_plugins f5af33dedcfc5e707e5560baa4a72f8d96a968fe +%global shortcommit_plugins %(c=%{commit_plugins}; 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 @@ -44,6 +51,7 @@ Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ Source0: %{git0}/archive/%{commit0}/%{repo}-%{shortcommit0}.tar.gz +Source1: %{git_plugins}/archive/%{commit_plugins}/%{repo_plugins}-%{shortcommit_plugins}.tar.gz # 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 @@ -75,6 +83,7 @@ Requires: containernetworking-plugins >= 0.7.5-1 Requires: iptables Requires: nftables Requires: conmon +Requires: %{name}-plugins = %{epoch}:%{version}-%{release} %if 0%{?fedora} Recommends: %{name}-manpages = %{epoch}:%{version}-%{release} Recommends: container-selinux @@ -419,18 +428,33 @@ BuildArch: noarch %description manpages Man pages for the %{name} commands +%package plugins +Summary: Plugins for %{name} + +%description plugins +This plugin sets up the use of dnsmasq on a given CNI network so +that Pods can resolve each other by name. When configured, +the pod and its IP address are added to a network specific hosts file +that dnsmasq will read in. Similarly, when a pod +is removed from the network, it will remove the entry from the hosts +file. Each CNI network will have its own dnsmasq instance. + %prep %autosetup -Sgit -n %{repo}-%{commit0} +# untar dnsname +tar zxf %{SOURCE1} + %build +export GO111MODULE=off +export GOPATH=$(pwd)/_build:$(pwd) + mkdir _build pushd _build mkdir -p src/%{provider}.%{provider_tld}/%{project} ln -s ../../../../ src/%{import_path} popd ln -s vendor src -export GOPATH=$(pwd)/_build:$(pwd) -export GO111MODULE=off %gogenerate ./cmd/%{name}/varlink/... # build %%{name} @@ -444,6 +468,17 @@ export BUILDTAGS="remoteclient systemd varlink seccomp exclude_graphdriver_devic %gobuild -o bin/%{name}-remote %{import_path}/cmd/%{name} %endif +pushd dnsname-%{commit_plugins} +mkdir _build +pushd _build +mkdir -p src/%{provider}.%{provider_tld}/%{project} +ln -s ../../../../ src/%{import_path_plugins} +popd +ln -s vendor src +export GOPATH=$(pwd)/_build:$(pwd) +%gobuild -o bin/dnsname %{import_path_plugins}/plugins/meta/dnsname +popd + %install sed -s 's/^runtime[ =].*"runc/runtime = "crun/' libpod.conf -i sed -i 's/install.remote: podman-remote/install.remote:/' Makefile @@ -468,6 +503,11 @@ mv pkg/hooks/README.md pkg/hooks/README-hooks.md install -dp %{buildroot}%{_datadir}/containers install -p -m 644 %{repo}.conf %{buildroot}%{_datadir}/containers +# install plugins +pushd dnsname-%{commit_plugins} +%{__make} PREFIX=%{_prefix} DESTDIR=%{buildroot} install +popd + # source codes for building projects %if 0%{?with_devel} install -d -p %{buildroot}/%{gopath}/src/%{import_path}/ @@ -587,6 +627,11 @@ exit 0 %{_datadir}/%{name}/test %endif +%files plugins +%license dnsname-%{commit_plugins}/LICENSE +%doc dnsname-%{commit_plugins}/{README.md,README_PODMAN.md} +%{_libexecdir}/cni/dnsname + %changelog * Wed Oct 30 2019 Lokesh Mandvekar - 1.6.2-3 - crun only for fedora ATM From 0b5720b3e2068900882b125a90621f4b81daad75 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Fri, 8 Nov 2019 08:03:10 -0500 Subject: [PATCH 28/63] add podman-plugins subpackage Signed-off-by: Lokesh Mandvekar --- podman.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/podman.spec b/podman.spec index d2a47a7..032a487 100644 --- a/podman.spec +++ b/podman.spec @@ -46,7 +46,7 @@ Name: podman Epoch: 2 %endif Version: 1.6.2 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -633,6 +633,9 @@ exit 0 %{_libexecdir}/cni/dnsname %changelog +* Fri Nov 08 2019 Lokesh Mandvekar - 2:1.6.2-4 +- add podman-plugins subpackage + * Wed Oct 30 2019 Lokesh Mandvekar - 1.6.2-3 - crun only for fedora ATM From 5b7f6b673603004d81aeb8d5040b5e98b2a1e7a4 Mon Sep 17 00:00:00 2001 From: RH Container Bot Date: Wed, 11 Dec 2019 19:11:12 +0000 Subject: [PATCH 29/63] podman-2:1.7.0-0.2.rc1 - bump to v1.7.0-rc1 - autobuilt 7bbef41 Signed-off-by: RH Container Bot --- .gitignore | 2 ++ podman.spec | 12 ++++++++---- sources | 3 ++- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index f550cff..6f6d0cb 100644 --- a/.gitignore +++ b/.gitignore @@ -394,3 +394,5 @@ /libpod-233d95f.tar.gz /libpod-4d653f0.tar.gz /libpod-f3ffda1.tar.gz +/dnsname-f5af33d.tar.gz +/libpod-7bbef41.tar.gz diff --git a/podman.spec b/podman.spec index 032a487..afa9af2 100644 --- a/podman.spec +++ b/podman.spec @@ -27,7 +27,7 @@ %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} %global git0 https://%{provider}.%{provider_tld}/%{project}/%{repo} -%global commit0 f3ffda1e08f19e9a6a88484136b5eed76533f21a +%global commit0 7bbef419fbbe49eddc9caf975159088e9d805823 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) %global repo_plugins dnsname @@ -39,14 +39,14 @@ # Used for comparing with latest upstream tag # to decide whether to autobuild (non-rawhide only) -%global built_tag v1.6.2 +%global built_tag v1.7.0-rc1 Name: podman %if 0%{?fedora} Epoch: 2 %endif -Version: 1.6.2 -Release: 4%{?dist} +Version: 1.7.0 +Release: 0.2.rc1%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -633,6 +633,10 @@ exit 0 %{_libexecdir}/cni/dnsname %changelog +* Wed Dec 11 2019 RH Container Bot - 2:1.7.0-0.2.rc1 +- bump to v1.7.0-rc1 +- autobuilt 7bbef41 + * Fri Nov 08 2019 Lokesh Mandvekar - 2:1.6.2-4 - add podman-plugins subpackage diff --git a/sources b/sources index 88750c6..f067b36 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ -SHA512 (libpod-f3ffda1.tar.gz) = 05cedc0b58c5a3eac74d687ebca4ce4ffa3fe348deae89b3127e4edb5b1ce76d94c0b94df6ebae6c38ce0902cfab21dafe1f6fac752c0f67cfb001258727650c +SHA512 (dnsname-f5af33d.tar.gz) = 564555ef83f9bf70560bfdaf864112d62c318b83827400e65d8cbca6deed0813cafdef222c32ada4f596ad60fe4d9753286e65b577a73c85915bd46fc550cadc +SHA512 (libpod-7bbef41.tar.gz) = c1a4c3e2dd3f2d0ca8e2c213b64866fb52d8c6acb5ff5695f4412628c15999e534569aaef6c8391fe56166ca7466da9a498addb965a3003dee7a6d2806c75c8c From 065e89cb60783c14450d2d0bbbe5c4df1e7ffdc4 Mon Sep 17 00:00:00 2001 From: RH Container Bot Date: Thu, 2 Jan 2020 21:10:24 +0000 Subject: [PATCH 30/63] podman-2:1.7.0-0.3.rc1 - bump to v1.7.0-rc2 - autobuilt 9090c47 Signed-off-by: RH Container Bot --- .gitignore | 1 + podman.spec | 12 ++++++++---- sources | 2 +- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 6f6d0cb..58fddc2 100644 --- a/.gitignore +++ b/.gitignore @@ -396,3 +396,4 @@ /libpod-f3ffda1.tar.gz /dnsname-f5af33d.tar.gz /libpod-7bbef41.tar.gz +/libpod-9090c47.tar.gz diff --git a/podman.spec b/podman.spec index afa9af2..53c8ec8 100644 --- a/podman.spec +++ b/podman.spec @@ -27,7 +27,7 @@ %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} %global git0 https://%{provider}.%{provider_tld}/%{project}/%{repo} -%global commit0 7bbef419fbbe49eddc9caf975159088e9d805823 +%global commit0 9090c476f76638ae9e86b6bc30b64fce3252266c %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) %global repo_plugins dnsname @@ -39,14 +39,14 @@ # Used for comparing with latest upstream tag # to decide whether to autobuild (non-rawhide only) -%global built_tag v1.7.0-rc1 +%global built_tag v1.7.0-rc2 Name: podman %if 0%{?fedora} Epoch: 2 %endif Version: 1.7.0 -Release: 0.2.rc1%{?dist} +Release: 0.3.rc1%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -633,6 +633,10 @@ exit 0 %{_libexecdir}/cni/dnsname %changelog +* Thu Jan 02 2020 RH Container Bot - 2:1.7.0-0.3.rc1 +- bump to v1.7.0-rc2 +- autobuilt 9090c47 + * Wed Dec 11 2019 RH Container Bot - 2:1.7.0-0.2.rc1 - bump to v1.7.0-rc1 - autobuilt 7bbef41 @@ -678,7 +682,7 @@ exit 0 - bump to v1.6.0 - autobuilt b02b072 -* Wed Sep 25 2019 RH Container Bot - 2:1.6.0-0.2.rc2.git9181c65 +* Wed Sep 25 2019 RH Container Bot - 2:1.6.0-0.2.rc2git9181c65 - bump to v1.6.0-rc2 - autobuilt 9181c65 diff --git a/sources b/sources index f067b36..1bf8584 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (dnsname-f5af33d.tar.gz) = 564555ef83f9bf70560bfdaf864112d62c318b83827400e65d8cbca6deed0813cafdef222c32ada4f596ad60fe4d9753286e65b577a73c85915bd46fc550cadc -SHA512 (libpod-7bbef41.tar.gz) = c1a4c3e2dd3f2d0ca8e2c213b64866fb52d8c6acb5ff5695f4412628c15999e534569aaef6c8391fe56166ca7466da9a498addb965a3003dee7a6d2806c75c8c +SHA512 (libpod-9090c47.tar.gz) = a6c1082ad5db5aabbca6ab292d9dc3a8910acf71b0564af267abfd8f8cf9c8bdfdbc25841f01d37ca2bbab6fa5946b88fb48ef54d26aab9a8d0adf8f6e27628b From 4f889b68edd9ac2c3abe780da6345fb235a88ba0 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Mon, 6 Jan 2020 23:57:23 +0530 Subject: [PATCH 31/63] use correct rc tag Signed-off-by: Lokesh Mandvekar --- podman.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/podman.spec b/podman.spec index 53c8ec8..601daf8 100644 --- a/podman.spec +++ b/podman.spec @@ -46,7 +46,7 @@ Name: podman Epoch: 2 %endif Version: 1.7.0 -Release: 0.3.rc1%{?dist} +Release: 0.4.rc2%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -633,6 +633,9 @@ exit 0 %{_libexecdir}/cni/dnsname %changelog +* Mon Jan 06 2020 Lokesh Mandvekar - 2:1.7.0-0.4.rc2 +- use correct rc tag + * Thu Jan 02 2020 RH Container Bot - 2:1.7.0-0.3.rc1 - bump to v1.7.0-rc2 - autobuilt 9090c47 From edde6e2d142bdd3f3305191fa5dd4c37d48b4b40 Mon Sep 17 00:00:00 2001 From: Jindrich Novy Date: Tue, 7 Jan 2020 12:12:48 +0100 Subject: [PATCH 32/63] podman-1.7.0-0.5.rc2.fc31 - merge podman-manpages with podman package - require container-selinux (#1765818) - minor spec file updates Signed-off-by: Jindrich Novy --- podman.spec | 41 +++++++++++++++++++---------------------- 1 file changed, 19 insertions(+), 22 deletions(-) diff --git a/podman.spec b/podman.spec index 601daf8..3eda915 100644 --- a/podman.spec +++ b/podman.spec @@ -46,12 +46,14 @@ Name: podman Epoch: 2 %endif Version: 1.7.0 -Release: 0.4.rc2%{?dist} +Release: 0.5.rc2%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ Source0: %{git0}/archive/%{commit0}/%{repo}-%{shortcommit0}.tar.gz Source1: %{git_plugins}/archive/%{commit_plugins}/%{repo_plugins}-%{shortcommit_plugins}.tar.gz +Provides: %{name}-manpages = %{epoch}:%{version}-%{release} +Obsoletes: %{name}-manpages < %{epoch}:%{version}-%{release} # 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 @@ -84,17 +86,14 @@ Requires: iptables Requires: nftables Requires: conmon Requires: %{name}-plugins = %{epoch}:%{version}-%{release} +Requires: container-selinux %if 0%{?fedora} -Recommends: %{name}-manpages = %{epoch}:%{version}-%{release} -Recommends: container-selinux +Recommends: libvarlink-util Recommends: slirp4netns >= 0.3.0-2 Recommends: fuse-overlayfs >= 0.3-8 Recommends: runc -Recommends: libvarlink-util %else #### DO NOT REMOVE - NEEDED FOR CENTOS -Requires: %{name}-manpages = %{version}-%{release} -Requires: container-selinux Requires: slirp4netns >= 0.3.0-2 Requires: runc >= 1.0.0-57 Requires: libvarlink-util @@ -207,9 +206,12 @@ Provides: bundled(golang(k8s.io/utils)) = 258e2a2fa64568210fbd6267cf1d8fd87c3cb8 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. +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. +%{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} Simple management tool for pods, containers and images @@ -383,7 +385,8 @@ Requires: golang(github.com/urfave/cli) %description unit-test-devel %{summary} -libpod provides a library for applications looking to use the Container Pod concept popularized by Kubernetes. +%{repo} provides a library for applications looking to use the +Container Pod concept popularized by Kubernetes. This package contains unit tests for project providing packages with %{import_path} prefix. @@ -404,7 +407,6 @@ This package contains system tests for %{name} %package remote Summary: (Experimental) Remote client for managing %{name} containers -Recommends: %{name}-manpages = %{epoch}:%{version}-%{release} %description remote Remote client for managing %{name} containers. @@ -417,17 +419,6 @@ manage pods, containers and container images. %{name}-remote supports ssh connections as well. %endif -%package manpages -Summary: Man pages for the %{name} commands -BuildArch: noarch - -%files manpages -%{_mandir}/man1/%{name}*.1* -%{_mandir}/man5/*.5* - -%description manpages -Man pages for the %{name} commands - %package plugins Summary: Plugins for %{name} @@ -596,8 +587,9 @@ exit 0 %{_unitdir}/io.%{name}.socket %{_userunitdir}/io.%{name}.service %{_userunitdir}/io.%{name}.socket - %{_usr}/lib/tmpfiles.d/%{name}.conf +%{_mandir}/man1/%{name}*.1* +%{_mandir}/man5/*.5* %files docker %{_bindir}/docker @@ -633,6 +625,11 @@ exit 0 %{_libexecdir}/cni/dnsname %changelog +* Tue Jan 07 2020 Jindrich Novy - 2:1.7.0-0.5.rc2 +- merge podman-manpages with podman package +- require container-selinux (#1765818) +- minor spec file updates + * Mon Jan 06 2020 Lokesh Mandvekar - 2:1.7.0-0.4.rc2 - use correct rc tag From 32767aad7c6120ebaef5dcdf09468fb9bfe94441 Mon Sep 17 00:00:00 2001 From: RH Container Bot Date: Tue, 7 Jan 2020 17:10:26 +0000 Subject: [PATCH 33/63] podman-2:1.7.0-2 - bump to v1.7.0 - autobuilt b7ce115 Signed-off-by: RH Container Bot --- .gitignore | 1 + podman.spec | 10 +++++++--- sources | 2 +- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 58fddc2..3bd534e 100644 --- a/.gitignore +++ b/.gitignore @@ -397,3 +397,4 @@ /dnsname-f5af33d.tar.gz /libpod-7bbef41.tar.gz /libpod-9090c47.tar.gz +/libpod-b7ce115.tar.gz diff --git a/podman.spec b/podman.spec index 3eda915..90aee06 100644 --- a/podman.spec +++ b/podman.spec @@ -27,7 +27,7 @@ %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} %global git0 https://%{provider}.%{provider_tld}/%{project}/%{repo} -%global commit0 9090c476f76638ae9e86b6bc30b64fce3252266c +%global commit0 b7ce1157b00af09f4a09e39b377aa3abff46ee05 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) %global repo_plugins dnsname @@ -39,14 +39,14 @@ # Used for comparing with latest upstream tag # to decide whether to autobuild (non-rawhide only) -%global built_tag v1.7.0-rc2 +%global built_tag v1.7.0 Name: podman %if 0%{?fedora} Epoch: 2 %endif Version: 1.7.0 -Release: 0.5.rc2%{?dist} +Release: 2%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -625,6 +625,10 @@ exit 0 %{_libexecdir}/cni/dnsname %changelog +* Tue Jan 07 2020 RH Container Bot - 2:1.7.0-2 +- bump to v1.7.0 +- autobuilt b7ce115 + * Tue Jan 07 2020 Jindrich Novy - 2:1.7.0-0.5.rc2 - merge podman-manpages with podman package - require container-selinux (#1765818) diff --git a/sources b/sources index 1bf8584..25ef3e0 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (dnsname-f5af33d.tar.gz) = 564555ef83f9bf70560bfdaf864112d62c318b83827400e65d8cbca6deed0813cafdef222c32ada4f596ad60fe4d9753286e65b577a73c85915bd46fc550cadc -SHA512 (libpod-9090c47.tar.gz) = a6c1082ad5db5aabbca6ab292d9dc3a8910acf71b0564af267abfd8f8cf9c8bdfdbc25841f01d37ca2bbab6fa5946b88fb48ef54d26aab9a8d0adf8f6e27628b +SHA512 (libpod-b7ce115.tar.gz) = 7981b5cd9eab77e33ed229cf2d507262199aaf11bac365fbe2c1a9ea142166f7e2c90049d2a852ef219e2ca9d6766099357f53958a24b74a05ac6ed2cb025180 From f89b62d924173a7b6fbf46943c9fd4654f2e9a3c Mon Sep 17 00:00:00 2001 From: Jindrich Novy Date: Wed, 8 Jan 2020 15:04:21 +0100 Subject: [PATCH 34/63] podman-1.7.0-2.fc31 - require container-selinux only when selinux-policy is installed and move podman-remote man pages to dedicated package (#1765818) Signed-off-by: Jindrich Novy --- podman.spec | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/podman.spec b/podman.spec index 90aee06..39f96d5 100644 --- a/podman.spec +++ b/podman.spec @@ -86,7 +86,7 @@ Requires: iptables Requires: nftables Requires: conmon Requires: %{name}-plugins = %{epoch}:%{version}-%{release} -Requires: container-selinux +Requires: (container-selinux if selinux-policy) %if 0%{?fedora} Recommends: libvarlink-util Recommends: slirp4netns >= 0.3.0-2 @@ -499,6 +499,11 @@ pushd dnsname-%{commit_plugins} %{__make} PREFIX=%{_prefix} DESTDIR=%{buildroot} install popd +# do not include docker and podman-remote man pages in main package +for file in `find %{buildroot}%{_mandir}/man[15] -type f | sed "s,%{buildroot},," | grep -v -e remote -e docker`; do + echo "$file*" >> podman.file-list +done + # source codes for building projects %if 0%{?with_devel} install -d -p %{buildroot}/%{gopath}/src/%{import_path}/ @@ -573,7 +578,7 @@ exit 0 #define license tag if not already defined %{!?_licensedir:%global license %doc} -%files +%files -f podman.file-list %license LICENSE %doc README.md CONTRIBUTING.md pkg/hooks/README-hooks.md install.md code-of-conduct.md transfer.md %{_bindir}/%{name} @@ -588,8 +593,6 @@ exit 0 %{_userunitdir}/io.%{name}.service %{_userunitdir}/io.%{name}.socket %{_usr}/lib/tmpfiles.d/%{name}.conf -%{_mandir}/man1/%{name}*.1* -%{_mandir}/man5/*.5* %files docker %{_bindir}/docker @@ -613,6 +616,8 @@ exit 0 %files remote %license LICENSE %{_bindir}/%{name}-remote +%{_mandir}/man1/%{name}-remote*.1* +%{_mandir}/man5/%{name}-remote*.5* %files tests %license LICENSE @@ -625,6 +630,10 @@ exit 0 %{_libexecdir}/cni/dnsname %changelog +* Wed Jan 08 2020 Jindrich Novy - 2:1.7.1-3 +- require container-selinux only when selinux-policy is installed and + move podman-remote man pages to dedicated package (#1765818) + * Tue Jan 07 2020 RH Container Bot - 2:1.7.0-2 - bump to v1.7.0 - autobuilt b7ce115 From 5a94bec9eb4b72c963a4c6d9bdf1b33cdd99cb3a Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Mon, 3 Feb 2020 10:02:40 -0500 Subject: [PATCH 35/63] adjust macros and deps for OBS build Signed-off-by: Lokesh Mandvekar --- podman.spec | 34 +++++++++++++++++++--------------- 1 file changed, 19 insertions(+), 15 deletions(-) diff --git a/podman.spec b/podman.spec index 39f96d5..363b58c 100644 --- a/podman.spec +++ b/podman.spec @@ -1,15 +1,15 @@ %global with_devel 0 %global with_bundled 1 -%global with_debug 1 %global with_check 0 %global with_unit_test 0 -%if 0%{?fedora} +%if 0%{?fedora} || 0%{?centos} >= 8 #### DO NOT REMOVE - NEEDED FOR CENTOS %bcond_without varlink -%define gogenerate go generate +%global with_debug 1 %else %bcond_with varlink +%global with_debug 0 %endif %if 0%{?with_debug} @@ -19,6 +19,11 @@ %global debug_package %{nil} %endif +%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 +%define gogenerate go generate + %global provider github %global provider_tld com %global project containers @@ -39,7 +44,9 @@ # Used for comparing with latest upstream tag # to decide whether to autobuild (non-rawhide only) -%global built_tag v1.7.0 +%define built_tag v1.7.0 +%define built_tag_strip %(b=%{built_tag}; echo ${b:1}) +%define download_url https://github.com/containers/libpod/archive/%{built_tag}.tar.gz Name: podman %if 0%{?fedora} @@ -50,22 +57,18 @@ Release: 2%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ -Source0: %{git0}/archive/%{commit0}/%{repo}-%{shortcommit0}.tar.gz +Source0: %{download_url} Source1: %{git_plugins}/archive/%{commit_plugins}/%{repo_plugins}-%{shortcommit_plugins}.tar.gz Provides: %{name}-manpages = %{epoch}:%{version}-%{release} Obsoletes: %{name}-manpages < %{epoch}:%{version}-%{release} # 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: golang BuildRequires: btrfs-progs-devel BuildRequires: glib2-devel BuildRequires: glibc-devel BuildRequires: glibc-static BuildRequires: git -%if 0%{?fedora} -BuildRequires: golang-github-cpuguy83-md2man -%else BuildRequires: go-md2man -%endif BuildRequires: gpgme-devel BuildRequires: libassuan-devel BuildRequires: libgpg-error-devel @@ -76,10 +79,6 @@ BuildRequires: pkgconfig BuildRequires: make BuildRequires: systemd BuildRequires: systemd-devel -# Not for CentOS yet -%if 0%{?fedora} -Requires: crun >= 0.10.2-1 -%endif Requires: containers-common Requires: containernetworking-plugins >= 0.7.5-1 Requires: iptables @@ -92,10 +91,13 @@ Recommends: libvarlink-util Recommends: slirp4netns >= 0.3.0-2 Recommends: fuse-overlayfs >= 0.3-8 Recommends: runc +Requires: crun >= 0.10.2-1 %else #### DO NOT REMOVE - NEEDED FOR CENTOS Requires: slirp4netns >= 0.3.0-2 Requires: runc >= 1.0.0-57 +%endif +%if 0%{?centos} >= 8 Requires: libvarlink-util %endif @@ -431,7 +433,7 @@ is removed from the network, it will remove the entry from the hosts file. Each CNI network will have its own dnsmasq instance. %prep -%autosetup -Sgit -n %{repo}-%{commit0} +%autosetup -Sgit -n %{repo}-%{built_tag_strip} # untar dnsname tar zxf %{SOURCE1} @@ -471,7 +473,9 @@ export GOPATH=$(pwd)/_build:$(pwd) popd %install +%if 0%{?fedora} sed -s 's/^runtime[ =].*"runc/runtime = "crun/' libpod.conf -i +%endif sed -i 's/install.remote: podman-remote/install.remote:/' Makefile sed -i 's/install.bin: podman/install.bin:/' Makefile rm -rf docs/containers-mounts.conf.5.md From 518b0a49bca42013d2ea82449e7df8e1d569a5ca Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Mon, 3 Feb 2020 10:38:42 -0500 Subject: [PATCH 36/63] no ostree/btrfs deps for centos Signed-off-by: Lokesh Mandvekar --- podman.spec | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/podman.spec b/podman.spec index 363b58c..41ac3eb 100644 --- a/podman.spec +++ b/podman.spec @@ -63,7 +63,6 @@ Provides: %{name}-manpages = %{epoch}:%{version}-%{release} Obsoletes: %{name}-manpages < %{epoch}:%{version}-%{release} # If go_compiler is not set to 1, there is no virtual provide. Use golang instead. BuildRequires: golang -BuildRequires: btrfs-progs-devel BuildRequires: glib2-devel BuildRequires: glibc-devel BuildRequires: glibc-static @@ -74,7 +73,6 @@ BuildRequires: libassuan-devel BuildRequires: libgpg-error-devel BuildRequires: libseccomp-devel BuildRequires: libselinux-devel -BuildRequires: ostree-devel BuildRequires: pkgconfig BuildRequires: make BuildRequires: systemd @@ -87,6 +85,8 @@ Requires: conmon Requires: %{name}-plugins = %{epoch}:%{version}-%{release} Requires: (container-selinux if selinux-policy) %if 0%{?fedora} +BuildRequires: btrfs-progs-devel +BuildRequires: ostree-devel Recommends: libvarlink-util Recommends: slirp4netns >= 0.3.0-2 Recommends: fuse-overlayfs >= 0.3-8 @@ -452,12 +452,18 @@ ln -s vendor src # 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)" +%if 0%{?centos} +export BUILDTAGS+="exclude_graphdriver_btrfs containers_image_ostree_stub" +%endif %gobuild -o bin/%{name} %{import_path}/cmd/%{name} %if 0%{?fedora} #### DO NOT REMOVE - NEEDED FOR CENTOS # build %%{name}-remote 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)" +%if 0%{?centos} +export BUILDTAGS+="exclude_graphdriver_btrfs containers_image_ostree_stub" +%endif %gobuild -o bin/%{name}-remote %{import_path}/cmd/%{name} %endif From d3487efebb0f65e4ecba9d574efb62369449ac39 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Mon, 3 Feb 2020 10:46:53 -0500 Subject: [PATCH 37/63] set Epoch:0 for centos Signed-off-by: Lokesh Mandvekar --- podman.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/podman.spec b/podman.spec index 41ac3eb..876a9be 100644 --- a/podman.spec +++ b/podman.spec @@ -51,6 +51,8 @@ Name: podman %if 0%{?fedora} Epoch: 2 +%else +Epoch: 0 %endif Version: 1.7.0 Release: 2%{?dist} From 6676d817bce0060693e2b707a4aafbbcf45d7fda Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Mon, 3 Feb 2020 11:00:20 -0500 Subject: [PATCH 38/63] built v1.8.0-rc1 Signed-off-by: Lokesh Mandvekar --- .gitignore | 1 + podman.spec | 40 ++++++++++++++++++++++------------------ sources | 2 +- 3 files changed, 24 insertions(+), 19 deletions(-) diff --git a/.gitignore b/.gitignore index 3bd534e..f0dabe6 100644 --- a/.gitignore +++ b/.gitignore @@ -398,3 +398,4 @@ /libpod-7bbef41.tar.gz /libpod-9090c47.tar.gz /libpod-b7ce115.tar.gz +/v1.8.0-rc1.tar.gz diff --git a/podman.spec b/podman.spec index 876a9be..1228d24 100644 --- a/podman.spec +++ b/podman.spec @@ -24,27 +24,27 @@ %endif %define gogenerate go generate -%global provider github -%global provider_tld com -%global project containers -%global repo libpod +%define provider github +%define provider_tld com +%define project containers +%define repo 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 b7ce1157b00af09f4a09e39b377aa3abff46ee05 -%global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) +%define provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} +%define import_path %{provider_prefix} +%define git0 https://%{provider}.%{provider_tld}/%{project}/%{repo} +%define commit0 5558c2620cb9ad32173a1a9e2240c2adff2fc888 +%define shortcommit0 %(c=%{commit0}; echo ${c:0:7}) -%global repo_plugins dnsname +%define repo_plugins dnsname # https://github.com/containers/libpod -%global import_path_plugins %%{provider}.%{provider_tld}/%{project}/%{repo_plugins} -%global git_plugins https://%{import_path_plugins} -%global commit_plugins f5af33dedcfc5e707e5560baa4a72f8d96a968fe -%global shortcommit_plugins %(c=%{commit_plugins}; echo ${c:0:7}) +%define import_path_plugins %{provider}.%{provider_tld}/%{project}/%{repo_plugins} +%define git_plugins https://github.com/containers/dnsname +%define commit_plugins f5af33dedcfc5e707e5560baa4a72f8d96a968fe +%define shortcommit_plugins %(c=%{commit_plugins}; echo ${c:0:7}) # Used for comparing with latest upstream tag # to decide whether to autobuild (non-rawhide only) -%define built_tag v1.7.0 +%define built_tag v1.8.0-rc1 %define built_tag_strip %(b=%{built_tag}; echo ${b:1}) %define download_url https://github.com/containers/libpod/archive/%{built_tag}.tar.gz @@ -54,13 +54,13 @@ Epoch: 2 %else Epoch: 0 %endif -Version: 1.7.0 -Release: 2%{?dist} +Version: 1.8.0 +Release: 0.1%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ Source0: %{download_url} -Source1: %{git_plugins}/archive/%{commit_plugins}/%{repo_plugins}-%{shortcommit_plugins}.tar.gz +Source1: https://github.com/containers/dnsname/archive/%{commit_plugins}/dnsname-%{shortcommit_plugins}.tar.gz Provides: %{name}-manpages = %{epoch}:%{version}-%{release} Obsoletes: %{name}-manpages < %{epoch}:%{version}-%{release} # If go_compiler is not set to 1, there is no virtual provide. Use golang instead. @@ -609,6 +609,7 @@ exit 0 %files docker %{_bindir}/docker %{_mandir}/man1/docker*.1* +%{_usr}/lib/tmpfiles.d/%{name}-docker.conf %if 0%{?with_devel} %files -n libpod-devel -f devel.file-list @@ -642,6 +643,9 @@ exit 0 %{_libexecdir}/cni/dnsname %changelog +* Mon Feb 03 2020 Lokesh Mandvekar - 2:1.8.0-0.1 +- built v1.8.0-rc1 + * Wed Jan 08 2020 Jindrich Novy - 2:1.7.1-3 - require container-selinux only when selinux-policy is installed and move podman-remote man pages to dedicated package (#1765818) diff --git a/sources b/sources index 25ef3e0..0d8ed73 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (dnsname-f5af33d.tar.gz) = 564555ef83f9bf70560bfdaf864112d62c318b83827400e65d8cbca6deed0813cafdef222c32ada4f596ad60fe4d9753286e65b577a73c85915bd46fc550cadc -SHA512 (libpod-b7ce115.tar.gz) = 7981b5cd9eab77e33ed229cf2d507262199aaf11bac365fbe2c1a9ea142166f7e2c90049d2a852ef219e2ca9d6766099357f53958a24b74a05ac6ed2cb025180 +SHA512 (v1.8.0-rc1.tar.gz) = 14dd3c1f4bd59cea34f342248f05ed6eb942c055ece407d0f2f1a27a746e3706c4afa0c7cc40280aae0c0f179bfc9c20852deb52ee8e5663b68897c481c0c8c7 From e957fe4a2226f212e24d1cdbc6e7ea3288220705 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Tue, 4 Feb 2020 09:03:21 -0500 Subject: [PATCH 39/63] adjust build steps for happy CentOS builds on OBS Signed-off-by: Lokesh Mandvekar --- podman.spec | 62 +++++++++++++++++++++++++++++++---------------------- 1 file changed, 36 insertions(+), 26 deletions(-) diff --git a/podman.spec b/podman.spec index 1228d24..f4b855d 100644 --- a/podman.spec +++ b/podman.spec @@ -6,9 +6,13 @@ %if 0%{?fedora} || 0%{?centos} >= 8 #### DO NOT REMOVE - NEEDED FOR CENTOS %bcond_without varlink -%global with_debug 1 %else %bcond_with varlink +%endif + +%if 0%{?fedora} +%global with_debug 1 +%else %global with_debug 0 %endif @@ -60,7 +64,7 @@ Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ Source0: %{download_url} -Source1: https://github.com/containers/dnsname/archive/%{commit_plugins}/dnsname-%{shortcommit_plugins}.tar.gz +Source1: https://github.com/containers/dnsname/archive/f5af33dedcfc5e707e5560baa4a72f8d96a968fe/dnsname-f5af33d.tar.gz Provides: %{name}-manpages = %{epoch}:%{version}-%{release} Obsoletes: %{name}-manpages < %{epoch}:%{version}-%{release} # If go_compiler is not set to 1, there is no virtual provide. Use golang instead. @@ -85,7 +89,7 @@ Requires: iptables Requires: nftables Requires: conmon Requires: %{name}-plugins = %{epoch}:%{version}-%{release} -Requires: (container-selinux if selinux-policy) +Requires: container-selinux %if 0%{?fedora} BuildRequires: btrfs-progs-devel BuildRequires: ostree-devel @@ -396,7 +400,6 @@ This package contains unit tests for project providing packages with %{import_path} prefix. %endif -%if 0%{?fedora} %package tests Summary: Tests for %{name} @@ -409,6 +412,7 @@ Requires: jq This package contains system tests for %{name} +%if 0%{?fedora} || 0%{?centos} >= 8 %package remote Summary: (Experimental) Remote client for managing %{name} containers @@ -442,8 +446,20 @@ tar zxf %{SOURCE1} %build export GO111MODULE=off -export GOPATH=$(pwd)/_build:$(pwd) +# build plugins first cause we don't wanna use podman's buildtags +pushd dnsname-%{commit_plugins} +mkdir _build +pushd _build +mkdir -p src/%{provider}.%{provider_tld}/%{project} +ln -s ../../../../ src/%{import_path_plugins} +popd +ln -s vendor src +export GOPATH=$(pwd)/_build:$(pwd) +%gobuild -o bin/dnsname %{import_path_plugins}/plugins/meta/dnsname +popd + +export GOPATH=$(pwd)/_build:$(pwd) mkdir _build pushd _build mkdir -p src/%{provider}.%{provider_tld}/%{project} @@ -459,27 +475,12 @@ export BUILDTAGS+="exclude_graphdriver_btrfs containers_image_ostree_stub" %endif %gobuild -o bin/%{name} %{import_path}/cmd/%{name} -%if 0%{?fedora} -#### DO NOT REMOVE - NEEDED FOR CENTOS +%if 0%{?fedora} || 0%{?centos} >= 8 # build %%{name}-remote -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)" -%if 0%{?centos} -export BUILDTAGS+="exclude_graphdriver_btrfs containers_image_ostree_stub" -%endif +export BUILDTAGS+="remoteclient" %gobuild -o bin/%{name}-remote %{import_path}/cmd/%{name} %endif -pushd dnsname-%{commit_plugins} -mkdir _build -pushd _build -mkdir -p src/%{provider}.%{provider_tld}/%{project} -ln -s ../../../../ src/%{import_path_plugins} -popd -ln -s vendor src -export GOPATH=$(pwd)/_build:$(pwd) -%gobuild -o bin/dnsname %{import_path_plugins}/plugins/meta/dnsname -popd - %install %if 0%{?fedora} sed -s 's/^runtime[ =].*"runc/runtime = "crun/' libpod.conf -i @@ -488,10 +489,17 @@ sed -i 's/install.remote: podman-remote/install.remote:/' Makefile sed -i 's/install.bin: podman/install.bin:/' Makefile rm -rf docs/containers-mounts.conf.5.md +# do not install remote manpages on centos7 +%if 0%{?centos} < 8 +rm -rf docs/build/man/docker-remote.1 +rm -rf docs/build/man/%{name}-remote.1 +rm -rf docs/build/man/%{name}-remote.conf.5 +%endif + install -dp %{buildroot}%{_unitdir} PODMAN_VERSION=%{version} %{__make} PREFIX=%{buildroot}%{_prefix} ETCDIR=%{buildroot}%{_sysconfdir} \ install.bin \ -%if 0%{?fedora} +%if 0%{?fedora} || 0%{?centos} >= 8 install.remote \ %endif install.man \ @@ -625,17 +633,19 @@ exit 0 %endif #### DO NOT REMOVE - NEEDED FOR CENTOS -%if 0%{?fedora} +%if 0%{?fedora} || 0%{?centos} >= 8 %files remote %license LICENSE %{_bindir}/%{name}-remote %{_mandir}/man1/%{name}-remote*.1* %{_mandir}/man5/%{name}-remote*.5* +%endif %files tests %license LICENSE -%{_datadir}/%{name}/test -%endif +%dir %{_datadir}/%{name}/test +%dir %{_datadir}/%{name}/test/system +%{_datadir}/%{name}/test/system/* %files plugins %license dnsname-%{commit_plugins}/LICENSE From fc17da38eef71d1b8a3c9e3c13724ee58957b988 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Thu, 6 Feb 2020 06:50:12 -0500 Subject: [PATCH 40/63] do not install remote files for centos7 Signed-off-by: Lokesh Mandvekar --- podman.spec | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/podman.spec b/podman.spec index f4b855d..b8ea708 100644 --- a/podman.spec +++ b/podman.spec @@ -489,13 +489,6 @@ sed -i 's/install.remote: podman-remote/install.remote:/' Makefile sed -i 's/install.bin: podman/install.bin:/' Makefile rm -rf docs/containers-mounts.conf.5.md -# do not install remote manpages on centos7 -%if 0%{?centos} < 8 -rm -rf docs/build/man/docker-remote.1 -rm -rf docs/build/man/%{name}-remote.1 -rm -rf docs/build/man/%{name}-remote.conf.5 -%endif - install -dp %{buildroot}%{_unitdir} PODMAN_VERSION=%{version} %{__make} PREFIX=%{buildroot}%{_prefix} ETCDIR=%{buildroot}%{_sysconfdir} \ install.bin \ @@ -524,6 +517,13 @@ for file in `find %{buildroot}%{_mandir}/man[15] -type f | sed "s,%{buildroot},, echo "$file*" >> podman.file-list done +# do not install remote manpages on centos7 +%if 0%{?centos} < 8 +rm -rf %{buildroot}%{_mandir}/man1/docker-remote.1 +rm -rf %{buildroot}%{_mandir}/man1/%{name}-remote.1 +rm -rf %{buildroot}%{_mandir}/man5/%{name}-remote.conf.5 +%endif + # source codes for building projects %if 0%{?with_devel} install -d -p %{buildroot}/%{gopath}/src/%{import_path}/ From a136e565f6767ba0021b5f1db210ed499ef2f119 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Thu, 6 Feb 2020 11:28:22 -0500 Subject: [PATCH 41/63] podman-2:1.8.0-0.2 - bump crun dependency Signed-off-by: Lokesh Mandvekar --- podman.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/podman.spec b/podman.spec index b8ea708..904187a 100644 --- a/podman.spec +++ b/podman.spec @@ -59,7 +59,7 @@ Epoch: 2 Epoch: 0 %endif Version: 1.8.0 -Release: 0.1%{?dist} +Release: 0.2%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -97,7 +97,7 @@ Recommends: libvarlink-util Recommends: slirp4netns >= 0.3.0-2 Recommends: fuse-overlayfs >= 0.3-8 Recommends: runc -Requires: crun >= 0.10.2-1 +Requires: crun >= 0.12.1-1 %else #### DO NOT REMOVE - NEEDED FOR CENTOS Requires: slirp4netns >= 0.3.0-2 @@ -653,6 +653,9 @@ exit 0 %{_libexecdir}/cni/dnsname %changelog +* Thu Feb 06 2020 Lokesh Mandvekar - 2:1.8.0-0.2 +- bump crun dependency + * Mon Feb 03 2020 Lokesh Mandvekar - 2:1.8.0-0.1 - built v1.8.0-rc1 From 7bae89e0f110d8e740eb9ae49b3783731943947c Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Fri, 7 Feb 2020 14:29:14 -0500 Subject: [PATCH 42/63] keep remote manpages for fedora Signed-off-by: Lokesh Mandvekar --- podman.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/podman.spec b/podman.spec index 904187a..2533734 100644 --- a/podman.spec +++ b/podman.spec @@ -518,7 +518,7 @@ for file in `find %{buildroot}%{_mandir}/man[15] -type f | sed "s,%{buildroot},, done # do not install remote manpages on centos7 -%if 0%{?centos} < 8 +%if ! 0%{?fedora} && 0%{?centos} < 8 rm -rf %{buildroot}%{_mandir}/man1/docker-remote.1 rm -rf %{buildroot}%{_mandir}/man1/%{name}-remote.1 rm -rf %{buildroot}%{_mandir}/man5/%{name}-remote.conf.5 From cc155853f29f0c4227647674c6cc83b431ce6126 Mon Sep 17 00:00:00 2001 From: RH Container Bot Date: Fri, 7 Feb 2020 20:01:46 +0000 Subject: [PATCH 43/63] podman-2:1.8.0-2 - bump to v1.8.0 - autobuilt 2ced909 Signed-off-by: RH Container Bot --- .gitignore | 1 + podman.spec | 10 +++++++--- sources | 2 +- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index f0dabe6..34ed955 100644 --- a/.gitignore +++ b/.gitignore @@ -399,3 +399,4 @@ /libpod-9090c47.tar.gz /libpod-b7ce115.tar.gz /v1.8.0-rc1.tar.gz +/v1.8.0.tar.gz diff --git a/podman.spec b/podman.spec index 2533734..03bf78a 100644 --- a/podman.spec +++ b/podman.spec @@ -36,7 +36,7 @@ %define provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %define import_path %{provider_prefix} %define git0 https://%{provider}.%{provider_tld}/%{project}/%{repo} -%define commit0 5558c2620cb9ad32173a1a9e2240c2adff2fc888 +%define commit0 2ced9094d4728dd09f60a177faa32339a8d0f721 %define shortcommit0 %(c=%{commit0}; echo ${c:0:7}) %define repo_plugins dnsname @@ -48,7 +48,7 @@ # Used for comparing with latest upstream tag # to decide whether to autobuild (non-rawhide only) -%define built_tag v1.8.0-rc1 +%define built_tag v1.8.0 %define built_tag_strip %(b=%{built_tag}; echo ${b:1}) %define download_url https://github.com/containers/libpod/archive/%{built_tag}.tar.gz @@ -59,7 +59,7 @@ Epoch: 2 Epoch: 0 %endif Version: 1.8.0 -Release: 0.2%{?dist} +Release: 2%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -653,6 +653,10 @@ exit 0 %{_libexecdir}/cni/dnsname %changelog +* Fri Feb 07 2020 RH Container Bot - 2:1.8.0-2 +- bump to v1.8.0 +- autobuilt 2ced909 + * Thu Feb 06 2020 Lokesh Mandvekar - 2:1.8.0-0.2 - bump crun dependency diff --git a/sources b/sources index 0d8ed73..c178719 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (dnsname-f5af33d.tar.gz) = 564555ef83f9bf70560bfdaf864112d62c318b83827400e65d8cbca6deed0813cafdef222c32ada4f596ad60fe4d9753286e65b577a73c85915bd46fc550cadc -SHA512 (v1.8.0-rc1.tar.gz) = 14dd3c1f4bd59cea34f342248f05ed6eb942c055ece407d0f2f1a27a746e3706c4afa0c7cc40280aae0c0f179bfc9c20852deb52ee8e5663b68897c481c0c8c7 +SHA512 (v1.8.0.tar.gz) = 8e46633742e7dda1b9f6b641051009485331a3a95fcc8ff4c59c46a66f86ce1b79c832c5775d825aa54b885edaf533be2f864257137277a5265509026d0a8b87 From 3e12549aab26a2970505ffd796651c80d9d72e9a Mon Sep 17 00:00:00 2001 From: RH Container Bot Date: Fri, 7 Feb 2020 20:09:56 +0000 Subject: [PATCH 44/63] podman-2:1.8.0-2 - bump to v1.8.0 - autobuilt 2ced909 Signed-off-by: RH Container Bot --- podman.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/podman.spec b/podman.spec index 03bf78a..03784c5 100644 --- a/podman.spec +++ b/podman.spec @@ -657,6 +657,10 @@ exit 0 - bump to v1.8.0 - autobuilt 2ced909 +* Fri Feb 07 2020 RH Container Bot - 2:1.8.0-2 +- bump to v1.8.0 +- autobuilt 2ced909 + * Thu Feb 06 2020 Lokesh Mandvekar - 2:1.8.0-0.2 - bump crun dependency From d297d054af5437382b1fee723b5c32e525ba4e5a Mon Sep 17 00:00:00 2001 From: RH Container Bot Date: Fri, 7 Feb 2020 21:09:34 +0000 Subject: [PATCH 45/63] podman-2:1.8.0-2 - bump to v1.8.0 - autobuilt 2ced909 Signed-off-by: RH Container Bot --- podman.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/podman.spec b/podman.spec index 03784c5..9d5ef6c 100644 --- a/podman.spec +++ b/podman.spec @@ -661,6 +661,10 @@ exit 0 - bump to v1.8.0 - autobuilt 2ced909 +* Fri Feb 07 2020 RH Container Bot - 2:1.8.0-2 +- bump to v1.8.0 +- autobuilt 2ced909 + * Thu Feb 06 2020 Lokesh Mandvekar - 2:1.8.0-0.2 - bump crun dependency From 194ad3b3ee0b9907d79e447f54dd4ef7a6839cc4 Mon Sep 17 00:00:00 2001 From: RH Container Bot Date: Fri, 7 Feb 2020 22:03:52 +0000 Subject: [PATCH 46/63] podman-2:1.8.0-2 - bump to v1.8.0 - autobuilt 2ced909 Signed-off-by: RH Container Bot --- podman.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/podman.spec b/podman.spec index 9d5ef6c..732c152 100644 --- a/podman.spec +++ b/podman.spec @@ -665,6 +665,10 @@ exit 0 - bump to v1.8.0 - autobuilt 2ced909 +* Fri Feb 07 2020 RH Container Bot - 2:1.8.0-2 +- bump to v1.8.0 +- autobuilt 2ced909 + * Thu Feb 06 2020 Lokesh Mandvekar - 2:1.8.0-0.2 - bump crun dependency From 710914e79c141e8e67129c9f83ba73eba702e553 Mon Sep 17 00:00:00 2001 From: RH Container Bot Date: Fri, 7 Feb 2020 22:09:43 +0000 Subject: [PATCH 47/63] podman-2:1.8.0-2 - bump to v1.8.0 - autobuilt 2ced909 Signed-off-by: RH Container Bot --- podman.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/podman.spec b/podman.spec index 732c152..dd23427 100644 --- a/podman.spec +++ b/podman.spec @@ -669,6 +669,10 @@ exit 0 - bump to v1.8.0 - autobuilt 2ced909 +* Fri Feb 07 2020 RH Container Bot - 2:1.8.0-2 +- bump to v1.8.0 +- autobuilt 2ced909 + * Thu Feb 06 2020 Lokesh Mandvekar - 2:1.8.0-0.2 - bump crun dependency From d78d741879c5109e4d11d4534985aad4ac96cde3 Mon Sep 17 00:00:00 2001 From: RH Container Bot Date: Fri, 7 Feb 2020 22:26:37 +0000 Subject: [PATCH 48/63] podman-2:1.8.0-2 - bump to v1.8.0 - autobuilt 2ced909 Signed-off-by: RH Container Bot --- podman.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/podman.spec b/podman.spec index dd23427..701fa94 100644 --- a/podman.spec +++ b/podman.spec @@ -673,6 +673,10 @@ exit 0 - bump to v1.8.0 - autobuilt 2ced909 +* Fri Feb 07 2020 RH Container Bot - 2:1.8.0-2 +- bump to v1.8.0 +- autobuilt 2ced909 + * Thu Feb 06 2020 Lokesh Mandvekar - 2:1.8.0-0.2 - bump crun dependency From 9809d0f98fc9995434fcf1c1ece903016728e7c8 Mon Sep 17 00:00:00 2001 From: RH Container Bot Date: Fri, 7 Feb 2020 22:37:52 +0000 Subject: [PATCH 49/63] podman-2:1.8.0-2 - bump to v1.8.0 - autobuilt 2ced909 Signed-off-by: RH Container Bot --- podman.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/podman.spec b/podman.spec index 701fa94..211d483 100644 --- a/podman.spec +++ b/podman.spec @@ -677,6 +677,10 @@ exit 0 - bump to v1.8.0 - autobuilt 2ced909 +* Fri Feb 07 2020 RH Container Bot - 2:1.8.0-2 +- bump to v1.8.0 +- autobuilt 2ced909 + * Thu Feb 06 2020 Lokesh Mandvekar - 2:1.8.0-0.2 - bump crun dependency From 04898a3b500602a3f5cfa4485eb1ff24ebf22eb3 Mon Sep 17 00:00:00 2001 From: RH Container Bot Date: Fri, 7 Feb 2020 23:09:35 +0000 Subject: [PATCH 50/63] podman-2:1.8.0-2 - bump to v1.8.0 - autobuilt 2ced909 Signed-off-by: RH Container Bot --- podman.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/podman.spec b/podman.spec index 211d483..db1bc62 100644 --- a/podman.spec +++ b/podman.spec @@ -681,6 +681,10 @@ exit 0 - bump to v1.8.0 - autobuilt 2ced909 +* Fri Feb 07 2020 RH Container Bot - 2:1.8.0-2 +- bump to v1.8.0 +- autobuilt 2ced909 + * Thu Feb 06 2020 Lokesh Mandvekar - 2:1.8.0-0.2 - bump crun dependency From eaaf25899d67518760f7b7c115bb7bc562c01d98 Mon Sep 17 00:00:00 2001 From: RH Container Bot Date: Sat, 8 Feb 2020 00:09:36 +0000 Subject: [PATCH 51/63] podman-2:1.8.0-2 - bump to v1.8.0 - autobuilt 2ced909 Signed-off-by: RH Container Bot --- podman.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/podman.spec b/podman.spec index db1bc62..56f9cdd 100644 --- a/podman.spec +++ b/podman.spec @@ -653,6 +653,10 @@ exit 0 %{_libexecdir}/cni/dnsname %changelog +* Sat Feb 08 2020 RH Container Bot - 2:1.8.0-2 +- bump to v1.8.0 +- autobuilt 2ced909 + * Fri Feb 07 2020 RH Container Bot - 2:1.8.0-2 - bump to v1.8.0 - autobuilt 2ced909 From 02fe23666867bfd453606a94f0f7be9673b7fdda Mon Sep 17 00:00:00 2001 From: RH Container Bot Date: Sat, 8 Feb 2020 01:11:25 +0000 Subject: [PATCH 52/63] podman-2:1.8.0-2 - bump to v1.8.0 - autobuilt 2ced909 Signed-off-by: RH Container Bot --- podman.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/podman.spec b/podman.spec index 56f9cdd..9eb00d8 100644 --- a/podman.spec +++ b/podman.spec @@ -657,6 +657,10 @@ exit 0 - bump to v1.8.0 - autobuilt 2ced909 +* Sat Feb 08 2020 RH Container Bot - 2:1.8.0-2 +- bump to v1.8.0 +- autobuilt 2ced909 + * Fri Feb 07 2020 RH Container Bot - 2:1.8.0-2 - bump to v1.8.0 - autobuilt 2ced909 From 4a41bf1da5e0930368f8682d7dca64604d87bbf6 Mon Sep 17 00:00:00 2001 From: RH Container Bot Date: Sat, 8 Feb 2020 02:11:26 +0000 Subject: [PATCH 53/63] podman-2:1.8.0-2 - bump to v1.8.0 - autobuilt 2ced909 Signed-off-by: RH Container Bot --- podman.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/podman.spec b/podman.spec index 9eb00d8..9a1dab8 100644 --- a/podman.spec +++ b/podman.spec @@ -661,6 +661,10 @@ exit 0 - bump to v1.8.0 - autobuilt 2ced909 +* Sat Feb 08 2020 RH Container Bot - 2:1.8.0-2 +- bump to v1.8.0 +- autobuilt 2ced909 + * Fri Feb 07 2020 RH Container Bot - 2:1.8.0-2 - bump to v1.8.0 - autobuilt 2ced909 From 5764bc9eff25c9d4ee393554d0ab6d35e4c98b22 Mon Sep 17 00:00:00 2001 From: RH Container Bot Date: Sat, 8 Feb 2020 03:10:41 +0000 Subject: [PATCH 54/63] podman-2:1.8.0-2 - bump to v1.8.0 - autobuilt 2ced909 Signed-off-by: RH Container Bot --- podman.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/podman.spec b/podman.spec index 9a1dab8..67216f0 100644 --- a/podman.spec +++ b/podman.spec @@ -665,6 +665,10 @@ exit 0 - bump to v1.8.0 - autobuilt 2ced909 +* Sat Feb 08 2020 RH Container Bot - 2:1.8.0-2 +- bump to v1.8.0 +- autobuilt 2ced909 + * Fri Feb 07 2020 RH Container Bot - 2:1.8.0-2 - bump to v1.8.0 - autobuilt 2ced909 From 5da5b1be27c7e131a792c1d45ef235850a2e136c Mon Sep 17 00:00:00 2001 From: RH Container Bot Date: Sat, 8 Feb 2020 04:28:26 +0000 Subject: [PATCH 55/63] podman-2:1.8.0-2 - bump to v1.8.0 - autobuilt 2ced909 Signed-off-by: RH Container Bot --- podman.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/podman.spec b/podman.spec index 67216f0..ee02718 100644 --- a/podman.spec +++ b/podman.spec @@ -669,6 +669,10 @@ exit 0 - bump to v1.8.0 - autobuilt 2ced909 +* Sat Feb 08 2020 RH Container Bot - 2:1.8.0-2 +- bump to v1.8.0 +- autobuilt 2ced909 + * Fri Feb 07 2020 RH Container Bot - 2:1.8.0-2 - bump to v1.8.0 - autobuilt 2ced909 From 5a111af584a8163563c9130dfde0b36542cab953 Mon Sep 17 00:00:00 2001 From: RH Container Bot Date: Sat, 8 Feb 2020 05:11:10 +0000 Subject: [PATCH 56/63] podman-2:1.8.0-2 - bump to v1.8.0 - autobuilt 2ced909 Signed-off-by: RH Container Bot --- podman.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/podman.spec b/podman.spec index ee02718..bf4864e 100644 --- a/podman.spec +++ b/podman.spec @@ -673,6 +673,10 @@ exit 0 - bump to v1.8.0 - autobuilt 2ced909 +* Sat Feb 08 2020 RH Container Bot - 2:1.8.0-2 +- bump to v1.8.0 +- autobuilt 2ced909 + * Fri Feb 07 2020 RH Container Bot - 2:1.8.0-2 - bump to v1.8.0 - autobuilt 2ced909 From 6a20051cd72434f68a5b6c78be50cb4b85d33f6c Mon Sep 17 00:00:00 2001 From: RH Container Bot Date: Sat, 8 Feb 2020 06:11:16 +0000 Subject: [PATCH 57/63] podman-2:1.8.0-2 - bump to v1.8.0 - autobuilt 2ced909 Signed-off-by: RH Container Bot --- podman.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/podman.spec b/podman.spec index bf4864e..006f6a6 100644 --- a/podman.spec +++ b/podman.spec @@ -677,6 +677,10 @@ exit 0 - bump to v1.8.0 - autobuilt 2ced909 +* Sat Feb 08 2020 RH Container Bot - 2:1.8.0-2 +- bump to v1.8.0 +- autobuilt 2ced909 + * Fri Feb 07 2020 RH Container Bot - 2:1.8.0-2 - bump to v1.8.0 - autobuilt 2ced909 From 341a1f9757c7c7bcc79a001bdabe269dbd512446 Mon Sep 17 00:00:00 2001 From: RH Container Bot Date: Sat, 8 Feb 2020 07:10:29 +0000 Subject: [PATCH 58/63] podman-2:1.8.0-2 - bump to v1.8.0 - autobuilt 2ced909 Signed-off-by: RH Container Bot --- podman.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/podman.spec b/podman.spec index 006f6a6..9ecc78d 100644 --- a/podman.spec +++ b/podman.spec @@ -681,6 +681,10 @@ exit 0 - bump to v1.8.0 - autobuilt 2ced909 +* Sat Feb 08 2020 RH Container Bot - 2:1.8.0-2 +- bump to v1.8.0 +- autobuilt 2ced909 + * Fri Feb 07 2020 RH Container Bot - 2:1.8.0-2 - bump to v1.8.0 - autobuilt 2ced909 From 5cc1730e7e287823f34f859990b9e7ad42743a22 Mon Sep 17 00:00:00 2001 From: RH Container Bot Date: Sat, 8 Feb 2020 08:11:15 +0000 Subject: [PATCH 59/63] podman-2:1.8.0-2 - bump to v1.8.0 - autobuilt 2ced909 Signed-off-by: RH Container Bot --- podman.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/podman.spec b/podman.spec index 9ecc78d..6451301 100644 --- a/podman.spec +++ b/podman.spec @@ -685,6 +685,10 @@ exit 0 - bump to v1.8.0 - autobuilt 2ced909 +* Sat Feb 08 2020 RH Container Bot - 2:1.8.0-2 +- bump to v1.8.0 +- autobuilt 2ced909 + * Fri Feb 07 2020 RH Container Bot - 2:1.8.0-2 - bump to v1.8.0 - autobuilt 2ced909 From 2404379b4f75263fe4bf7afc999a9fb6cfd1bf74 Mon Sep 17 00:00:00 2001 From: RH Container Bot Date: Sat, 8 Feb 2020 09:12:10 +0000 Subject: [PATCH 60/63] podman-2:1.8.0-2 - bump to v1.8.0 - autobuilt 2ced909 Signed-off-by: RH Container Bot --- podman.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/podman.spec b/podman.spec index 6451301..15ca868 100644 --- a/podman.spec +++ b/podman.spec @@ -689,6 +689,10 @@ exit 0 - bump to v1.8.0 - autobuilt 2ced909 +* Sat Feb 08 2020 RH Container Bot - 2:1.8.0-2 +- bump to v1.8.0 +- autobuilt 2ced909 + * Fri Feb 07 2020 RH Container Bot - 2:1.8.0-2 - bump to v1.8.0 - autobuilt 2ced909 From 4ef281656f8423911d43252e075f81d396f09cca Mon Sep 17 00:00:00 2001 From: RH Container Bot Date: Sat, 8 Feb 2020 10:11:44 +0000 Subject: [PATCH 61/63] podman-2:1.8.0-2 - bump to v1.8.0 - autobuilt 2ced909 Signed-off-by: RH Container Bot --- podman.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/podman.spec b/podman.spec index 15ca868..7a711ad 100644 --- a/podman.spec +++ b/podman.spec @@ -693,6 +693,10 @@ exit 0 - bump to v1.8.0 - autobuilt 2ced909 +* Sat Feb 08 2020 RH Container Bot - 2:1.8.0-2 +- bump to v1.8.0 +- autobuilt 2ced909 + * Fri Feb 07 2020 RH Container Bot - 2:1.8.0-2 - bump to v1.8.0 - autobuilt 2ced909 From 0235e90b88cc6b462ab621a3cbcd9dc5e880472c Mon Sep 17 00:00:00 2001 From: RH Container Bot Date: Sat, 8 Feb 2020 11:11:24 +0000 Subject: [PATCH 62/63] podman-2:1.8.0-2 - bump to v1.8.0 - autobuilt 2ced909 Signed-off-by: RH Container Bot --- podman.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/podman.spec b/podman.spec index 7a711ad..ae2d92d 100644 --- a/podman.spec +++ b/podman.spec @@ -697,6 +697,10 @@ exit 0 - bump to v1.8.0 - autobuilt 2ced909 +* Sat Feb 08 2020 RH Container Bot - 2:1.8.0-2 +- bump to v1.8.0 +- autobuilt 2ced909 + * Fri Feb 07 2020 RH Container Bot - 2:1.8.0-2 - bump to v1.8.0 - autobuilt 2ced909 From 5840f03527e9fb897c6d58fde107fb72b145b412 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Wed, 12 Feb 2020 20:06:55 -0500 Subject: [PATCH 63/63] no min version requirement on runc for centos Signed-off-by: Lokesh Mandvekar --- podman.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/podman.spec b/podman.spec index ae2d92d..6cb6c9b 100644 --- a/podman.spec +++ b/podman.spec @@ -101,7 +101,7 @@ Requires: crun >= 0.12.1-1 %else #### DO NOT REMOVE - NEEDED FOR CENTOS Requires: slirp4netns >= 0.3.0-2 -Requires: runc >= 1.0.0-57 +Requires: runc %endif %if 0%{?centos} >= 8 Requires: libvarlink-util