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

Update oracle linux selinux to match docker upstream

Browse Source 
Add a dependency on specific selinux version for OL on docker-engine.spec

Signed-off-by: Thomas Tanaka <thomas.tanaka@oracle.com>
Upstream-commit: fc7cc1cc75b68005ad161dad53d696696b5c5f9f
Component: engine
This commit is contained in:
Thomas Tanaka
2017-03-02 13:59:05 -08:00
parent e4f4018baa
commit de55ec79ea
8 changed files with 123 additions and 394 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
components/engine/hack/make/.build-rpm/docker-engine-selinux.spec
View File

@ -14,6 +14,9 @@ Vendor: Docker
Packager: Docker <support@docker.com>
%global selinux_policyver 3.13.1-102
%if 0%{?oraclelinux} >= 7
%global selinux_policyver 3.13.1-102.0.3.el7_3.15
%endif # oraclelinux 7
%global selinuxtype targeted
%global moduletype services
%global modulenames docker

7
components/engine/hack/make/.build-rpm/docker-engine.spec
View File

@ -84,9 +84,12 @@ Requires: device-mapper >= 1.02.90-2
%if 0%{?fedora} >= 22
%global selinux_policyver 3.13.1-128
%endif # fedora 22
%if 0%{?centos} >= 7 || 0%{?rhel} >= 7 || 0%{?oraclelinux} >= 7
%if 0%{?centos} >= 7 || 0%{?rhel} >= 7
%global selinux_policyver 3.13.1-23
%endif # centos,oraclelinux 7
%endif # centos,rhel 7
%if 0%{?oraclelinux} >= 7
%global selinux_policyver 3.13.1-102.0.3.el7_3.15
%endif # oraclelinux 7
%endif # with_selinux
# RE: rhbz#1195804 - ensure min NVR for selinux-policy