github/dokku
0
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #1204 from 3onyc/bootstrap-fix

Browse Source 
Fix bootstrap.sh, install curl when it's missing, make curl follow redirects, don't suppress stderr
This commit is contained in:
Jose Diaz-Gonzalez
2015-05-22 04:04:23 -04:00
parent 6e0eb5938a 450f9f19b2
commit 3bf68616ad
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
bootstrap.sh
View File

@@ -15,6 +15,7 @@ if ! command -v apt-get &>/dev/null; then
fi
apt-get update
which curl > /dev/null || apt-get install -qq -y curl
[[ $(lsb_release -sr) == "12.04" ]] && apt-get install -qq -y python-software-properties
dokku_install_source() {
@@ -31,8 +32,8 @@ dokku_install_source() {
}
dokku_install_package() {
curl --silent https://get.docker.io/gpg 2> /dev/null | apt-key add - > /dev/null 2>&1
curl --silent https://packagecloud.io/gpg.key 2> /dev/null | apt-key add - > /dev/null 2>&1
curl -sSL https://get.docker.io/gpg | apt-key add -
curl -sSL https://packagecloud.io/gpg.key | apt-key add -
echo "deb http://get.docker.io/ubuntu docker main" > /etc/apt/sources.list.d/docker.list
echo "deb https://packagecloud.io/dokku/dokku/ubuntu/ trusty main" > /etc/apt/sources.list.d/dokku.list