Selaa lähdekoodia

Revert "get rhel7.3 selinux-policy-devel pkg for centos-7"

This reverts commit 97b66261380a2762c6b6290324f45eeb60903019.

Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
Andrew Hsu 8 vuotta sitten
vanhempi
commit
85aa678ad8

+ 0 - 1
contrib/builder/rpm/amd64/centos-7/Dockerfile

@@ -7,7 +7,6 @@ FROM centos:7
 RUN yum groupinstall -y "Development Tools"
 RUN yum -y swap -- remove systemd-container systemd-container-libs -- install systemd systemd-libs
 RUN yum install -y btrfs-progs-devel device-mapper-devel glibc-static libseccomp-devel libselinux-devel libtool-ltdl-devel pkgconfig selinux-policy selinux-policy-devel sqlite-devel systemd-devel tar git
-RUN [ `rpm -q selinux-policy-devel | grep el7_3` ] || yum -y --enablerepo=cr install selinux-policy-devel
 
 ENV GO_VERSION 1.6.4
 RUN curl -fSL "https://storage.googleapis.com/golang/go${GO_VERSION}.linux-amd64.tar.gz" | tar xzC /usr/local

+ 0 - 4
contrib/builder/rpm/amd64/generate.sh

@@ -132,10 +132,6 @@ for version in "${versions[@]}"; do
 			# use zypper
 			echo "RUN zypper --non-interactive install ${packages[*]}" >> "$version/Dockerfile"
 			;;
-		centos:7)
-			echo "RUN ${installer} install -y ${packages[*]}" >> "$version/Dockerfile"
-			echo 'RUN [ `rpm -q selinux-policy-devel | grep el7_3` ] || yum -y --enablerepo=cr install selinux-policy-devel' >> "$version/Dockerfile"
-			;;
 		*)
 			echo "RUN ${installer} install -y ${packages[*]}" >> "$version/Dockerfile"
 			;;