Merge pull request #1190 from progrium/minor-vagrant-fixes

Fix docker gpg key installation
This commit is contained in:
Jose Diaz-Gonzalez committed 2015-05-16 13:43:07 -04:00
commit 9980b74688
3 files changed
+5 -5

No files matched your search

+1 -1
View File
@@ -86,7 +86,7 @@ docker: aufs
apt-get install -qq -y curl apt-get install -qq -y curl
egrep -i "^docker" /etc/group || groupadd docker egrep -i "^docker" /etc/group || groupadd docker
usermod -aG docker dokku usermod -aG docker dokku
curl --silent https://get.docker.com/gpg | apt-key add - curl -sSL https://get.docker.com/gpg | apt-key add -
echo deb http://get.docker.io/ubuntu docker main > /etc/apt/sources.list.d/docker.list echo deb http://get.docker.io/ubuntu docker main > /etc/apt/sources.list.d/docker.list
apt-get update apt-get update
ifdef DOCKER_VERSION ifdef DOCKER_VERSION
+2 -2
View File
@@ -137,10 +137,10 @@ function install_prerequisites {
sudo apt-get install -qq -y curl > /dev/null 2>&1 sudo apt-get install -qq -y curl > /dev/null 2>&1
logit "Installing docker gpg key" logit "Installing docker gpg key"
curl --silent https://get.docker.com/gpg 2> /dev/null | apt-key add - > /dev/null 2>&1 curl -sSL https://get.docker.com/gpg 2> /dev/null | apt-key add - > /dev/null 2>&1
logit "Installing dokku gpg key" logit "Installing dokku gpg key"
curl --silent https://packagecloud.io/gpg.key 2> /dev/null | apt-key add - > /dev/null 2>&1 curl -sSL https://packagecloud.io/gpg.key 2> /dev/null | apt-key add - > /dev/null 2>&1
logit "Running apt-get update" logit "Running apt-get update"
sudo apt-get update > /dev/null sudo apt-get update > /dev/null
+2 -2
View File
@@ -31,10 +31,10 @@ GOPATH = /home/vagrant/gocode
install-from-deb: install-from-deb:
echo "--> Initial apt-get update" echo "--> Initial apt-get update"
sudo apt-get update > /dev/null sudo apt-get update > /dev/null
sudo apt-get install -y apt-transport-https sudo apt-get install -y apt-transport-https curl
echo "--> Installing docker gpg key" echo "--> Installing docker gpg key"
curl --silent https://get.docker.com/gpg 2> /dev/null | apt-key add - 2>&1 >/dev/null curl -sSL https://get.docker.com/gpg | apt-key add -
echo "--> Installing dokku gpg key" echo "--> Installing dokku gpg key"
curl --silent https://packagecloud.io/gpg.key 2> /dev/null | apt-key add - 2>&1 >/dev/null curl --silent https://packagecloud.io/gpg.key 2> /dev/null | apt-key add - 2>&1 >/dev/null