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

Remove reference to CENTOS6 from generate script
This commit is contained in:
Arnaud Porterie 2015-07-21 07:27:29 -07:00
commit a7d61882c0

View file

@ -80,9 +80,5 @@ for version in "${versions[@]}"; do
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