| commit | e81486637eb4aaef41d7639551df6993cfb52cca | [log] [tgz] |
|---|---|---|
| author | Tibor Vass <tiborvass@users.noreply.github.com> | Thu Dec 15 17:56:32 2016 -0800 |
| committer | GitHub <noreply@github.com> | Thu Dec 15 17:56:32 2016 -0800 |
| tree | d50a43c87e04e48b349f776f7c35713d871b08a4 | |
| parent | e9e3ab6b6a718118a5928e726ab1297f0b8ef5cd [diff] | |
| parent | 6646fc318f7abb2646634b18f5064cc0c9513f52 [diff] |
Merge pull request #29464 from andrewhsu/revert-selinux [1.12.x] Revert depend on docker-selinux for centos-7.3+
diff --git a/contrib/selinux-fedora-23/docker-engine-selinux/LICENSE b/contrib/selinux/docker-engine-selinux/LICENSE similarity index 100% rename from contrib/selinux-fedora-23/docker-engine-selinux/LICENSE rename to contrib/selinux/docker-engine-selinux/LICENSE
diff --git a/contrib/selinux-fedora-23/docker-engine-selinux/Makefile b/contrib/selinux/docker-engine-selinux/Makefile similarity index 100% rename from contrib/selinux-fedora-23/docker-engine-selinux/Makefile rename to contrib/selinux/docker-engine-selinux/Makefile
diff --git a/contrib/selinux-fedora-23/docker-engine-selinux/docker.fc b/contrib/selinux/docker-engine-selinux/docker.fc similarity index 100% rename from contrib/selinux-fedora-23/docker-engine-selinux/docker.fc rename to contrib/selinux/docker-engine-selinux/docker.fc
diff --git a/contrib/selinux-fedora-23/docker-engine-selinux/docker.if b/contrib/selinux/docker-engine-selinux/docker.if similarity index 100% rename from contrib/selinux-fedora-23/docker-engine-selinux/docker.if rename to contrib/selinux/docker-engine-selinux/docker.if
diff --git a/contrib/selinux-fedora-23/docker-engine-selinux/docker.te b/contrib/selinux/docker-engine-selinux/docker.te similarity index 100% rename from contrib/selinux-fedora-23/docker-engine-selinux/docker.te rename to contrib/selinux/docker-engine-selinux/docker.te
diff --git a/contrib/selinux-fedora-23/docker-engine-selinux/docker_selinux.8.gz b/contrib/selinux/docker-engine-selinux/docker_selinux.8.gz similarity index 100% rename from contrib/selinux-fedora-23/docker-engine-selinux/docker_selinux.8.gz rename to contrib/selinux/docker-engine-selinux/docker_selinux.8.gz Binary files differ
diff --git a/hack/make/.build-rpm/docker-engine.spec b/hack/make/.build-rpm/docker-engine.spec index 9dbdc91..88836f4 100644 --- a/hack/make/.build-rpm/docker-engine.spec +++ b/hack/make/.build-rpm/docker-engine.spec
@@ -86,11 +86,7 @@ # RE: rhbz#1195804 - ensure min NVR for selinux-policy %if 0%{?with_selinux} Requires: selinux-policy >= %{selinux_policyver} -%if 0%{?centos} >= 7 -Requires(pre): docker-selinux -%else Requires(pre): %{name}-selinux >= %{version}-%{release} -%endif # centos 7+ %endif # with_selinux # conflicting packages
diff --git a/hack/make/build-rpm b/hack/make/build-rpm index 69e20cb..18ff488 100644 --- a/hack/make/build-rpm +++ b/hack/make/build-rpm
@@ -132,12 +132,13 @@ --define '_experimental ${DOCKER_EXPERIMENTAL:-0}' \ ${rpmName}.spec EOF - - # by default do not create selinux rpm - # if there exists a selinux policy dir specifically for distro version - # then build a selinux rpm with the policy in the policy dir - if [ -d "./contrib/selinux-$version" ]; then - selinuxDir="selinux-${version}" + # selinux policy referencing systemd things won't work on non-systemd versions + # of centos or rhel, which we don't support anyways + if [ "${suite%.*}" -gt 6 ] && [[ "$version" != opensuse* ]]; then + selinuxDir="selinux" + if [ -d "./contrib/selinux-$version" ]; then + selinuxDir="selinux-${version}" + fi cat >> "$DEST/$version/Dockerfile.build" <<-EOF RUN tar -cz -C /usr/src/${rpmName}/contrib/${selinuxDir} -f /root/rpmbuild/SOURCES/${rpmName}-selinux.tar.gz ${rpmName}-selinux RUN rpmbuild -ba \ @@ -148,7 +149,6 @@ ${rpmName}-selinux.spec EOF fi - tempImage="docker-temp/build-rpm:$version" ( set -x && docker build -t "$tempImage" -f $DEST/$version/Dockerfile.build . ) docker run --rm "$tempImage" bash -c 'cd /root/rpmbuild && tar -c *RPMS' | tar -xvC "$DEST/$version"