p4u1/docker-cli
0
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

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

Browse Source 
Remove reference to CENTOS6 from generate script
Upstream-commit: a7d61882c0b65e9ccc0b64b019b63140164fb507
Component: engine
This commit is contained in:
Arnaud Porterie
2015-07-21 07:27:29 -07:00
parent d7cb201163 9acb0cc0fc
commit 84053f7c10
1 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
components/engine/contrib/builder/rpm/generate.sh
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