From b0a75f072f37e1c032d7ba3016aeb0e6124996c9 Mon Sep 17 00:00:00 2001 From: Daniel J Walsh Date: Sun, 26 Aug 2018 07:51:42 -0400 Subject: [PATCH 01/87] Resolves: #1619411 - python3-podman should require python3-psutil podman-docker should conflict with moby-engine require nftables recommend slirp4netns and fuse-overlayfs (latter only for kernel >= 4.18) --- podman.spec | 58 ++++++++++++++++++++++++++++++++++------------------- 1 file changed, 37 insertions(+), 21 deletions(-) diff --git a/podman.spec b/podman.spec index 94f9f6a..65e5946 100644 --- a/podman.spec +++ b/podman.spec @@ -20,28 +20,33 @@ %global provider github %global provider_tld com -%global project projectatomic +%global project containers %global repo libpod -# https://github.com/projectatomic/libpod +# https://github.com/containers/libpod %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} %global git0 https://%{provider}.%{provider_tld}/%{project}/%{repo} -%global commit0 3d55721fc4879cba166a9afb5acfeb8e1cdd6272 +%global commit0 9f9b8cffe5231e828a26b5bbec93bd474370c9d9 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) +%global import_path_conmon github.com/kubernetes-incubator/cri-o +%global git_conmon https://%{import_path_conmon} +%global commit_conmon 4e7f71b714932dafc6a70e9b6dc09112da478be1 +%global shortcommit_conmon %(c=%{commit_conmon}; echo ${c:0:7}) + Name: podman # Version string is wrong but only written as such to avoid epoch bumps # Will be fixed once upstream moves to 0.8.11-dev %if 0%{?fedora} > 28 Epoch: 1 %endif -Version: 0.8.3 -Release: 4.dev.git%{shortcommit0}%{?dist} +Version: 0.8.4 +Release: 1.git%{shortcommit0}%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: %{git_podman} Source0: %{git0}/archive/%{commit0}/%{repo}-%{shortcommit0}.tar.gz -Patch: rootless.patch +Source1: %{git_conmon}/archive/%{commit_conmon}/cri-o-%{shortcommit_conmon}.tar.gz # e.g. el6 has ppc64 arch without gcc-go, so EA tag is required #ExclusiveArch: %%{?go_arches:%%{go_arches}}%%{!?go_arches:%%{ix86} x86_64 aarch64 %%{arm}} ExclusiveArch: aarch64 %{arm} ppc64le s390x x86_64 @@ -69,7 +74,7 @@ Requires: iptables Requires: nftables Requires: atomic-registries Requires: oci-systemd-hook -Requires: conmon +#Requires: conmon Recommends: container-selinux Recommends: slirp4netns %if 0%{?fedora} > 28 @@ -229,6 +234,10 @@ This package installs a script named docker that emulates the Docker CLI by executes podman commands, it also creates links between all Docker CLI man pages and podman. +%files docker +%{_bindir}/docker +%{_mandir}/man1/docker*.1* + %if 0%{?with_devel} %package devel Summary: Library for applications looking to use Container Pods @@ -364,7 +373,7 @@ building other packages which use import path with %if 0%{?with_unit_test} && 0%{?with_devel} %package unit-test-devel -Summary: Unit tests for %{name} package +Summary: Unit tests for %{name} package %if 0%{?with_check} #Here comes all BuildRequires: PACKAGE the unit tests #in %%check section need for running @@ -396,6 +405,9 @@ sed -i 's/0.0.0/%{version}/' contrib/python/%{name}/setup.py sed -i 's/0.0.0/%{version}/' contrib/python/py%{name}/setup.py mv pkg/hooks/README.md pkg/hooks/README-hooks.md +# untar cri-o +tar zxf %{SOURCE1} + %build mkdir _build pushd _build @@ -406,20 +418,23 @@ ln -s vendor src export GOPATH=$(pwd)/_build:$(pwd):$(pwd):%{gopath} export BUILDTAGS="varlink selinux seccomp $(hack/btrfs_installed_tag.sh) $(hack/btrfs_tag.sh) $(hack/libdm_tag.sh)" %gogenerate ./cmd/%{name}/varlink/... -%gobuild -o bin/%{name} %{import_path}/cmd/%{name} +BUILDTAGS=$BUILDTAGS make binaries docs -%if %{with varlink} -#install python-podman -pushd contrib/python/podman -%py3_build +# build conmon +pushd cri-o-%{commit_conmon} + +mkdir _output +pushd _output +mkdir -p src/%{provider}.%{provider_tld}/{kubernetes-incubator,opencontainers} +ln -s $(dirs +1 -l) src/%{import_path_conmon} popd -#install python-pypodman -pushd contrib/python/pypodman -%py3_build +ln -s vendor src +export GOPATH=$(pwd)/_output:$(pwd):%{gopath} +export BUILDTAGS="selinux seccomp $(hack/btrfs_installed_tag.sh) $(hack/btrfs_tag.sh) containers_image_ostree_stub" +BUILDTAGS=$BUILDTAGS make -C conmon popd -%endif # varlink %install install -dp %{buildroot}%{_unitdir} %{__make} PREFIX=%{buildroot}%{_prefix} ETCDIR=%{buildroot}%{_sysconfdir} \ @@ -438,6 +453,10 @@ install -dp %{buildroot}%{_unitdir} install -dp %{buildroot}%{_datadir}/containers install -p -m 644 %{repo}.conf %{buildroot}%{_datadir}/containers +# install conmon +install -dp %{buildroot}%{_libexecdir}/%{name} +install -p -m 755 cri-o-%{commit_conmon}/bin/conmon %{buildroot}%{_libexecdir}/%{name} + # source codes for building projects %if 0%{?with_devel} install -d -p %{buildroot}/%{gopath}/src/%{import_path}/ @@ -512,6 +531,7 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %{_mandir}/man1/podman*.1* %{_mandir}/man5/*.5* %{_datadir}/bash-completion/completions/* +%{_libexecdir}/%{name}/conmon %config(noreplace) %{_sysconfdir}/cni/net.d/87-%{name}-bridge.conflist %{_datadir}/containers/%{repo}.conf %{_unitdir}/io.%{name}.service @@ -535,10 +555,6 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %{_bindir}/py%{name} %endif # varlink -%files docker -%{_bindir}/docker -%{_mandir}/man1/docker*.1* - %if 0%{?with_devel} %files -n libpod-devel -f devel.file-list %license LICENSE From 6caaf4db84d1292d3f680119253c479f494f85a4 Mon Sep 17 00:00:00 2001 From: Daniel J Walsh Date: Sun, 26 Aug 2018 07:53:10 -0400 Subject: [PATCH 02/87] Resolves: #1619411 - python3-podman should require python3-psutil podman-docker should conflict with moby-engine require nftables recommend slirp4netns and fuse-overlayfs (latter only for kernel >= 4.18) --- podman.spec | 28 +--------------------------- 1 file changed, 1 insertion(+), 27 deletions(-) diff --git a/podman.spec b/podman.spec index 65e5946..414458f 100644 --- a/podman.spec +++ b/podman.spec @@ -29,11 +29,6 @@ %global commit0 9f9b8cffe5231e828a26b5bbec93bd474370c9d9 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) -%global import_path_conmon github.com/kubernetes-incubator/cri-o -%global git_conmon https://%{import_path_conmon} -%global commit_conmon 4e7f71b714932dafc6a70e9b6dc09112da478be1 -%global shortcommit_conmon %(c=%{commit_conmon}; echo ${c:0:7}) - Name: podman # Version string is wrong but only written as such to avoid epoch bumps # Will be fixed once upstream moves to 0.8.11-dev @@ -46,7 +41,6 @@ Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: %{git_podman} Source0: %{git0}/archive/%{commit0}/%{repo}-%{shortcommit0}.tar.gz -Source1: %{git_conmon}/archive/%{commit_conmon}/cri-o-%{shortcommit_conmon}.tar.gz # e.g. el6 has ppc64 arch without gcc-go, so EA tag is required #ExclusiveArch: %%{?go_arches:%%{go_arches}}%%{!?go_arches:%%{ix86} x86_64 aarch64 %%{arm}} ExclusiveArch: aarch64 %{arm} ppc64le s390x x86_64 @@ -74,7 +68,7 @@ Requires: iptables Requires: nftables Requires: atomic-registries Requires: oci-systemd-hook -#Requires: conmon +Requires: conmon Recommends: container-selinux Recommends: slirp4netns %if 0%{?fedora} > 28 @@ -420,21 +414,6 @@ export BUILDTAGS="varlink selinux seccomp $(hack/btrfs_installed_tag.sh) $(hack/ %gogenerate ./cmd/%{name}/varlink/... BUILDTAGS=$BUILDTAGS make binaries docs -# build conmon -pushd cri-o-%{commit_conmon} - -mkdir _output -pushd _output -mkdir -p src/%{provider}.%{provider_tld}/{kubernetes-incubator,opencontainers} -ln -s $(dirs +1 -l) src/%{import_path_conmon} -popd - -ln -s vendor src -export GOPATH=$(pwd)/_output:$(pwd):%{gopath} -export BUILDTAGS="selinux seccomp $(hack/btrfs_installed_tag.sh) $(hack/btrfs_tag.sh) containers_image_ostree_stub" -BUILDTAGS=$BUILDTAGS make -C conmon -popd - %install install -dp %{buildroot}%{_unitdir} %{__make} PREFIX=%{buildroot}%{_prefix} ETCDIR=%{buildroot}%{_sysconfdir} \ @@ -453,10 +432,6 @@ install -dp %{buildroot}%{_unitdir} install -dp %{buildroot}%{_datadir}/containers install -p -m 644 %{repo}.conf %{buildroot}%{_datadir}/containers -# install conmon -install -dp %{buildroot}%{_libexecdir}/%{name} -install -p -m 755 cri-o-%{commit_conmon}/bin/conmon %{buildroot}%{_libexecdir}/%{name} - # source codes for building projects %if 0%{?with_devel} install -d -p %{buildroot}/%{gopath}/src/%{import_path}/ @@ -531,7 +506,6 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %{_mandir}/man1/podman*.1* %{_mandir}/man5/*.5* %{_datadir}/bash-completion/completions/* -%{_libexecdir}/%{name}/conmon %config(noreplace) %{_sysconfdir}/cni/net.d/87-%{name}-bridge.conflist %{_datadir}/containers/%{repo}.conf %{_unitdir}/io.%{name}.service From 3a4199d0fd450805a0c95917180878f014845af7 Mon Sep 17 00:00:00 2001 From: Daniel J Walsh Date: Sun, 26 Aug 2018 07:53:10 -0400 Subject: [PATCH 03/87] Resolves: #1619411 - python3-podman should require python3-psutil podman-docker should conflict with moby-engine require nftables recommend slirp4netns and fuse-overlayfs (latter only for kernel >= 4.18) Signed-off-by: Daniel J Walsh --- .gitignore | 20 ++++++-------------- podman.spec | 28 +--------------------------- sources | 2 +- 3 files changed, 8 insertions(+), 42 deletions(-) diff --git a/.gitignore b/.gitignore index ba79c3d..9b91a25 100644 --- a/.gitignore +++ b/.gitignore @@ -82,17 +82,9 @@ /libpod-99959e5.tar.gz /libpod-ca6ffbc.tar.gz /libpod-0660108.tar.gz -/libpod-f661e1d.tar.gz -/libpod-c7424b6.tar.gz -/libpod-4f9b1ae.tar.gz -/libpod-84cfdb2.tar.gz -/libpod-86154b6.tar.gz -/libpod-9a18681.tar.gz -/libpod-c90b740.tar.gz -/libpod-9c806a4.tar.gz -/libpod-3dd577e.tar.gz -/libpod-87d8edb.tar.gz -/libpod-433cbd5.tar.gz -/libpod-5a4e590.tar.gz -/libpod-1a439f9.tar.gz -/libpod-3d55721.tar.gz +/libpod-6b4ab2a.tar.gz +/libpod-7a526bb.tar.gz +/cri-o-4e7f71b.tar.gz +/libpod-f38eb4f.tar.gz +/libpod-9d09a4d.tar.gz +/libpod-9f9b8cf.tar.gz diff --git a/podman.spec b/podman.spec index 65e5946..414458f 100644 --- a/podman.spec +++ b/podman.spec @@ -29,11 +29,6 @@ %global commit0 9f9b8cffe5231e828a26b5bbec93bd474370c9d9 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) -%global import_path_conmon github.com/kubernetes-incubator/cri-o -%global git_conmon https://%{import_path_conmon} -%global commit_conmon 4e7f71b714932dafc6a70e9b6dc09112da478be1 -%global shortcommit_conmon %(c=%{commit_conmon}; echo ${c:0:7}) - Name: podman # Version string is wrong but only written as such to avoid epoch bumps # Will be fixed once upstream moves to 0.8.11-dev @@ -46,7 +41,6 @@ Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: %{git_podman} Source0: %{git0}/archive/%{commit0}/%{repo}-%{shortcommit0}.tar.gz -Source1: %{git_conmon}/archive/%{commit_conmon}/cri-o-%{shortcommit_conmon}.tar.gz # e.g. el6 has ppc64 arch without gcc-go, so EA tag is required #ExclusiveArch: %%{?go_arches:%%{go_arches}}%%{!?go_arches:%%{ix86} x86_64 aarch64 %%{arm}} ExclusiveArch: aarch64 %{arm} ppc64le s390x x86_64 @@ -74,7 +68,7 @@ Requires: iptables Requires: nftables Requires: atomic-registries Requires: oci-systemd-hook -#Requires: conmon +Requires: conmon Recommends: container-selinux Recommends: slirp4netns %if 0%{?fedora} > 28 @@ -420,21 +414,6 @@ export BUILDTAGS="varlink selinux seccomp $(hack/btrfs_installed_tag.sh) $(hack/ %gogenerate ./cmd/%{name}/varlink/... BUILDTAGS=$BUILDTAGS make binaries docs -# build conmon -pushd cri-o-%{commit_conmon} - -mkdir _output -pushd _output -mkdir -p src/%{provider}.%{provider_tld}/{kubernetes-incubator,opencontainers} -ln -s $(dirs +1 -l) src/%{import_path_conmon} -popd - -ln -s vendor src -export GOPATH=$(pwd)/_output:$(pwd):%{gopath} -export BUILDTAGS="selinux seccomp $(hack/btrfs_installed_tag.sh) $(hack/btrfs_tag.sh) containers_image_ostree_stub" -BUILDTAGS=$BUILDTAGS make -C conmon -popd - %install install -dp %{buildroot}%{_unitdir} %{__make} PREFIX=%{buildroot}%{_prefix} ETCDIR=%{buildroot}%{_sysconfdir} \ @@ -453,10 +432,6 @@ install -dp %{buildroot}%{_unitdir} install -dp %{buildroot}%{_datadir}/containers install -p -m 644 %{repo}.conf %{buildroot}%{_datadir}/containers -# install conmon -install -dp %{buildroot}%{_libexecdir}/%{name} -install -p -m 755 cri-o-%{commit_conmon}/bin/conmon %{buildroot}%{_libexecdir}/%{name} - # source codes for building projects %if 0%{?with_devel} install -d -p %{buildroot}/%{gopath}/src/%{import_path}/ @@ -531,7 +506,6 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %{_mandir}/man1/podman*.1* %{_mandir}/man5/*.5* %{_datadir}/bash-completion/completions/* -%{_libexecdir}/%{name}/conmon %config(noreplace) %{_sysconfdir}/cni/net.d/87-%{name}-bridge.conflist %{_datadir}/containers/%{repo}.conf %{_unitdir}/io.%{name}.service diff --git a/sources b/sources index 651c884..6f64d4e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libpod-3d55721.tar.gz) = 78366d0f6cb63d83bfbd49dc59b9206494eef9aa72d8a8d7e937f875bc05fb245d3ff8ae3ca6b7f6397d8ee094b5e48a37c750dfb9278033d204fda769aa7420 +SHA512 (libpod-9f9b8cf.tar.gz) = 85b25cc960451727002220e4888cd70cec98644b75f388bc36f0777146c8d36fb9fed66dd58a82622c3e5bbc9da881f949b98d8b2527630e94db3d140f8e9ec4 From 292a35110107d267a881e7ae9761564538076108 Mon Sep 17 00:00:00 2001 From: Daniel J Walsh Date: Mon, 27 Aug 2018 05:20:07 -0400 Subject: [PATCH 04/87] Resolves: #1619411 - python3-podman should require python3-psutil podman-docker should conflict with moby-engine require nftables recommend slirp4netns and fuse-overlayfs (latter only for kernel >= 4.18) --- podman.spec | 3 --- 1 file changed, 3 deletions(-) diff --git a/podman.spec b/podman.spec index 414458f..07123f6 100644 --- a/podman.spec +++ b/podman.spec @@ -399,9 +399,6 @@ sed -i 's/0.0.0/%{version}/' contrib/python/%{name}/setup.py sed -i 's/0.0.0/%{version}/' contrib/python/py%{name}/setup.py mv pkg/hooks/README.md pkg/hooks/README-hooks.md -# untar cri-o -tar zxf %{SOURCE1} - %build mkdir _build pushd _build From a535daaa22f727092d0971c624d65aa96766850e Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Thu, 30 Aug 2018 09:12:51 -0400 Subject: [PATCH 05/87] correct min dep on containernetworking-plugins Signed-off-by: Lokesh Mandvekar --- podman.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/podman.spec b/podman.spec index 07123f6..58a4e7f 100644 --- a/podman.spec +++ b/podman.spec @@ -63,7 +63,7 @@ BuildRequires: pkgconfig BuildRequires: make Requires: runc Requires: containers-common -Requires: containernetworking-plugins >= 0.7.3-1 +Requires: containernetworking-plugins >= 0.7.3-2 Requires: iptables Requires: nftables Requires: atomic-registries From e930a54ae18f73a27357415af56afe7b19b5ee20 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Thu, 30 Aug 2018 09:33:03 -0400 Subject: [PATCH 06/87] podman-1:0.8.4-2.git9f9b8cf - correct min dep on containernetworking-plugins - update bundled provides Signed-off-by: Lokesh Mandvekar --- podman.spec | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/podman.spec b/podman.spec index 58a4e7f..d0792cb 100644 --- a/podman.spec +++ b/podman.spec @@ -36,7 +36,7 @@ Name: podman Epoch: 1 %endif Version: 0.8.4 -Release: 1.git%{shortcommit0}%{?dist} +Release: 2.git%{shortcommit0}%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: %{git_podman} @@ -85,10 +85,10 @@ Provides: bundled(golang(github.com/buger/goterm)) = 2f8dfbc7dbbff5dd1d391ed9148 Provides: bundled(golang(github.com/BurntSushi/toml)) = v0.2.0 Provides: bundled(golang(github.com/containerd/cgroups)) = 77e628511d924b13a77cebdc73b757a47f6d751b Provides: bundled(golang(github.com/containerd/continuity)) = master -Provides: bundled(golang(github.com/containernetworking/cni)) = v0.7.0-alpha1 +#Provides: bundled(golang(github.com/containernetworking/cni)) = v0.7.0-alpha1 Provides: bundled(golang(github.com/containernetworking/plugins)) = 1562a1e60ed101aacc5e08ed9dbeba8e9f3d4ec1 Provides: bundled(golang(github.com/containers/image)) = 134f99bed228d6297dc01d152804f6f09f185418 -Provides: bundled(golang(github.com/containers/psgo)) = 382fc951fe0a8aba62043862ce1a56f77524db87 +Provides: bundled(golang(github.com/containers/psgo)) = 5dde6da0bc8831b35243a847625bcf18183bd1ee Provides: bundled(golang(github.com/containers/storage)) = 17c7d1fee5603ccf6dd97edc14162fc1510e7e23 Provides: bundled(golang(github.com/coreos/go-systemd)) = v14 Provides: bundled(golang(github.com/cri-o/ocicni)) = master @@ -120,6 +120,7 @@ Provides: bundled(golang(github.com/hashicorp/go-multierror)) = 83588e72410abfbe Provides: bundled(golang(github.com/imdario/mergo)) = 0.2.2 Provides: bundled(golang(github.com/json-iterator/go)) = 1.0.0 Provides: bundled(golang(github.com/kr/pty)) = v1.0.0 +Provides: bundled(golang(github.com/mailru/easyjson)) = 03f2033d19d5860aef995fe360ac7d395cd8ce65 Provides: bundled(golang(github.com/mattn/go-runewidth)) = v0.0.1 Provides: bundled(golang(github.com/Microsoft/go-winio)) = 78439966b38d69bf38227fbf57ac8a6fee70f69a Provides: bundled(golang(github.com/Microsoft/hcsshim)) = 43f9725307998e09f2e3816c2c0c36dc98f0c982 @@ -127,18 +128,18 @@ Provides: bundled(golang(github.com/mistifyio/go-zfs)) = v2.1.1 Provides: bundled(golang(github.com/mrunalp/fileutils)) = master Provides: bundled(golang(github.com/mtrmac/gpgme)) = b2432428689ca58c2b8e8dea9449d3295cf96fc9 Provides: bundled(golang(github.com/Nvveen/Gotty)) = master -Provides: bundled(golang(github.com/opencontainers/go-digest)) = v1.0.0-rc0 +#Provides: bundled(golang(github.com/opencontainers/go-digest)) = v1.0.0-rc0 Provides: bundled(golang(github.com/opencontainers/image-spec)) = v1.0.0 Provides: bundled(golang(github.com/opencontainers/runc)) = b4e2ecb452d9ee4381137cc0a7e6715b96bed6de Provides: bundled(golang(github.com/opencontainers/runtime-spec)) = v1.0.0 -Provides: bundled(golang(github.com/opencontainers/runtime-tools)) = 625e2322645b151a7cbb93a8b42920933e72167f +Provides: bundled(golang(github.com/opencontainers/runtime-tools)) = master Provides: bundled(golang(github.com/opencontainers/selinux)) = b6fa367ed7f534f9ba25391cc2d467085dbb445a Provides: bundled(golang(github.com/openshift/imagebuilder)) = master Provides: bundled(golang(github.com/ostreedev/ostree-go)) = master Provides: bundled(golang(github.com/pkg/errors)) = v0.8.0 Provides: bundled(golang(github.com/pmezard/go-difflib)) = 792786c7400a136282c1664665ae0a8db921c6c2 Provides: bundled(golang(github.com/pquerna/ffjson)) = d49c2bc1aa135aad0c6f4fc2056623ec78f5d5ac -Provides: bundled(golang(github.com/projectatomic/buildah)) = 35a37f36d37bf84397d7f79f6bb8649f728c19f1 +Provides: bundled(golang(github.com/projectatomic/buildah)) = 745bf7e56bda740ce7cfc55318da08529e5ed519 Provides: bundled(golang(github.com/seccomp/containers-golang)) = master Provides: bundled(golang(github.com/seccomp/libseccomp-golang)) = v0.9.0 Provides: bundled(golang(github.com/sirupsen/logrus)) = v1.0.0 @@ -148,8 +149,7 @@ Provides: bundled(golang(github.com/syndtr/gocapability)) = e7cb7fa329f456b38551 Provides: bundled(golang(github.com/tchap/go-patricia)) = v2.2.6 Provides: bundled(golang(github.com/ulikunitz/xz)) = v0.5.4 Provides: bundled(golang(github.com/ulule/deepcopier)) = master -# no '-' in version -#Provides: bundled(golang(github.com/urfave/cli)) = fix-short-opts-parsing +Provides: bundled(golang(github.com/urfave/cli)) = 934abfb2f102315b5794e15ebc7949e4ca253920 Provides: bundled(golang(github.com/varlink/go)) = master Provides: bundled(golang(github.com/vbatts/tar-split)) = v0.10.2 Provides: bundled(golang(github.com/vishvananda/netlink)) = master @@ -540,6 +540,10 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %endif %changelog +* Thu Aug 30 2018 Lokesh Mandvekar - 1:0.8.4-2.git9f9b8cf +- correct min dep on containernetworking-plugins +- update bundled provides + * Mon Aug 20 2018 Lokesh Mandvekar - 1:0.8.3-4.dev.git3d55721f - Resolves: #1619411 - python3-podman should require python3-psutil - podman-docker should conflict with moby-engine From 08f6564b8a6c9b37c0a60526ee0db325141722fe Mon Sep 17 00:00:00 2001 From: baude Date: Fri, 31 Aug 2018 17:27:34 -0500 Subject: [PATCH 07/87] Upstream 0.8.5 release --- .gitignore | 1 + podman.spec | 10 ++++++---- rootless.patch | 15 --------------- sources | 2 +- 4 files changed, 8 insertions(+), 20 deletions(-) delete mode 100644 rootless.patch diff --git a/.gitignore b/.gitignore index 9b91a25..ec5b527 100644 --- a/.gitignore +++ b/.gitignore @@ -88,3 +88,4 @@ /libpod-f38eb4f.tar.gz /libpod-9d09a4d.tar.gz /libpod-9f9b8cf.tar.gz +/libpod-dc5a711.tar.gz diff --git a/podman.spec b/podman.spec index d0792cb..46788f4 100644 --- a/podman.spec +++ b/podman.spec @@ -26,7 +26,7 @@ %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} %global git0 https://%{provider}.%{provider_tld}/%{project}/%{repo} -%global commit0 9f9b8cffe5231e828a26b5bbec93bd474370c9d9 +%global commit0 dc5a711fb6368ce7b817b9c48e5c0102348df29c %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) Name: podman @@ -35,8 +35,8 @@ Name: podman %if 0%{?fedora} > 28 Epoch: 1 %endif -Version: 0.8.4 -Release: 2.git%{shortcommit0}%{?dist} +Version: 0.8.5 +Release: 1.git%{shortcommit0}%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: %{git_podman} @@ -67,7 +67,6 @@ Requires: containernetworking-plugins >= 0.7.3-2 Requires: iptables Requires: nftables Requires: atomic-registries -Requires: oci-systemd-hook Requires: conmon Recommends: container-selinux Recommends: slirp4netns @@ -540,6 +539,9 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %endif %changelog +* Fri Aug 31 2018 baude - 0.8.5-1.gitdc5a711 +- Upstream 0.8.5 release + * Thu Aug 30 2018 Lokesh Mandvekar - 1:0.8.4-2.git9f9b8cf - correct min dep on containernetworking-plugins - update bundled provides diff --git a/rootless.patch b/rootless.patch deleted file mode 100644 index aac01b3..0000000 --- a/rootless.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/cmd/podman/libpodruntime/runtime.go b/cmd/podman/libpodruntime/runtime.go -index 9d1347cc..f1f2b963 100644 ---- a/cmd/podman/libpodruntime/runtime.go -+++ b/cmd/podman/libpodruntime/runtime.go -@@ -105,6 +105,10 @@ func GetRuntimeWithStorageOpts(c *cli.Context, storageOpts *storage.StoreOptions - - if c.GlobalIsSet("cgroup-manager") { - options = append(options, libpod.WithCgroupManager(c.GlobalString("cgroup-manager"))) -+ } else { -+ if rootless.IsRootless() { -+ options = append(options, libpod.WithCgroupManager("cgroupfs")) -+ } - } - - // TODO flag to set libpod static dir? diff --git a/sources b/sources index 6f64d4e..a38945f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libpod-9f9b8cf.tar.gz) = 85b25cc960451727002220e4888cd70cec98644b75f388bc36f0777146c8d36fb9fed66dd58a82622c3e5bbc9da881f949b98d8b2527630e94db3d140f8e9ec4 +SHA512 (libpod-dc5a711.tar.gz) = 2fa8df74bbf4a04b7dda7be87eb000126c2a49ae1bcd6cc4200fb28a57b9df482475169df5e31ce2dd81ac4cddf0291c8b41d39e50188d73c848cf180c78ede4 From 26d9608bcfc8e89065ec78d2d7eda87722f95434 Mon Sep 17 00:00:00 2001 From: Daniel J Walsh Date: Tue, 4 Sep 2018 06:27:32 -0400 Subject: [PATCH 08/87] Add a specific version of runc or later to require --- podman.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/podman.spec b/podman.spec index 46788f4..fffbb65 100644 --- a/podman.spec +++ b/podman.spec @@ -36,7 +36,7 @@ Name: podman Epoch: 1 %endif Version: 0.8.5 -Release: 1.git%{shortcommit0}%{?dist} +Release: 2.git%{shortcommit0}%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: %{git_podman} @@ -61,7 +61,7 @@ BuildRequires: libselinux-devel BuildRequires: ostree-devel BuildRequires: pkgconfig BuildRequires: make -Requires: runc +Requires: runc >= 1.0.0-50 Requires: containers-common Requires: containernetworking-plugins >= 0.7.3-2 Requires: iptables @@ -539,6 +539,9 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %endif %changelog +* Mon Sep 3 2018 Dan Walsh - 0.8.5-2.gitdc5a711 +- Add a specific version of runc or later to require + * Fri Aug 31 2018 baude - 0.8.5-1.gitdc5a711 - Upstream 0.8.5 release From a6b8ec09ccfc7a7d2ac9666a625ec8dc8acc923e Mon Sep 17 00:00:00 2001 From: Daniel J Walsh Date: Tue, 4 Sep 2018 09:27:23 -0400 Subject: [PATCH 09/87] Fix required version of runc --- podman.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/podman.spec b/podman.spec index fffbb65..9546703 100644 --- a/podman.spec +++ b/podman.spec @@ -36,7 +36,7 @@ Name: podman Epoch: 1 %endif Version: 0.8.5 -Release: 2.git%{shortcommit0}%{?dist} +Release: 3.git%{shortcommit0}%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: %{git_podman} @@ -61,7 +61,7 @@ BuildRequires: libselinux-devel BuildRequires: ostree-devel BuildRequires: pkgconfig BuildRequires: make -Requires: runc >= 1.0.0-50 +Requires: runc >= 1.0.0-51 Requires: containers-common Requires: containernetworking-plugins >= 0.7.3-2 Requires: iptables @@ -539,6 +539,9 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %endif %changelog +* Tue Sep 4 2018 Dan Walsh - 1:0.8.5-3.dev.git65c31d4 +- Fix required version of runc + * Mon Sep 3 2018 Dan Walsh - 0.8.5-2.gitdc5a711 - Add a specific version of runc or later to require From 18f435cd911d2ae1a5737ee4e8936a410eee315c Mon Sep 17 00:00:00 2001 From: Daniel J Walsh Date: Tue, 4 Sep 2018 09:59:38 -0400 Subject: [PATCH 10/87] Fix rpm -qi podman to show the correct URL --- podman.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/podman.spec b/podman.spec index 9546703..c86b62a 100644 --- a/podman.spec +++ b/podman.spec @@ -36,10 +36,10 @@ Name: podman Epoch: 1 %endif Version: 0.8.5 -Release: 3.git%{shortcommit0}%{?dist} +Release: 4.git%{shortcommit0}%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 -URL: %{git_podman} +URL: %{git0} Source0: %{git0}/archive/%{commit0}/%{repo}-%{shortcommit0}.tar.gz # e.g. el6 has ppc64 arch without gcc-go, so EA tag is required #ExclusiveArch: %%{?go_arches:%%{go_arches}}%%{!?go_arches:%%{ix86} x86_64 aarch64 %%{arm}} @@ -539,6 +539,9 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %endif %changelog +* Tue Sep 4 2018 Dan Walsh - 1:0.8.5-4.dev.git65c31d4 +- Fix rpm -qi podman to show the correct URL + * Tue Sep 4 2018 Dan Walsh - 1:0.8.5-3.dev.git65c31d4 - Fix required version of runc From c1c4c54eb3a2bafc2482d62aaf4d7b48c655320f Mon Sep 17 00:00:00 2001 From: Daniel J Walsh Date: Tue, 4 Sep 2018 12:23:54 -0400 Subject: [PATCH 11/87] Fix required version of runc --- podman.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/podman.spec b/podman.spec index c86b62a..05457b8 100644 --- a/podman.spec +++ b/podman.spec @@ -36,7 +36,7 @@ Name: podman Epoch: 1 %endif Version: 0.8.5 -Release: 4.git%{shortcommit0}%{?dist} +Release: 5.git%{shortcommit0}%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: %{git0} @@ -61,7 +61,7 @@ BuildRequires: libselinux-devel BuildRequires: ostree-devel BuildRequires: pkgconfig BuildRequires: make -Requires: runc >= 1.0.0-51 +Requires: runc >= 2:1.0.0-51 Requires: containers-common Requires: containernetworking-plugins >= 0.7.3-2 Requires: iptables @@ -539,6 +539,9 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %endif %changelog +* Tue Sep 4 2018 Dan Walsh - 1:0.8.5-5.dev.git65c31d4 +- Fix required version of runc + * Tue Sep 4 2018 Dan Walsh - 1:0.8.5-4.dev.git65c31d4 - Fix rpm -qi podman to show the correct URL From 05f03289e0f71d4ab2c85f1a2d8f4dd63b4f105f Mon Sep 17 00:00:00 2001 From: baude Date: Fri, 7 Sep 2018 15:00:19 -0500 Subject: [PATCH 12/87] Upstream 0.9.1 release Signed-off-by: baude --- .gitignore | 1 + podman.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index ec5b527..d69978a 100644 --- a/.gitignore +++ b/.gitignore @@ -89,3 +89,4 @@ /libpod-9d09a4d.tar.gz /libpod-9f9b8cf.tar.gz /libpod-dc5a711.tar.gz +/libpod-c325a18.tar.gz diff --git a/podman.spec b/podman.spec index 05457b8..af71798 100644 --- a/podman.spec +++ b/podman.spec @@ -26,7 +26,7 @@ %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} %global git0 https://%{provider}.%{provider_tld}/%{project}/%{repo} -%global commit0 dc5a711fb6368ce7b817b9c48e5c0102348df29c +%global commit0 c325a1842039eb7af1b6114c5f819ffe2d30bfe9 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) Name: podman @@ -35,8 +35,8 @@ Name: podman %if 0%{?fedora} > 28 Epoch: 1 %endif -Version: 0.8.5 -Release: 5.git%{shortcommit0}%{?dist} +Version: 0.9.1 +Release: 1.git%{shortcommit0}%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: %{git0} @@ -539,6 +539,9 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %endif %changelog +* Fri Sep 07 2018 baude - 0.9.1-1.gitc325a18 +- Upstream 0.9.1 release + * Tue Sep 4 2018 Dan Walsh - 1:0.8.5-5.dev.git65c31d4 - Fix required version of runc diff --git a/sources b/sources index a38945f..b906b5a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libpod-dc5a711.tar.gz) = 2fa8df74bbf4a04b7dda7be87eb000126c2a49ae1bcd6cc4200fb28a57b9df482475169df5e31ce2dd81ac4cddf0291c8b41d39e50188d73c848cf180c78ede4 +SHA512 (libpod-c325a18.tar.gz) = 7717a5c38834c6b3f6d93920720a815e64e7125319ac5f6049c48d7dba4b14eb5032b2412adc92ae785e29aeb0e19461970fe08ee6b929bb5ad51ce908296230 From 50d7da1cda9e11cf418643cc7ec584be401c98b7 Mon Sep 17 00:00:00 2001 From: Daniel J Walsh Date: Sun, 9 Sep 2018 07:21:21 -0400 Subject: [PATCH 13/87] Grab correct commit for podman-0.9.1 --- .gitignore | 1 + podman.spec | 9 ++++++--- sources | 3 ++- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index d69978a..ae32f3c 100644 --- a/.gitignore +++ b/.gitignore @@ -90,3 +90,4 @@ /libpod-9f9b8cf.tar.gz /libpod-dc5a711.tar.gz /libpod-c325a18.tar.gz +/libpod-aba58d1.tar.gz diff --git a/podman.spec b/podman.spec index af71798..d1fe161 100644 --- a/podman.spec +++ b/podman.spec @@ -26,7 +26,7 @@ %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} %global git0 https://%{provider}.%{provider_tld}/%{project}/%{repo} -%global commit0 c325a1842039eb7af1b6114c5f819ffe2d30bfe9 +%global commit0 aba58d1660e36e1bed8b52d4a79221867962348a %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) Name: podman @@ -36,7 +36,7 @@ Name: podman Epoch: 1 %endif Version: 0.9.1 -Release: 1.git%{shortcommit0}%{?dist} +Release: 3.git%{shortcommit0}%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: %{git0} @@ -68,7 +68,7 @@ Requires: iptables Requires: nftables Requires: atomic-registries Requires: conmon -Recommends: container-selinux +Recommends: container-selinux >= 2:2.71 Recommends: slirp4netns %if 0%{?fedora} > 28 Recommends: fuse-overlayfs @@ -539,6 +539,9 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %endif %changelog +* Sun Sep 09 2018 baude - 0.9.1-3.gitaba58d1 +- Grab correct commit for podman-0.9.1 + * Fri Sep 07 2018 baude - 0.9.1-1.gitc325a18 - Upstream 0.9.1 release diff --git a/sources b/sources index b906b5a..121b131 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ -SHA512 (libpod-c325a18.tar.gz) = 7717a5c38834c6b3f6d93920720a815e64e7125319ac5f6049c48d7dba4b14eb5032b2412adc92ae785e29aeb0e19461970fe08ee6b929bb5ad51ce908296230 +SHA512 (cri-o-4e7f71b.tar.gz) = 268d098b1312132f27164d4c07101edf8bbde97c5b65a13f254cd2b4868cb9ff0102a6e63af1a2dc8d91696d3b49f2da62b94414d59ab8f6107b04faf6b5a35d +SHA512 (libpod-aba58d1.tar.gz) = a156c89239fa66d2d88b205fb0afee18e2c9fa5221fee80dd1c07c36bb7e2bf06eb6637d7e4892c57ac3a0e2bf2d0ce920ff627d87269a97f3d6cd0f1bb25910 From dbdb37801419f51ef80b1153a9cc8560b1e1b671 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Tue, 11 Sep 2018 22:47:54 -0400 Subject: [PATCH 14/87] podman-1:0.9.1.1-1.dev.git95dbcad - bump to v0.9.1.1 - built commit 95dbcad Signed-off-by: Lokesh Mandvekar --- .gitignore | 20 ++++++++++++++++++++ podman.spec | 14 +++++++++++--- sources | 3 +-- 3 files changed, 32 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index ae32f3c..d27f45f 100644 --- a/.gitignore +++ b/.gitignore @@ -82,6 +82,7 @@ /libpod-99959e5.tar.gz /libpod-ca6ffbc.tar.gz /libpod-0660108.tar.gz +<<<<<<< HEAD /libpod-6b4ab2a.tar.gz /libpod-7a526bb.tar.gz /cri-o-4e7f71b.tar.gz @@ -91,3 +92,22 @@ /libpod-dc5a711.tar.gz /libpod-c325a18.tar.gz /libpod-aba58d1.tar.gz +======= +/libpod-f661e1d.tar.gz +/libpod-c7424b6.tar.gz +/libpod-4f9b1ae.tar.gz +/libpod-84cfdb2.tar.gz +/libpod-86154b6.tar.gz +/libpod-9a18681.tar.gz +/libpod-c90b740.tar.gz +/libpod-9c806a4.tar.gz +/libpod-3dd577e.tar.gz +/libpod-87d8edb.tar.gz +/libpod-433cbd5.tar.gz +/libpod-5a4e590.tar.gz +/libpod-1a439f9.tar.gz +/libpod-3d55721.tar.gz +/libpod-65c31d4.tar.gz +/libpod-123de30.tar.gz +/libpod-95dbcad.tar.gz +>>>>>>> ce30e40... podman-1:0.9.1.1-1.dev.git95dbcad diff --git a/podman.spec b/podman.spec index d1fe161..404d34c 100644 --- a/podman.spec +++ b/podman.spec @@ -26,7 +26,7 @@ %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} %global git0 https://%{provider}.%{provider_tld}/%{project}/%{repo} -%global commit0 aba58d1660e36e1bed8b52d4a79221867962348a +%global commit0 95dbcada740b4d7d0d3458cadfda1bf95f722c99 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) Name: podman @@ -35,8 +35,8 @@ Name: podman %if 0%{?fedora} > 28 Epoch: 1 %endif -Version: 0.9.1 -Release: 3.git%{shortcommit0}%{?dist} +Version: 0.9.1.1 +Release: 1.dev.git%{shortcommit0}%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: %{git0} @@ -539,6 +539,14 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %endif %changelog +* Tue Sep 11 2018 Lokesh Mandvekar - 1:0.9.1.1-1.dev.git95dbcad +- bump to v0.9.1.1 +- built commit 95dbcad + +* Tue Sep 11 2018 baude - 1:0.9.1-1.dev.git123de30 +- Upstream release of 0.9.1 +- Do not build with devicemapper + * Sun Sep 09 2018 baude - 0.9.1-3.gitaba58d1 - Grab correct commit for podman-0.9.1 diff --git a/sources b/sources index 121b131..c305131 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -SHA512 (cri-o-4e7f71b.tar.gz) = 268d098b1312132f27164d4c07101edf8bbde97c5b65a13f254cd2b4868cb9ff0102a6e63af1a2dc8d91696d3b49f2da62b94414d59ab8f6107b04faf6b5a35d -SHA512 (libpod-aba58d1.tar.gz) = a156c89239fa66d2d88b205fb0afee18e2c9fa5221fee80dd1c07c36bb7e2bf06eb6637d7e4892c57ac3a0e2bf2d0ce920ff627d87269a97f3d6cd0f1bb25910 +SHA512 (libpod-95dbcad.tar.gz) = 65366f3c18f234ae5702d47db6c261920c481ef5a7d04353652772870ba6726f9ef355905c41f209cef7125adfc46283d5cd5d98fc6b422f7eb153123d66a985 From 20958c99f93009848c9d5d4c892bc295ea72a4a5 Mon Sep 17 00:00:00 2001 From: baude Date: Wed, 12 Sep 2018 08:46:06 -0500 Subject: [PATCH 15/87] Remove device mapper support Signed-off-by: baude --- podman.spec | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/podman.spec b/podman.spec index 404d34c..2524de4 100644 --- a/podman.spec +++ b/podman.spec @@ -47,7 +47,6 @@ ExclusiveArch: aarch64 %{arm} ppc64le s390x x86_64 # If go_compiler is not set to 1, there is no virtual provide. Use golang instead. BuildRequires: %{?go_compiler:compiler(go-compiler)}%{!?go_compiler:golang} BuildRequires: btrfs-progs-devel -BuildRequires: device-mapper-devel BuildRequires: glib2-devel BuildRequires: glibc-devel BuildRequires: glibc-static @@ -406,7 +405,7 @@ ln -s ../../../../ src/%{import_path} popd ln -s vendor src export GOPATH=$(pwd)/_build:$(pwd):$(pwd):%{gopath} -export BUILDTAGS="varlink selinux seccomp $(hack/btrfs_installed_tag.sh) $(hack/btrfs_tag.sh) $(hack/libdm_tag.sh)" +export BUILDTAGS="varlink selinux seccomp $(hack/btrfs_installed_tag.sh) $(hack/btrfs_tag.sh) $(hack/libdm_tag.sh) exclude_graphdriver_devicemapper" %gogenerate ./cmd/%{name}/varlink/... BUILDTAGS=$BUILDTAGS make binaries docs From 123d37b444d723f8a4e002e2aeb9ebb58fc28d4c Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Wed, 12 Sep 2018 15:15:22 -0400 Subject: [PATCH 16/87] fix .gitignore Signed-off-by: Lokesh Mandvekar --- .gitignore | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/.gitignore b/.gitignore index d27f45f..cb4abc6 100644 --- a/.gitignore +++ b/.gitignore @@ -82,17 +82,6 @@ /libpod-99959e5.tar.gz /libpod-ca6ffbc.tar.gz /libpod-0660108.tar.gz -<<<<<<< HEAD -/libpod-6b4ab2a.tar.gz -/libpod-7a526bb.tar.gz -/cri-o-4e7f71b.tar.gz -/libpod-f38eb4f.tar.gz -/libpod-9d09a4d.tar.gz -/libpod-9f9b8cf.tar.gz -/libpod-dc5a711.tar.gz -/libpod-c325a18.tar.gz -/libpod-aba58d1.tar.gz -======= /libpod-f661e1d.tar.gz /libpod-c7424b6.tar.gz /libpod-4f9b1ae.tar.gz @@ -110,4 +99,3 @@ /libpod-65c31d4.tar.gz /libpod-123de30.tar.gz /libpod-95dbcad.tar.gz ->>>>>>> ce30e40... podman-1:0.9.1.1-1.dev.git95dbcad From 6e97de88bb671b82d201c3016d6055b34aa0ad42 Mon Sep 17 00:00:00 2001 From: Daniel J Walsh Date: Fri, 14 Sep 2018 07:08:14 -0400 Subject: [PATCH 17/87] podman no longer requires atomic-registries Signed-off-by: Daniel J Walsh --- podman.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/podman.spec b/podman.spec index 2524de4..39f03f6 100644 --- a/podman.spec +++ b/podman.spec @@ -65,7 +65,6 @@ Requires: containers-common Requires: containernetworking-plugins >= 0.7.3-2 Requires: iptables Requires: nftables -Requires: atomic-registries Requires: conmon Recommends: container-selinux >= 2:2.71 Recommends: slirp4netns From ac6234c52633c0b50755086f7e8f9fa1bf45b089 Mon Sep 17 00:00:00 2001 From: baude Date: Fri, 14 Sep 2018 20:40:13 -0500 Subject: [PATCH 18/87] upstream 0.9.2 release --- .gitignore | 1 + podman.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index cb4abc6..5e0a786 100644 --- a/.gitignore +++ b/.gitignore @@ -99,3 +99,4 @@ /libpod-65c31d4.tar.gz /libpod-123de30.tar.gz /libpod-95dbcad.tar.gz +/libpod-81df604.tar.gz diff --git a/podman.spec b/podman.spec index 39f03f6..77badd1 100644 --- a/podman.spec +++ b/podman.spec @@ -26,7 +26,7 @@ %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} %global git0 https://%{provider}.%{provider_tld}/%{project}/%{repo} -%global commit0 95dbcada740b4d7d0d3458cadfda1bf95f722c99 +%global commit0 81df604bdb20367572f2f69872da802cb5846e35 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) Name: podman @@ -35,8 +35,8 @@ Name: podman %if 0%{?fedora} > 28 Epoch: 1 %endif -Version: 0.9.1.1 -Release: 1.dev.git%{shortcommit0}%{?dist} +Version: 0.9.2 +Release: 2.git%{shortcommit0}%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: %{git0} @@ -537,6 +537,9 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %endif %changelog +* Sat Sep 15 2018 baude - 0.9.2-2.git81df604 +- Upstream 0.9.2 release + * Tue Sep 11 2018 Lokesh Mandvekar - 1:0.9.1.1-1.dev.git95dbcad - bump to v0.9.1.1 - built commit 95dbcad diff --git a/sources b/sources index c305131..9bcd7c1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libpod-95dbcad.tar.gz) = 65366f3c18f234ae5702d47db6c261920c481ef5a7d04353652772870ba6726f9ef355905c41f209cef7125adfc46283d5cd5d98fc6b422f7eb153123d66a985 +SHA512 (libpod-81df604.tar.gz) = ae4aa424b7af5e3c0e3962f8f13c3775a7add73e30d3114c6e90a4e08722898447ebbc7442f151e4b562347793ef5ab06bab9b4950720134390f8cf6079dbb72 From 1db93bd03d0e0a78864ed4ae4b0e8d6e1445a511 Mon Sep 17 00:00:00 2001 From: Daniel J Walsh Date: Mon, 17 Sep 2018 12:49:28 -0400 Subject: [PATCH 19/87] Merge in fixes for podman build, to handle symbolic links and running sudo in Dockerfile --- .gitignore | 1 + podman.spec | 10 ++++++++-- sources | 2 +- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index cb4abc6..01c0e34 100644 --- a/.gitignore +++ b/.gitignore @@ -99,3 +99,4 @@ /libpod-65c31d4.tar.gz /libpod-123de30.tar.gz /libpod-95dbcad.tar.gz +/libpod-19cb754.tar.gz diff --git a/podman.spec b/podman.spec index 39f03f6..0b8b11f 100644 --- a/podman.spec +++ b/podman.spec @@ -26,7 +26,7 @@ %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} %global git0 https://%{provider}.%{provider_tld}/%{project}/%{repo} -%global commit0 95dbcada740b4d7d0d3458cadfda1bf95f722c99 +%global commit0 19cb7545565b6e2e10a05d50a103afea682efd97 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) Name: podman @@ -35,7 +35,7 @@ Name: podman %if 0%{?fedora} > 28 Epoch: 1 %endif -Version: 0.9.1.1 +Version: 0.9.2.1 Release: 1.dev.git%{shortcommit0}%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 @@ -537,6 +537,12 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %endif %changelog +* Mon Sep 17 2018 Dan Walsh - 0.9.2.1-2.git19cb754 +- Merge in fixes for podman build, to handle symbolic links and running sudo in Dockerfile + +* Sat Sep 15 2018 baude - 0.9.2-2.git81df604 +- Upstream 0.9.2 + * Tue Sep 11 2018 Lokesh Mandvekar - 1:0.9.1.1-1.dev.git95dbcad - bump to v0.9.1.1 - built commit 95dbcad diff --git a/sources b/sources index c305131..119755c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libpod-95dbcad.tar.gz) = 65366f3c18f234ae5702d47db6c261920c481ef5a7d04353652772870ba6726f9ef355905c41f209cef7125adfc46283d5cd5d98fc6b422f7eb153123d66a985 +SHA512 (libpod-19cb754.tar.gz) = 0eda23caed8cc87d84ed70bcd7e6488216ff37236b3f1ce1f631d3fabe70d273ee41c495343a160edc9c6e4bd5c63f523cdb05627c8470c20a3f1d9946f4ca4e From bfb90cbae045b76887960381c9fa8dd4fe32d6e2 Mon Sep 17 00:00:00 2001 From: Daniel J Walsh Date: Mon, 17 Sep 2018 12:51:57 -0400 Subject: [PATCH 20/87] Merge in fixes for podman build, to handle symbolic links and running sudo in Dockerfile --- .gitignore | 3 --- podman.spec | 16 +--------------- sources | 4 ---- 3 files changed, 1 insertion(+), 22 deletions(-) diff --git a/.gitignore b/.gitignore index 2911c97..3526a32 100644 --- a/.gitignore +++ b/.gitignore @@ -99,8 +99,5 @@ /libpod-65c31d4.tar.gz /libpod-123de30.tar.gz /libpod-95dbcad.tar.gz -<<<<<<< HEAD /libpod-19cb754.tar.gz -======= /libpod-81df604.tar.gz ->>>>>>> ac6234c52633c0b50755086f7e8f9fa1bf45b089 diff --git a/podman.spec b/podman.spec index a00baab..04e801b 100644 --- a/podman.spec +++ b/podman.spec @@ -26,11 +26,7 @@ %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} %global git0 https://%{provider}.%{provider_tld}/%{project}/%{repo} -<<<<<<< HEAD %global commit0 19cb7545565b6e2e10a05d50a103afea682efd97 -======= -%global commit0 81df604bdb20367572f2f69872da802cb5846e35 ->>>>>>> ac6234c52633c0b50755086f7e8f9fa1bf45b089 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) Name: podman @@ -39,13 +35,8 @@ Name: podman %if 0%{?fedora} > 28 Epoch: 1 %endif -<<<<<<< HEAD Version: 0.9.2.1 Release: 1.dev.git%{shortcommit0}%{?dist} -======= -Version: 0.9.2 -Release: 2.git%{shortcommit0}%{?dist} ->>>>>>> ac6234c52633c0b50755086f7e8f9fa1bf45b089 Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: %{git0} @@ -546,16 +537,11 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %endif %changelog -<<<<<<< HEAD -* Mon Sep 17 2018 Dan Walsh - 0.9.2.1-2.git19cb754 +* Mon Sep 17 2018 Dan Walsh - 0.9.2.1-1.git19cb754 - Merge in fixes for podman build, to handle symbolic links and running sudo in Dockerfile * Sat Sep 15 2018 baude - 0.9.2-2.git81df604 - Upstream 0.9.2 -======= -* Sat Sep 15 2018 baude - 0.9.2-2.git81df604 -- Upstream 0.9.2 release ->>>>>>> ac6234c52633c0b50755086f7e8f9fa1bf45b089 * Tue Sep 11 2018 Lokesh Mandvekar - 1:0.9.1.1-1.dev.git95dbcad - bump to v0.9.1.1 diff --git a/sources b/sources index c93f566..119755c 100644 --- a/sources +++ b/sources @@ -1,5 +1 @@ -<<<<<<< HEAD SHA512 (libpod-19cb754.tar.gz) = 0eda23caed8cc87d84ed70bcd7e6488216ff37236b3f1ce1f631d3fabe70d273ee41c495343a160edc9c6e4bd5c63f523cdb05627c8470c20a3f1d9946f4ca4e -======= -SHA512 (libpod-81df604.tar.gz) = ae4aa424b7af5e3c0e3962f8f13c3775a7add73e30d3114c6e90a4e08722898447ebbc7442f151e4b562347793ef5ab06bab9b4950720134390f8cf6079dbb72 ->>>>>>> ac6234c52633c0b50755086f7e8f9fa1bf45b089 From 2dc0a21f81bb28ac95786c92fda7289a7f26be38 Mon Sep 17 00:00:00 2001 From: Yanko Kaneti Date: Thu, 20 Sep 2018 12:57:25 +0000 Subject: [PATCH 21/87] Point URL to podman.io --- podman.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/podman.spec b/podman.spec index 04e801b..b3cb5ce 100644 --- a/podman.spec +++ b/podman.spec @@ -39,7 +39,7 @@ Version: 0.9.2.1 Release: 1.dev.git%{shortcommit0}%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 -URL: %{git0} +URL: https://podman.io/ Source0: %{git0}/archive/%{commit0}/%{repo}-%{shortcommit0}.tar.gz # e.g. el6 has ppc64 arch without gcc-go, so EA tag is required #ExclusiveArch: %%{?go_arches:%%{go_arches}}%%{!?go_arches:%%{ix86} x86_64 aarch64 %%{arm}} From 0e4951de2dd1debad2c46474359ac727181c9d45 Mon Sep 17 00:00:00 2001 From: Daniel J Walsh Date: Sat, 22 Sep 2018 06:50:20 -0400 Subject: [PATCH 22/87] Upstream 0.9.3 --- .gitignore | 1 + podman.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 3526a32..11e2e36 100644 --- a/.gitignore +++ b/.gitignore @@ -101,3 +101,4 @@ /libpod-95dbcad.tar.gz /libpod-19cb754.tar.gz /libpod-81df604.tar.gz +/libpod-a723353.tar.gz diff --git a/podman.spec b/podman.spec index b3cb5ce..5a01b14 100644 --- a/podman.spec +++ b/podman.spec @@ -26,7 +26,7 @@ %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} %global git0 https://%{provider}.%{provider_tld}/%{project}/%{repo} -%global commit0 19cb7545565b6e2e10a05d50a103afea682efd97 +%global commit0 a723353ab0720c6eb9b4a7eab2ad36a13aa2ca5a %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) Name: podman @@ -35,7 +35,7 @@ Name: podman %if 0%{?fedora} > 28 Epoch: 1 %endif -Version: 0.9.2.1 +Version: 0.9.3 Release: 1.dev.git%{shortcommit0}%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 @@ -537,6 +537,9 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %endif %changelog +* Sat Sep 22 2018 Dan Walsh - 0.9.3-1.gita723353 +- Upstream 0.9.3 + * Mon Sep 17 2018 Dan Walsh - 0.9.2.1-1.git19cb754 - Merge in fixes for podman build, to handle symbolic links and running sudo in Dockerfile diff --git a/sources b/sources index 119755c..5172a25 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libpod-19cb754.tar.gz) = 0eda23caed8cc87d84ed70bcd7e6488216ff37236b3f1ce1f631d3fabe70d273ee41c495343a160edc9c6e4bd5c63f523cdb05627c8470c20a3f1d9946f4ca4e +SHA512 (libpod-a723353.tar.gz) = ac638019f61231bf7e9023b5c0ea68d003a38570236900e951d378f31bfe672027cf06de9956b5ce2c68c68d73beceea7cf9155ada9b41a624b984bc9b17a9f0 From d7966fc074de32c3b3f9692e58c25fb6a146d9e1 Mon Sep 17 00:00:00 2001 From: Daniel J Walsh Date: Sat, 22 Sep 2018 07:36:22 -0400 Subject: [PATCH 23/87] Upstream 0.9.3 --- podman.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/podman.spec b/podman.spec index 5a01b14..428ed64 100644 --- a/podman.spec +++ b/podman.spec @@ -36,7 +36,7 @@ Name: podman Epoch: 1 %endif Version: 0.9.3 -Release: 1.dev.git%{shortcommit0}%{?dist} +Release: 2.git%{shortcommit0}%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://podman.io/ From 70e1750d12c4adcf326897e61f3ea11e2e12d612 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Mon, 24 Sep 2018 10:54:18 -0400 Subject: [PATCH 24/87] podman-1:0.9.3-4.gita723353 - ensure smooth upgrade path from f28 - mention epoch number in changelogs Signed-off-by: Lokesh Mandvekar --- podman.spec | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/podman.spec b/podman.spec index 428ed64..61c751f 100644 --- a/podman.spec +++ b/podman.spec @@ -36,7 +36,7 @@ Name: podman Epoch: 1 %endif Version: 0.9.3 -Release: 2.git%{shortcommit0}%{?dist} +Release: 4.git%{shortcommit0}%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://podman.io/ @@ -537,10 +537,14 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %endif %changelog -* Sat Sep 22 2018 Dan Walsh - 0.9.3-1.gita723353 +* Mon Sep 24 2018 Lokesh Mandvekar - 1:0.9.3-4.gita723353 +- ensure smooth upgrade path from f28 +- mention epoch number in changelogs + +* Sat Sep 22 2018 Dan Walsh - 1:0.9.3-1.gita723353 - Upstream 0.9.3 -* Mon Sep 17 2018 Dan Walsh - 0.9.2.1-1.git19cb754 +* Mon Sep 17 2018 Dan Walsh - 1:0.9.2.1-1.git19cb754 - Merge in fixes for podman build, to handle symbolic links and running sudo in Dockerfile * Sat Sep 15 2018 baude - 0.9.2-2.git81df604 From 6c296bf0ddb2a6c29d513c270584c473724cd7e4 Mon Sep 17 00:00:00 2001 From: Daniel J Walsh Date: Tue, 25 Sep 2018 10:13:22 -0400 Subject: [PATCH 25/87] Fix required version of runc --- podman.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/podman.spec b/podman.spec index 61c751f..a8288e2 100644 --- a/podman.spec +++ b/podman.spec @@ -60,7 +60,7 @@ BuildRequires: libselinux-devel BuildRequires: ostree-devel BuildRequires: pkgconfig BuildRequires: make -Requires: runc >= 2:1.0.0-51 +Requires: runc >= 2:1.0.0-55 Requires: containers-common Requires: containernetworking-plugins >= 0.7.3-2 Requires: iptables @@ -537,6 +537,9 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %endif %changelog +* Tue Sep 25 2018 Dan Walsh - 1:0.9.4-2.dev.gitaf791f3 +- Fix required version of runc + * Mon Sep 24 2018 Lokesh Mandvekar - 1:0.9.3-4.gita723353 - ensure smooth upgrade path from f28 - mention epoch number in changelogs From 8f768f150554d4c42b90ce781bccc152101c84c2 Mon Sep 17 00:00:00 2001 From: baude Date: Tue, 25 Sep 2018 16:41:14 -0500 Subject: [PATCH 26/87] Upstream 0.9.3.1 release Signed-off-by: baude --- podman.spec | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/podman.spec b/podman.spec index a8288e2..8030e9d 100644 --- a/podman.spec +++ b/podman.spec @@ -26,7 +26,7 @@ %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} %global git0 https://%{provider}.%{provider_tld}/%{project}/%{repo} -%global commit0 a723353ab0720c6eb9b4a7eab2ad36a13aa2ca5a +%global commit0 1cd906da9295304eb7aa2c3d9e75f47b3dd65585 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) Name: podman @@ -35,8 +35,8 @@ Name: podman %if 0%{?fedora} > 28 Epoch: 1 %endif -Version: 0.9.3 -Release: 4.git%{shortcommit0}%{?dist} +Version: 0.9.3.1 +Release: 1.git%{shortcommit0}%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://podman.io/ @@ -60,7 +60,7 @@ BuildRequires: libselinux-devel BuildRequires: ostree-devel BuildRequires: pkgconfig BuildRequires: make -Requires: runc >= 2:1.0.0-55 +Requires: runc Requires: containers-common Requires: containernetworking-plugins >= 0.7.3-2 Requires: iptables @@ -537,6 +537,9 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %endif %changelog +* Tue Sep 25 2018 baude - 0.9.3.1-1.git1cd906d +- Upstream 0.9.3.1 upstream release + * Tue Sep 25 2018 Dan Walsh - 1:0.9.4-2.dev.gitaf791f3 - Fix required version of runc From 482788e43377f5b4f60e2d22710af8e605350e30 Mon Sep 17 00:00:00 2001 From: baude Date: Tue, 25 Sep 2018 18:18:41 -0500 Subject: [PATCH 27/87] Upstream 0.9.3.1 release Signed-off-by: baude --- .gitignore | 1 + sources | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 11e2e36..7c145c5 100644 --- a/.gitignore +++ b/.gitignore @@ -102,3 +102,4 @@ /libpod-19cb754.tar.gz /libpod-81df604.tar.gz /libpod-a723353.tar.gz +/libpod-1cd906d.tar.gz diff --git a/sources b/sources index 5172a25..ec4602c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libpod-a723353.tar.gz) = ac638019f61231bf7e9023b5c0ea68d003a38570236900e951d378f31bfe672027cf06de9956b5ce2c68c68d73beceea7cf9155ada9b41a624b984bc9b17a9f0 +SHA512 (libpod-1cd906d.tar.gz) = 36ea87f6efd70f12a2299929ef5d04559b340593cbff5b259e9beb5a2a9f144b3720de23f97cfaa8cf8b0ae8d5d734ac1d3eac996491841f16719235d8dac850 From d765eeb5d61edc014917b197a8c1d72b1b9e3b13 Mon Sep 17 00:00:00 2001 From: Daniel J Walsh Date: Tue, 2 Oct 2018 04:44:50 -0400 Subject: [PATCH 28/87] Fix podman-docker to require proper version. --- podman.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/podman.spec b/podman.spec index 8030e9d..6e4add4 100644 --- a/podman.spec +++ b/podman.spec @@ -36,7 +36,7 @@ Name: podman Epoch: 1 %endif Version: 0.9.3.1 -Release: 1.git%{shortcommit0}%{?dist} +Release: 2.git%{shortcommit0}%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://podman.io/ @@ -213,7 +213,7 @@ This package contains Python 3 tool for %{name}. %package docker Summary: Emulate Docker CLI using podman BuildArch: noarch -Requires: %{name} = %{version}-%{release} +Requires: %{name} = %{epoch}:%{version}-%{release} Conflicts: docker Conflicts: docker-latest Conflicts: docker-ce @@ -537,6 +537,9 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %endif %changelog +* Tue Oct 2 2018 Dan Walsh - 1:0.9.3.1-2.git1cd906d +- Fix podman-docker to require proper version. + * Tue Sep 25 2018 baude - 0.9.3.1-1.git1cd906d - Upstream 0.9.3.1 upstream release From 6a5ccb7647f2b9c236cd4872d56f96547bae6afc Mon Sep 17 00:00:00 2001 From: Daniel J Walsh Date: Fri, 12 Oct 2018 07:46:03 -0400 Subject: [PATCH 29/87] Upstream 10.1 release --- podman.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/podman.spec b/podman.spec index 6e4add4..1f29993 100644 --- a/podman.spec +++ b/podman.spec @@ -26,7 +26,7 @@ %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} %global git0 https://%{provider}.%{provider_tld}/%{project}/%{repo} -%global commit0 1cd906da9295304eb7aa2c3d9e75f47b3dd65585 +%global commit0 8fb88590fafd3d4e845f9bca49133f62 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) Name: podman @@ -35,8 +35,8 @@ Name: podman %if 0%{?fedora} > 28 Epoch: 1 %endif -Version: 0.9.3.1 -Release: 2.git%{shortcommit0}%{?dist} +Version: 0.10.1 +Release: 1.git%{shortcommit0}%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://podman.io/ @@ -537,6 +537,9 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %endif %changelog +* Fri Oct 12 2018 Dan Walsh - 1:0.10.1-1.gite4a1553 +- Upstream 10.1 release + * Tue Oct 2 2018 Dan Walsh - 1:0.9.3.1-2.git1cd906d - Fix podman-docker to require proper version. From f1bd8029d76533629bb973f7e8ad0704faed0f9f Mon Sep 17 00:00:00 2001 From: Daniel J Walsh Date: Fri, 12 Oct 2018 07:48:28 -0400 Subject: [PATCH 30/87] Upstream 10.1 release --- .gitignore | 1 + podman.spec | 2 +- sources | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 7c145c5..4f40854 100644 --- a/.gitignore +++ b/.gitignore @@ -103,3 +103,4 @@ /libpod-81df604.tar.gz /libpod-a723353.tar.gz /libpod-1cd906d.tar.gz +/libpod-e4a1553.tar.gz diff --git a/podman.spec b/podman.spec index 1f29993..92ed290 100644 --- a/podman.spec +++ b/podman.spec @@ -26,7 +26,7 @@ %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} %global git0 https://%{provider}.%{provider_tld}/%{project}/%{repo} -%global commit0 8fb88590fafd3d4e845f9bca49133f62 +%global commit0 e4a155328fb88590fafd3d4e845f9bca49133f62 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) Name: podman diff --git a/sources b/sources index ec4602c..a90ecbf 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ SHA512 (libpod-1cd906d.tar.gz) = 36ea87f6efd70f12a2299929ef5d04559b340593cbff5b259e9beb5a2a9f144b3720de23f97cfaa8cf8b0ae8d5d734ac1d3eac996491841f16719235d8dac850 +SHA512 (libpod-e4a1553.tar.gz) = 494485731085a9ffa8cb2bad656c98c2fe5e6c786d61cac2628bb13319bfdeb4e99afa6332119d5d078d3483fce1f8a3d6393f0aae58987aa7f49a42f5ce07d9 From 9b93f7773f39dbd2db0fb18196a6a41a85281a9d Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Thu, 18 Oct 2018 14:52:09 -0400 Subject: [PATCH 31/87] podman-1:0.10.1.3-1.dev.gitdb08685 - bump to v0.10.1.3 - correct changelog and epoch mentions Signed-off-by: Lokesh Mandvekar --- .gitignore | 2 ++ podman.spec | 85 ++++++++++++++++++++++++++++++++++++++++------------- sources | 4 +-- 3 files changed, 69 insertions(+), 22 deletions(-) diff --git a/.gitignore b/.gitignore index 4f40854..7c48a12 100644 --- a/.gitignore +++ b/.gitignore @@ -104,3 +104,5 @@ /libpod-a723353.tar.gz /libpod-1cd906d.tar.gz /libpod-e4a1553.tar.gz +/cri-o-a30f93c.tar.gz +/libpod-db08685.tar.gz diff --git a/podman.spec b/podman.spec index 92ed290..344ebfc 100644 --- a/podman.spec +++ b/podman.spec @@ -26,21 +26,29 @@ %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} %global git0 https://%{provider}.%{provider_tld}/%{project}/%{repo} -%global commit0 e4a155328fb88590fafd3d4e845f9bca49133f62 +%global commit0 db08685af57206c21fd3dd150ecb70d7147ce7f4 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) +%global import_path_conmon github.com/kubernetes-sigs/cri-o +%global git_conmon https://%{import_path_conmon} +%global commit_conmon a30f93ca229c7fc68fb1d8c7a3342de3c3f54ae5 +%global shortcommit_conmon %(c=%{commit_conmon}; echo ${c:0:7}) + Name: podman # Version string is wrong but only written as such to avoid epoch bumps # Will be fixed once upstream moves to 0.8.11-dev %if 0%{?fedora} > 28 Epoch: 1 +%else +Epoch: 0 %endif -Version: 0.10.1 +Version: 0.10.1.3 Release: 1.git%{shortcommit0}%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://podman.io/ Source0: %{git0}/archive/%{commit0}/%{repo}-%{shortcommit0}.tar.gz +Source1: %{git_conmon}/archive/%{commit_conmon}/cri-o-%{shortcommit_conmon}.tar.gz # e.g. el6 has ppc64 arch without gcc-go, so EA tag is required #ExclusiveArch: %%{?go_arches:%%{go_arches}}%%{!?go_arches:%%{ix86} x86_64 aarch64 %%{arm}} ExclusiveArch: aarch64 %{arm} ppc64le s390x x86_64 @@ -65,7 +73,7 @@ Requires: containers-common Requires: containernetworking-plugins >= 0.7.3-2 Requires: iptables Requires: nftables -Requires: conmon +#Requires: conmon Recommends: container-selinux >= 2:2.71 Recommends: slirp4netns %if 0%{?fedora} > 28 @@ -189,7 +197,7 @@ Requires: python3-varlink Requires: python3-dateutil Requires: python3-humanize Requires: python3-psutil -Provides: python3-%{name} = %{version}-%{release} +Provides: python3-%{name} = %{epoch}:%{version}-%{release} Summary: Python 3 bindings for %{name} %description -n python3-%{name} @@ -233,7 +241,7 @@ pages and podman. %package devel Summary: Library for applications looking to use Container Pods BuildArch: noarch -Provides: %{repo}-devel = %{version}-%{release} +Provides: %{repo}-devel = %{epoch}:%{version}-%{release} %if 0%{?with_check} && ! 0%{?with_bundled} BuildRequires: golang(github.com/BurntSushi/toml) @@ -341,18 +349,18 @@ Requires: golang(k8s.io/apimachinery/pkg/util/wait) Requires: golang(k8s.io/client-go/tools/remotecommand) Requires: golang(k8s.io/kubernetes/pkg/kubelet/container) -Provides: golang(%{import_path}/cmd/%{name}/docker) = %{version}-%{release} -Provides: golang(%{import_path}/cmd/%{name}/formats) = %{version}-%{release} -Provides: golang(%{import_path}/libkpod) = %{version}-%{release} -Provides: golang(%{import_path}/libpod) = %{version}-%{release} -Provides: golang(%{import_path}/libpod/common) = %{version}-%{release} -Provides: golang(%{import_path}/libpod/driver) = %{version}-%{release} -Provides: golang(%{import_path}/libpod/layers) = %{version}-%{release} -Provides: golang(%{import_path}/pkg/annotations) = %{version}-%{release} -Provides: golang(%{import_path}/pkg/chrootuser) = %{version}-%{release} -Provides: golang(%{import_path}/pkg/registrar) = %{version}-%{release} -Provides: golang(%{import_path}/pkg/storage) = %{version}-%{release} -Provides: golang(%{import_path}/utils) = %{version}-%{release} +Provides: golang(%{import_path}/cmd/%{name}/docker) = %{epoch}:%{version}-%{release} +Provides: golang(%{import_path}/cmd/%{name}/formats) = %{epoch}:%{version}-%{release} +Provides: golang(%{import_path}/libkpod) = %{epoch}:%{version}-%{release} +Provides: golang(%{import_path}/libpod) = %{epoch}:%{version}-%{release} +Provides: golang(%{import_path}/libpod/common) = %{epoch}:%{version}-%{release} +Provides: golang(%{import_path}/libpod/driver) = %{epoch}:%{version}-%{release} +Provides: golang(%{import_path}/libpod/layers) = %{epoch}:%{version}-%{release} +Provides: golang(%{import_path}/pkg/annotations) = %{epoch}:%{version}-%{release} +Provides: golang(%{import_path}/pkg/chrootuser) = %{epoch}:%{version}-%{release} +Provides: golang(%{import_path}/pkg/registrar) = %{epoch}:%{version}-%{release} +Provides: golang(%{import_path}/pkg/storage) = %{epoch}:%{version}-%{release} +Provides: golang(%{import_path}/utils) = %{epoch}:%{version}-%{release} %description -n libpod-devel %{summary} @@ -371,7 +379,7 @@ Summary: Unit tests for %{name} package %endif # test subpackage tests code from devel subpackage -Requires: %{name}-devel = %{version}-%{release} +Requires: %{name}-devel = %{epoch}:%{version}-%{release} %if 0%{?with_check} && ! 0%{?with_bundled} BuildRequires: golang(github.com/stretchr/testify/assert) @@ -396,6 +404,9 @@ sed -i 's/0.0.0/%{version}/' contrib/python/%{name}/setup.py sed -i 's/0.0.0/%{version}/' contrib/python/py%{name}/setup.py mv pkg/hooks/README.md pkg/hooks/README-hooks.md +# untar cri-o +tar zxf %{SOURCE1} + %build mkdir _build pushd _build @@ -408,6 +419,31 @@ export BUILDTAGS="varlink selinux seccomp $(hack/btrfs_installed_tag.sh) $(hack/ %gogenerate ./cmd/%{name}/varlink/... BUILDTAGS=$BUILDTAGS make binaries docs +# build conmon +pushd cri-o-%{commit_conmon} +mkdir _output +pushd _output +mkdir -p src/%{provider}.%{provider_tld}/{kubernetes-sigs,opencontainers} +ln -s $(dirs +1 -l) src/%{import_path_conmon} +popd +ln -s vendor src +export GOPATH=$(pwd)/_output:$(pwd):%{gopath} +export BUILDTAGS="selinux seccomp $(hack/btrfs_installed_tag.sh) $(hack/btrfs_tag.sh) containers_image_ostree_stub" +BUILDTAGS=$BUILDTAGS make -C conmon +popd + +%if %{with varlink} +#install python-podman +pushd contrib/python/podman +%py3_build +popd + +#install python-pypodman +pushd contrib/python/pypodman +%py3_build +popd +%endif #varlink + %install install -dp %{buildroot}%{_unitdir} %{__make} PREFIX=%{buildroot}%{_prefix} ETCDIR=%{buildroot}%{_sysconfdir} \ @@ -426,6 +462,10 @@ install -dp %{buildroot}%{_unitdir} install -dp %{buildroot}%{_datadir}/containers install -p -m 644 %{repo}.conf %{buildroot}%{_datadir}/containers +# install conmon +install -dp %{buildroot}%{_libexecdir}/%{name} +install -p -m 755 cri-o-%{commit_conmon}/bin/conmon %{buildroot}%{_libexecdir}/%{name} + # source codes for building projects %if 0%{?with_devel} install -d -p %{buildroot}/%{gopath}/src/%{import_path}/ @@ -500,6 +540,7 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %{_mandir}/man1/podman*.1* %{_mandir}/man5/*.5* %{_datadir}/bash-completion/completions/* +%{_libexecdir}/%{name}/conmon %config(noreplace) %{_sysconfdir}/cni/net.d/87-%{name}-bridge.conflist %{_datadir}/containers/%{repo}.conf %{_unitdir}/io.%{name}.service @@ -537,13 +578,17 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %endif %changelog +* Thu Oct 18 2018 Lokesh Mandvekar - 1:0.10.1.3-1.dev.gitdb08685 +- bump to v0.10.1.3 +- correct changelog and epoch mentions + * Fri Oct 12 2018 Dan Walsh - 1:0.10.1-1.gite4a1553 -- Upstream 10.1 release +- Upstream v0.10.1 release * Tue Oct 2 2018 Dan Walsh - 1:0.9.3.1-2.git1cd906d - Fix podman-docker to require proper version. -* Tue Sep 25 2018 baude - 0.9.3.1-1.git1cd906d +* Tue Sep 25 2018 baude - 1:0.9.3.1-1.git1cd906d - Upstream 0.9.3.1 upstream release * Tue Sep 25 2018 Dan Walsh - 1:0.9.4-2.dev.gitaf791f3 diff --git a/sources b/sources index a90ecbf..80853bd 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (libpod-1cd906d.tar.gz) = 36ea87f6efd70f12a2299929ef5d04559b340593cbff5b259e9beb5a2a9f144b3720de23f97cfaa8cf8b0ae8d5d734ac1d3eac996491841f16719235d8dac850 -SHA512 (libpod-e4a1553.tar.gz) = 494485731085a9ffa8cb2bad656c98c2fe5e6c786d61cac2628bb13319bfdeb4e99afa6332119d5d078d3483fce1f8a3d6393f0aae58987aa7f49a42f5ce07d9 +SHA512 (cri-o-a30f93c.tar.gz) = 8bfa291fe3720259b63abaae5b0e50574a3437e1742c84fca36ff325d046ddd81a406a26fe0a3c4760b4c69a7e065a9b1ac550f2e061b45aadc7faf4702b798d +SHA512 (libpod-db08685.tar.gz) = f02cb70238e46b9da1a0eced1343746fb9a1f380c130be02c8f86a648786d0a71447fb0b97bd0fe65a7828541f3d35c247c1b31aaf42f96fdfc0ebcc2a852108 From 0dd7d96e6b50b8ec76896295155a2b8911ff72a8 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Fri, 19 Oct 2018 11:38:58 -0400 Subject: [PATCH 32/87] podman-1:0.10.1.3-2.gitdb08685 - consistent epoch:version-release in changelog Signed-off-by: Lokesh Mandvekar --- podman.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/podman.spec b/podman.spec index 344ebfc..47d9f3c 100644 --- a/podman.spec +++ b/podman.spec @@ -43,7 +43,7 @@ Epoch: 1 Epoch: 0 %endif Version: 0.10.1.3 -Release: 1.git%{shortcommit0}%{?dist} +Release: 2.git%{shortcommit0}%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://podman.io/ @@ -578,7 +578,10 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %endif %changelog -* Thu Oct 18 2018 Lokesh Mandvekar - 1:0.10.1.3-1.dev.gitdb08685 +* Fri Oct 19 2018 Lokesh Mandvekar - 1:0.10.1.3-2.gitdb08685 +- consistent epoch:version-release in changelog + +* Thu Oct 18 2018 Lokesh Mandvekar - 1:0.10.1.3-1.gitdb08685 - bump to v0.10.1.3 - correct changelog and epoch mentions From ee28ed42e58bdf2ef07f2672879dd17a1b0f52ba Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Sun, 28 Oct 2018 19:02:27 -0400 Subject: [PATCH 33/87] podman-1:0.10.1.3-3.gitdb08685 - Resolves: #1643733 - build podman with ostree support Signed-off-by: Lokesh Mandvekar --- podman.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/podman.spec b/podman.spec index 47d9f3c..25f2b4f 100644 --- a/podman.spec +++ b/podman.spec @@ -43,7 +43,7 @@ Epoch: 1 Epoch: 0 %endif Version: 0.10.1.3 -Release: 2.git%{shortcommit0}%{?dist} +Release: 3.git%{shortcommit0}%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://podman.io/ @@ -415,7 +415,7 @@ ln -s ../../../../ src/%{import_path} popd ln -s vendor src export GOPATH=$(pwd)/_build:$(pwd):$(pwd):%{gopath} -export BUILDTAGS="varlink selinux seccomp $(hack/btrfs_installed_tag.sh) $(hack/btrfs_tag.sh) $(hack/libdm_tag.sh) exclude_graphdriver_devicemapper" +export BUILDTAGS="varlink seccomp $(hack/btrfs_installed_tag.sh) $(hack/btrfs_tag.sh) $(hack/libdm_tag.sh) $(hack/ostree_tag.sh) $(hack/selinux_tag.sh) exclude_graphdriver_devicemapper" %gogenerate ./cmd/%{name}/varlink/... BUILDTAGS=$BUILDTAGS make binaries docs @@ -578,6 +578,9 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %endif %changelog +* Sun Oct 28 2018 Lokesh Mandvekar - 1:0.10.1.3-3.gitdb08685 +- Resolves: #1643733 - build podman with ostree support + * Fri Oct 19 2018 Lokesh Mandvekar - 1:0.10.1.3-2.gitdb08685 - consistent epoch:version-release in changelog From 800026b0ff494d90d42b9a1c982b24069d95e939 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Sun, 28 Oct 2018 19:55:56 -0400 Subject: [PATCH 34/87] podman-1:0.10.1.3-4.gitdb08685 - Correct bug id in previous changelog entry Signed-off-by: Lokesh Mandvekar --- podman.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/podman.spec b/podman.spec index 25f2b4f..cafdee2 100644 --- a/podman.spec +++ b/podman.spec @@ -43,7 +43,7 @@ Epoch: 1 Epoch: 0 %endif Version: 0.10.1.3 -Release: 3.git%{shortcommit0}%{?dist} +Release: 4.git%{shortcommit0}%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://podman.io/ @@ -578,8 +578,11 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %endif %changelog +* Sun Oct 28 2018 Lokesh Mandvekar - 1:0.10.1.3-4.gitdb08685 +- Correct bug id in previous changelog entry + * Sun Oct 28 2018 Lokesh Mandvekar - 1:0.10.1.3-3.gitdb08685 -- Resolves: #1643733 - build podman with ostree support +- Resolves: #1643744 - build podman with ostree support * Fri Oct 19 2018 Lokesh Mandvekar - 1:0.10.1.3-2.gitdb08685 - consistent epoch:version-release in changelog From 1511481359f2d237ca16deebcaa854fe4008ed35 Mon Sep 17 00:00:00 2001 From: baude Date: Thu, 8 Nov 2018 15:31:55 -0600 Subject: [PATCH 35/87] upstream-0.11.1-1 --- .gitignore | 1 + podman.spec | 11 +++++++---- sources | 2 +- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 7c48a12..dd88f60 100644 --- a/.gitignore +++ b/.gitignore @@ -106,3 +106,4 @@ /libpod-e4a1553.tar.gz /cri-o-a30f93c.tar.gz /libpod-db08685.tar.gz +/libpod-a4adfe5.tar.gz diff --git a/podman.spec b/podman.spec index cafdee2..7afc465 100644 --- a/podman.spec +++ b/podman.spec @@ -26,7 +26,7 @@ %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} %global git0 https://%{provider}.%{provider_tld}/%{project}/%{repo} -%global commit0 db08685af57206c21fd3dd150ecb70d7147ce7f4 +%global commit0 a4adfe5e0c9de160866455c77b24342304fa3706 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) %global import_path_conmon github.com/kubernetes-sigs/cri-o @@ -42,8 +42,8 @@ Epoch: 1 %else Epoch: 0 %endif -Version: 0.10.1.3 -Release: 4.git%{shortcommit0}%{?dist} +Version: 0.11.1 +Release: 1.git%{shortcommit0}%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://podman.io/ @@ -68,7 +68,7 @@ BuildRequires: libselinux-devel BuildRequires: ostree-devel BuildRequires: pkgconfig BuildRequires: make -Requires: runc +Requires: runc >= 2:1.0.0-57 Requires: containers-common Requires: containernetworking-plugins >= 0.7.3-2 Requires: iptables @@ -578,6 +578,9 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %endif %changelog +* Thu Nov 08 2018 bbaude - 1:0.11.1-1.gita4adfe5 +- Upstream 0.11.1-1 + * Sun Oct 28 2018 Lokesh Mandvekar - 1:0.10.1.3-4.gitdb08685 - Correct bug id in previous changelog entry diff --git a/sources b/sources index 80853bd..6eaeb2d 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (cri-o-a30f93c.tar.gz) = 8bfa291fe3720259b63abaae5b0e50574a3437e1742c84fca36ff325d046ddd81a406a26fe0a3c4760b4c69a7e065a9b1ac550f2e061b45aadc7faf4702b798d -SHA512 (libpod-db08685.tar.gz) = f02cb70238e46b9da1a0eced1343746fb9a1f380c130be02c8f86a648786d0a71447fb0b97bd0fe65a7828541f3d35c247c1b31aaf42f96fdfc0ebcc2a852108 +SHA512 (libpod-a4adfe5.tar.gz) = 3c8795faa15e5da565093cd1c8a50ecc8643516984b35138e59a6d5f5d9726d86f2083a20f8ee88ec41e5406e7589885b25a4e7296b76a1ff8fd0589dea180c6 From 4cbb18123caea5e0700338987b17a0891598cbc7 Mon Sep 17 00:00:00 2001 From: Daniel J Walsh Date: Sat, 10 Nov 2018 05:18:07 -0500 Subject: [PATCH 36/87] Remove dirty flag from podman version --- podman.spec | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/podman.spec b/podman.spec index 7afc465..dad8ec9 100644 --- a/podman.spec +++ b/podman.spec @@ -43,7 +43,7 @@ Epoch: 1 Epoch: 0 %endif Version: 0.11.1 -Release: 1.git%{shortcommit0}%{?dist} +Release: 2.git%{shortcommit0}%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://podman.io/ @@ -399,10 +399,6 @@ providing packages with %{import_path} prefix. %prep %autosetup -Sgit -n %{repo}-%{commit0} -sed -i '/\/bin\/env/d' completions/bash/%{name} -sed -i 's/0.0.0/%{version}/' contrib/python/%{name}/setup.py -sed -i 's/0.0.0/%{version}/' contrib/python/py%{name}/setup.py -mv pkg/hooks/README.md pkg/hooks/README-hooks.md # untar cri-o tar zxf %{SOURCE1} @@ -431,6 +427,7 @@ export GOPATH=$(pwd)/_output:$(pwd):%{gopath} export BUILDTAGS="selinux seccomp $(hack/btrfs_installed_tag.sh) $(hack/btrfs_tag.sh) containers_image_ostree_stub" BUILDTAGS=$BUILDTAGS make -C conmon popd +mv pkg/hooks/README.md pkg/hooks/README-hooks.md %if %{with varlink} #install python-podman @@ -446,7 +443,7 @@ popd %install install -dp %{buildroot}%{_unitdir} -%{__make} PREFIX=%{buildroot}%{_prefix} ETCDIR=%{buildroot}%{_sysconfdir} \ +PODMAN_VERSION=%{version} %{__make} PREFIX=%{buildroot}%{_prefix} ETCDIR=%{buildroot}%{_sysconfdir} \ install.bin \ install.man \ install.cni \ @@ -455,7 +452,7 @@ install -dp %{buildroot}%{_unitdir} install.docker %if %{with varlink} -%{__make} DESTDIR=%{buildroot} install.python +PODMAN_VERSION=%{version} %{__make} DESTDIR=%{buildroot} install.python %endif # varlink # install libpod.conf @@ -578,6 +575,9 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %endif %changelog +* Sat Nov 10 2018 Dan Walsh - 1:0.11.1-2.gita4adfe5 +- Remove dirty flag from podman version + * Thu Nov 08 2018 bbaude - 1:0.11.1-1.gita4adfe5 - Upstream 0.11.1-1 From 15a795dd27acc2896d64366c01c967e40b1f1ffb Mon Sep 17 00:00:00 2001 From: Ed Santiago Date: Wed, 21 Nov 2018 14:22:46 -0700 Subject: [PATCH 37/87] pypodman: add rpm deps on python3-podman, pytoml Fixes: pkg_resources.DistributionNotFound: The 'pytoml' distribution was not found and is required by pypodman " " " " " " " " " " " 'podman' " " " ... Signed-off-by: Ed Santiago --- podman.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/podman.spec b/podman.spec index dad8ec9..1af151d 100644 --- a/podman.spec +++ b/podman.spec @@ -208,10 +208,12 @@ BuildArch: noarch BuildRequires: python3-devel BuildRequires: python3-setuptools BuildRequires: python3-varlink +Requires: python3-%{name} Requires: python3-setuptools Requires: python3-varlink Requires: python3-dateutil Requires: python3-psutil +Requires: python3-pytoml Summary: Python 3 tool for %{name} %description -n python3-py%{name} From 6cc43c93b9c515589028c543f068b1cabf7740f6 Mon Sep 17 00:00:00 2001 From: baude Date: Thu, 6 Dec 2018 19:26:32 -0600 Subject: [PATCH 38/87] upstream 0.12.1 Signed-off-by: baude --- .gitignore | 1 + podman.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index dd88f60..a1222b8 100644 --- a/.gitignore +++ b/.gitignore @@ -107,3 +107,4 @@ /cri-o-a30f93c.tar.gz /libpod-db08685.tar.gz /libpod-a4adfe5.tar.gz +/libpod-7ba215f.tar.gz diff --git a/podman.spec b/podman.spec index 1af151d..1c10a28 100644 --- a/podman.spec +++ b/podman.spec @@ -26,7 +26,7 @@ %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} %global git0 https://%{provider}.%{provider_tld}/%{project}/%{repo} -%global commit0 a4adfe5e0c9de160866455c77b24342304fa3706 +%global commit0 7ba215f7595ea2da85561dd8702b4ae8f1e93b95 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) %global import_path_conmon github.com/kubernetes-sigs/cri-o @@ -42,8 +42,8 @@ Epoch: 1 %else Epoch: 0 %endif -Version: 0.11.1 -Release: 2.git%{shortcommit0}%{?dist} +Version: 0.12.1 +Release: 1.git%{shortcommit0}%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://podman.io/ @@ -577,6 +577,9 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %endif %changelog +* Thu Dec 06 2018 Brent Baude - 1:0.12.1-2.git7ba215f +- Upstream 0.12.1 release + * Sat Nov 10 2018 Dan Walsh - 1:0.11.1-2.gita4adfe5 - Remove dirty flag from podman version diff --git a/sources b/sources index 6eaeb2d..2dabf8a 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (cri-o-a30f93c.tar.gz) = 8bfa291fe3720259b63abaae5b0e50574a3437e1742c84fca36ff325d046ddd81a406a26fe0a3c4760b4c69a7e065a9b1ac550f2e061b45aadc7faf4702b798d -SHA512 (libpod-a4adfe5.tar.gz) = 3c8795faa15e5da565093cd1c8a50ecc8643516984b35138e59a6d5f5d9726d86f2083a20f8ee88ec41e5406e7589885b25a4e7296b76a1ff8fd0589dea180c6 +SHA512 (libpod-7ba215f.tar.gz) = 5ad4f201f81a04224918531d23593517153e9151ff664cd0483c0d1e38ac4a4f3ab102d68ace7e679ba088cdb0c5c37025890ae70feefa44b75373e45cea9648 From f64c4438e9ba3433b2d1c4836792a54af1f3e5e1 Mon Sep 17 00:00:00 2001 From: baude Date: Fri, 7 Dec 2018 13:26:07 -0600 Subject: [PATCH 39/87] upstream 0.12.1.1 Signed-off-by: baude --- .gitignore | 1 + podman.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index a1222b8..5231a65 100644 --- a/.gitignore +++ b/.gitignore @@ -108,3 +108,4 @@ /libpod-db08685.tar.gz /libpod-a4adfe5.tar.gz /libpod-7ba215f.tar.gz +/libpod-66d3499.tar.gz diff --git a/podman.spec b/podman.spec index 1c10a28..4244e9a 100644 --- a/podman.spec +++ b/podman.spec @@ -26,7 +26,7 @@ %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} %global git0 https://%{provider}.%{provider_tld}/%{project}/%{repo} -%global commit0 7ba215f7595ea2da85561dd8702b4ae8f1e93b95 +%global commit0 66d34998316adac9f9d3c0f422705bf4b02011d5 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) %global import_path_conmon github.com/kubernetes-sigs/cri-o @@ -42,7 +42,7 @@ Epoch: 1 %else Epoch: 0 %endif -Version: 0.12.1 +Version: 0.12.1.1 Release: 1.git%{shortcommit0}%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 @@ -577,6 +577,9 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %endif %changelog +* Fri Dec 07 2018 Brent Baude - 1:0.12.1.1 -1.git66d3499 +- Upstream 0.12.1.1 release + * Thu Dec 06 2018 Brent Baude - 1:0.12.1-2.git7ba215f - Upstream 0.12.1 release diff --git a/sources b/sources index 2dabf8a..61dea44 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (cri-o-a30f93c.tar.gz) = 8bfa291fe3720259b63abaae5b0e50574a3437e1742c84fca36ff325d046ddd81a406a26fe0a3c4760b4c69a7e065a9b1ac550f2e061b45aadc7faf4702b798d -SHA512 (libpod-7ba215f.tar.gz) = 5ad4f201f81a04224918531d23593517153e9151ff664cd0483c0d1e38ac4a4f3ab102d68ace7e679ba088cdb0c5c37025890ae70feefa44b75373e45cea9648 +SHA512 (libpod-66d3499.tar.gz) = edd331fa82a94d123a2babbb2be7a494df7fe7d0a7d44ee06a09fdf0495641ddc368550dcf6181b87f92591f71e95d813ff53938ebdee851dff050df4903dd0f From 0d625e0e2db517a26b0fe0f094f6c7720f278943 Mon Sep 17 00:00:00 2001 From: baude Date: Thu, 13 Dec 2018 13:31:20 -0600 Subject: [PATCH 40/87] upstream 0.12.1.2 Signed-off-by: baude --- .gitignore | 1 + podman.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 5231a65..7d1e122 100644 --- a/.gitignore +++ b/.gitignore @@ -109,3 +109,4 @@ /libpod-a4adfe5.tar.gz /libpod-7ba215f.tar.gz /libpod-66d3499.tar.gz +/libpod-9551f6b.tar.gz diff --git a/podman.spec b/podman.spec index 4244e9a..c79a9d5 100644 --- a/podman.spec +++ b/podman.spec @@ -26,7 +26,7 @@ %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} %global git0 https://%{provider}.%{provider_tld}/%{project}/%{repo} -%global commit0 66d34998316adac9f9d3c0f422705bf4b02011d5 +%global commit0 9551f6bb379d4af56dfb63ddf0f3682e40a6694e %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) %global import_path_conmon github.com/kubernetes-sigs/cri-o @@ -42,7 +42,7 @@ Epoch: 1 %else Epoch: 0 %endif -Version: 0.12.1.1 +Version: 0.12.1.2 Release: 1.git%{shortcommit0}%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 @@ -577,6 +577,9 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %endif %changelog +* Thu Dec 13 2018 bbaude - 1:0.12.1.2-1.git9551f6b +- Upstream 0.12.1.2 release + * Fri Dec 07 2018 Brent Baude - 1:0.12.1.1 -1.git66d3499 - Upstream 0.12.1.1 release diff --git a/sources b/sources index 61dea44..276b2ac 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (cri-o-a30f93c.tar.gz) = 8bfa291fe3720259b63abaae5b0e50574a3437e1742c84fca36ff325d046ddd81a406a26fe0a3c4760b4c69a7e065a9b1ac550f2e061b45aadc7faf4702b798d -SHA512 (libpod-66d3499.tar.gz) = edd331fa82a94d123a2babbb2be7a494df7fe7d0a7d44ee06a09fdf0495641ddc368550dcf6181b87f92591f71e95d813ff53938ebdee851dff050df4903dd0f +SHA512 (libpod-9551f6b.tar.gz) = 44ed1a8f3bc9ea7a30bf7b02a592d4f5bd6855c10b47bca2aec1f04c81c16315749b504d45339e683b29b952007d3bfe106a57b08aca6d4d0d99bd213b0b06b9 From f63544c76ff66a1028a0395fb8e9d2caae00160c Mon Sep 17 00:00:00 2001 From: Daniel J Walsh Date: Sat, 12 Jan 2019 07:30:39 -0500 Subject: [PATCH 41/87] Upstream 1.0.0 release --- podman.spec | 80 ++++------------------------------------------------- 1 file changed, 5 insertions(+), 75 deletions(-) diff --git a/podman.spec b/podman.spec index c79a9d5..cc9ecb0 100644 --- a/podman.spec +++ b/podman.spec @@ -4,12 +4,7 @@ %global with_check 0 %global with_unit_test 0 -%if 0%{?fedora} >= 28 -%bcond_without varlink %define gogenerate go generate -%else -%bcond_with varlink -%endif %if 0%{?with_debug} %global _find_debuginfo_dwz_opts %{nil} @@ -26,7 +21,7 @@ %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} %global git0 https://%{provider}.%{provider_tld}/%{project}/%{repo} -%global commit0 9551f6bb379d4af56dfb63ddf0f3682e40a6694e +%global commit0 82e80110c3f2d8728745c47e340f3bee4d408846 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) %global import_path_conmon github.com/kubernetes-sigs/cri-o @@ -42,7 +37,7 @@ Epoch: 1 %else Epoch: 0 %endif -Version: 0.12.1.2 +Version: 1.0.0 Release: 1.git%{shortcommit0}%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 @@ -155,7 +150,6 @@ Provides: bundled(golang(github.com/tchap/go-patricia)) = v2.2.6 Provides: bundled(golang(github.com/ulikunitz/xz)) = v0.5.4 Provides: bundled(golang(github.com/ulule/deepcopier)) = master Provides: bundled(golang(github.com/urfave/cli)) = 934abfb2f102315b5794e15ebc7949e4ca253920 -Provides: bundled(golang(github.com/varlink/go)) = master Provides: bundled(golang(github.com/vbatts/tar-split)) = v0.10.2 Provides: bundled(golang(github.com/vishvananda/netlink)) = master Provides: bundled(golang(github.com/vishvananda/netns)) = master @@ -186,40 +180,6 @@ Provides: bundled(golang(k8s.io/utils)) = 258e2a2fa64568210fbd6267cf1d8fd87c3cb8 %{repo} provides a library for applications looking to use the Container Pod concept popularized by Kubernetes. -%if %{with varlink} -%package -n python3-%{name} -BuildArch: noarch -BuildRequires: python3-devel -BuildRequires: python3-setuptools -BuildRequires: python3-varlink -Requires: python3-setuptools -Requires: python3-varlink -Requires: python3-dateutil -Requires: python3-humanize -Requires: python3-psutil -Provides: python3-%{name} = %{epoch}:%{version}-%{release} -Summary: Python 3 bindings for %{name} - -%description -n python3-%{name} -This package contains Python 3 bindings for %{name}. - -%package -n python3-py%{name} -BuildArch: noarch -BuildRequires: python3-devel -BuildRequires: python3-setuptools -BuildRequires: python3-varlink -Requires: python3-%{name} -Requires: python3-setuptools -Requires: python3-varlink -Requires: python3-dateutil -Requires: python3-psutil -Requires: python3-pytoml -Summary: Python 3 tool for %{name} - -%description -n python3-py%{name} -This package contains Python 3 tool for %{name}. -%endif # varlink - %package docker Summary: Emulate Docker CLI using podman BuildArch: noarch @@ -431,18 +391,6 @@ BUILDTAGS=$BUILDTAGS make -C conmon popd mv pkg/hooks/README.md pkg/hooks/README-hooks.md -%if %{with varlink} -#install python-podman -pushd contrib/python/podman -%py3_build -popd - -#install python-pypodman -pushd contrib/python/pypodman -%py3_build -popd -%endif #varlink - %install install -dp %{buildroot}%{_unitdir} PODMAN_VERSION=%{version} %{__make} PREFIX=%{buildroot}%{_prefix} ETCDIR=%{buildroot}%{_sysconfdir} \ @@ -453,10 +401,6 @@ PODMAN_VERSION=%{version} %{__make} PREFIX=%{buildroot}%{_prefix} ETCDIR=%{build install.completions \ install.docker -%if %{with varlink} -PODMAN_VERSION=%{version} %{__make} DESTDIR=%{buildroot} install.python -%endif # varlink - # install libpod.conf install -dp %{buildroot}%{_datadir}/containers install -p -m 644 %{repo}.conf %{buildroot}%{_datadir}/containers @@ -546,23 +490,6 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %{_unitdir}/io.%{name}.socket %{_usr}/lib/tmpfiles.d/%{name}.conf -%if %{with varlink} -%files -n python3-%{name} -%license LICENSE -%doc README.md CONTRIBUTING.md pkg/hooks/README-hooks.md install.md code-of-conduct.md transfer.md -%dir %{python3_sitelib}/%{name} -%{python3_sitelib}/%{name}/* -%{python3_sitelib}/%{name}*.egg-info - -%files -n python3-py%{name} -%license LICENSE -%doc README.md CONTRIBUTING.md pkg/hooks/README-hooks.md install.md code-of-conduct.md transfer.md -%dir %{python3_sitelib}/py%{name} -%{python3_sitelib}/py%{name}/* -%{python3_sitelib}/py%{name}*.egg-info -%{_bindir}/py%{name} -%endif # varlink - %if 0%{?with_devel} %files -n libpod-devel -f devel.file-list %license LICENSE @@ -577,6 +504,9 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %endif %changelog +* Sat Jan 12 2019 dwalsh - 1:1.0.0-1.git82e8011 +- Upstream 1.0.0 release + * Thu Dec 13 2018 bbaude - 1:0.12.1.2-1.git9551f6b - Upstream 0.12.1.2 release From f830686d2d7021e5e381013d6de2a0665f9a146b Mon Sep 17 00:00:00 2001 From: Daniel J Walsh Date: Sat, 12 Jan 2019 08:40:07 -0500 Subject: [PATCH 42/87] Upstream 1.0.0 release --- .gitignore | 1 + sources | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 7d1e122..7940a83 100644 --- a/.gitignore +++ b/.gitignore @@ -110,3 +110,4 @@ /libpod-7ba215f.tar.gz /libpod-66d3499.tar.gz /libpod-9551f6b.tar.gz +/libpod-82e8011.tar.gz diff --git a/sources b/sources index 276b2ac..f4e64fe 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (cri-o-a30f93c.tar.gz) = 8bfa291fe3720259b63abaae5b0e50574a3437e1742c84fca36ff325d046ddd81a406a26fe0a3c4760b4c69a7e065a9b1ac550f2e061b45aadc7faf4702b798d -SHA512 (libpod-9551f6b.tar.gz) = 44ed1a8f3bc9ea7a30bf7b02a592d4f5bd6855c10b47bca2aec1f04c81c16315749b504d45339e683b29b952007d3bfe106a57b08aca6d4d0d99bd213b0b06b9 +SHA512 (libpod-82e8011.tar.gz) = 24331b34eb204c198563c0de6cf1f19bbdba76d96cff108d158c50bd683f4d5df19b25d919d2ef6a85fd520e0bbc1e778befc96711aa61592724bb19658f1df9 From b39fae6d8ef8ed1ba10a376a19a7b4a2282248bf Mon Sep 17 00:00:00 2001 From: Daniel J Walsh Date: Wed, 27 Feb 2019 07:41:00 -0500 Subject: [PATCH 43/87] Upstream 1.0.0 release --- .gitignore | 1 + podman.spec | 10 +++++++--- sources | 2 +- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 7940a83..6ba99b6 100644 --- a/.gitignore +++ b/.gitignore @@ -111,3 +111,4 @@ /libpod-66d3499.tar.gz /libpod-9551f6b.tar.gz /libpod-82e8011.tar.gz +/libpod-006206a.tar.gz diff --git a/podman.spec b/podman.spec index cc9ecb0..69840f6 100644 --- a/podman.spec +++ b/podman.spec @@ -21,7 +21,7 @@ %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} %global git0 https://%{provider}.%{provider_tld}/%{project}/%{repo} -%global commit0 82e80110c3f2d8728745c47e340f3bee4d408846 +%global commit0 006206abe1bed76835049c819dbffb5308a63a38 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) %global import_path_conmon github.com/kubernetes-sigs/cri-o @@ -37,7 +37,7 @@ Epoch: 1 %else Epoch: 0 %endif -Version: 1.0.0 +Version: 1.1.0 Release: 1.git%{shortcommit0}%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 @@ -70,7 +70,7 @@ Requires: iptables Requires: nftables #Requires: conmon Recommends: container-selinux >= 2:2.71 -Recommends: slirp4netns +Recommends: slirp4netns >= 0.3-0 %if 0%{?fedora} > 28 Recommends: fuse-overlayfs %endif @@ -503,6 +503,10 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %doc README.md CONTRIBUTING.md pkg/hooks/README-hooks.md install.md code-of-conduct.md transfer.md %endif +%triggerpostun -- %{name} < 1.1 +podman system renumber +exit 0 + %changelog * Sat Jan 12 2019 dwalsh - 1:1.0.0-1.git82e8011 - Upstream 1.0.0 release diff --git a/sources b/sources index f4e64fe..063a7e1 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (cri-o-a30f93c.tar.gz) = 8bfa291fe3720259b63abaae5b0e50574a3437e1742c84fca36ff325d046ddd81a406a26fe0a3c4760b4c69a7e065a9b1ac550f2e061b45aadc7faf4702b798d -SHA512 (libpod-82e8011.tar.gz) = 24331b34eb204c198563c0de6cf1f19bbdba76d96cff108d158c50bd683f4d5df19b25d919d2ef6a85fd520e0bbc1e778befc96711aa61592724bb19658f1df9 +SHA512 (libpod-006206a.tar.gz) = 785dfa323b0b28bc926c4fd011a72a692a330c8e585c87cc9476e646e84e42074bd06e1cdf249eb66729fd440d824a85c1caecbb604b8585f4117ef96d324295 From ca450cb6414acaae3f9cf9a7c1a1f68d44fb793a Mon Sep 17 00:00:00 2001 From: Daniel J Walsh Date: Wed, 27 Feb 2019 07:42:49 -0500 Subject: [PATCH 44/87] Upstream 1.1.0 release --- podman.spec | 3 +++ 1 file changed, 3 insertions(+) diff --git a/podman.spec b/podman.spec index 69840f6..2868c4e 100644 --- a/podman.spec +++ b/podman.spec @@ -508,6 +508,9 @@ podman system renumber exit 0 %changelog +* Wed Feb 27 2019 dwalsh - 1:1.1.0-1.git006206a +- Upstream 1.1.0 release + * Sat Jan 12 2019 dwalsh - 1:1.0.0-1.git82e8011 - Upstream 1.0.0 release From e64b4bce9d264cac5ce45f0be9ae463736246e0b Mon Sep 17 00:00:00 2001 From: Daniel J Walsh Date: Tue, 5 Mar 2019 13:07:21 -0500 Subject: [PATCH 45/87] Upstream 1.1.2 release --- .gitignore | 1 + podman.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 6ba99b6..6d93f15 100644 --- a/.gitignore +++ b/.gitignore @@ -112,3 +112,4 @@ /libpod-9551f6b.tar.gz /libpod-82e8011.tar.gz /libpod-006206a.tar.gz +/libpod-0ad9b6b.tar.gz diff --git a/podman.spec b/podman.spec index 2868c4e..d2e87ec 100644 --- a/podman.spec +++ b/podman.spec @@ -21,7 +21,7 @@ %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} %global git0 https://%{provider}.%{provider_tld}/%{project}/%{repo} -%global commit0 006206abe1bed76835049c819dbffb5308a63a38 +%global commit0 0ad9b6bf2aea4ba37e8c9738feabec61343ba175 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) %global import_path_conmon github.com/kubernetes-sigs/cri-o @@ -37,7 +37,7 @@ Epoch: 1 %else Epoch: 0 %endif -Version: 1.1.0 +Version: 1.1.2 Release: 1.git%{shortcommit0}%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 @@ -508,6 +508,9 @@ podman system renumber exit 0 %changelog +* Tue Mar 5 2019 dwalsh - 1:1.1.2-1.git0ad9b6b +- Upstream 1.1.2 release + * Wed Feb 27 2019 dwalsh - 1:1.1.0-1.git006206a - Upstream 1.1.0 release diff --git a/sources b/sources index 063a7e1..088a689 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (cri-o-a30f93c.tar.gz) = 8bfa291fe3720259b63abaae5b0e50574a3437e1742c84fca36ff325d046ddd81a406a26fe0a3c4760b4c69a7e065a9b1ac550f2e061b45aadc7faf4702b798d -SHA512 (libpod-006206a.tar.gz) = 785dfa323b0b28bc926c4fd011a72a692a330c8e585c87cc9476e646e84e42074bd06e1cdf249eb66729fd440d824a85c1caecbb604b8585f4117ef96d324295 +SHA512 (libpod-0ad9b6b.tar.gz) = 1654cae54eaaa0588ba981dc36a85b6ff58b33533b5b27a02ff295b2c4653414b456a3e7410d2d7576bc40de6bd65f6bba3aa9ade43a4ca2c6c2096a3c30b6dc From 543c3e00bb2e0b9e87728871cfbc4d0678bb8021 Mon Sep 17 00:00:00 2001 From: Ed Santiago Date: Fri, 18 Jan 2019 10:59:24 -0700 Subject: [PATCH 46/87] New tests subpackage Define a new podman-tests subpackage, containing a set of tests intended to be run as gates. As of this initial checkin, this consists of a set of BATS tests in /usr/share/podman . Include a configuration for running under Fedora CI Signed-off-by: Ed Santiago --- .gitignore | 1 + podman.spec | 31 ++++++++++++++++++++++++++----- sources | 2 +- tests/test_podman.sh | 13 +++++++++++++ tests/test_podman.yml | 41 +++++++++++++++++++++++++++++++++++++++++ tests/tests.yml | 1 + 6 files changed, 83 insertions(+), 6 deletions(-) create mode 100755 tests/test_podman.sh create mode 100644 tests/test_podman.yml create mode 100644 tests/tests.yml diff --git a/.gitignore b/.gitignore index 6d93f15..12cb321 100644 --- a/.gitignore +++ b/.gitignore @@ -113,3 +113,4 @@ /libpod-82e8011.tar.gz /libpod-006206a.tar.gz /libpod-0ad9b6b.tar.gz +/libpod-b33a00e.tar.gz diff --git a/podman.spec b/podman.spec index d2e87ec..9272e8f 100644 --- a/podman.spec +++ b/podman.spec @@ -21,7 +21,7 @@ %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} %global git0 https://%{provider}.%{provider_tld}/%{project}/%{repo} -%global commit0 0ad9b6bf2aea4ba37e8c9738feabec61343ba175 +%global commit0 b33a00ef96601d7ce2389ac634e86847239d7d2e %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) %global import_path_conmon github.com/kubernetes-sigs/cri-o @@ -38,7 +38,7 @@ Epoch: 1 Epoch: 0 %endif Version: 1.1.2 -Release: 1.git%{shortcommit0}%{?dist} +Release: 2.git%{shortcommit0}%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://podman.io/ @@ -188,7 +188,7 @@ Conflicts: docker Conflicts: docker-latest Conflicts: docker-ce Conflicts: docker-ee -Conflicts: moby-engine +Conflicts: moby-engine %description docker This package installs a script named docker that emulates the Docker CLI by @@ -359,6 +359,18 @@ This package contains unit tests for project providing packages with %{import_path} prefix. %endif +%package tests +Summary: Tests for %{name} + +Requires: %{name} = %{epoch}:%{version}-%{release} +Requires: bats +Requires: jq + +%description tests +%{summary} + +This package contains system tests for %{name} + %prep %autosetup -Sgit -n %{repo}-%{commit0} @@ -466,13 +478,16 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %if ! 0%{?gotest:1} %global gotest go test %endif - + %gotest %{import_path}/cmd/%{name} %gotest %{import_path}/libkpod %gotest %{import_path}/libpod %gotest %{import_path}/pkg/registrar %endif +install -d -p %{buildroot}/%{_datadir}/%{name}/test/system +cp -pav test/system %{buildroot}/%{_datadir}/%{name}/test/ + #define license tag if not already defined %{!?_licensedir:%global license %doc} @@ -507,7 +522,14 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} podman system renumber exit 0 +%files tests +%license LICENSE +%{_datadir}/%{name}/test + %changelog +* Mon Mar 11 2019 Eduardo Santiago - 1:1.1.2-2.git55dc783 +- new -tests subpackage + * Tue Mar 5 2019 dwalsh - 1:1.1.2-1.git0ad9b6b - Upstream 1.1.2 release @@ -1007,4 +1029,3 @@ exit 0 * Wed Jan 10 2018 Frantisek Kluknavsky - 0-0.1.gitc1b2278 - First package for Fedora - diff --git a/sources b/sources index 088a689..e6fc603 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (cri-o-a30f93c.tar.gz) = 8bfa291fe3720259b63abaae5b0e50574a3437e1742c84fca36ff325d046ddd81a406a26fe0a3c4760b4c69a7e065a9b1ac550f2e061b45aadc7faf4702b798d -SHA512 (libpod-0ad9b6b.tar.gz) = 1654cae54eaaa0588ba981dc36a85b6ff58b33533b5b27a02ff295b2c4653414b456a3e7410d2d7576bc40de6bd65f6bba3aa9ade43a4ca2c6c2096a3c30b6dc +SHA512 (libpod-b33a00e.tar.gz) = a682d6e79d23f31ec9a969cacdf108f3c0b21cf61bd8f9cb329f272c237777a15f68e6b74b7217d99985d41e75b3b7d9b9bfe4c5c84c8194ba082a288f1bdce1 diff --git a/tests/test_podman.sh b/tests/test_podman.sh new file mode 100755 index 0000000..da220bf --- /dev/null +++ b/tests/test_podman.sh @@ -0,0 +1,13 @@ +#!/bin/bash +# +# Simple podman tests +# + +rm -f /tmp/test.log /tmp/test.debug.log + +# Log program versions +rpm -q podman podman-tests >/tmp/test.debug.log + +bats /usr/share/podman/test/system &> /tmp/test.log + +echo "bats completed with status $?" >>/tmp/test.debug.log diff --git a/tests/test_podman.yml b/tests/test_podman.yml new file mode 100644 index 0000000..45a8157 --- /dev/null +++ b/tests/test_podman.yml @@ -0,0 +1,41 @@ +--- +- hosts: localhost + vars: + - artifacts: ./artifacts + # FIXME! It would be cleaner to include 'podman' in this list; but the + # dnf module is broken in ansible <= 2.8, it doesn't report failures + # to install as long as _one_ package installs! So if podman installs + # but podman-tests doesn't, the `dnf` stanza succeeds, then the test + # one fails with a less-than-helpful error. + # + # See https://github.com/ansible/ansible/pull/49760 + - required_packages: + - podman-tests + tags: + - classic + - container + + tasks: + - name: install packages + dnf: name="{{ required_packages }}" state=installed + enablerepo=updates-testing + + - name: install podman-tests + dnf: name=/tmp/podman-tests-1.1.2-2.gitb33a00e.fc29.x86_64.rpm state=installed + + - name: hi there + command: echo hi + + - block: + # FIXME: how to make two passes, one as root and one rootless? + - name: Run test + script: ./test_podman.sh + always: + - name: Pull out logs + fetch: + src: "/tmp/{{ item }}" + dest: "{{ artifacts }}/{{ item }}" + flat: yes + with_items: + - test.log + - test.debug.log diff --git a/tests/tests.yml b/tests/tests.yml new file mode 100644 index 0000000..80caee7 --- /dev/null +++ b/tests/tests.yml @@ -0,0 +1 @@ +- import_playbook: test_podman.yml From 8dbbc1291a61d398ed68939e45b9ae5a1ef16e1e Mon Sep 17 00:00:00 2001 From: Ed Santiago Date: Wed, 13 Mar 2019 07:31:06 -0600 Subject: [PATCH 47/87] Screwup fix: remove test-environment hacks I accidentally left in some code used for testing the CI setup. Signed-off-by: Ed Santiago --- tests/test_podman.yml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/tests/test_podman.yml b/tests/test_podman.yml index 45a8157..694b6d6 100644 --- a/tests/test_podman.yml +++ b/tests/test_podman.yml @@ -20,12 +20,6 @@ dnf: name="{{ required_packages }}" state=installed enablerepo=updates-testing - - name: install podman-tests - dnf: name=/tmp/podman-tests-1.1.2-2.gitb33a00e.fc29.x86_64.rpm state=installed - - - name: hi there - command: echo hi - - block: # FIXME: how to make two passes, one as root and one rootless? - name: Run test From 2636b5e280a4859fc8c9fa5201f50eff23297764 Mon Sep 17 00:00:00 2001 From: Ed Santiago Date: Sun, 17 Mar 2019 09:16:57 -0600 Subject: [PATCH 48/87] Package zsh completion. Note that we declare ownership of /usr/share/zsh/site-functions (directory). This seems to be legit; see curl and mercurial packages. The alternatives are to explicitly Require: zsh or to bundle the completion script in a separate rpm. Signed-off-by: Ed Santiago --- .gitignore | 1 + podman.spec | 10 ++++++++-- sources | 2 +- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 12cb321..dfe2620 100644 --- a/.gitignore +++ b/.gitignore @@ -114,3 +114,4 @@ /libpod-006206a.tar.gz /libpod-0ad9b6b.tar.gz /libpod-b33a00e.tar.gz +/libpod-6aa8078.tar.gz diff --git a/podman.spec b/podman.spec index 9272e8f..8d3ba75 100644 --- a/podman.spec +++ b/podman.spec @@ -21,7 +21,7 @@ %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} %global git0 https://%{provider}.%{provider_tld}/%{project}/%{repo} -%global commit0 b33a00ef96601d7ce2389ac634e86847239d7d2e +%global commit0 6aa8078cc1f54a5c6e6197d7e0273e36ed55060e %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) %global import_path_conmon github.com/kubernetes-sigs/cri-o @@ -38,7 +38,7 @@ Epoch: 1 Epoch: 0 %endif Version: 1.1.2 -Release: 2.git%{shortcommit0}%{?dist} +Release: 3.git%{shortcommit0}%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://podman.io/ @@ -498,6 +498,9 @@ cp -pav test/system %{buildroot}/%{_datadir}/%{name}/test/ %{_mandir}/man1/podman*.1* %{_mandir}/man5/*.5* %{_datadir}/bash-completion/completions/* +# By "owning" the site-functions dir, we don't need to Require zsh +%{_datadir}/zsh/site-functions +%{_datadir}/zsh/site-functions/* %{_libexecdir}/%{name}/conmon %config(noreplace) %{_sysconfdir}/cni/net.d/87-%{name}-bridge.conflist %{_datadir}/containers/%{repo}.conf @@ -527,6 +530,9 @@ exit 0 %{_datadir}/%{name}/test %changelog +* Sun Mar 17 2019 Eduardo Santiago - 1:1.1.2-3.git6aa8078 +- include zsh completion + * Mon Mar 11 2019 Eduardo Santiago - 1:1.1.2-2.git55dc783 - new -tests subpackage diff --git a/sources b/sources index e6fc603..2e58642 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (cri-o-a30f93c.tar.gz) = 8bfa291fe3720259b63abaae5b0e50574a3437e1742c84fca36ff325d046ddd81a406a26fe0a3c4760b4c69a7e065a9b1ac550f2e061b45aadc7faf4702b798d -SHA512 (libpod-b33a00e.tar.gz) = a682d6e79d23f31ec9a969cacdf108f3c0b21cf61bd8f9cb329f272c237777a15f68e6b74b7217d99985d41e75b3b7d9b9bfe4c5c84c8194ba082a288f1bdce1 +SHA512 (libpod-6aa8078.tar.gz) = bad4f304fc2ee4e48cf6cd6ed55bbf811f5a47ff6d4b57d5138f4675766a0815abdba1dd9bd8fd5aaef87fabaf8b59fb2bf29ab89688fe98b3bca3b2cb8292fa From 18d63de32e20f455cf07e288162039e97ee0a6fc Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Tue, 19 Mar 2019 12:55:36 +0100 Subject: [PATCH 49/87] Fix the build by ensuring that the %{_unitdir} RPM macro is defined A BuildRequires on systemd should be added as specified in the Fedora packaging guidelines: https://fedoraproject.org/wiki/Packaging:Systemd It's likely that something in the dependency chain is implicitly pulling in the systemd RPM, but that might change. --- podman.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/podman.spec b/podman.spec index 8d3ba75..1d42bf8 100644 --- a/podman.spec +++ b/podman.spec @@ -63,6 +63,7 @@ BuildRequires: libselinux-devel BuildRequires: ostree-devel BuildRequires: pkgconfig BuildRequires: make +BuildRequires: systemd Requires: runc >= 2:1.0.0-57 Requires: containers-common Requires: containernetworking-plugins >= 0.7.3-2 From 0fd5c2ba8792a405ef4901c9db4d9dc23a50c662 Mon Sep 17 00:00:00 2001 From: Daniel J Walsh Date: Mon, 1 Apr 2019 10:05:34 -0400 Subject: [PATCH 50/87] include zsh completion --- .gitignore | 94 ++++++++++-- podman.spec | 418 ++++++++++++++++++++++++++++++++++++++++------------ 2 files changed, 409 insertions(+), 103 deletions(-) diff --git a/.gitignore b/.gitignore index dfe2620..055e62c 100644 --- a/.gitignore +++ b/.gitignore @@ -99,19 +99,93 @@ /libpod-65c31d4.tar.gz /libpod-123de30.tar.gz /libpod-95dbcad.tar.gz -/libpod-19cb754.tar.gz -/libpod-81df604.tar.gz -/libpod-a723353.tar.gz -/libpod-1cd906d.tar.gz -/libpod-e4a1553.tar.gz +/libpod-28a2bf8.tar.gz +/libpod-c3a0874.tar.gz +/libpod-af791f3.tar.gz +/cri-o-2cbe48b.tar.gz +/libpod-e7e81e6.tar.gz +/libpod-da5c894.tar.gz /cri-o-a30f93c.tar.gz /libpod-db08685.tar.gz +/libpod-4955572.tar.gz +/libpod-e9f8aed.tar.gz +/libpod-672f572.tar.gz /libpod-a4adfe5.tar.gz -/libpod-7ba215f.tar.gz -/libpod-66d3499.tar.gz -/libpod-9551f6b.tar.gz -/libpod-82e8011.tar.gz -/libpod-006206a.tar.gz +/libpod-f5473c6.tar.gz +/libpod-78e6d8e.tar.gz +/libpod-7965716.tar.gz +/libpod-97bded4.tar.gz +/libpod-236408b.tar.gz +/libpod-cd5742f.tar.gz +/libpod-ea928f2.tar.gz +/libpod-23feb0d.tar.gz +/libpod-1fdfeb8.tar.gz +/libpod-78604c3.tar.gz +/libpod-e3ece3b.tar.gz +/libpod-3956050.tar.gz +/libpod-3af62f6.tar.gz +/libpod-6b8f89d.tar.gz +/libpod-41f250c.tar.gz +/libpod-5f6ad82.tar.gz +/libpod-320085a.tar.gz +/libpod-75b19ca.tar.gz +/libpod-a387c72.tar.gz +/libpod-1f547b2.tar.gz +/libpod-235a630.tar.gz +/libpod-8a3361f.tar.gz +/libpod-508388b.tar.gz +/libpod-93b5ccf.tar.gz +/libpod-c086118.tar.gz +/libpod-b21d474.tar.gz +/libpod-68414c5.tar.gz +/libpod-c8eaf59.tar.gz +/libpod-6b059a5.tar.gz +/libpod-fa998f2.tar.gz +/libpod-fe186c6.tar.gz +/libpod-792f109.tar.gz +/libpod-8fe3050.tar.gz +/libpod-c50332d.tar.gz +/libpod-1aa55ed.tar.gz +/libpod-7438b7b.tar.gz +/libpod-098c134.tar.gz +/libpod-9ffd480.tar.gz +/libpod-4e0c0ec.tar.gz +/libpod-b83b07c.tar.gz +/libpod-faa2462.tar.gz +/libpod-c9d63fe.tar.gz +/libpod-0f6535c.tar.gz +/libpod-5c86efb.tar.gz +/libpod-140ae25.tar.gz +/libpod-6301f6a.tar.gz +/libpod-1b2f752.tar.gz +/libpod-0e3264a.tar.gz +/libpod-e3dc660.tar.gz +/libpod-0d4bfb0.tar.gz +/libpod-579fc0f.tar.gz +/libpod-ef2f6f9.tar.gz +/libpod-ec96987.tar.gz +/libpod-7838a13.tar.gz +/libpod-c9e1f36.tar.gz +/libpod-ebe9297.tar.gz +/libpod-ad5579e.tar.gz +/libpod-805c6d9.tar.gz +/libpod-e97dc8e.tar.gz +/libpod-e6426af.tar.gz +/libpod-d5593b8.tar.gz +/libpod-778f986.tar.gz +/libpod-650e242.tar.gz +/libpod-f250745.tar.gz +/libpod-962850c.tar.gz +/libpod-afd4d5f.tar.gz +/libpod-c86e8f1.tar.gz +/libpod-8923703.tar.gz +/libpod-ee27c39.tar.gz +/libpod-dfc64e1.tar.gz +/libpod-81ace5c.tar.gz +/libpod-0a521e1.tar.gz +/libpod-1cb16bd.tar.gz +/libpod-3f32eae.tar.gz +/libpod-228d1cb.tar.gz /libpod-0ad9b6b.tar.gz /libpod-b33a00e.tar.gz /libpod-6aa8078.tar.gz diff --git a/podman.spec b/podman.spec index 1d42bf8..5605065 100644 --- a/podman.spec +++ b/podman.spec @@ -1,10 +1,16 @@ +%{?python_enable_dependency_generator} %global with_devel 0 %global with_bundled 1 %global with_debug 1 %global with_check 0 %global with_unit_test 0 +%if 0%{?fedora} >= 28 +%bcond_without varlink %define gogenerate go generate +%else +%bcond_with varlink +%endif %if 0%{?with_debug} %global _find_debuginfo_dwz_opts %{nil} @@ -21,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 6aa8078cc1f54a5c6e6197d7e0273e36ed55060e +%global commit0 3bd528e583182b4249f3e6bbd8497a8831d89950 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) %global import_path_conmon github.com/kubernetes-sigs/cri-o @@ -30,15 +36,15 @@ %global shortcommit_conmon %(c=%{commit_conmon}; echo ${c:0:7}) Name: podman -# Version string is wrong but only written as such to avoid epoch bumps -# Will be fixed once upstream moves to 0.8.11-dev -%if 0%{?fedora} > 28 -Epoch: 1 +# Epoch is 2 for f30 (rawhide), 1 for f28 and f29 +# BEWARE while using on other distros +%if 0%{?fedora} >= 30 +Epoch: 2 %else -Epoch: 0 +Epoch: 1 %endif -Version: 1.1.2 -Release: 3.git%{shortcommit0}%{?dist} +Version: 1.2.0 +Release: 1.dev.git%{shortcommit0}%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://podman.io/ @@ -69,12 +75,9 @@ Requires: containers-common Requires: containernetworking-plugins >= 0.7.3-2 Requires: iptables Requires: nftables -#Requires: conmon -Recommends: container-selinux >= 2:2.71 +Recommends: container-selinux Recommends: slirp4netns >= 0.3-0 -%if 0%{?fedora} > 28 -Recommends: fuse-overlayfs -%endif +Recommends: fuse-overlayfs >= 0.3-8 # vendored libraries # awk '{print "Provides: bundled(golang("$1")) = "$2}' vendor.conf | sort @@ -84,13 +87,14 @@ Provides: bundled(golang(github.com/blang/semver)) = v3.5.0 Provides: bundled(golang(github.com/boltdb/bolt)) = master Provides: bundled(golang(github.com/buger/goterm)) = 2f8dfbc7dbbff5dd1d391ed91482c24df243b2d3 Provides: bundled(golang(github.com/BurntSushi/toml)) = v0.2.0 -Provides: bundled(golang(github.com/containerd/cgroups)) = 77e628511d924b13a77cebdc73b757a47f6d751b +Provides: bundled(golang(github.com/containerd/cgroups)) = 58556f5ad8448d99a6f7bea69ea4bdb7747cfeb0 Provides: bundled(golang(github.com/containerd/continuity)) = master #Provides: bundled(golang(github.com/containernetworking/cni)) = v0.7.0-alpha1 Provides: bundled(golang(github.com/containernetworking/plugins)) = 1562a1e60ed101aacc5e08ed9dbeba8e9f3d4ec1 -Provides: bundled(golang(github.com/containers/image)) = 134f99bed228d6297dc01d152804f6f09f185418 +Provides: bundled(golang(github.com/containers/image)) = 85d7559d44fd71f30e46e43d809bfbf88d11d916 Provides: bundled(golang(github.com/containers/psgo)) = 5dde6da0bc8831b35243a847625bcf18183bd1ee -Provides: bundled(golang(github.com/containers/storage)) = 17c7d1fee5603ccf6dd97edc14162fc1510e7e23 +Provides: bundled(golang(github.com/containers/storage)) = 243c4cd616afdf06b4a975f18c4db083d26b1641 +Provides: bundled(golang(github.com/coreos/go-iptables)) = 25d087f3cffd9aedc0c2b7eff25f23cbf3c20fe1 Provides: bundled(golang(github.com/coreos/go-systemd)) = v14 Provides: bundled(golang(github.com/cri-o/ocicni)) = master Provides: bundled(golang(github.com/cyphar/filepath-securejoin)) = v0.2.1 @@ -132,7 +136,7 @@ Provides: bundled(golang(github.com/Nvveen/Gotty)) = master #Provides: bundled(golang(github.com/opencontainers/go-digest)) = v1.0.0-rc0 Provides: bundled(golang(github.com/opencontainers/image-spec)) = v1.0.0 Provides: bundled(golang(github.com/opencontainers/runc)) = b4e2ecb452d9ee4381137cc0a7e6715b96bed6de -Provides: bundled(golang(github.com/opencontainers/runtime-spec)) = v1.0.0 +Provides: bundled(golang(github.com/opencontainers/runtime-spec)) = d810dbc60d8c5aeeb3d054bd1132fab2121968ce Provides: bundled(golang(github.com/opencontainers/runtime-tools)) = master Provides: bundled(golang(github.com/opencontainers/selinux)) = b6fa367ed7f534f9ba25391cc2d467085dbb445a Provides: bundled(golang(github.com/openshift/imagebuilder)) = master @@ -140,7 +144,7 @@ Provides: bundled(golang(github.com/ostreedev/ostree-go)) = master Provides: bundled(golang(github.com/pkg/errors)) = v0.8.0 Provides: bundled(golang(github.com/pmezard/go-difflib)) = 792786c7400a136282c1664665ae0a8db921c6c2 Provides: bundled(golang(github.com/pquerna/ffjson)) = d49c2bc1aa135aad0c6f4fc2056623ec78f5d5ac -Provides: bundled(golang(github.com/projectatomic/buildah)) = 745bf7e56bda740ce7cfc55318da08529e5ed519 +Provides: bundled(golang(github.com/projectatomic/buildah)) = af5bbde0180026ae87b7fc81c2dc124aa73ec959 Provides: bundled(golang(github.com/seccomp/containers-golang)) = master Provides: bundled(golang(github.com/seccomp/libseccomp-golang)) = v0.9.0 Provides: bundled(golang(github.com/sirupsen/logrus)) = v1.0.0 @@ -151,6 +155,7 @@ Provides: bundled(golang(github.com/tchap/go-patricia)) = v2.2.6 Provides: bundled(golang(github.com/ulikunitz/xz)) = v0.5.4 Provides: bundled(golang(github.com/ulule/deepcopier)) = master Provides: bundled(golang(github.com/urfave/cli)) = 934abfb2f102315b5794e15ebc7949e4ca253920 +Provides: bundled(golang(github.com/varlink/go)) = master Provides: bundled(golang(github.com/vbatts/tar-split)) = v0.10.2 Provides: bundled(golang(github.com/vishvananda/netlink)) = master Provides: bundled(golang(github.com/vishvananda/netns)) = master @@ -196,14 +201,10 @@ This package installs a script named docker that emulates the Docker CLI by executes podman commands, it also creates links between all Docker CLI man pages and podman. -%files docker -%{_bindir}/docker -%{_mandir}/man1/docker*.1* - %if 0%{?with_devel} %package devel -Summary: Library for applications looking to use Container Pods -BuildArch: noarch +Summary: Library for applications looking to use Container Pods +BuildArch: noarch Provides: %{repo}-devel = %{epoch}:%{version}-%{release} %if 0%{?with_check} && ! 0%{?with_bundled} @@ -315,15 +316,15 @@ Requires: golang(k8s.io/kubernetes/pkg/kubelet/container) Provides: golang(%{import_path}/cmd/%{name}/docker) = %{epoch}:%{version}-%{release} Provides: golang(%{import_path}/cmd/%{name}/formats) = %{epoch}:%{version}-%{release} Provides: golang(%{import_path}/libkpod) = %{epoch}:%{version}-%{release} -Provides: golang(%{import_path}/libpod) = %{epoch}:%{version}-%{release} -Provides: golang(%{import_path}/libpod/common) = %{epoch}:%{version}-%{release} -Provides: golang(%{import_path}/libpod/driver) = %{epoch}:%{version}-%{release} -Provides: golang(%{import_path}/libpod/layers) = %{epoch}:%{version}-%{release} -Provides: golang(%{import_path}/pkg/annotations) = %{epoch}:%{version}-%{release} -Provides: golang(%{import_path}/pkg/chrootuser) = %{epoch}:%{version}-%{release} -Provides: golang(%{import_path}/pkg/registrar) = %{epoch}:%{version}-%{release} -Provides: golang(%{import_path}/pkg/storage) = %{epoch}:%{version}-%{release} -Provides: golang(%{import_path}/utils) = %{epoch}:%{version}-%{release} +Provides: golang(%{import_path}/libpod) = %{epoch}:%{version}-%{release} +Provides: golang(%{import_path}/libpod/common) = %{epoch}:%{version}-%{release} +Provides: golang(%{import_path}/libpod/driver) = %{epoch}:%{version}-%{release} +Provides: golang(%{import_path}/libpod/layers) = %{epoch}:%{version}-%{release} +Provides: golang(%{import_path}/pkg/annotations) = %{epoch}:%{version}-%{release} +Provides: golang(%{import_path}/pkg/chrootuser) = %{epoch}:%{version}-%{release} +Provides: golang(%{import_path}/pkg/registrar) = %{epoch}:%{version}-%{release} +Provides: golang(%{import_path}/pkg/storage) = %{epoch}:%{version}-%{release} +Provides: golang(%{import_path}/utils) = %{epoch}:%{version}-%{release} %description -n libpod-devel %{summary} @@ -335,14 +336,14 @@ building other packages which use import path with %if 0%{?with_unit_test} && 0%{?with_devel} %package unit-test-devel -Summary: Unit tests for %{name} package +Summary: Unit tests for %{name} package %if 0%{?with_check} #Here comes all BuildRequires: PACKAGE the unit tests #in %%check section need for running %endif # test subpackage tests code from devel subpackage -Requires: %{name}-devel = %{epoch}:%{version}-%{release} +Requires: %{name}-devel = %{epoch}:%{version}-%{release} %if 0%{?with_check} && ! 0%{?with_bundled} BuildRequires: golang(github.com/stretchr/testify/assert) @@ -385,10 +386,10 @@ mkdir -p src/%{provider}.%{provider_tld}/%{project} ln -s ../../../../ src/%{import_path} popd ln -s vendor src -export GOPATH=$(pwd)/_build:$(pwd):$(pwd):%{gopath} -export BUILDTAGS="varlink seccomp $(hack/btrfs_installed_tag.sh) $(hack/btrfs_tag.sh) $(hack/libdm_tag.sh) $(hack/ostree_tag.sh) $(hack/selinux_tag.sh) exclude_graphdriver_devicemapper" +export GOPATH=$(pwd)/_build:$(pwd) +export BUILDTAGS="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)" %gogenerate ./cmd/%{name}/varlink/... -BUILDTAGS=$BUILDTAGS make binaries docs +%gobuild -o bin/%{name} %{import_path}/cmd/%{name} # build conmon pushd cri-o-%{commit_conmon} @@ -398,11 +399,10 @@ mkdir -p src/%{provider}.%{provider_tld}/{kubernetes-sigs,opencontainers} ln -s $(dirs +1 -l) src/%{import_path_conmon} popd ln -s vendor src -export GOPATH=$(pwd)/_output:$(pwd):%{gopath} +export GOPATH=$(pwd)/_output:$(pwd) export BUILDTAGS="selinux seccomp $(hack/btrfs_installed_tag.sh) $(hack/btrfs_tag.sh) containers_image_ostree_stub" BUILDTAGS=$BUILDTAGS make -C conmon popd -mv pkg/hooks/README.md pkg/hooks/README-hooks.md %install install -dp %{buildroot}%{_unitdir} @@ -414,6 +414,8 @@ PODMAN_VERSION=%{version} %{__make} PREFIX=%{buildroot}%{_prefix} ETCDIR=%{build install.completions \ install.docker +mv pkg/hooks/README.md pkg/hooks/README-hooks.md + # install libpod.conf install -dp %{buildroot}%{_datadir}/containers install -p -m 644 %{repo}.conf %{buildroot}%{_datadir}/containers @@ -509,6 +511,10 @@ cp -pav test/system %{buildroot}/%{_datadir}/%{name}/test/ %{_unitdir}/io.%{name}.socket %{_usr}/lib/tmpfiles.d/%{name}.conf +%files docker +%{_bindir}/docker +%{_mandir}/man1/docker*.1* + %if 0%{?with_devel} %files -n libpod-devel -f devel.file-list %license LICENSE @@ -523,7 +529,7 @@ cp -pav test/system %{buildroot}/%{_datadir}/%{name}/test/ %endif %triggerpostun -- %{name} < 1.1 -podman system renumber +%{_bindir}/%{name} system renumber exit 0 %files tests @@ -531,73 +537,306 @@ exit 0 %{_datadir}/%{name}/test %changelog -* Sun Mar 17 2019 Eduardo Santiago - 1:1.1.2-3.git6aa8078 +* Mon Mar 18 2019 Eduardo Santiago - 2:1.1.2-4.dev.git6aa8078 - include zsh completion -* Mon Mar 11 2019 Eduardo Santiago - 1:1.1.2-2.git55dc783 +* Wed Mar 13 2019 Eduardo Santiago - 2:1.1.2-3.dev.gitb33a00e - new -tests subpackage -* Tue Mar 5 2019 dwalsh - 1:1.1.2-1.git0ad9b6b -- Upstream 1.1.2 release +* Tue Mar 12 2019 Lokesh Mandvekar - 2:1.1.2-2.dev.git0ad9b6b +- missed the system renumber scriptlet in the previous build -* Wed Feb 27 2019 dwalsh - 1:1.1.0-1.git006206a -- Upstream 1.1.0 release +* Tue Mar 12 2019 Lokesh Mandvekar - 2:1.1.2-1.dev.git0ad9b6b +- bump to v1.1.2 -* Sat Jan 12 2019 dwalsh - 1:1.0.0-1.git82e8011 +* Tue Mar 12 2019 Lokesh Mandvekar - 2:1.0.1-32.dev.git228d1cb +- Resolves: #1686636 - do not depend on conmon (conmon moved to modules) + +* Tue Feb 19 2019 Lokesh Mandvekar (Bot) - 2:1.0.1-31.dev.git228d1cb +- autobuilt 228d1cb + +* Mon Feb 18 2019 Lokesh Mandvekar (Bot) - 2:1.0.1-30.dev.git3f32eae +- autobuilt 3f32eae + +* Sun Feb 17 2019 Lokesh Mandvekar (Bot) - 2:1.0.1-29.dev.git1cb16bd +- autobuilt 1cb16bd + +* Sat Feb 16 2019 Lokesh Mandvekar (Bot) - 2:1.0.1-28.dev.git0a521e1 +- autobuilt 0a521e1 + +* Fri Feb 15 2019 Lokesh Mandvekar (Bot) - 2:1.0.1-27.dev.git81ace5c +- autobuilt 81ace5c + +* Thu Feb 14 2019 Lokesh Mandvekar (Bot) - 2:1.0.1-26.dev.gitdfc64e1 +- autobuilt dfc64e1 + +* Wed Feb 13 2019 Lokesh Mandvekar (Bot) - 2:1.0.1-25.dev.gitee27c39 +- autobuilt ee27c39 + +* Tue Feb 12 2019 Lokesh Mandvekar (Bot) - 2:1.0.1-24.dev.git8923703 +- autobuilt 8923703 + +* Sun Feb 10 2019 Lokesh Mandvekar (Bot) - 2:1.0.1-23.dev.gitc86e8f1 +- autobuilt c86e8f1 + +* Sat Feb 09 2019 Lokesh Mandvekar (Bot) - 2:1.0.1-22.dev.gitafd4d5f +- autobuilt afd4d5f + +* Fri Feb 08 2019 Lokesh Mandvekar (Bot) - 2:1.0.1-21.dev.git962850c +- autobuilt 962850c + +* Thu Feb 07 2019 Lokesh Mandvekar (Bot) - 2:1.0.1-20.dev.gitf250745 +- autobuilt f250745 + +* Wed Feb 06 2019 Lokesh Mandvekar (Bot) - 2:1.0.1-19.dev.git650e242 +- autobuilt 650e242 + +* Tue Feb 05 2019 Lokesh Mandvekar (Bot) - 2:1.0.1-18.dev.git778f986 +- autobuilt 778f986 + +* Sun Feb 03 2019 Lokesh Mandvekar (Bot) - 2:1.0.1-17.dev.gitd5593b8 +- autobuilt d5593b8 + +* Sat Feb 02 2019 Lokesh Mandvekar (Bot) - 2:1.0.1-16.dev.gite6426af +- autobuilt e6426af + +* Fri Feb 01 2019 Lokesh Mandvekar (Bot) - 2:1.0.1-15.dev.gite97dc8e +- autobuilt e97dc8e + +* Thu Jan 31 2019 Lokesh Mandvekar (Bot) - 2:1.0.1-14.dev.git805c6d9 +- autobuilt 805c6d9 + +* Wed Jan 30 2019 Lokesh Mandvekar (Bot) - 2:1.0.1-13.dev.gitad5579e +- autobuilt ad5579e + +* Tue Jan 29 2019 Lokesh Mandvekar (Bot) - 2:1.0.1-12.dev.gitebe9297 +- autobuilt ebe9297 + +* Thu Jan 24 2019 Lokesh Mandvekar (Bot) - 2:1.0.1-11.dev.gitc9e1f36 +- autobuilt c9e1f36 + +* Wed Jan 23 2019 Lokesh Mandvekar (Bot) - 2:1.0.1-10.dev.git7838a13 +- autobuilt 7838a13 + +* Tue Jan 22 2019 Lokesh Mandvekar (Bot) - 2:1.0.1-9.dev.gitec96987 +- autobuilt ec96987 + +* Mon Jan 21 2019 Lokesh Mandvekar (Bot) - 2:1.0.1-8.dev.gitef2f6f9 +- autobuilt ef2f6f9 + +* Sun Jan 20 2019 Lokesh Mandvekar (Bot) - 2:1.0.1-7.dev.git579fc0f +- autobuilt 579fc0f + +* Sat Jan 19 2019 Lokesh Mandvekar (Bot) - 2:1.0.1-6.dev.git0d4bfb0 +- autobuilt 0d4bfb0 + +* Fri Jan 18 2019 Lokesh Mandvekar (Bot) - 2:1.0.1-5.dev.gite3dc660 +- autobuilt e3dc660 + +* Thu Jan 17 2019 Lokesh Mandvekar (Bot) - 2:1.0.1-4.dev.git0e3264a +- autobuilt 0e3264a + +* Wed Jan 16 2019 Lokesh Mandvekar (Bot) - 2:1.0.1-3.dev.git1b2f752 +- autobuilt 1b2f752 + +* Tue Jan 15 2019 Lokesh Mandvekar (Bot) - 2:1.0.1-2.dev.git6301f6a +- bump to 1.0.1 +- autobuilt 6301f6a + +* Mon Jan 14 2019 Lokesh Mandvekar (Bot) - 2:0.12.2-3.dev.git140ae25 +- autobuilt 140ae25 + +* Sat Jan 12 2019 Lokesh Mandvekar (Bot) - 2:0.12.2-2.dev.git5c86efb +- bump to 0.12.2 +- autobuilt 5c86efb + +* Fri Jan 11 2019 bbaude - 1:1.0.0-1.dev.git82e8011 - Upstream 1.0.0 release -* Thu Dec 13 2018 bbaude - 1:0.12.1.2-1.git9551f6b -- Upstream 0.12.1.2 release +* Thu Jan 10 2019 Lokesh Mandvekar (Bot) - 2:0.12.2-27.dev.git0f6535c +- autobuilt 0f6535c -* Fri Dec 07 2018 Brent Baude - 1:0.12.1.1 -1.git66d3499 -- Upstream 0.12.1.1 release +* Wed Jan 09 2019 Lokesh Mandvekar (Bot) - 2:0.12.2-26.dev.gitc9d63fe +- autobuilt c9d63fe -* Thu Dec 06 2018 Brent Baude - 1:0.12.1-2.git7ba215f -- Upstream 0.12.1 release +* Tue Jan 08 2019 Lokesh Mandvekar (Bot) - 2:0.12.2-25.dev.gitfaa2462 +- autobuilt faa2462 -* Sat Nov 10 2018 Dan Walsh - 1:0.11.1-2.gita4adfe5 +* Mon Jan 07 2019 Lokesh Mandvekar (Bot) - 2:0.12.2-24.dev.gitb83b07c +- autobuilt b83b07c + +* Sat Jan 05 2019 Lokesh Mandvekar (Bot) - 2:0.12.2-23.dev.git4e0c0ec +- autobuilt 4e0c0ec + +* Fri Jan 04 2019 Lokesh Mandvekar (Bot) - 2:0.12.2-22.dev.git9ffd480 +- autobuilt 9ffd480 + +* Thu Jan 03 2019 Lokesh Mandvekar (Bot) - 2:0.12.2-21.dev.git098c134 +- autobuilt 098c134 + +* Tue Jan 01 2019 Lokesh Mandvekar (Bot) - 2:0.12.2-20.dev.git7438b7b +- autobuilt 7438b7b + +* Sat Dec 29 2018 Lokesh Mandvekar (Bot) - 2:0.12.2-1.nightly.git5c86efb9.dev.git1aa55ed +- autobuilt 1aa55ed + +* Thu Dec 27 2018 Igor Gnatenko - 2:0.12.2-1.nightly.git5c86efb8.dev.gitc50332d +- Enable python dependency generator + +* Tue Dec 25 2018 Lokesh Mandvekar (Bot) - 2:0.12.2-1.nightly.git5c86efb7.dev.gitc50332d +- autobuilt c50332d + +* Mon Dec 24 2018 Lokesh Mandvekar (Bot) - 2:0.12.2-1.nightly.git5c86efb6.dev.git8fe3050 +- autobuilt 8fe3050 + +* Sun Dec 23 2018 Lokesh Mandvekar (Bot) - 2:0.12.2-1.nightly.git5c86efb5.dev.git792f109 +- autobuilt 792f109 + +* Sat Dec 22 2018 Lokesh Mandvekar (Bot) - 2:0.12.2-1.nightly.git5c86efb4.dev.gitfe186c6 +- autobuilt fe186c6 + +* Fri Dec 21 2018 Lokesh Mandvekar (Bot) - 2:0.12.2-1.nightly.git5c86efb3.dev.gitfa998f2 +- autobuilt fa998f2 + +* Thu Dec 20 2018 Lokesh Mandvekar (Bot) - 2:0.12.2-1.nightly.git5c86efb2.dev.git6b059a5 +- autobuilt 6b059a5 + +* Wed Dec 19 2018 Lokesh Mandvekar (Bot) - 2:0.12.2-1.nightly.git5c86efb1.dev.gitc8eaf59 +- autobuilt c8eaf59 + +* Tue Dec 18 2018 Lokesh Mandvekar (Bot) - 2:0.12.2-1.nightly.git5c86efb0.dev.git68414c5 +- autobuilt 68414c5 + +* Mon Dec 17 2018 Lokesh Mandvekar (Bot) - 2:0.12.2-9.dev.gitb21d474 +- autobuilt b21d474 + +* Sat Dec 15 2018 Lokesh Mandvekar (Bot) - 2:0.12.2-8.dev.gitc086118 +- autobuilt c086118 + +* Fri Dec 14 2018 Lokesh Mandvekar (Bot) - 2:0.12.2-7.dev.git93b5ccf +- autobuilt 93b5ccf + +* Thu Dec 13 2018 Lokesh Mandvekar (Bot) - 2:0.12.2-6.dev.git508388b +- autobuilt 508388b + +* Wed Dec 12 2018 Lokesh Mandvekar (Bot) - 2:0.12.2-5.dev.git8a3361f +- autobuilt 8a3361f + +* Tue Dec 11 2018 Lokesh Mandvekar (Bot) - 2:0.12.2-4.dev.git235a630 +- autobuilt 235a630 + +* Sat Dec 08 2018 Lokesh Mandvekar (Bot) - 2:0.12.2-3.dev.git1f547b2 +- autobuilt 1f547b2 + +* Fri Dec 07 2018 Lokesh Mandvekar (Bot) - 2:0.12.2-2.dev.gita387c72 +- bump to 0.12.2 +- autobuilt a387c72 + +* Thu Dec 06 2018 Lokesh Mandvekar (Bot) - 2:0.11.2-15.dev.git75b19ca +- autobuilt 75b19ca + +* Wed Dec 05 2018 Lokesh Mandvekar (Bot) - 2:0.11.2-14.dev.git320085a +- autobuilt 320085a + +* Tue Dec 04 2018 Lokesh Mandvekar (Bot) - 2:0.11.2-13.dev.git5f6ad82 +- autobuilt 5f6ad82 + +* Sun Dec 02 2018 Lokesh Mandvekar (Bot) - 2:0.11.2-12.dev.git41f250c +- autobuilt 41f250c + +* Sat Dec 01 2018 Lokesh Mandvekar (Bot) - 2:0.11.2-11.dev.git6b8f89d +- autobuilt 6b8f89d + +* Thu Nov 29 2018 Lokesh Mandvekar (Bot) - 2:0.11.2-10.dev.git3af62f6 +- autobuilt 3af62f6 + +* Tue Nov 27 2018 Lokesh Mandvekar (Bot) - 2:0.11.2-9.dev.git3956050 +- autobuilt 3956050 + +* Mon Nov 26 2018 Lokesh Mandvekar (Bot) - 2:0.11.2-8.dev.gite3ece3b +- autobuilt e3ece3b + +* Sat Nov 24 2018 Lokesh Mandvekar (Bot) - 2:0.11.2-7.dev.git78604c3 +- autobuilt 78604c3 + +* Thu Nov 22 2018 Lokesh Mandvekar (Bot) - 2:0.11.2-6.dev.git1fdfeb8 +- autobuilt 1fdfeb8 + +* Wed Nov 21 2018 Lokesh Mandvekar (Bot) - 2:0.11.2-5.dev.git23feb0d +- autobuilt 23feb0d + +* Tue Nov 20 2018 Lokesh Mandvekar (Bot) - 2:0.11.2-4.dev.gitea928f2 +- autobuilt ea928f2 + +* Sat Nov 17 2018 Lokesh Mandvekar (Bot) - 2:0.11.2-3.dev.gitcd5742f +- autobuilt cd5742f + +* Fri Nov 16 2018 Lokesh Mandvekar (Bot) - 2:0.11.2-2.dev.git236408b +- autobuilt 236408b + +* Wed Nov 14 2018 Lokesh Mandvekar - 2:0.11.2-1.dev.git97bded4 +- bump epoch cause previous version was messed up +- built 97bded4 + +* Tue Nov 13 2018 Lokesh Mandvekar (Bot) - 1:0.11.20.11.2-1.dev.git79657161 +- bump to 0.11.2 +- autobuilt 7965716 + +* Sat Nov 10 2018 Dan Walsh - 1:0.11.20.11.2-2.dev.git78e6d8e1 - Remove dirty flag from podman version -* Thu Nov 08 2018 bbaude - 1:0.11.1-1.gita4adfe5 + +* Sat Nov 10 2018 Lokesh Mandvekar (Bot) - 1:0.11.20.11.2-1.dev.git7965716.dev.git78e6d8e1 +- bump to 0.11.2 +- autobuilt 78e6d8e + +* Fri Nov 09 2018 Lokesh Mandvekar (Bot) - 1:0.11.20.11.2-1.dev.git7965716.dev.git78e6d8e.dev.gitf5473c61 +- bump to 0.11.2 +- autobuilt f5473c6 + +* Thu Nov 08 2018 baude - 1:0.11.1-1.dev.gita4adfe5 - Upstream 0.11.1-1 -* Sun Oct 28 2018 Lokesh Mandvekar - 1:0.10.1.3-4.gitdb08685 -- Correct bug id in previous changelog entry +* Thu Nov 08 2018 Lokesh Mandvekar (Bot) - 1:0.10.2-3.dev.git672f572 +- autobuilt 672f572 -* Sun Oct 28 2018 Lokesh Mandvekar - 1:0.10.1.3-3.gitdb08685 +* Wed Nov 07 2018 Lokesh Mandvekar (Bot) - 1:0.10.2-2.dev.gite9f8aed +- autobuilt e9f8aed + +* Sun Oct 28 2018 Lokesh Mandvekar - 1:0.10.2-1.dev.git4955572 - Resolves: #1643744 - build podman with ostree support +- bump to v0.10.2 +- built commit 4955572 -* Fri Oct 19 2018 Lokesh Mandvekar - 1:0.10.1.3-2.gitdb08685 +* Fri Oct 19 2018 Lokesh Mandvekar - 1:0.10.1.3-3.dev.gitdb08685 - consistent epoch:version-release in changelog -* Thu Oct 18 2018 Lokesh Mandvekar - 1:0.10.1.3-1.gitdb08685 -- bump to v0.10.1.3 -- correct changelog and epoch mentions +* Thu Oct 18 2018 Lokesh Mandvekar - 1:0.10.1.3-2.dev.gitdb08685 +- correct epoch mentions -* Fri Oct 12 2018 Dan Walsh - 1:0.10.1-1.gite4a1553 +* Thu Oct 18 2018 Lokesh Mandvekar - 1:0.10.1.3-1.dev.gitdb08685 +- bump to v0.10.1.3 + +* Thu Oct 11 2018 baude - 1:0.10.1-1.gitda5c894 - Upstream v0.10.1 release -* Tue Oct 2 2018 Dan Walsh - 1:0.9.3.1-2.git1cd906d -- Fix podman-docker to require proper version. - -* Tue Sep 25 2018 baude - 1:0.9.3.1-1.git1cd906d -- Upstream 0.9.3.1 upstream release +* Fri Sep 28 2018 Lokesh Mandvekar - 1:0.9.4-3.dev.gite7e81e6 +- built libpod commit e7e81e6 +- built conmon from cri-o commit 2cbe48b * Tue Sep 25 2018 Dan Walsh - 1:0.9.4-2.dev.gitaf791f3 - Fix required version of runc -* Mon Sep 24 2018 Lokesh Mandvekar - 1:0.9.3-4.gita723353 -- ensure smooth upgrade path from f28 -- mention epoch number in changelogs +* Mon Sep 24 2018 Lokesh Mandvekar - 1:0.9.4-1.dev.gitaf791f3 +- bump to v0.9.4 +- built af791f3 -* Sat Sep 22 2018 Dan Walsh - 1:0.9.3-1.gita723353 -- Upstream 0.9.3 +* Wed Sep 19 2018 Lokesh Mandvekar - 1:0.9.3-2.dev.gitc3a0874 +- autobuilt c3a0874 -* Mon Sep 17 2018 Dan Walsh - 1:0.9.2.1-1.git19cb754 -- Merge in fixes for podman build, to handle symbolic links and running sudo in Dockerfile - -* Sat Sep 15 2018 baude - 0.9.2-2.git81df604 -- Upstream 0.9.2 +* Mon Sep 17 2018 Lokesh Mandvekar - 1:0.9.3-1.dev.git28a2bf8 +- bump to v0.9.3 +- built commit 28a2bf82 * Tue Sep 11 2018 Lokesh Mandvekar - 1:0.9.1.1-1.dev.git95dbcad - bump to v0.9.1.1 @@ -607,13 +846,7 @@ exit 0 - Upstream release of 0.9.1 - Do not build with devicemapper -* Sun Sep 09 2018 baude - 0.9.1-3.gitaba58d1 -- Grab correct commit for podman-0.9.1 - -* Fri Sep 07 2018 baude - 0.9.1-1.gitc325a18 -- Upstream 0.9.1 release - -* Tue Sep 4 2018 Dan Walsh - 1:0.8.5-5.dev.git65c31d4 +* Tue Sep 4 2018 Dan Walsh - 1:0.8.5-5.git65c31d4 - Fix required version of runc * Tue Sep 4 2018 Dan Walsh - 1:0.8.5-4.dev.git65c31d4 @@ -622,15 +855,14 @@ exit 0 * Tue Sep 4 2018 Dan Walsh - 1:0.8.5-3.dev.git65c31d4 - Fix required version of runc -* Mon Sep 3 2018 Dan Walsh - 0.8.5-2.gitdc5a711 +* Mon Sep 3 2018 Dan Walsh - 1:0.8.5-2.dev.git65c31d4 - Add a specific version of runc or later to require -* Fri Aug 31 2018 baude - 0.8.5-1.gitdc5a711 -- Upstream 0.8.5 release - -* Thu Aug 30 2018 Lokesh Mandvekar - 1:0.8.4-2.git9f9b8cf -- correct min dep on containernetworking-plugins -- update bundled provides +* Thu Aug 30 2018 Lokesh Mandvekar - 1:0.8.5-1.dev.git65c31d4 +- bump to v0.8.5-dev +- built commit 65c31d4 +- correct min dep on containernetworking-plugins for upgrade from +containernetworking-cni * Mon Aug 20 2018 Lokesh Mandvekar - 1:0.8.3-4.dev.git3d55721f - Resolves: #1619411 - python3-podman should require python3-psutil From 5694433766c12a59bd10cdc8b37653af49588178 Mon Sep 17 00:00:00 2001 From: Daniel J Walsh Date: Mon, 1 Apr 2019 10:12:31 -0400 Subject: [PATCH 51/87] include zsh completion --- .gitignore | 1 + sources | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 055e62c..5d1dc56 100644 --- a/.gitignore +++ b/.gitignore @@ -189,3 +189,4 @@ /libpod-0ad9b6b.tar.gz /libpod-b33a00e.tar.gz /libpod-6aa8078.tar.gz +/libpod-3bd528e.tar.gz diff --git a/sources b/sources index 2e58642..294bbc2 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (cri-o-a30f93c.tar.gz) = 8bfa291fe3720259b63abaae5b0e50574a3437e1742c84fca36ff325d046ddd81a406a26fe0a3c4760b4c69a7e065a9b1ac550f2e061b45aadc7faf4702b798d -SHA512 (libpod-6aa8078.tar.gz) = bad4f304fc2ee4e48cf6cd6ed55bbf811f5a47ff6d4b57d5138f4675766a0815abdba1dd9bd8fd5aaef87fabaf8b59fb2bf29ab89688fe98b3bca3b2cb8292fa +SHA512 (libpod-3bd528e.tar.gz) = 6993886a244775e029fb9cb1cb20c28e94a29cee2f199ce2fa765d6c9630d9e1f2e9de985dc574acee8a98eb378bb738c24ca928ee0f749df3c13594b04fdc52 From 7532998671974fc7532f9582b6e34a0e256b7474 Mon Sep 17 00:00:00 2001 From: Daniel J Walsh Date: Mon, 1 Apr 2019 10:31:37 -0400 Subject: [PATCH 52/87] New Release of podman --- podman.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/podman.spec b/podman.spec index 5605065..a2a09c0 100644 --- a/podman.spec +++ b/podman.spec @@ -44,7 +44,7 @@ Epoch: 2 Epoch: 1 %endif Version: 1.2.0 -Release: 1.dev.git%{shortcommit0}%{?dist} +Release: 2.git%{shortcommit0}%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://podman.io/ @@ -537,6 +537,9 @@ exit 0 %{_datadir}/%{name}/test %changelog +* Mon Apr 1 2019 Dan Walsh - 2:1.2.0-2.git6aa8078 +- New Release of podman + * Mon Mar 18 2019 Eduardo Santiago - 2:1.1.2-4.dev.git6aa8078 - include zsh completion From 65295254470712be34a08ada4346a55f7a217c61 Mon Sep 17 00:00:00 2001 From: Daniel J Walsh Date: Fri, 17 May 2019 11:23:58 -0400 Subject: [PATCH 53/87] New Release of podman --- .gitignore | 57 ++++++++++++++++++++++++++++++++++++++++++++++++++--- podman.spec | 10 +++++++--- sources | 2 +- 3 files changed, 62 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 5d1dc56..aad89cc 100644 --- a/.gitignore +++ b/.gitignore @@ -186,7 +186,58 @@ /libpod-1cb16bd.tar.gz /libpod-3f32eae.tar.gz /libpod-228d1cb.tar.gz -/libpod-0ad9b6b.tar.gz -/libpod-b33a00e.tar.gz +/libpod-3b88c73.tar.gz +/libpod-4934bf2.tar.gz +/libpod-1788add.tar.gz +/libpod-b223d4e.tar.gz +/libpod-cc4addd.tar.gz +/libpod-553ac80.tar.gz +/libpod-cf52144.tar.gz +/libpod-623fcfa.tar.gz +/libpod-5afae0b.tar.gz +/libpod-9137315.tar.gz +/libpod-9adcda7.tar.gz +/libpod-f3a3d8e.tar.gz +/libpod-4b80517.tar.gz +/libpod-40f7843.tar.gz +/libpod-614409f.tar.gz +/libpod-1b2f867.tar.gz +/libpod-9b21f14.tar.gz +/libpod-d95f97a.tar.gz +/libpod-de0192a.tar.gz +/libpod-883566f.tar.gz +/libpod-7426d4f.tar.gz +/libpod-31f11a8.tar.gz /libpod-6aa8078.tar.gz -/libpod-3bd528e.tar.gz +/libpod-ac523cb.tar.gz +/libpod-537c382.tar.gz +/libpod-c230f0c.tar.gz +/libpod-68e3df3.tar.gz +/libpod-0458daf.tar.gz +/libpod-d0c6a35.tar.gz +/libpod-fc546d4.tar.gz +/libpod-850326c.tar.gz +/libpod-fdf979a.tar.gz +/libpod-7b73974.tar.gz +/libpod-833204d.tar.gz +/libpod-cd35e20.tar.gz +/libpod-ad467ba.tar.gz +/libpod-4bda537.tar.gz +/libpod-bda28c6.tar.gz +/libpod-bc320be.tar.gz +/libpod-c94903a.tar.gz +/libpod-60ef8f8.tar.gz +/libpod-6cd6eb6.tar.gz +/libpod-387d601.tar.gz +/libpod-1572367.tar.gz +/libpod-b926005.tar.gz +/libpod-167ce59.tar.gz +/libpod-c1e2b58.tar.gz +/libpod-a87cf6f.tar.gz +/libpod-bf5ffda.tar.gz +/libpod-e4947e5.tar.gz +/libpod-9f92b21.tar.gz +/libpod-d652c86.tar.gz +/libpod-b01fdcb.tar.gz +/libpod-9ae3221.tar.gz +/libpod-7210727.tar.gz diff --git a/podman.spec b/podman.spec index a2a09c0..b67cf09 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 3bd528e583182b4249f3e6bbd8497a8831d89950 +%global commit0 7210727e205c333af9a2d0ed0bb66adcf92a6369 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) %global import_path_conmon github.com/kubernetes-sigs/cri-o @@ -43,8 +43,8 @@ Epoch: 2 %else Epoch: 1 %endif -Version: 1.2.0 -Release: 2.git%{shortcommit0}%{?dist} +Version: 1.3.1 +Release: 1.git%{shortcommit0}%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://podman.io/ @@ -504,6 +504,7 @@ cp -pav test/system %{buildroot}/%{_datadir}/%{name}/test/ # By "owning" the site-functions dir, we don't need to Require zsh %{_datadir}/zsh/site-functions %{_datadir}/zsh/site-functions/* +%dir %{_libexecdir}/%{name} %{_libexecdir}/%{name}/conmon %config(noreplace) %{_sysconfdir}/cni/net.d/87-%{name}-bridge.conflist %{_datadir}/containers/%{repo}.conf @@ -537,6 +538,9 @@ exit 0 %{_datadir}/%{name}/test %changelog +* Fri May 17 2019 Dan Walsh - 2:1.3.1-1.git7210727 +- New Release of podman + * Mon Apr 1 2019 Dan Walsh - 2:1.2.0-2.git6aa8078 - New Release of podman diff --git a/sources b/sources index 294bbc2..e794229 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (cri-o-a30f93c.tar.gz) = 8bfa291fe3720259b63abaae5b0e50574a3437e1742c84fca36ff325d046ddd81a406a26fe0a3c4760b4c69a7e065a9b1ac550f2e061b45aadc7faf4702b798d -SHA512 (libpod-3bd528e.tar.gz) = 6993886a244775e029fb9cb1cb20c28e94a29cee2f199ce2fa765d6c9630d9e1f2e9de985dc574acee8a98eb378bb738c24ca928ee0f749df3c13594b04fdc52 +SHA512 (libpod-7210727.tar.gz) = f92543cbf4777ea7c09cb9a0ec5f836eb2a8b9c4b8b2fefa9b353e0f2f3df9734168979de1cbbffa0f7b2d4434ee1223ee9cded50a42db34abc3eee24af9509a From 2c379334e01cd2f6c2db6057110427d55cbad0fe Mon Sep 17 00:00:00 2001 From: Daniel J Walsh Date: Fri, 17 May 2019 12:53:15 -0400 Subject: [PATCH 54/87] New Release of podman --- podman.spec | 37 ++++++++++++++++++++++++++++++++++--- 1 file changed, 34 insertions(+), 3 deletions(-) diff --git a/podman.spec b/podman.spec index b67cf09..ae44648 100644 --- a/podman.spec +++ b/podman.spec @@ -75,6 +75,7 @@ Requires: containers-common Requires: containernetworking-plugins >= 0.7.3-2 Requires: iptables Requires: nftables +Recommends: podman-manpages = %{epoch}:%{version}-%{release} Recommends: container-selinux Recommends: slirp4netns >= 0.3-0 Recommends: fuse-overlayfs >= 0.3-8 @@ -182,9 +183,12 @@ Provides: bundled(golang(k8s.io/kube-openapi)) = 275e2ce91dec4c05a4094a7b1daee55 Provides: bundled(golang(k8s.io/utils)) = 258e2a2fa64568210fbd6267cf1d8fd87c3cb86e %description +Podman (Pod Manager) is a fully featured container engine that is a simple daemonless tool. Podman 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=podman. Most Podman commands can be run as a regular user, without requiring additional privileges. + +Podman uses Buildah(1) internally to create container images. Both tools share image (not container) storage, hence each can use or manipulate images (but not containers) created by the other. + %{summary} -%{repo} provides a library for applications looking to use -the Container Pod concept popularized by Kubernetes. +%{repo} Simple management tool for pods, containers and images %package docker Summary: Emulate Docker CLI using podman @@ -387,6 +391,7 @@ ln -s ../../../../ src/%{import_path} popd ln -s vendor src export GOPATH=$(pwd)/_build:$(pwd) +PODMAN_VERSION=%{version} %{__make} PREFIX=%{buildroot}%{_prefix} ETCDIR=%{buildroot}%{_sysconfdir} podman-remote export BUILDTAGS="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)" %gogenerate ./cmd/%{name}/varlink/... %gobuild -o bin/%{name} %{import_path}/cmd/%{name} @@ -498,7 +503,6 @@ cp -pav test/system %{buildroot}/%{_datadir}/%{name}/test/ %license LICENSE %doc README.md CONTRIBUTING.md pkg/hooks/README-hooks.md install.md code-of-conduct.md transfer.md %{_bindir}/%{name} -%{_mandir}/man1/podman*.1* %{_mandir}/man5/*.5* %{_datadir}/bash-completion/completions/* # By "owning" the site-functions dir, we don't need to Require zsh @@ -529,6 +533,33 @@ cp -pav test/system %{buildroot}/%{_datadir}/%{name}/test/ %doc README.md CONTRIBUTING.md pkg/hooks/README-hooks.md install.md code-of-conduct.md transfer.md %endif +%package manpages +Summary: Man pages for the podman commands +BuildArch: noarch + +%files manpages +%{_mandir}/man1/podman*.1* + +%description manpages +Man pages for the podman commands + +%package remote +Summary: (Experimental) Remote client for managing podman containers +Recommends: podman-manpages = %{epoch}:%{version}-%{release} + +%description remote +Remote client for managing podman containers. + +This experimental remote client is under heavy development. Please do not +run podman-remote in production. + +podman-remote uses the varlink connection to connect to a podman client to +manage pods, containers and container images. Podman-remote supports ssh +connections as well. + +%files remote +%{_bindir}/podman-remote + %triggerpostun -- %{name} < 1.1 %{_bindir}/%{name} system renumber exit 0 From 898cc7546f7aec8571f70d38eed03f38bc380c9c Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Mon, 10 Jun 2019 18:04:14 +0530 Subject: [PATCH 55/87] podman-2:1.4.0-1 - Resolves: #1715668 - CVE-2019-10152 - bump to v1.4.0 Signed-off-by: Lokesh Mandvekar --- .gitignore | 3 ++ podman.spec | 113 ++++++++++++++++++++++++++++------------------------ sources | 4 +- 3 files changed, 66 insertions(+), 54 deletions(-) diff --git a/.gitignore b/.gitignore index aad89cc..47ec809 100644 --- a/.gitignore +++ b/.gitignore @@ -241,3 +241,6 @@ /libpod-b01fdcb.tar.gz /libpod-9ae3221.tar.gz /libpod-7210727.tar.gz +/conmon-5995229.tar.gz +/libpod-41365a8.tar.gz +/libpod-6d285b8.tar.gz diff --git a/podman.spec b/podman.spec index ae44648..0bdd358 100644 --- a/podman.spec +++ b/podman.spec @@ -5,7 +5,7 @@ %global with_check 0 %global with_unit_test 0 -%if 0%{?fedora} >= 28 +%if 0%{?fedora} %bcond_without varlink %define gogenerate go generate %else @@ -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 7210727e205c333af9a2d0ed0bb66adcf92a6369 +%global commit0 41365a8f6760349cac826a7c1d50ba2c4057ed50 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) -%global import_path_conmon github.com/kubernetes-sigs/cri-o +%global import_path_conmon github.com/containers/conmon %global git_conmon https://%{import_path_conmon} -%global commit_conmon a30f93ca229c7fc68fb1d8c7a3342de3c3f54ae5 +%global commit_conmon 59952292a3b07ac125575024ae21956efe0ecdfb %global shortcommit_conmon %(c=%{commit_conmon}; echo ${c:0:7}) Name: podman @@ -43,13 +43,13 @@ Epoch: 2 %else Epoch: 1 %endif -Version: 1.3.1 -Release: 1.git%{shortcommit0}%{?dist} +Version: 1.4.0 +Release: 1%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 -URL: https://podman.io/ +URL: https://%{name}.io/ Source0: %{git0}/archive/%{commit0}/%{repo}-%{shortcommit0}.tar.gz -Source1: %{git_conmon}/archive/%{commit_conmon}/cri-o-%{shortcommit_conmon}.tar.gz +Source1: %{git_conmon}/archive/%{commit_conmon}/conmon-%{shortcommit_conmon}.tar.gz # e.g. el6 has ppc64 arch without gcc-go, so EA tag is required #ExclusiveArch: %%{?go_arches:%%{go_arches}}%%{!?go_arches:%%{ix86} x86_64 aarch64 %%{arm}} ExclusiveArch: aarch64 %{arm} ppc64le s390x x86_64 @@ -72,10 +72,10 @@ BuildRequires: make BuildRequires: systemd Requires: runc >= 2:1.0.0-57 Requires: containers-common -Requires: containernetworking-plugins >= 0.7.3-2 +Requires: containernetworking-plugins >= 0.7.5-1 Requires: iptables Requires: nftables -Recommends: podman-manpages = %{epoch}:%{version}-%{release} +Recommends: %{name}-manpages = %{epoch}:%{version}-%{release} Recommends: container-selinux Recommends: slirp4netns >= 0.3-0 Recommends: fuse-overlayfs >= 0.3-8 @@ -183,15 +183,15 @@ Provides: bundled(golang(k8s.io/kube-openapi)) = 275e2ce91dec4c05a4094a7b1daee55 Provides: bundled(golang(k8s.io/utils)) = 258e2a2fa64568210fbd6267cf1d8fd87c3cb86e %description -Podman (Pod Manager) is a fully featured container engine that is a simple daemonless tool. Podman 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=podman. Most Podman commands can be run as a regular user, without requiring additional privileges. +%{name} (Pod Manager) is a fully featured container engine that is a simple daemonless tool. %{name} provides a Docker-CLI comparable command line that eases the transition from other container engines and allows the management of pods, containers and images. Simply put: alias docker=%{name}. Most %{name} commands can be run as a regular user, without requiring additional privileges. -Podman 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 %package docker -Summary: Emulate Docker CLI using podman +Summary: Emulate Docker CLI using %{name} BuildArch: noarch Requires: %{name} = %{epoch}:%{version}-%{release} Conflicts: docker @@ -202,8 +202,29 @@ Conflicts: moby-engine %description docker This package installs a script named docker that emulates the Docker CLI by -executes podman commands, it also creates links between all Docker CLI man -pages and podman. +executes %{name} commands, it also creates links between all Docker CLI man +pages and %{name}. + +%package manpages +Summary: Man pages for the %{name} commands +BuildArch: noarch + +%description manpages +Man pages for the %{name} commands + +%package remote +Summary: (Experimental) Remote client for managing %{name} containers +Recommends: %{name}-manpages = %{epoch}:%{version}-%{release} + +%description remote +Remote client for managing %{name} containers. + +This experimental remote client is under heavy development. Please do not +run %{name}-remote in production. + +%{name}-remote uses the varlink connection to connect to a %{name} client to +manage pods, containers and container images. %{name}-remote supports ssh +connections as well. %if 0%{?with_devel} %package devel @@ -340,7 +361,7 @@ building other packages which use import path with %if 0%{?with_unit_test} && 0%{?with_devel} %package unit-test-devel -Summary: Unit tests for %{name} package +Summary: Unit tests for %{name} package %if 0%{?with_check} #Here comes all BuildRequires: PACKAGE the unit tests #in %%check section need for running @@ -366,7 +387,7 @@ providing packages with %{import_path} prefix. %endif %package tests -Summary: Tests for %{name} +Summary: Tests for %{name} Requires: %{name} = %{epoch}:%{version}-%{release} Requires: bats @@ -391,28 +412,26 @@ ln -s ../../../../ src/%{import_path} popd ln -s vendor src export GOPATH=$(pwd)/_build:$(pwd) -PODMAN_VERSION=%{version} %{__make} PREFIX=%{buildroot}%{_prefix} ETCDIR=%{buildroot}%{_sysconfdir} podman-remote -export BUILDTAGS="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)" %gogenerate ./cmd/%{name}/varlink/... + +# build %%{name} +export BUILDTAGS="systemd varlink seccomp exclude_graphdriver_devicemapper $(hack/btrfs_installed_tag.sh) $(hack/btrfs_tag.sh) $(hack/libdm_tag.sh) $(hack/ostree_tag.sh) $(hack/selinux_tag.sh)" %gobuild -o bin/%{name} %{import_path}/cmd/%{name} +# build %%{name}-remote +export BUILDTAGS="rmeoteclient systemd varlink seccomp exclude_graphdriver_devicemapper $(hack/btrfs_installed_tag.sh) $(hack/btrfs_tag.sh) $(hack/libdm_tag.sh) $(hack/ostree_tag.sh) $(hack/selinux_tag.sh)" +%gobuild -o bin/%{name}-remote %{import_path}/cmd/%{name} + # build conmon -pushd cri-o-%{commit_conmon} -mkdir _output -pushd _output -mkdir -p src/%{provider}.%{provider_tld}/{kubernetes-sigs,opencontainers} -ln -s $(dirs +1 -l) src/%{import_path_conmon} -popd -ln -s vendor src -export GOPATH=$(pwd)/_output:$(pwd) -export BUILDTAGS="selinux seccomp $(hack/btrfs_installed_tag.sh) $(hack/btrfs_tag.sh) containers_image_ostree_stub" -BUILDTAGS=$BUILDTAGS make -C conmon +pushd conmon-%{commit_conmon} +%{__make} all popd %install install -dp %{buildroot}%{_unitdir} PODMAN_VERSION=%{version} %{__make} PREFIX=%{buildroot}%{_prefix} ETCDIR=%{buildroot}%{_sysconfdir} \ install.bin \ + install.remote \ install.man \ install.cni \ install.systemd \ @@ -426,8 +445,11 @@ 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 install -dp %{buildroot}%{_libexecdir}/%{name} -install -p -m 755 cri-o-%{commit_conmon}/bin/conmon %{buildroot}%{_libexecdir}/%{name} +install -p -m 755 bin/conmon %{buildroot}%{_libexecdir}/%{name} +popd # source codes for building projects %if 0%{?with_devel} @@ -510,6 +532,8 @@ cp -pav test/system %{buildroot}/%{_datadir}/%{name}/test/ %{_datadir}/zsh/site-functions/* %dir %{_libexecdir}/%{name} %{_libexecdir}/%{name}/conmon +%dir %{_libexecdir}/crio +%{_libexecdir}/crio/conmon %config(noreplace) %{_sysconfdir}/cni/net.d/87-%{name}-bridge.conflist %{_datadir}/containers/%{repo}.conf %{_unitdir}/io.%{name}.service @@ -533,32 +557,11 @@ cp -pav test/system %{buildroot}/%{_datadir}/%{name}/test/ %doc README.md CONTRIBUTING.md pkg/hooks/README-hooks.md install.md code-of-conduct.md transfer.md %endif -%package manpages -Summary: Man pages for the podman commands -BuildArch: noarch - %files manpages -%{_mandir}/man1/podman*.1* - -%description manpages -Man pages for the podman commands - -%package remote -Summary: (Experimental) Remote client for managing podman containers -Recommends: podman-manpages = %{epoch}:%{version}-%{release} - -%description remote -Remote client for managing podman containers. - -This experimental remote client is under heavy development. Please do not -run podman-remote in production. - -podman-remote uses the varlink connection to connect to a podman client to -manage pods, containers and container images. Podman-remote supports ssh -connections as well. +%{_mandir}/man1/%{name}*.1* %files remote -%{_bindir}/podman-remote +%{_bindir}/%{name}-remote %triggerpostun -- %{name} < 1.1 %{_bindir}/%{name} system renumber @@ -569,6 +572,10 @@ exit 0 %{_datadir}/%{name}/test %changelog +* Mon Jun 10 2019 Lokesh Mandvekar - 2:1.4.0-1 +- Resolves: #1715668 - CVE-2019-10152 +- bump to v1.4.0 + * Fri May 17 2019 Dan Walsh - 2:1.3.1-1.git7210727 - New Release of podman diff --git a/sources b/sources index e794229..f30e3a3 100644 --- a/sources +++ b/sources @@ -1,2 +1,4 @@ -SHA512 (cri-o-a30f93c.tar.gz) = 8bfa291fe3720259b63abaae5b0e50574a3437e1742c84fca36ff325d046ddd81a406a26fe0a3c4760b4c69a7e065a9b1ac550f2e061b45aadc7faf4702b798d +SHA512 (conmon-5995229.tar.gz) = 9b739acdf6ba4ec24fa9e2ca60843e236a93f7b641b202459d0efde49928a3f803bc2fab6c626ea56bd5f34ef079f6f3123abd5660c9cbc1de9cc5b4648f8f51 +SHA512 (libpod-41365a8.tar.gz) = 2a826f73df1be4d6bcaf8de19f9dc7448f4147e2de93b27caed32abec0552d798553ef958e5109b4e24f5e0b4078d4eb87d8c143440ae9f0d81d6f4696d0b092 +SHA512 (libpod-6d285b8.tar.gz) = 67ccdf0ce69ece8c4cc6758af7b6f9b785f7d23dc09dba9eefdcf5d82bbf104a13c9faec033801d94e685af738fa8deab6810d6550bc3ea68e4f317c4fb512a5 SHA512 (libpod-7210727.tar.gz) = f92543cbf4777ea7c09cb9a0ec5f836eb2a8b9c4b8b2fefa9b353e0f2f3df9734168979de1cbbffa0f7b2d4434ee1223ee9cded50a42db34abc3eee24af9509a From d6e72845bf4935589af478f65b6c340eb604d45a Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Mon, 10 Jun 2019 09:10:41 -0400 Subject: [PATCH 56/87] buildable on centos, deps updated Signed-off-by: Lokesh Mandvekar --- podman.spec | 49 +++++++++++++++++++++++++++++++++++-------------- 1 file changed, 35 insertions(+), 14 deletions(-) diff --git a/podman.spec b/podman.spec index 0bdd358..7bbff70 100644 --- a/podman.spec +++ b/podman.spec @@ -19,6 +19,11 @@ %global debug_package %{nil} %endif +%if ! 0%{?gobuild:1} +%define gobuild(o:) 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 %{?**}; +%define gogenerate go generate +%endif + %global provider github %global provider_tld com %global project containers @@ -36,13 +41,9 @@ %global shortcommit_conmon %(c=%{commit_conmon}; echo ${c:0:7}) Name: podman -# Epoch is 2 for f30 (rawhide), 1 for f28 and f29 -# BEWARE while using on other distros -%if 0%{?fedora} >= 30 +%if 0%{?fedora} Epoch: 2 -%else -Epoch: 1 -%endif +%endif # fedora Version: 1.4.0 Release: 1%{?dist} Summary: Manage Pods, Containers and Container Images @@ -50,9 +51,6 @@ 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 -# e.g. el6 has ppc64 arch without gcc-go, so EA tag is required -#ExclusiveArch: %%{?go_arches:%%{go_arches}}%%{!?go_arches:%%{ix86} x86_64 aarch64 %%{arm}} -ExclusiveArch: aarch64 %{arm} ppc64le s390x x86_64 # If go_compiler is not set to 1, there is no virtual provide. Use golang instead. BuildRequires: %{?go_compiler:compiler(go-compiler)}%{!?go_compiler:golang} BuildRequires: btrfs-progs-devel @@ -70,15 +68,23 @@ BuildRequires: ostree-devel BuildRequires: pkgconfig BuildRequires: make BuildRequires: systemd +BuildRequires: systemd-devel Requires: runc >= 2:1.0.0-57 Requires: containers-common Requires: containernetworking-plugins >= 0.7.5-1 Requires: iptables Requires: nftables +%if 0%{?fedora} Recommends: %{name}-manpages = %{epoch}:%{version}-%{release} Recommends: container-selinux Recommends: slirp4netns >= 0.3-0 Recommends: fuse-overlayfs >= 0.3-8 +%else +Requires: %{name}-manpages = %{epoch}:%{version}-%{release} +Requires: container-selinux +Requires: slirp4netns >= 0.3-0 +%endif #fedora + # vendored libraries # awk '{print "Provides: bundled(golang("$1")) = "$2}' vendor.conf | sort @@ -212,6 +218,7 @@ BuildArch: noarch %description manpages Man pages for the %{name} commands +%if 0%{?fedora} %package remote Summary: (Experimental) Remote client for managing %{name} containers Recommends: %{name}-manpages = %{epoch}:%{version}-%{release} @@ -225,6 +232,7 @@ run %{name}-remote in production. %{name}-remote uses the varlink connection to connect to a %{name} client to manage pods, containers and container images. %{name}-remote supports ssh connections as well. +%endif #fedora %if 0%{?with_devel} %package devel @@ -412,15 +420,24 @@ ln -s ../../../../ src/%{import_path} popd ln -s vendor src export GOPATH=$(pwd)/_build:$(pwd) + +%if 0%{?fedora} %gogenerate ./cmd/%{name}/varlink/... +%endif # fedora # build %%{name} +%if 0%{?fedora} 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)" +%else +export BUILDTAGS="systemd 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)" +%endif # fedora %gobuild -o bin/%{name} %{import_path}/cmd/%{name} +%if 0%{?fedora} # build %%{name}-remote -export BUILDTAGS="rmeoteclient systemd varlink seccomp exclude_graphdriver_devicemapper $(hack/btrfs_installed_tag.sh) $(hack/btrfs_tag.sh) $(hack/libdm_tag.sh) $(hack/ostree_tag.sh) $(hack/selinux_tag.sh)" +export 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)" %gobuild -o bin/%{name}-remote %{import_path}/cmd/%{name} +%endif # fedora # build conmon pushd conmon-%{commit_conmon} @@ -431,7 +448,9 @@ popd install -dp %{buildroot}%{_unitdir} PODMAN_VERSION=%{version} %{__make} PREFIX=%{buildroot}%{_prefix} ETCDIR=%{buildroot}%{_sysconfdir} \ install.bin \ +%if 0%{?fedora} install.remote \ +%endif # fedora install.man \ install.cni \ install.systemd \ @@ -518,6 +537,10 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} install -d -p %{buildroot}/%{_datadir}/%{name}/test/system cp -pav test/system %{buildroot}/%{_datadir}/%{name}/test/ +%triggerpostun -- %{name} < 1.1 +%{_bindir}/%{name} system renumber +exit 0 + #define license tag if not already defined %{!?_licensedir:%global license %doc} @@ -560,12 +583,10 @@ cp -pav test/system %{buildroot}/%{_datadir}/%{name}/test/ %files manpages %{_mandir}/man1/%{name}*.1* +%if 0%{?fedora} %files remote %{_bindir}/%{name}-remote - -%triggerpostun -- %{name} < 1.1 -%{_bindir}/%{name} system renumber -exit 0 +%endif # fedora %files tests %license LICENSE From 3ca68479ba2f3bb816a6ddc5e13b22141830ad27 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Tue, 11 Jun 2019 17:36:44 +0530 Subject: [PATCH 57/87] podman-2:1.4.0-2 - do not install /usr/libexec/crio - conflicts with crio Signed-off-by: Lokesh Mandvekar --- podman.spec | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/podman.spec b/podman.spec index 7bbff70..619078e 100644 --- a/podman.spec +++ b/podman.spec @@ -45,7 +45,7 @@ Name: podman Epoch: 2 %endif # fedora Version: 1.4.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -466,8 +466,7 @@ install -p -m 644 %{repo}.conf %{buildroot}%{_datadir}/containers # install conmon pushd conmon-%{commit_conmon} %{__make} LIBEXECDIR=%{buildroot}%{_libexecdir} install -install -dp %{buildroot}%{_libexecdir}/%{name} -install -p -m 755 bin/conmon %{buildroot}%{_libexecdir}/%{name} +mv %{buildroot}%{_libexecdir}/crio %{buildroot}%{_libexecdir}/%{name} popd # source codes for building projects @@ -555,8 +554,6 @@ exit 0 %{_datadir}/zsh/site-functions/* %dir %{_libexecdir}/%{name} %{_libexecdir}/%{name}/conmon -%dir %{_libexecdir}/crio -%{_libexecdir}/crio/conmon %config(noreplace) %{_sysconfdir}/cni/net.d/87-%{name}-bridge.conflist %{_datadir}/containers/%{repo}.conf %{_unitdir}/io.%{name}.service @@ -593,6 +590,9 @@ exit 0 %{_datadir}/%{name}/test %changelog +* Tue Jun 11 2019 Lokesh Mandvekar - 2:1.4.0-2 +- do not install /usr/libexec/crio - conflicts with crio + * Mon Jun 10 2019 Lokesh Mandvekar - 2:1.4.0-1 - Resolves: #1715668 - CVE-2019-10152 - bump to v1.4.0 From deeca22ecca2db1ff0bff24e194eeb06a3e87ff1 Mon Sep 17 00:00:00 2001 From: Daniel J Walsh Date: Wed, 19 Jun 2019 08:29:37 -0400 Subject: [PATCH 58/87] Bump to v1.4.2 --- .gitignore | 1 + podman.spec | 29 +++++++++++++++++++++-------- sources | 4 +--- 3 files changed, 23 insertions(+), 11 deletions(-) diff --git a/.gitignore b/.gitignore index 47ec809..155a2d6 100644 --- a/.gitignore +++ b/.gitignore @@ -244,3 +244,4 @@ /conmon-5995229.tar.gz /libpod-41365a8.tar.gz /libpod-6d285b8.tar.gz +/libpod-9b6a98c.tar.gz diff --git a/podman.spec b/podman.spec index 619078e..859b51d 100644 --- a/podman.spec +++ b/podman.spec @@ -32,7 +32,7 @@ %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} %global git0 https://%{provider}.%{provider_tld}/%{project}/%{repo} -%global commit0 41365a8f6760349cac826a7c1d50ba2c4057ed50 +%global commit0 9b6a98cfd7813513e5697888baa93318395a2055 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) %global import_path_conmon github.com/containers/conmon @@ -44,8 +44,8 @@ Name: podman %if 0%{?fedora} Epoch: 2 %endif # fedora -Version: 1.4.0 -Release: 2%{?dist} +Version: 1.4.2 +Release: 1%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -69,7 +69,6 @@ BuildRequires: pkgconfig BuildRequires: make BuildRequires: systemd BuildRequires: systemd-devel -Requires: runc >= 2:1.0.0-57 Requires: containers-common Requires: containernetworking-plugins >= 0.7.5-1 Requires: iptables @@ -77,12 +76,15 @@ Requires: nftables %if 0%{?fedora} Recommends: %{name}-manpages = %{epoch}:%{version}-%{release} Recommends: container-selinux -Recommends: slirp4netns >= 0.3-0 +Recommends: slirp4netns >= 0.3.0-2 Recommends: fuse-overlayfs >= 0.3-8 +Recommends: libvarlink-util >= 18-1 +Requires: runc >= 2:1.0.0-57 %else -Requires: %{name}-manpages = %{epoch}:%{version}-%{release} +Requires: %{name}-manpages = %{version}-%{release} Requires: container-selinux -Requires: slirp4netns >= 0.3-0 +Requires: slirp4netns >= 0.3.0-2 +Requires: runc >= 1.0.0-57 %endif #fedora @@ -199,7 +201,11 @@ Provides: bundled(golang(k8s.io/utils)) = 258e2a2fa64568210fbd6267cf1d8fd87c3cb8 %package docker Summary: Emulate Docker CLI using %{name} BuildArch: noarch +%if 0%{?fedora} Requires: %{name} = %{epoch}:%{version}-%{release} +%else +Requires: %{name} = %{version}-%{release} +%endif # fedora Conflicts: docker Conflicts: docker-latest Conflicts: docker-ce @@ -394,6 +400,7 @@ This package contains unit tests for project providing packages with %{import_path} prefix. %endif +%if 0%{?fedora} %package tests Summary: Tests for %{name} @@ -405,6 +412,7 @@ Requires: jq %{summary} This package contains system tests for %{name} +%endif # fedora %prep %autosetup -Sgit -n %{repo}-%{commit0} @@ -533,8 +541,10 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %gotest %{import_path}/pkg/registrar %endif +%if 0%{?fedora} install -d -p %{buildroot}/%{_datadir}/%{name}/test/system cp -pav test/system %{buildroot}/%{_datadir}/%{name}/test/ +%endif # fedora %triggerpostun -- %{name} < 1.1 %{_bindir}/%{name} system renumber @@ -583,13 +593,16 @@ exit 0 %if 0%{?fedora} %files remote %{_bindir}/%{name}-remote -%endif # fedora %files tests %license LICENSE %{_datadir}/%{name}/test +%endif # fedora %changelog +* Wed Jun 19 2019 Dan Walsh - 2:1.4.2-1 +- Bump to v1.4.2 + * Tue Jun 11 2019 Lokesh Mandvekar - 2:1.4.0-2 - do not install /usr/libexec/crio - conflicts with crio diff --git a/sources b/sources index f30e3a3..481d5c4 100644 --- a/sources +++ b/sources @@ -1,4 +1,2 @@ SHA512 (conmon-5995229.tar.gz) = 9b739acdf6ba4ec24fa9e2ca60843e236a93f7b641b202459d0efde49928a3f803bc2fab6c626ea56bd5f34ef079f6f3123abd5660c9cbc1de9cc5b4648f8f51 -SHA512 (libpod-41365a8.tar.gz) = 2a826f73df1be4d6bcaf8de19f9dc7448f4147e2de93b27caed32abec0552d798553ef958e5109b4e24f5e0b4078d4eb87d8c143440ae9f0d81d6f4696d0b092 -SHA512 (libpod-6d285b8.tar.gz) = 67ccdf0ce69ece8c4cc6758af7b6f9b785f7d23dc09dba9eefdcf5d82bbf104a13c9faec033801d94e685af738fa8deab6810d6550bc3ea68e4f317c4fb512a5 -SHA512 (libpod-7210727.tar.gz) = f92543cbf4777ea7c09cb9a0ec5f836eb2a8b9c4b8b2fefa9b353e0f2f3df9734168979de1cbbffa0f7b2d4434ee1223ee9cded50a42db34abc3eee24af9509a +SHA512 (libpod-9b6a98c.tar.gz) = 5395cbdb30ec8d4279636cbf1add1dd8521e9969be1313db56d3120cb7c3e0f1d18ccf81ad52635d268cfce44fdc84b1baeab04d221e5ad4769c2b9c03516e1d From 20d6ca493dcd2ddd5f9f65829463cb393c7ec902 Mon Sep 17 00:00:00 2001 From: Daniel J Walsh Date: Wed, 26 Jun 2019 08:43:29 -0400 Subject: [PATCH 59/87] Bump to v1.4.3 --- .gitignore | 1 + podman.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 155a2d6..04e6715 100644 --- a/.gitignore +++ b/.gitignore @@ -245,3 +245,4 @@ /libpod-41365a8.tar.gz /libpod-6d285b8.tar.gz /libpod-9b6a98c.tar.gz +/libpod-7fd6528.tar.gz diff --git a/podman.spec b/podman.spec index 859b51d..4ce2f2b 100644 --- a/podman.spec +++ b/podman.spec @@ -32,7 +32,7 @@ %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} %global git0 https://%{provider}.%{provider_tld}/%{project}/%{repo} -%global commit0 9b6a98cfd7813513e5697888baa93318395a2055 +%global commit0 7fd65288f177b059ccde987ad87450be1ca2fa27 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) %global import_path_conmon github.com/containers/conmon @@ -44,7 +44,7 @@ Name: podman %if 0%{?fedora} Epoch: 2 %endif # fedora -Version: 1.4.2 +Version: 1.4.3 Release: 1%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 @@ -600,6 +600,9 @@ exit 0 %endif # fedora %changelog +* Wed Jun 26 2019 Dan Walsh - 2:1.4.3-1 +- Bump to v1.4.3 + * Wed Jun 19 2019 Dan Walsh - 2:1.4.2-1 - Bump to v1.4.2 diff --git a/sources b/sources index 481d5c4..991fb72 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (conmon-5995229.tar.gz) = 9b739acdf6ba4ec24fa9e2ca60843e236a93f7b641b202459d0efde49928a3f803bc2fab6c626ea56bd5f34ef079f6f3123abd5660c9cbc1de9cc5b4648f8f51 -SHA512 (libpod-9b6a98c.tar.gz) = 5395cbdb30ec8d4279636cbf1add1dd8521e9969be1313db56d3120cb7c3e0f1d18ccf81ad52635d268cfce44fdc84b1baeab04d221e5ad4769c2b9c03516e1d +SHA512 (libpod-7fd6528.tar.gz) = c09853040fb5a778e09f6e89071d84eb7c0bbd63cd89f6591b7f9340d1c2146305a011b88daafdae31c501b0fe5bcc581a815c5a7e239839f81d2fe115f4c3a0 From 5c1734d88f82c4779569c7a37ac3031fb308fd2a Mon Sep 17 00:00:00 2001 From: Daniel J Walsh Date: Thu, 27 Jun 2019 08:44:41 -0400 Subject: [PATCH 60/87] Bump to v1.4.3 --- sources | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sources b/sources index 991fb72..ad56865 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (conmon-5995229.tar.gz) = 9b739acdf6ba4ec24fa9e2ca60843e236a93f7b641b202459d0efde49928a3f803bc2fab6c626ea56bd5f34ef079f6f3123abd5660c9cbc1de9cc5b4648f8f51 -SHA512 (libpod-7fd6528.tar.gz) = c09853040fb5a778e09f6e89071d84eb7c0bbd63cd89f6591b7f9340d1c2146305a011b88daafdae31c501b0fe5bcc581a815c5a7e239839f81d2fe115f4c3a0 +SHA512 (libpod-7fd6528.tar.gz) = 76c945cef309ebe66e81e61ec0130961eee524de192bd35b3c2473a42b70ecbc14f99e2bfa6cb2c1101cb71d8ce705f5c130e8608724b8ecc3507c9033ee5de6 From b932a3e7ce21b9c45823fe93f1386ef78f92f882 Mon Sep 17 00:00:00 2001 From: Daniel J Walsh Date: Thu, 27 Jun 2019 11:35:45 -0400 Subject: [PATCH 61/87] Bump to v1.4.3 --- podman.spec | 52 +++++++--------------------------------------------- 1 file changed, 7 insertions(+), 45 deletions(-) diff --git a/podman.spec b/podman.spec index 4ce2f2b..2b7f157 100644 --- a/podman.spec +++ b/podman.spec @@ -5,12 +5,8 @@ %global with_check 0 %global with_unit_test 0 -%if 0%{?fedora} %bcond_without varlink %define gogenerate go generate -%else -%bcond_with varlink -%endif %if 0%{?with_debug} %global _find_debuginfo_dwz_opts %{nil} @@ -19,11 +15,6 @@ %global debug_package %{nil} %endif -%if ! 0%{?gobuild:1} -%define gobuild(o:) 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 %{?**}; -%define gogenerate go generate -%endif - %global provider github %global provider_tld com %global project containers @@ -41,9 +32,7 @@ %global shortcommit_conmon %(c=%{commit_conmon}; echo ${c:0:7}) Name: podman -%if 0%{?fedora} Epoch: 2 -%endif # fedora Version: 1.4.3 Release: 1%{?dist} Summary: Manage Pods, Containers and Container Images @@ -69,24 +58,16 @@ BuildRequires: pkgconfig BuildRequires: make BuildRequires: systemd BuildRequires: systemd-devel +Requires: runc >= 2:1.0.0-57 Requires: containers-common Requires: containernetworking-plugins >= 0.7.5-1 Requires: iptables Requires: nftables -%if 0%{?fedora} Recommends: %{name}-manpages = %{epoch}:%{version}-%{release} Recommends: container-selinux Recommends: slirp4netns >= 0.3.0-2 Recommends: fuse-overlayfs >= 0.3-8 Recommends: libvarlink-util >= 18-1 -Requires: runc >= 2:1.0.0-57 -%else -Requires: %{name}-manpages = %{version}-%{release} -Requires: container-selinux -Requires: slirp4netns >= 0.3.0-2 -Requires: runc >= 1.0.0-57 -%endif #fedora - # vendored libraries # awk '{print "Provides: bundled(golang("$1")) = "$2}' vendor.conf | sort @@ -201,11 +182,7 @@ Provides: bundled(golang(k8s.io/utils)) = 258e2a2fa64568210fbd6267cf1d8fd87c3cb8 %package docker Summary: Emulate Docker CLI using %{name} BuildArch: noarch -%if 0%{?fedora} Requires: %{name} = %{epoch}:%{version}-%{release} -%else -Requires: %{name} = %{version}-%{release} -%endif # fedora Conflicts: docker Conflicts: docker-latest Conflicts: docker-ce @@ -224,7 +201,9 @@ BuildArch: noarch %description manpages Man pages for the %{name} commands -%if 0%{?fedora} +%files manpages +%{_mandir}/man1/%{name}*.1* + %package remote Summary: (Experimental) Remote client for managing %{name} containers Recommends: %{name}-manpages = %{epoch}:%{version}-%{release} @@ -238,7 +217,6 @@ run %{name}-remote in production. %{name}-remote uses the varlink connection to connect to a %{name} client to manage pods, containers and container images. %{name}-remote supports ssh connections as well. -%endif #fedora %if 0%{?with_devel} %package devel @@ -400,7 +378,6 @@ This package contains unit tests for project providing packages with %{import_path} prefix. %endif -%if 0%{?fedora} %package tests Summary: Tests for %{name} @@ -412,7 +389,6 @@ Requires: jq %{summary} This package contains system tests for %{name} -%endif # fedora %prep %autosetup -Sgit -n %{repo}-%{commit0} @@ -429,23 +405,18 @@ popd ln -s vendor src export GOPATH=$(pwd)/_build:$(pwd) -%if 0%{?fedora} +export GO111MODULE=off %gogenerate ./cmd/%{name}/varlink/... -%endif # fedora # build %%{name} -%if 0%{?fedora} 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)" -%else -export BUILDTAGS="systemd 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)" -%endif # fedora +export GO111MODULE=off %gobuild -o bin/%{name} %{import_path}/cmd/%{name} -%if 0%{?fedora} # 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)" +export GO111MODULE=off %gobuild -o bin/%{name}-remote %{import_path}/cmd/%{name} -%endif # fedora # build conmon pushd conmon-%{commit_conmon} @@ -456,9 +427,7 @@ popd install -dp %{buildroot}%{_unitdir} PODMAN_VERSION=%{version} %{__make} PREFIX=%{buildroot}%{_prefix} ETCDIR=%{buildroot}%{_sysconfdir} \ install.bin \ -%if 0%{?fedora} install.remote \ -%endif # fedora install.man \ install.cni \ install.systemd \ @@ -541,10 +510,8 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %gotest %{import_path}/pkg/registrar %endif -%if 0%{?fedora} install -d -p %{buildroot}/%{_datadir}/%{name}/test/system cp -pav test/system %{buildroot}/%{_datadir}/%{name}/test/ -%endif # fedora %triggerpostun -- %{name} < 1.1 %{_bindir}/%{name} system renumber @@ -587,17 +554,12 @@ exit 0 %doc README.md CONTRIBUTING.md pkg/hooks/README-hooks.md install.md code-of-conduct.md transfer.md %endif -%files manpages -%{_mandir}/man1/%{name}*.1* - -%if 0%{?fedora} %files remote %{_bindir}/%{name}-remote %files tests %license LICENSE %{_datadir}/%{name}/test -%endif # fedora %changelog * Wed Jun 26 2019 Dan Walsh - 2:1.4.3-1 From e3d1378ce994744ca49469b463030c8dcbfe74f0 Mon Sep 17 00:00:00 2001 From: baude Date: Tue, 2 Jul 2019 19:19:25 -0500 Subject: [PATCH 62/87] 1.4.4 Signed-off-by: baude --- .gitignore | 1 + podman.spec | 7 +++++-- sources | 2 +- tests/test_podman.sh | 13 ------------- tests/test_podman.yml | 35 ----------------------------------- tests/tests.yml | 1 - 6 files changed, 7 insertions(+), 52 deletions(-) delete mode 100755 tests/test_podman.sh delete mode 100644 tests/test_podman.yml delete mode 100644 tests/tests.yml diff --git a/.gitignore b/.gitignore index 04e6715..e84c5cc 100644 --- a/.gitignore +++ b/.gitignore @@ -246,3 +246,4 @@ /libpod-6d285b8.tar.gz /libpod-9b6a98c.tar.gz /libpod-7fd6528.tar.gz +/libpod-2371158.tar.gz diff --git a/podman.spec b/podman.spec index 2b7f157..dc9b2ae 100644 --- a/podman.spec +++ b/podman.spec @@ -23,7 +23,7 @@ %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} %global git0 https://%{provider}.%{provider_tld}/%{project}/%{repo} -%global commit0 7fd65288f177b059ccde987ad87450be1ca2fa27 +%global commit0 23711589f06b243fde07b9fcecb1cdc11c98a616 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) %global import_path_conmon github.com/containers/conmon @@ -33,7 +33,7 @@ Name: podman Epoch: 2 -Version: 1.4.3 +Version: 1.4.4 Release: 1%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 @@ -562,6 +562,9 @@ exit 0 %{_datadir}/%{name}/test %changelog +* Tue Jul 02 2019 bbaude - 2:1.4.4-1 +- Bump to v1.4.4 + * Wed Jun 26 2019 Dan Walsh - 2:1.4.3-1 - Bump to v1.4.3 diff --git a/sources b/sources index ad56865..b85593d 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (conmon-5995229.tar.gz) = 9b739acdf6ba4ec24fa9e2ca60843e236a93f7b641b202459d0efde49928a3f803bc2fab6c626ea56bd5f34ef079f6f3123abd5660c9cbc1de9cc5b4648f8f51 -SHA512 (libpod-7fd6528.tar.gz) = 76c945cef309ebe66e81e61ec0130961eee524de192bd35b3c2473a42b70ecbc14f99e2bfa6cb2c1101cb71d8ce705f5c130e8608724b8ecc3507c9033ee5de6 +SHA512 (libpod-2371158.tar.gz) = d9af4d6fae424131fe7ecc43d7dd73c8cb5d48cf9a78d61e3480efb01a76058a629baca250f97e59489c11a8e15c90f38c3ec1be21e99c60a795ddc3963d9a1e diff --git a/tests/test_podman.sh b/tests/test_podman.sh deleted file mode 100755 index da220bf..0000000 --- a/tests/test_podman.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/bash -# -# Simple podman tests -# - -rm -f /tmp/test.log /tmp/test.debug.log - -# Log program versions -rpm -q podman podman-tests >/tmp/test.debug.log - -bats /usr/share/podman/test/system &> /tmp/test.log - -echo "bats completed with status $?" >>/tmp/test.debug.log diff --git a/tests/test_podman.yml b/tests/test_podman.yml deleted file mode 100644 index 694b6d6..0000000 --- a/tests/test_podman.yml +++ /dev/null @@ -1,35 +0,0 @@ ---- -- hosts: localhost - vars: - - artifacts: ./artifacts - # FIXME! It would be cleaner to include 'podman' in this list; but the - # dnf module is broken in ansible <= 2.8, it doesn't report failures - # to install as long as _one_ package installs! So if podman installs - # but podman-tests doesn't, the `dnf` stanza succeeds, then the test - # one fails with a less-than-helpful error. - # - # See https://github.com/ansible/ansible/pull/49760 - - required_packages: - - podman-tests - tags: - - classic - - container - - tasks: - - name: install packages - dnf: name="{{ required_packages }}" state=installed - enablerepo=updates-testing - - - block: - # FIXME: how to make two passes, one as root and one rootless? - - name: Run test - script: ./test_podman.sh - always: - - name: Pull out logs - fetch: - src: "/tmp/{{ item }}" - dest: "{{ artifacts }}/{{ item }}" - flat: yes - with_items: - - test.log - - test.debug.log diff --git a/tests/tests.yml b/tests/tests.yml deleted file mode 100644 index 80caee7..0000000 --- a/tests/tests.yml +++ /dev/null @@ -1 +0,0 @@ -- import_playbook: test_podman.yml From 5bb894acf8ec98002711f500dca7c4e49d6ecc99 Mon Sep 17 00:00:00 2001 From: baude Date: Mon, 8 Jul 2019 10:38:22 -0500 Subject: [PATCH 63/87] add runtime depend for libseccomp Signed-off-by: baude --- podman.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/podman.spec b/podman.spec index dc9b2ae..eda8c45 100644 --- a/podman.spec +++ b/podman.spec @@ -34,7 +34,7 @@ Name: podman Epoch: 2 Version: 1.4.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -63,6 +63,7 @@ Requires: containers-common Requires: containernetworking-plugins >= 0.7.5-1 Requires: iptables Requires: nftables +Requires: libseccomp >= 2.4.1 Recommends: %{name}-manpages = %{epoch}:%{version}-%{release} Recommends: container-selinux Recommends: slirp4netns >= 0.3.0-2 @@ -562,6 +563,9 @@ exit 0 %{_datadir}/%{name}/test %changelog +* Mon Jul 08 2019 bbaude - 2:1.4.4-2 +- add runtime depend for libssecomp + * Tue Jul 02 2019 bbaude - 2:1.4.4-1 - Bump to v1.4.4 From 308f4abc2f7d466016fda798a6daa88fd5933a0f Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Wed, 17 Jul 2019 20:50:50 +0530 Subject: [PATCH 64/87] podman-2:1.4.4-4 - use conmon v1.0.0-rc2 Signed-off-by: Lokesh Mandvekar --- .gitignore | 2 ++ podman.spec | 15 ++++++++++----- sources | 4 ++-- 3 files changed, 14 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index e84c5cc..cde4b04 100644 --- a/.gitignore +++ b/.gitignore @@ -247,3 +247,5 @@ /libpod-9b6a98c.tar.gz /libpod-7fd6528.tar.gz /libpod-2371158.tar.gz +/libpod-b3f10c8.tar.gz +/conmon-1de71ad.tar.gz diff --git a/podman.spec b/podman.spec index eda8c45..fb503b8 100644 --- a/podman.spec +++ b/podman.spec @@ -23,18 +23,18 @@ %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} %global git0 https://%{provider}.%{provider_tld}/%{project}/%{repo} -%global commit0 23711589f06b243fde07b9fcecb1cdc11c98a616 +%global commit0 b3f10c8be229bcc58c1673b0431285fd5fce1293 %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 59952292a3b07ac125575024ae21956efe0ecdfb +%global commit_conmon 1de71ad51b9f390451eb37029ae913b0a86f1a5b %global shortcommit_conmon %(c=%{commit_conmon}; echo ${c:0:7}) Name: podman Epoch: 2 Version: 1.4.4 -Release: 2%{?dist} +Release: 4%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -443,8 +443,7 @@ install -p -m 644 %{repo}.conf %{buildroot}%{_datadir}/containers # install conmon pushd conmon-%{commit_conmon} -%{__make} LIBEXECDIR=%{buildroot}%{_libexecdir} install -mv %{buildroot}%{_libexecdir}/crio %{buildroot}%{_libexecdir}/%{name} +%{__make} LIBEXECDIR=%{buildroot}%{_libexecdir} install.%{name} popd # source codes for building projects @@ -563,6 +562,12 @@ exit 0 %{_datadir}/%{name}/test %changelog +* Wed Jul 17 2019 Lokesh Mandvekar - 2:1.4.4-4 +- use conmon v1.0.0-rc2 + +* Mon Jul 08 2019 bbaude - 2:1.4.4-3 +- correct 1.4.4 commit + * Mon Jul 08 2019 bbaude - 2:1.4.4-2 - add runtime depend for libssecomp diff --git a/sources b/sources index b85593d..5b00597 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (conmon-5995229.tar.gz) = 9b739acdf6ba4ec24fa9e2ca60843e236a93f7b641b202459d0efde49928a3f803bc2fab6c626ea56bd5f34ef079f6f3123abd5660c9cbc1de9cc5b4648f8f51 -SHA512 (libpod-2371158.tar.gz) = d9af4d6fae424131fe7ecc43d7dd73c8cb5d48cf9a78d61e3480efb01a76058a629baca250f97e59489c11a8e15c90f38c3ec1be21e99c60a795ddc3963d9a1e +SHA512 (conmon-1de71ad.tar.gz) = 363e5ca2b92c2099f5f82297cf41c3ba9465f3ba0d6285a371a0c22f5dcacbc71e1d1dcfdddee35808c75d958cadd9e60dedd85f54d595450ee2441ef02cde45 +SHA512 (libpod-b3f10c8.tar.gz) = 534f77d34d2b80c3520dab88349e55a34273d0b1c91af38d0304eec5afa0232e824eb7dfe5d5fd8accc37f622e343df963bb58a08a887f9695c4549a5de805c9 From 7e5d47b546c73805c9ca4abeb5da750fd636af95 Mon Sep 17 00:00:00 2001 From: baude Date: Mon, 8 Jul 2019 16:34:46 -0500 Subject: [PATCH 65/87] correct podman commit Signed-off-by: baude --- sources | 1 + 1 file changed, 1 insertion(+) diff --git a/sources b/sources index 5b00597..80697d1 100644 --- a/sources +++ b/sources @@ -1,2 +1,3 @@ SHA512 (conmon-1de71ad.tar.gz) = 363e5ca2b92c2099f5f82297cf41c3ba9465f3ba0d6285a371a0c22f5dcacbc71e1d1dcfdddee35808c75d958cadd9e60dedd85f54d595450ee2441ef02cde45 +SHA512 (conmon-5995229.tar.gz) = 9b739acdf6ba4ec24fa9e2ca60843e236a93f7b641b202459d0efde49928a3f803bc2fab6c626ea56bd5f34ef079f6f3123abd5660c9cbc1de9cc5b4648f8f51 SHA512 (libpod-b3f10c8.tar.gz) = 534f77d34d2b80c3520dab88349e55a34273d0b1c91af38d0304eec5afa0232e824eb7dfe5d5fd8accc37f622e343df963bb58a08a887f9695c4549a5de805c9 From 73eb6b9e1756cd19a7f5dc0c0c5fea24a04bf21a Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Tue, 9 Jul 2019 19:04:47 +0530 Subject: [PATCH 66/87] spec file conditionals cleanup, add GO111MODULE=off before podman-remote Signed-off-by: Lokesh Mandvekar --- podman.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/podman.spec b/podman.spec index fb503b8..8229358 100644 --- a/podman.spec +++ b/podman.spec @@ -69,6 +69,7 @@ Recommends: container-selinux Recommends: slirp4netns >= 0.3.0-2 Recommends: fuse-overlayfs >= 0.3-8 Recommends: libvarlink-util >= 18-1 +Requires: runc >= 2:1.0.0-57 # vendored libraries # awk '{print "Provides: bundled(golang("$1")) = "$2}' vendor.conf | sort @@ -411,10 +412,10 @@ export GO111MODULE=off # 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)" -export GO111MODULE=off %gobuild -o bin/%{name} %{import_path}/cmd/%{name} # build %%{name}-remote +export GO111MODULE=off export BUILDTAGS="remoteclient systemd varlink seccomp exclude_graphdriver_devicemapper $(hack/btrfs_installed_tag.sh) $(hack/btrfs_tag.sh) $(hack/libdm_tag.sh) $(hack/ostree_tag.sh) $(hack/selinux_tag.sh)" export GO111MODULE=off %gobuild -o bin/%{name}-remote %{import_path}/cmd/%{name} From 556cb8b9552b95d9b00e2ffc8133e272e5a171b4 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Wed, 17 Jul 2019 20:50:50 +0530 Subject: [PATCH 67/87] podman-2:1.4.4-4 - use conmon v1.0.0-rc2 Signed-off-by: Lokesh Mandvekar --- sources | 1 - 1 file changed, 1 deletion(-) diff --git a/sources b/sources index 80697d1..5b00597 100644 --- a/sources +++ b/sources @@ -1,3 +1,2 @@ SHA512 (conmon-1de71ad.tar.gz) = 363e5ca2b92c2099f5f82297cf41c3ba9465f3ba0d6285a371a0c22f5dcacbc71e1d1dcfdddee35808c75d958cadd9e60dedd85f54d595450ee2441ef02cde45 -SHA512 (conmon-5995229.tar.gz) = 9b739acdf6ba4ec24fa9e2ca60843e236a93f7b641b202459d0efde49928a3f803bc2fab6c626ea56bd5f34ef079f6f3123abd5660c9cbc1de9cc5b4648f8f51 SHA512 (libpod-b3f10c8.tar.gz) = 534f77d34d2b80c3520dab88349e55a34273d0b1c91af38d0304eec5afa0232e824eb7dfe5d5fd8accc37f622e343df963bb58a08a887f9695c4549a5de805c9 From 4385bdc764d22890e8d6271f0e846e807253030a Mon Sep 17 00:00:00 2001 From: Bruno Goncalves Date: Fri, 19 Jul 2019 10:33:28 +0200 Subject: [PATCH 68/87] Revert tests; incorporate fixes from bgoncalv Tests were clobbered (accidentally, I assume) by f9aac43. Revert, and incorporate changes from bgoncalv that address changes to CI system in last few months (artifact handling, new ansible version, add rootless tests) Signed-off-by: Ed Santiago --- tests/test_podman.sh | 9 +++++++++ tests/test_podman.yml | 20 ++++++++++++++++++++ tests/tests.yml | 1 + 3 files changed, 30 insertions(+) create mode 100755 tests/test_podman.sh create mode 100644 tests/test_podman.yml create mode 100644 tests/tests.yml diff --git a/tests/test_podman.sh b/tests/test_podman.sh new file mode 100755 index 0000000..5a339e9 --- /dev/null +++ b/tests/test_podman.sh @@ -0,0 +1,9 @@ +#!/bin/bash -e +# +# Simple podman tests +# + +# Log program versions +rpm -q podman podman-tests + +bats /usr/share/podman/test/system diff --git a/tests/test_podman.yml b/tests/test_podman.yml new file mode 100644 index 0000000..0e00f56 --- /dev/null +++ b/tests/test_podman.yml @@ -0,0 +1,20 @@ +--- +- hosts: localhost + roles: + - role: standard-test-basic + tags: + - classic + - container + required_packages: + - bats + - podman + - podman-tests + tests: + - root-test: + dir: ./ + run: ./test_podman.sh + - rootless-test: + # 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 diff --git a/tests/tests.yml b/tests/tests.yml new file mode 100644 index 0000000..80caee7 --- /dev/null +++ b/tests/tests.yml @@ -0,0 +1 @@ +- import_playbook: test_podman.yml From 0640784df38a3bd041e1045e1575555c9709530b Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Wed, 31 Jul 2019 04:57:52 +0530 Subject: [PATCH 69/87] built_tag macro records exact upstream tag built Signed-off-by: Lokesh Mandvekar --- podman.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/podman.spec b/podman.spec index 8229358..f5ef091 100644 --- a/podman.spec +++ b/podman.spec @@ -31,6 +31,10 @@ %global commit_conmon 1de71ad51b9f390451eb37029ae913b0a86f1a5b %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.4.4 + Name: podman Epoch: 2 Version: 1.4.4 From 738f8281003236a0c3c367dbc1198b10fdcc8a71 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Thu, 8 Aug 2019 04:15:01 +0530 Subject: [PATCH 70/87] avoid `make` in `make install` RE: upstream pr 3757 https://github.com/containers/libpod/pull/3757 Signed-off-by: Lokesh Mandvekar --- podman.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/podman.spec b/podman.spec index f5ef091..366cc92 100644 --- a/podman.spec +++ b/podman.spec @@ -399,9 +399,13 @@ This package contains system tests for %{name} %prep %autosetup -Sgit -n %{repo}-%{commit0} -# untar cri-o +# untar conmon tar zxf %{SOURCE1} +sed -i 's/install.remote: podman-remote/install.remote:/' Makefile +sed -i 's/install.bin: podman/install.bin:/' Makefile +sed -i 's/install.man: docs/install.man:/' Makefile + %build mkdir _build pushd _build From 96d5708fc5eb51c13459f4bab2d1749527cc6668 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Fri, 9 Aug 2019 20:29:02 +0530 Subject: [PATCH 71/87] use conmon v2.0.0 Signed-off-by: Lokesh Mandvekar --- .gitignore | 1 + podman.spec | 2 +- sources | 3 +-- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index cde4b04..52c12fa 100644 --- a/.gitignore +++ b/.gitignore @@ -249,3 +249,4 @@ /libpod-2371158.tar.gz /libpod-b3f10c8.tar.gz /conmon-1de71ad.tar.gz +/conmon-e217fdf.tar.gz diff --git a/podman.spec b/podman.spec index 366cc92..3efe645 100644 --- a/podman.spec +++ b/podman.spec @@ -28,7 +28,7 @@ %global import_path_conmon github.com/containers/conmon %global git_conmon https://%{import_path_conmon} -%global commit_conmon 1de71ad51b9f390451eb37029ae913b0a86f1a5b +%global commit_conmon e217fdff82e0b1a6184a28c43043a4065083407f %global shortcommit_conmon %(c=%{commit_conmon}; echo ${c:0:7}) # Used for comparing with latest upstream tag diff --git a/sources b/sources index 5b00597..9a0d219 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -SHA512 (conmon-1de71ad.tar.gz) = 363e5ca2b92c2099f5f82297cf41c3ba9465f3ba0d6285a371a0c22f5dcacbc71e1d1dcfdddee35808c75d958cadd9e60dedd85f54d595450ee2441ef02cde45 -SHA512 (libpod-b3f10c8.tar.gz) = 534f77d34d2b80c3520dab88349e55a34273d0b1c91af38d0304eec5afa0232e824eb7dfe5d5fd8accc37f622e343df963bb58a08a887f9695c4549a5de805c9 +SHA512 (conmon-e217fdf.tar.gz) = aa75e0808e8c6fc535c8b2d8ee106fb8fde6d9ca7f8beb0c51013e83ff161c8005d2427a0366fed89c0d390462852b5a0b12a4e7bf0a44cec654a91328e85c78 From 838c696a36f1a92e627210ec0b4a8d03af5a7c09 Mon Sep 17 00:00:00 2001 From: "Lokesh Mandvekar (Bot)" Date: Fri, 9 Aug 2019 21:26:47 +0000 Subject: [PATCH 72/87] podman-2:1.5.0-2 - bump to v1.5.0 - autobuilt 54b394b Signed-off-by: Lokesh Mandvekar (Bot) --- .gitignore | 1 + podman.spec | 12 ++++++++---- sources | 1 + 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 52c12fa..ad4c92e 100644 --- a/.gitignore +++ b/.gitignore @@ -250,3 +250,4 @@ /libpod-b3f10c8.tar.gz /conmon-1de71ad.tar.gz /conmon-e217fdf.tar.gz +/libpod-54b394b.tar.gz diff --git a/podman.spec b/podman.spec index 3efe645..a3f0503 100644 --- a/podman.spec +++ b/podman.spec @@ -23,7 +23,7 @@ %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} %global git0 https://%{provider}.%{provider_tld}/%{project}/%{repo} -%global commit0 b3f10c8be229bcc58c1673b0431285fd5fce1293 +%global commit0 54b394bd3ec07d11c7ed176531a752261acc71a7 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) %global import_path_conmon github.com/containers/conmon @@ -33,12 +33,12 @@ # 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.0 Name: podman Epoch: 2 -Version: 1.4.4 -Release: 4%{?dist} +Version: 1.5.0 +Release: 2%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -571,6 +571,10 @@ exit 0 %{_datadir}/%{name}/test %changelog +* Fri Aug 09 2019 Lokesh Mandvekar (Bot) - 2:1.5.0-2 +- bump to v1.5.0 +- autobuilt 54b394b + * Wed Jul 17 2019 Lokesh Mandvekar - 2:1.4.4-4 - use conmon v1.0.0-rc2 diff --git a/sources b/sources index 9a0d219..7fe54d2 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ SHA512 (conmon-e217fdf.tar.gz) = aa75e0808e8c6fc535c8b2d8ee106fb8fde6d9ca7f8beb0c51013e83ff161c8005d2427a0366fed89c0d390462852b5a0b12a4e7bf0a44cec654a91328e85c78 +SHA512 (libpod-54b394b.tar.gz) = 693e789cb412cfdf8495842c05efec589f4181f902e6180e287366af99ba3b9cca4d3cc67e012fa43298775a57920c190be73f574af6e42298e8d001d8c8207a From d59a774933c07d5bff04bc910aeea95b948a3889 Mon Sep 17 00:00:00 2001 From: "Lokesh Mandvekar (Bot)" Date: Thu, 15 Aug 2019 23:25:35 +0000 Subject: [PATCH 73/87] podman-2:1.5.1-2 - bump to v1.5.1 - autobuilt 0005792 Signed-off-by: Lokesh Mandvekar (Bot) --- .gitignore | 1 + podman.spec | 10 +++++++--- sources | 2 +- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index ad4c92e..a95d824 100644 --- a/.gitignore +++ b/.gitignore @@ -251,3 +251,4 @@ /conmon-1de71ad.tar.gz /conmon-e217fdf.tar.gz /libpod-54b394b.tar.gz +/libpod-0005792.tar.gz diff --git a/podman.spec b/podman.spec index a3f0503..3cb03c0 100644 --- a/podman.spec +++ b/podman.spec @@ -23,7 +23,7 @@ %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} %global git0 https://%{provider}.%{provider_tld}/%{project}/%{repo} -%global commit0 54b394bd3ec07d11c7ed176531a752261acc71a7 +%global commit0 00057929f5acfd98341964d85722383363376d52 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) %global import_path_conmon github.com/containers/conmon @@ -33,11 +33,11 @@ # Used for comparing with latest upstream tag # to decide whether to autobuild (non-rawhide only) -%global built_tag v1.5.0 +%global built_tag v1.5.1 Name: podman Epoch: 2 -Version: 1.5.0 +Version: 1.5.1 Release: 2%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 @@ -571,6 +571,10 @@ exit 0 %{_datadir}/%{name}/test %changelog +* Thu Aug 15 2019 Lokesh Mandvekar (Bot) - 2:1.5.1-2 +- bump to v1.5.1 +- autobuilt 0005792 + * Fri Aug 09 2019 Lokesh Mandvekar (Bot) - 2:1.5.0-2 - bump to v1.5.0 - autobuilt 54b394b diff --git a/sources b/sources index 7fe54d2..c1a6163 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (conmon-e217fdf.tar.gz) = aa75e0808e8c6fc535c8b2d8ee106fb8fde6d9ca7f8beb0c51013e83ff161c8005d2427a0366fed89c0d390462852b5a0b12a4e7bf0a44cec654a91328e85c78 -SHA512 (libpod-54b394b.tar.gz) = 693e789cb412cfdf8495842c05efec589f4181f902e6180e287366af99ba3b9cca4d3cc67e012fa43298775a57920c190be73f574af6e42298e8d001d8c8207a +SHA512 (libpod-0005792.tar.gz) = 6b5209f1a495c0a5efb9bacb31390653cf8db983f402fc820572b31f5169dc368806aaa97eceae871643146b4dcf66fd776a0e6d4e7f27b9c76b04c1d6107214 From 5d463ef6f4e83cc7dd62902b16462e0b241e10eb Mon Sep 17 00:00:00 2001 From: Daniel J Walsh Date: Tue, 13 Aug 2019 14:17:36 -0400 Subject: [PATCH 74/87] list unitfiles in /usr/lib/systemd/user correctly (correct commit message) Signed-off-by: Lokesh Mandvekar --- podman.spec | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/podman.spec b/podman.spec index 3cb03c0..4dc4aeb 100644 --- a/podman.spec +++ b/podman.spec @@ -38,7 +38,7 @@ Name: podman Epoch: 2 Version: 1.5.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -544,6 +544,9 @@ 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 @@ -571,6 +574,9 @@ exit 0 %{_datadir}/%{name}/test %changelog +* Fri Aug 16 2019 Lokesh Mandvekar - 2:1.5.1-3 +- list unitfiles in /usr/lib/systemd/user + * Thu Aug 15 2019 Lokesh Mandvekar (Bot) - 2:1.5.1-2 - bump to v1.5.1 - autobuilt 0005792 From 547b783b912c8fadfbe97a1f96985bd9043a90c1 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Fri, 16 Aug 2019 17:50:20 +0530 Subject: [PATCH 75/87] correct doc install step Signed-off-by: Lokesh Mandvekar --- podman.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/podman.spec b/podman.spec index 4dc4aeb..87e7baf 100644 --- a/podman.spec +++ b/podman.spec @@ -404,7 +404,6 @@ tar zxf %{SOURCE1} sed -i 's/install.remote: podman-remote/install.remote:/' Makefile sed -i 's/install.bin: podman/install.bin:/' Makefile -sed -i 's/install.man: docs/install.man:/' Makefile %build mkdir _build From 6900b0db31c87de612b9e5cee4b86cfab44279e1 Mon Sep 17 00:00:00 2001 From: "Lokesh Mandvekar (Bot)" Date: Tue, 17 Sep 2019 19:07:07 +0000 Subject: [PATCH 76/87] podman-2:1.6.0-2 - 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 a95d824..5798fd0 100644 --- a/.gitignore +++ b/.gitignore @@ -252,3 +252,4 @@ /conmon-e217fdf.tar.gz /libpod-54b394b.tar.gz /libpod-0005792.tar.gz +/libpod-ca5ff03.tar.gz diff --git a/podman.spec b/podman.spec index 87e7baf..3dc922d 100644 --- a/podman.spec +++ b/podman.spec @@ -23,7 +23,7 @@ %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}) %global import_path_conmon github.com/containers/conmon @@ -33,12 +33,12 @@ # 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 Epoch: 2 -Version: 1.5.1 -Release: 3%{?dist} +Version: 1.6.0 +Release: 2%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -573,6 +573,10 @@ exit 0 %{_datadir}/%{name}/test %changelog +* Tue Sep 17 2019 Lokesh Mandvekar (Bot) - 2:1.6.0-2 +- bump to v1.6.0-rc1 +- autobuilt ca5ff03 + * Fri Aug 16 2019 Lokesh Mandvekar - 2:1.5.1-3 - list unitfiles in /usr/lib/systemd/user diff --git a/sources b/sources index c1a6163..baeac5e 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (conmon-e217fdf.tar.gz) = aa75e0808e8c6fc535c8b2d8ee106fb8fde6d9ca7f8beb0c51013e83ff161c8005d2427a0366fed89c0d390462852b5a0b12a4e7bf0a44cec654a91328e85c78 -SHA512 (libpod-0005792.tar.gz) = 6b5209f1a495c0a5efb9bacb31390653cf8db983f402fc820572b31f5169dc368806aaa97eceae871643146b4dcf66fd776a0e6d4e7f27b9c76b04c1d6107214 +SHA512 (libpod-ca5ff03.tar.gz) = 65894c42865fd11ab59989f9e658e162f17181fd86bc36099eb706b8a8ec1a242d0e8a077e1b70f87cb12c7a263b8b405d1777372bc51ff9c20c4838169bc55a From 52d6fb423f31d66096916798a2cd3476abfde956 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Wed, 25 Sep 2019 10:16:06 -0400 Subject: [PATCH 77/87] use standalone conmon as dep Signed-off-by: Lokesh Mandvekar --- podman.spec | 22 +--------------------- 1 file changed, 1 insertion(+), 21 deletions(-) diff --git a/podman.spec b/podman.spec index 3dc922d..adc2071 100644 --- a/podman.spec +++ b/podman.spec @@ -26,11 +26,6 @@ %global commit0 ca5ff03e2935c47288f7b28a2bae9212cbb83272 %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.6.0-rc1 @@ -43,7 +38,6 @@ 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 @@ -63,6 +57,7 @@ BuildRequires: make BuildRequires: systemd BuildRequires: systemd-devel Requires: runc >= 2:1.0.0-57 +Requires: conmon Requires: containers-common Requires: containernetworking-plugins >= 0.7.5-1 Requires: iptables @@ -399,9 +394,6 @@ This package contains system tests for %{name} %prep %autosetup -Sgit -n %{repo}-%{commit0} -# untar conmon -tar zxf %{SOURCE1} - sed -i 's/install.remote: podman-remote/install.remote:/' Makefile sed -i 's/install.bin: podman/install.bin:/' Makefile @@ -427,11 +419,6 @@ export BUILDTAGS="remoteclient systemd varlink seccomp exclude_graphdriver_devic export GO111MODULE=off %gobuild -o bin/%{name}-remote %{import_path}/cmd/%{name} -# build conmon -pushd conmon-%{commit_conmon} -%{__make} all -popd - %install install -dp %{buildroot}%{_unitdir} PODMAN_VERSION=%{version} %{__make} PREFIX=%{buildroot}%{_prefix} ETCDIR=%{buildroot}%{_sysconfdir} \ @@ -449,11 +436,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}/ @@ -537,8 +519,6 @@ exit 0 # By "owning" the site-functions dir, we don't need to Require zsh %{_datadir}/zsh/site-functions %{_datadir}/zsh/site-functions/* -%dir %{_libexecdir}/%{name} -%{_libexecdir}/%{name}/conmon %config(noreplace) %{_sysconfdir}/cni/net.d/87-%{name}-bridge.conflist %{_datadir}/containers/%{repo}.conf %{_unitdir}/io.%{name}.service From 93a95e651813d98c1e7c836cc00bbdd1ca7f7486 Mon Sep 17 00:00:00 2001 From: RH Container Bot Date: Wed, 25 Sep 2019 19:27:25 +0000 Subject: [PATCH 78/87] podman-2:1.6.0-0.2.rc2 - bump to v1.6.0-rc2 - autobuilt 9181c65 Signed-off-by: RH Container Bot --- .gitignore | 1 + podman.spec | 10 +++++++--- sources | 3 +-- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 5798fd0..8c04d99 100644 --- a/.gitignore +++ b/.gitignore @@ -253,3 +253,4 @@ /libpod-54b394b.tar.gz /libpod-0005792.tar.gz /libpod-ca5ff03.tar.gz +/libpod-9181c65.tar.gz diff --git a/podman.spec b/podman.spec index adc2071..bceb1ad 100644 --- a/podman.spec +++ b/podman.spec @@ -23,17 +23,17 @@ %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 Epoch: 2 Version: 1.6.0 -Release: 2%{?dist} +Release: 0.2.rc2%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -553,6 +553,10 @@ exit 0 %{_datadir}/%{name}/test %changelog +* Wed Sep 25 2019 RH Container Bot - 2:1.6.0-0.2.rc2 +- bump to v1.6.0-rc2 +- autobuilt 9181c65 + * Tue Sep 17 2019 Lokesh Mandvekar (Bot) - 2:1.6.0-2 - bump to v1.6.0-rc1 - autobuilt ca5ff03 diff --git a/sources b/sources index baeac5e..6df3385 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -SHA512 (conmon-e217fdf.tar.gz) = aa75e0808e8c6fc535c8b2d8ee106fb8fde6d9ca7f8beb0c51013e83ff161c8005d2427a0366fed89c0d390462852b5a0b12a4e7bf0a44cec654a91328e85c78 -SHA512 (libpod-ca5ff03.tar.gz) = 65894c42865fd11ab59989f9e658e162f17181fd86bc36099eb706b8a8ec1a242d0e8a077e1b70f87cb12c7a263b8b405d1777372bc51ff9c20c4838169bc55a +SHA512 (libpod-9181c65.tar.gz) = a04769a2ad2802d46472cffd1c9fae568890a77a1b580b8e2a9301acee3c6262adbd4368480f63cc741aa703acdc6f1c49900953317791775c88178962bb6e06 From 077517aff5aee419bfff05bbb1ae9cf0a68e1c86 Mon Sep 17 00:00:00 2001 From: RH Container Bot Date: Tue, 1 Oct 2019 18:16:55 +0000 Subject: [PATCH 79/87] 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 8c04d99..5ad21bd 100644 --- a/.gitignore +++ b/.gitignore @@ -254,3 +254,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 bceb1ad..63f579c 100644 --- a/podman.spec +++ b/podman.spec @@ -23,17 +23,17 @@ %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 Epoch: 2 Version: 1.6.0 -Release: 0.2.rc2%{?dist} +Release: 2%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -553,6 +553,10 @@ exit 0 %{_datadir}/%{name}/test %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 - 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 1189d4094cc088efc1d886187087632813e9ae88 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Tue, 1 Oct 2019 14:29:05 -0400 Subject: [PATCH 80/87] 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 63f579c..491b528 100644 --- a/podman.spec +++ b/podman.spec @@ -33,7 +33,7 @@ Name: podman Epoch: 2 Version: 1.6.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -553,6 +553,9 @@ exit 0 %{_datadir}/%{name}/test %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 0926a99a6d004b709045114216dea904461fb700 Mon Sep 17 00:00:00 2001 From: Ed Santiago Date: Tue, 1 Oct 2019 13:40:43 -0600 Subject: [PATCH 81/87] gating tests: bring in changes from other branches make test_podman.yml the same as master and fc30: include a 15-minute timeout, and include a chown in order to avoid "permission denied" errors on first podman run Signed-off-by: Ed Santiago --- tests/test_podman.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tests/test_podman.yml b/tests/test_podman.yml index 0e00f56..c0c3315 100644 --- a/tests/test_podman.yml +++ b/tests/test_podman.yml @@ -13,8 +13,10 @@ - root-test: dir: ./ run: ./test_podman.sh + timeout: 15m - rootless-test: # running the test with su doesn't create the directory for fedora user on /run/user/ # so create it manually dir: ./ - run: mkdir /run/user/$(id -u fedora); su -c ${PWD}/test_podman.sh - fedora + run: mkdir /run/user/$(id -u fedora); chown fedora /run/user/$(id -u fedora); su -c ${PWD}/test_podman.sh - fedora + timeout: 15m From 6897e9e901ebef76356731870a4d74e38abdd3d5 Mon Sep 17 00:00:00 2001 From: RH Container Bot Date: Wed, 2 Oct 2019 18:00:59 +0000 Subject: [PATCH 82/87] 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 5ad21bd..97db4ae 100644 --- a/.gitignore +++ b/.gitignore @@ -255,3 +255,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 491b528..d8944ca 100644 --- a/podman.spec +++ b/podman.spec @@ -23,17 +23,17 @@ %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 Epoch: 2 -Version: 1.6.0 -Release: 3%{?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/ @@ -553,6 +553,10 @@ exit 0 %{_datadir}/%{name}/test %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-3 - bump release tag 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 d5d9ef86f2b3256787247a173d9fe6c877e4ed04 Mon Sep 17 00:00:00 2001 From: RH Container Bot Date: Wed, 2 Oct 2019 23:16:51 +0000 Subject: [PATCH 83/87] 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 97db4ae..eaf2b95 100644 --- a/.gitignore +++ b/.gitignore @@ -256,3 +256,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 d8944ca..33e7b5b 100644 --- a/podman.spec +++ b/podman.spec @@ -23,17 +23,17 @@ %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 Epoch: 2 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/ @@ -553,6 +553,10 @@ exit 0 %{_datadir}/%{name}/test %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 146800938bb5ed82cae02ab6703b365c3356954e Mon Sep 17 00:00:00 2001 From: Ed Santiago Date: Thu, 3 Oct 2019 08:26:19 -0600 Subject: [PATCH 84/87] 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 4043d1f1221adf0d9d09ad3b63b57e1e91d85300 Mon Sep 17 00:00:00 2001 From: Ed Santiago Date: Wed, 9 Oct 2019 08:10:13 -0600 Subject: [PATCH 85/87] 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 c0c3315..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); chown fedora /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 1476b9937488502c03ca8b2310485cfb8a8b20e7 Mon Sep 17 00:00:00 2001 From: RH Container Bot Date: Wed, 16 Oct 2019 20:48:11 +0000 Subject: [PATCH 86/87] 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 eaf2b95..55284f2 100644 --- a/.gitignore +++ b/.gitignore @@ -257,3 +257,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 33e7b5b..d46e0eb 100644 --- a/podman.spec +++ b/podman.spec @@ -23,17 +23,17 @@ %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 Epoch: 2 -Version: 1.6.1 -Release: 2%{?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/ @@ -553,6 +553,10 @@ exit 0 %{_datadir}/%{name}/test %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 02 2019 RH Container Bot - 2:1.6.1-2 - bump to v1.6.1 - autobuilt 233d95f 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 cf70d56a5e03509d4776ca10f50994fd7badf6b8 Mon Sep 17 00:00:00 2001 From: RH Container Bot Date: Thu, 17 Oct 2019 22:16:59 +0000 Subject: [PATCH 87/87] 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 55284f2..a24c5e7 100644 --- a/.gitignore +++ b/.gitignore @@ -258,3 +258,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 d46e0eb..12811cc 100644 --- a/podman.spec +++ b/podman.spec @@ -23,17 +23,17 @@ %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 Epoch: 2 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/ @@ -553,6 +553,10 @@ exit 0 %{_datadir}/%{name}/test %changelog +* Thu Oct 17 2019 RH Container Bot - 2:1.6.2-2 +- bump to v1.6.2 +- autobuilt f3ffda1 + * Wed Oct 16 2019 RH Container Bot - 2:1.6.2-0.2.rc1 - bump to v1.6.2-rc1 - autobuilt 4d653f0 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