From 80397955232ad2d35e33d9e1f30ea74f51259fa5 Mon Sep 17 00:00:00 2001 From: Andrew Hsu Date: Fri, 2 Dec 2016 14:39:24 -0800 Subject: [PATCH] get rhel7.3 selinux-policy-devel pkg for centos-7 Signed-off-by: Andrew Hsu Upstream-commit: bfe5cab13bf0c83624fde0ab74f223bfa15d04c2 Component: engine --- .../engine/contrib/builder/rpm/amd64/centos-7/Dockerfile | 1 + components/engine/contrib/builder/rpm/amd64/generate.sh | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/components/engine/contrib/builder/rpm/amd64/centos-7/Dockerfile b/components/engine/contrib/builder/rpm/amd64/centos-7/Dockerfile index a1e462c0f8..fac5afd30d 100644 --- a/components/engine/contrib/builder/rpm/amd64/centos-7/Dockerfile +++ b/components/engine/contrib/builder/rpm/amd64/centos-7/Dockerfile @@ -7,6 +7,7 @@ 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.3 RUN curl -fSL "https://golang.org/dl/go${GO_VERSION}.linux-amd64.tar.gz" | tar xzC /usr/local diff --git a/components/engine/contrib/builder/rpm/amd64/generate.sh b/components/engine/contrib/builder/rpm/amd64/generate.sh index 895837e3c8..b91b91e056 100755 --- a/components/engine/contrib/builder/rpm/amd64/generate.sh +++ b/components/engine/contrib/builder/rpm/amd64/generate.sh @@ -142,6 +142,10 @@ 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" ;;