From 20a5fc751f7bc7e99dd475f1bfc240f75367addd Mon Sep 17 00:00:00 2001 From: Andrew Hsu Date: Thu, 8 Dec 2016 16:27:23 -0800 Subject: [PATCH] Revert "get rhel7.3 selinux-policy-devel pkg for centos-7" This reverts commit bfe5cab13bf0c83624fde0ab74f223bfa15d04c2. Signed-off-by: Andrew Hsu Upstream-commit: 793be849c8bd13a88cc2b370141cc8c9b1c3f77b Component: engine --- .../engine/contrib/builder/rpm/amd64/centos-7/Dockerfile | 1 - components/engine/contrib/builder/rpm/amd64/generate.sh | 4 ---- 2 files changed, 5 deletions(-) diff --git a/components/engine/contrib/builder/rpm/amd64/centos-7/Dockerfile b/components/engine/contrib/builder/rpm/amd64/centos-7/Dockerfile index ffd91caa7f..1e1b6d5e19 100644 --- a/components/engine/contrib/builder/rpm/amd64/centos-7/Dockerfile +++ b/components/engine/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 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 diff --git a/components/engine/contrib/builder/rpm/amd64/generate.sh b/components/engine/contrib/builder/rpm/amd64/generate.sh index 0466a39fbc..58a5381fc2 100755 --- a/components/engine/contrib/builder/rpm/amd64/generate.sh +++ b/components/engine/contrib/builder/rpm/amd64/generate.sh @@ -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" ;;