diff --git a/.cockpit-podman.metadata b/.cockpit-podman.metadata new file mode 100644 index 0000000..1285362 --- /dev/null +++ b/.cockpit-podman.metadata @@ -0,0 +1 @@ +77aa54b1a76e5f42600de56f980ce4b3176d64d3 SOURCES/cockpit-podman-29.tar.gz diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..7b05f49 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +SOURCES/cockpit-podman-29.tar.gz diff --git a/SOURCES/cockpit-podman-1937863.patch b/SOURCES/cockpit-podman-1937863.patch new file mode 100644 index 0000000..a802707 --- /dev/null +++ b/SOURCES/cockpit-podman-1937863.patch @@ -0,0 +1,24 @@ +From d4f06e0e0b9529bfa3d17c1ef73c028752ee1bb7 Mon Sep 17 00:00:00 2001 +From: Martin Pitt +Date: Thu, 4 Mar 2021 20:11:47 +0100 +Subject: [PATCH] test: Generalize cgroupsV2() for all rhel-8-* versions + +It looks like RHEL newer 8.y versions won't get cgroupsv2 either, so +generalize the check. +--- + test/check-application | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/test/check-application b/test/check-application +index 0b163ce7..a40f2d90 100755 +--- a/test/check-application ++++ b/test/check-application +@@ -80,7 +80,7 @@ class TestApplication(testlib.MachineCase): + self.has_selinux = self.machine.image not in ["debian-testing", "ubuntu-stable"] + + def cgroupsV2(self): +- return self.machine.image not in ["ubuntu-stable", "rhel-8-4"] ++ return self.machine.image != 'ubuntu-stable' and not self.machine.image.startswith('rhel-8') + + def execute(self, system, cmd): + if system: diff --git a/SPECS/cockpit-podman.spec b/SPECS/cockpit-podman.spec new file mode 100644 index 0000000..9383fc1 --- /dev/null +++ b/SPECS/cockpit-podman.spec @@ -0,0 +1,177 @@ +# This spec file has been automatically updated +Version: 29 +Release: 2%{?dist} +Name: cockpit-podman +Summary: Cockpit component for Podman containers +License: LGPLv2+ +URL: https://github.com/cockpit-project/cockpit-podman + +Source0: https://github.com/cockpit-project/cockpit-podman/releases/download/%{version}/cockpit-podman-%{version}.tar.gz +# related bug: https://bugzilla.redhat.com/show_bug.cgi?id=1937863 +# patch: https://patch-diff.githubusercontent.com/raw/cockpit-project/cockpit-podman/pull/688.patch +Patch0: cockpit-podman-1937863.patch +BuildArch: noarch +BuildRequires: libappstream-glib + +Requires: cockpit-bridge >= 138 +Requires: podman >= 1.3.0 + +%description +The Cockpit user interface for Podman containers. + +%prep +%setup -q -n cockpit-podman + +# https://bugzilla.redhat.com/show_bug.cgi?id=1937863 +%patch0 -p1 + +%build +# Nothing to build + +%install +%make_install +appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/metainfo/* + +%files +%doc README.md +%license LICENSE +%{_datadir}/cockpit/* +%{_datadir}/metainfo/* + +%changelog +* Fri Mar 12 2021 Jindrich Novy - 29-2 +- fix gating test failure for cockpit-podman +- Related: #1914884 + +* Mon Feb 22 2021 Jindrich Novy - 29-1 +- update to https://github.com/cockpit-project/cockpit-podman/releases/tag/29 +- Related: #1883490 + +* Fri Feb 12 2021 Jindrich Novy - 28.1-1 +- update to https://github.com/cockpit-project/cockpit-podman/releases/tag/28.1 +- Related: #1883490 + +* Wed Feb 10 2021 Jindrich Novy - 28-3 +- readd cockpit-system +Related: #1914884 + +* Tue Feb 09 2021 Jindrich Novy - 28-2 +- fix gating tests for cockpit-podman - thanks for Matej Marusak +- Related: #1883490 + +* Sat Feb 06 2021 Jindrich Novy - 28-1 +- update to https://github.com/cockpit-project/cockpit-podman/releases/tag/28 +- Related: #1883490 + +* Mon Jan 18 2021 Jindrich Novy - 27.1-4 +- fix "Fix gating tests of container-tools for 8.4.0" +- Related: #1883490 + +* Fri Jan 15 2021 Jindrich Novy - 27.1-3 +- another gating test fix - don't remove all containers but only admin ones + thanks to Matej Marusak +- Related: #1883490 + +* Fri Jan 08 2021 Jindrich Novy - 27.1-2 +- gating tests - always set VM password +- Related: #1883490 + +* Thu Jan 07 2021 Jindrich Novy - 27.1-1 +- update to https://github.com/cockpit-project/cockpit-podman/releases/tag/27.1 +- Related: #1883490 + +* Thu Jan 07 2021 Jindrich Novy - 27-1 +- update to https://github.com/cockpit-project/cockpit-podman/releases/tag/27 +- Related: #1883490 + +* Thu Dec 10 2020 Jindrich Novy - 26-1 +- update to https://github.com/cockpit-project/cockpit-podman/releases/tag/26 +- Related: #1883490 + +* Thu Dec 03 2020 Jindrich Novy - 25-4 +- replace docker.io with quay.io for gating tests due do + docker.io new pull rate limit requirements +- Related: #1883490 + +* Sat Nov 07 2020 Jindrich Novy - 25-3 +- test: Cleanup images before pulling the ones we need - thanks to Matej Marusak +- Related: #1883490 + +* Tue Nov 03 2020 Jindrich Novy - 25-2 +- remove hack in tests +- Related: #1883490 + +* Wed Oct 21 2020 Jindrich Novy - 25-1 +- synchronize with stream-container-tools-rhel8 +- Related: #1883490 + +* Sun Jul 26 2020 Jindrich Novy - 18.1-2 +- revert back to 18.1 as this version is aimed at 8.3.0 +- Related: #1821193 + +* Wed Jul 15 2020 Jindrich Novy - 19-1 +- update to https://github.com/cockpit-project/cockpit-podman/releases/tag/19 +- Related: #1821193 + +* Wed Jul 15 2020 Martin Pitt - 18.1-1 +- Fix AppStream metainfo (rhbz#1854673) + +* Mon Jun 15 2020 Jindrich Novy - 18-1 +- update to https://github.com/cockpit-project/cockpit-podman/releases/tag/v18 +- Related: #1821193 + +* Fri May 15 2020 Jindrich Novy - 17-1 +- update to https://github.com/cockpit-project/cockpit-podman/releases/tag/17 +- Related: #1821193 + +* Tue May 12 2020 Jindrich Novy - 16-1 +- synchronize containter-tools 8.3.0 with 8.2.1 +- Related: #1821193 + +* Mon Apr 20 2020 Matej Marusak - 15-1 +- Drop obsolete functionality for Fedora Atomic +- Localize dates and times +- Make tests non-destructive, to support gating +- Fix crash on filtering anonymous images +- Translation updates +- Show historical logs + +* Thu Jan 09 2020 Matej Marusak - 12-1 +- Configure CPU share for system containers +- Translation updates + +* Thu Nov 28 2019 Matej Marusak - 11-1 +- Fix Alert notification in Image Search Modal +- Allow more than a single Error Notification for Container action errors +- Various Alert cleanups +- Translation updates + +* Wed Nov 13 2019 Matej Marusak - 10-1 +- Support for user containers +- Show list of containers that use given image +- Show placeholder while loading containers and images +- Fix setting memory limit rhbz#1732713 +- Add container Terminal rhbz#1703245 + +* Wed Jun 26 2019 Martin Pitt - 4-1 +- Fix regression in container commit +- Fix AppStream ID rhbz#1734809 + +* Mon Jun 17 2019 Martin Pitt - 3-1 +- Enable Commit button for running containers +- Fix race condition with container deletion +- Stop fetching all containers/images for each container/image event + +* Sun Jun 09 2019 Martin Pitt - 2-2 +- Fix podman dependency + +* Mon May 27 2019 Martin Pitt - 2-1 +- Update to upstream 2 release +- Support podman API 1.3 +- Support running commands with arguments +- Show the default command coming from image +- Implement filtering of images and containers + +* Wed Apr 17 2019 Cockpit Project - 1-2 +- Update to upstream 1 release +