beenull/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source 
This reverts commit bfe5cab13b.

Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
This commit is contained in:
Andrew Hsu 2016-12-08 16:27:23 -08:00
parent 9aa0c9a214
commit 793be849c8
2 changed files with 0 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
contrib/builder/rpm/amd64/centos-7/Dockerfile
View file

@ -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 cmake vim-common
RUN [ `rpm -q selinux-policy-devel | grep el7_3` ] || yum -y --enablerepo=cr install selinux-policy-devel
ENV GO_VERSION 1.7.4
RUN curl -fSL "https://golang.org/dl/go${GO_VERSION}.linux-amd64.tar.gz" | tar xzC /usr/local

4
contrib/builder/rpm/amd64/generate.sh
View file

@ -145,10 +145,6 @@ for version in "${versions[@]}"; do
packages=( "${packages[@]/pkgconfig/pkg-config}" )
echo "RUN ${installer} install -y ${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"
;;