From 981f5e3d287a7da6aa8cec04946d9962a2acb90c84a9be0bad9f63b64d55c064 Mon Sep 17 00:00:00 2001 From: Richard Brown Date: Sat, 10 Apr 2021 13:26:04 +0000 Subject: [PATCH] Accepting request 883239 from devel:kubic OBS-URL: https://build.opensuse.org/request/show/883239 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/podman?expand=0&rev=76 --- podman.changes | 6 ++++++ podman.spec | 28 +++++++++++++++++++++++++--- 2 files changed, 31 insertions(+), 3 deletions(-) diff --git a/podman.changes b/podman.changes index 6465d14..c1c5136 100644 --- a/podman.changes +++ b/podman.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Mar 29 16:29:46 UTC 2021 - Frederic Crozat + +- Create docker subpackage to allow replacing docker with + corresponding aliases to podman. + ------------------------------------------------------------------- Wed Feb 24 13:46:35 UTC 2021 - Richard Brown diff --git a/podman.spec b/podman.spec index 727ae8b..3eed94f 100644 --- a/podman.spec +++ b/podman.spec @@ -54,8 +54,8 @@ BuildRequires: pkgconfig(libsystemd) %ifarch ppc64le #!BuildIgnore: gcc-PIE %endif -Recommends: apparmor-parser Recommends: apparmor-abstractions +Recommends: apparmor-parser Requires: catatonit Requires: cni Requires: cni-plugins @@ -97,6 +97,21 @@ A "basic" CNI configuration for podman that makes networking usable for basic setups. In more complicated setups, users are recommended to write their own CNI configurations. +%package docker +Summary: Emulate Docker CLI using podman +BuildArch: noarch +Requires: %{name} = %{version} +Conflicts: docker +Conflicts: docker-ce +Conflicts: docker-ee +Conflicts: docker-latest +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 %{name}. + %build # Build podman BUILDFLAGS="-buildmode=pie" make @@ -109,8 +124,7 @@ make %{?_smp_mflags} docs # Updates must be tested manually. %install -make DESTDIR=%{buildroot} PREFIX=/usr install -make DESTDIR=%{buildroot} PREFIX=/usr install.completions +make DESTDIR=%{buildroot} PREFIX=/usr install install.completions install.docker # packaged in libcontainers-common rm %{buildroot}/usr/share/man/man5/containers-mounts.conf.* %{buildroot}/usr/share/man/man5/oci-hooks.* @@ -163,6 +177,14 @@ install -D -m 0644 %{SOURCE4} %{buildroot}%{_docdir}/%{name}/README.SUSE %config %{_sysconfdir}/cni/net.d/87-podman-bridge.conflist %license LICENSE +%files docker +%{_bindir}/docker +%{_mandir}/man1/docker*.1* +%{_tmpfilesdir}/podman-docker.conf + +%post docker +%tmpfiles_create %{_tmpfilesdir}/podman-docker.conf + %pre %service_add_pre podman.service podman.socket # move away any old rpmsave config file to avoid having it re-activated again in