diff --git a/0001-podman-patch-for-local-search.patch b/0001-podman-patch-for-local-search.patch new file mode 100644 index 0000000000000000000000000000000000000000..90b59b155701b31fcab926cafa00251d5f9316f9 --- /dev/null +++ b/0001-podman-patch-for-local-search.patch @@ -0,0 +1,24 @@ +From 40aabbc1707bfb6ed0a0bb01bc356a16efae8b4e Mon Sep 17 00:00:00 2001 +From: weishengjing1 <773945074@qq.com> +Date: Sat, 9 Jan 2021 10:09:27 +0800 +Subject: [PATCH] patch for podman pull (issue I2BF99) + +--- + libpod.conf | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/libpod.conf b/libpod.conf +index 2976cec..4001d21 100644 +--- a/libpod.conf ++++ b/libpod.conf +@@ -7,6 +7,7 @@ image_default_transport = "docker://" + # Paths to look for a valid OCI runtime (runc, runv, etc) + runtime_path = [ + "/usr/bin/runc", ++ "/usr/local/bin/runc", + "/usr/sbin/runc", + "/sbin/runc", + "/bin/runc", +-- +2.27.0 + diff --git a/podman.spec b/podman.spec index 0b388c0eea92ddd502f32378340de213dbc074cf..ceafbeb91728a99fc215a473de088387391494c3 100644 --- a/podman.spec +++ b/podman.spec @@ -1,6 +1,6 @@ Name: podman Version: 0.10.1 -Release: 4 +Release: 5 Summary: A daemonless container engine for managing Containers Epoch: 1 License: ASL 2.0 @@ -108,6 +108,8 @@ Provides: bundled(golang(k8s.io/client-go)) = 7cd1d3291b7d9b1e2d54d4b69eb65995ea Provides: bundled(golang(k8s.io/kube-openapi)) = 275e2ce91dec4c05a4094a7b1daee5560b555ac9 Provides: bundled(golang(k8s.io/utils)) = 258e2a2fa64568210fbd6267cf1d8fd87c3cb86e +Patch1: 0001-podman-patch-for-local-search.patch + %description Podman manages the entire container ecosystem which includes pods, containers, container images, and container volumes using the libpod library. @@ -210,6 +212,9 @@ install -Dp -m644 libpod.conf %{buildroot}%{_datadir}/containers/libpod.conf %{_mandir}/man5/*.5* %changelog +* Sat Jan 9 2021 Shengjing Wei - 1:0.10.1-5 +- Fixed podman pull failed with issue I2BF99 + * Wed Sep 9 2020 Guoshuai Sun - 1:0.10.1-4 - Add conflicts with docker-engine for help package