瀏覽代碼

Merge pull request #14778 from thaJeztah/remove-rhel6-rpm-from-generate

Remove reference to CENTOS6 from generate script
Arnaud Porterie 10 年之前
父節點
當前提交
a7d61882c0
共有 1 個文件被更改,包括 1 次插入5 次删除
  1. 1 5
      contrib/builder/rpm/generate.sh

+ 1 - 5
contrib/builder/rpm/generate.sh

@@ -80,9 +80,5 @@ for version in "${versions[@]}"; do
 
 
 	echo 'ENV AUTO_GOPATH 1' >> "$version/Dockerfile"
 	echo 'ENV AUTO_GOPATH 1' >> "$version/Dockerfile"
 
 
-	if [ "$from" == "centos:6" ]; then
-		echo 'ENV DOCKER_BUILDTAGS selinux exclude_graphdriver_btrfs' >> "$version/Dockerfile"
-	else
-		echo 'ENV DOCKER_BUILDTAGS selinux' >> "$version/Dockerfile"
-	fi
+	echo 'ENV DOCKER_BUILDTAGS selinux' >> "$version/Dockerfile"
 done
 done