diff --git a/pkg/docker-cli/deb/control b/pkg/docker-cli/deb/control index 86aa12a1..49ed81b6 100644 --- a/pkg/docker-cli/deb/control +++ b/pkg/docker-cli/deb/control @@ -20,10 +20,7 @@ Recommends: docker-buildx-plugin, docker-compose-plugin Conflicts: docker (<< 1.5~), docker-engine, - docker-engine-cs, - docker.io, - lxc-docker, - lxc-docker-virtual-package + docker.io Replaces: docker-ce (<< 5:0) Breaks: docker-ce (<< 5:0) Description: Docker CLI: the open-source application container engine diff --git a/pkg/docker-cli/rpm/docker-ce-cli.spec b/pkg/docker-cli/rpm/docker-ce-cli.spec index 3fab6249..a61d4414 100644 --- a/pkg/docker-cli/rpm/docker-ce-cli.spec +++ b/pkg/docker-cli/rpm/docker-ce-cli.spec @@ -33,7 +33,6 @@ BuildRequires: make Conflicts: docker Conflicts: docker-io -Conflicts: docker-engine-cs Conflicts: docker-ee Conflicts: docker-ee-cli diff --git a/pkg/docker-engine/deb/control b/pkg/docker-engine/deb/control index 1505fe8c..bca3ff62 100644 --- a/pkg/docker-engine/deb/control +++ b/pkg/docker-engine/deb/control @@ -38,10 +38,7 @@ Recommends: apparmor, Suggests: aufs-tools [amd64], cgroupfs-mount | cgroup-lite Conflicts: docker (<< 1.5~), docker-engine, - docker-engine-cs, - docker.io, - lxc-docker, - lxc-docker-virtual-package + docker.io Replaces: docker-engine Description: Docker: the open-source application container engine Docker is a product for you to build, ship and run any application as a diff --git a/pkg/docker-engine/rpm/docker-ce.spec b/pkg/docker-engine/rpm/docker-ce.spec index 45ef5e83..00ac31ce 100644 --- a/pkg/docker-engine/rpm/docker-ce.spec +++ b/pkg/docker-engine/rpm/docker-ce.spec @@ -57,7 +57,6 @@ BuildRequires: which Conflicts: docker Conflicts: docker-io -Conflicts: docker-engine-cs Conflicts: docker-ee Obsoletes: docker-ce-selinux