docker/cli
1
0
Fork 0
mirror of https://github.com/docker/cli.git synced 2026-01-18 08:21:31 +03:00
Code Activity

Merge pull request #17 from cpuguy83/obsolete_docker-selinux_pkg

Browse Source 
Mark docker-*-selinux pkgs as obsolete
Upstream-commit: 43edc2d7fee731d0cac7b221266b9bd8e5cd5377
Component: packaging
This commit is contained in:
Andrew Hsu
2017-06-16 15:44:12 -07:00
committed by GitHub
parent d2f94fb172 a438006e4f
commit bfbdad0a36
3 changed files with 16 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -36,6 +36,11 @@ Conflicts: docker
Conflicts: docker-io
Conflicts: docker-engine-cs
# Obsolete packages
Obsoletes: docker-ce-selinux
Obsoletes: docker-engine-selinux
Obsoletes: docker-engine
%description
Docker is an open source project to build, ship and run any application as a
lightweight container.

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

@@ -27,6 +27,7 @@ Requires: libcgroup
Requires: systemd-units
Requires: tar
Requires: xz
Requires: container-selinux >= 1.10.3-55
# Resolves: rhbz#1165615
Requires: device-mapper-libs >= 1.02.90-1
@@ -36,6 +37,11 @@ Conflicts: docker
Conflicts: docker-io
Conflicts: docker-engine-cs
# Obsolete packages
Obsoletes: docker-ce-selinux
Obsoletes: docker-engine-selinux
Obsoletes: docker-engine
%description
Docker is an open source project to build, ship and run any application as a
lightweight container.

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

@@ -35,6 +35,11 @@ Conflicts: docker
Conflicts: docker-io
Conflicts: docker-engine-cs
# Obsolete packages
Obsoletes: docker-ce-selinux
Obsoletes: docker-engine-selinux
Obsoletes: docker-engine
%description
Docker is an open source project to build, ship and run any application as a
lightweight container.