diff --git a/components/packaging/deb/common/control b/components/packaging/deb/common/control index 46f53b4175..4dbded6476 100644 --- a/components/packaging/deb/common/control +++ b/components/packaging/deb/common/control @@ -42,8 +42,8 @@ Package: docker-ce-cli Architecture: linux-any Depends: ${shlibs:Depends} Conflicts: docker (<< 1.5~), docker.io, lxc-docker, lxc-docker-virtual-package, docker-engine, docker-engine-cs -Replaces: docker-ce (<< 5:18.09) -Breaks: docker-ce (<< 5:18.09) +Replaces: docker-ce (<< 5:0) +Breaks: docker-ce (<< 5:0) Description: Docker CLI: the open-source application container engine Docker is a product for you to build, ship and run any application as a lightweight container diff --git a/components/packaging/rpm/SPECS/docker-ce-cli.spec b/components/packaging/rpm/SPECS/docker-ce-cli.spec index d5b89a45fa..cc130e4adb 100644 --- a/components/packaging/rpm/SPECS/docker-ce-cli.spec +++ b/components/packaging/rpm/SPECS/docker-ce-cli.spec @@ -14,7 +14,6 @@ Packager: Docker # required packages on install Requires: /bin/sh -Requires: containerd BuildRequires: make BuildRequires: libtool-ltdl-devel diff --git a/components/packaging/rpm/SPECS/docker-ce.spec b/components/packaging/rpm/SPECS/docker-ce.spec index 062c374adb..2d8b0d6033 100644 --- a/components/packaging/rpm/SPECS/docker-ce.spec +++ b/components/packaging/rpm/SPECS/docker-ce.spec @@ -15,10 +15,16 @@ Packager: Docker Requires: docker-ce-cli Requires: container-selinux >= 2.9 +Requires: libseccomp >= 2.3 Requires: systemd-units Requires: iptables -# Should be required as well by docker-ce-cli but let's just be thorough +Requires: libcgroup Requires: containerd.io +Requires: tar +Requires: xz + +# Resolves: rhbz#1165615 +Requires: device-mapper-libs >= 1.02.90-1 BuildRequires: which BuildRequires: make