Upgrade dokku installation to use docker-engine

Also simplify deb-based installation everywhere.

Closes #1295
Closes #1461
This commit is contained in:
Jose Diaz-Gonzalez committed 2015-09-15 13:35:45 -07:00
1 parent 1be4b94226
commit 1e479c63bd
8 files changed
+47 -70

No files matched your search

+1 -1
View File
@@ -19,7 +19,7 @@
"sleep 30",
"echo '--> Updating apt repositories'",
"sudo apt-get update > /dev/null",
"sudo apt-get update -qq > /dev/null",
"echo '--> Installing make requirement'",
"sudo apt-get -qq -y install build-essential",
+8 -17
View File
@@ -134,26 +134,17 @@ EOF
}
function install_prerequisites {
sudo apt-get install -qq -y curl > /dev/null 2>&1
logit "Installing docker gpg key"
curl -sSL https://get.docker.com/gpg 2> /dev/null | apt-key add - > /dev/null 2>&1
logit "Installing dokku gpg key"
curl -sSL https://packagecloud.io/gpg.key 2> /dev/null | apt-key add - > /dev/null 2>&1
logit "Running apt-get update"
sudo apt-get update > /dev/null
logit "Installing pre-requisites"
sudo apt-get install -qq -y apt-transport-https > /dev/null 2>&1
sudo apt-get update -qq > /dev/null
sudo apt-get install -qq -y apt-transport-https curl > /dev/null 2>&1
logit "Setting up apt repositories"
echo "deb https://get.docker.io/ubuntu docker main" > /etc/apt/sources.list.d/docker.list
logit "Installing docker"
curl -sSL https://get.docker.com/ | sh
logit "Installing dokku"
curl -sSL https://packagecloud.io/gpg.key 2> /dev/null | apt-key add - > /dev/null 2>&1
echo "deb https://packagecloud.io/dokku/dokku/ubuntu/ trusty main" > /etc/apt/sources.list.d/dokku.list
logit "Running apt-get update"
sudo apt-get update > /dev/null
sudo apt-get update -qq > /dev/null
}
function install_dokku {