From 55d38f9cd6e8036761ed152352f45b596a3c4a3e Mon Sep 17 00:00:00 2001 From: Brian Goff Date: Sun, 18 Jun 2017 15:24:56 -0700 Subject: [PATCH] Add conflicts with docker-ee Signed-off-by: Brian Goff (cherry picked from commit 1c0fdb57a4c7d485f301050e140ad57bdf231cde) Signed-off-by: Andrew Hsu --- components/packaging/deb/common/control | 2 +- components/packaging/rpm/centos-7/docker-ce.spec | 1 + components/packaging/rpm/fedora-24/docker-ce.spec | 1 + components/packaging/rpm/fedora-25/docker-ce.spec | 1 + 4 files changed, 4 insertions(+), 1 deletion(-) diff --git a/components/packaging/deb/common/control b/components/packaging/deb/common/control index 45ca68f1c3..ce6a86f43b 100644 --- a/components/packaging/deb/common/control +++ b/components/packaging/deb/common/control @@ -16,7 +16,7 @@ Recommends: aufs-tools, git, xz-utils, ${apparmor:Recommends} -Conflicts: docker (<< 1.5~), docker.io, lxc-docker, lxc-docker-virtual-package, docker-engine-cs +Conflicts: docker (<< 1.5~), docker.io, lxc-docker, lxc-docker-virtual-package, docker-engine-cs, docker-ee Replaces: docker-engine Description: Docker: the open-source application container engine Docker is an open source project to build, ship and run any application as a diff --git a/components/packaging/rpm/centos-7/docker-ce.spec b/components/packaging/rpm/centos-7/docker-ce.spec index 818b36b773..57d05d56cb 100644 --- a/components/packaging/rpm/centos-7/docker-ce.spec +++ b/components/packaging/rpm/centos-7/docker-ce.spec @@ -35,6 +35,7 @@ Requires: device-mapper-libs >= 1.02.90-1 Conflicts: docker Conflicts: docker-io Conflicts: docker-engine-cs +Conflicts: docker-ee # Obsolete packages Obsoletes: docker-ce-selinux diff --git a/components/packaging/rpm/fedora-24/docker-ce.spec b/components/packaging/rpm/fedora-24/docker-ce.spec index d12c39b9a9..ed55c1d9c6 100644 --- a/components/packaging/rpm/fedora-24/docker-ce.spec +++ b/components/packaging/rpm/fedora-24/docker-ce.spec @@ -36,6 +36,7 @@ Requires: device-mapper-libs >= 1.02.90-1 Conflicts: docker Conflicts: docker-io Conflicts: docker-engine-cs +Conflicts: docker-ee # Obsolete packages Obsoletes: docker-ce-selinux diff --git a/components/packaging/rpm/fedora-25/docker-ce.spec b/components/packaging/rpm/fedora-25/docker-ce.spec index 56c8f6448e..69f5c81281 100644 --- a/components/packaging/rpm/fedora-25/docker-ce.spec +++ b/components/packaging/rpm/fedora-25/docker-ce.spec @@ -34,6 +34,7 @@ Requires: device-mapper-libs >= 1.02.90-1 Conflicts: docker Conflicts: docker-io Conflicts: docker-engine-cs +Conflicts: docker-ee # Obsolete packages Obsoletes: docker-ce-selinux