p4u1/docker-cli
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #18 from cpuguy83/conflicts_docker_ee

Browse Source 
Add conflicts with docker-ee
Upstream-commit: c5ed65456c22e4ea514eb730ed25378669a3c6f4
Component: packaging
This commit is contained in:
Andrew Hsu
2017-06-19 14:16:55 -07:00
committed by GitHub
parent bfbdad0a36 f162d46aa3
commit 77f12eb0fe
4 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
components/packaging/deb/common/control
View File

@ -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

1
components/packaging/rpm/centos-7/docker-ce.spec
View File

@ -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

1
components/packaging/rpm/fedora-24/docker-ce.spec
View File

@ -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

1
components/packaging/rpm/fedora-25/docker-ce.spec
View File

@ -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