Merge pull request #1057 from progrium/deb-packaging

Deb packaging

Makefile

@@ -79,7 +79,7 @@ docker: aufs
 	apt-get install -qq -y curl
 	egrep -i "^docker" /etc/group || groupadd docker
 	usermod -aG docker dokku
-	curl --silent https://get.docker.io/gpg | apt-key add -
+	curl --silent https://get.docker.com/gpg | apt-key add -
 	echo deb http://get.docker.io/ubuntu docker main > /etc/apt/sources.list.d/docker.list
 	apt-get update
 ifdef DOCKER_VERSION

Vagrantfile

@@ -53,6 +53,6 @@ Vagrant::configure("2") do |config|
 
   if Pathname.new(PUBLIC_KEY_PATH).exist?
     config.vm.provision :file, source: PUBLIC_KEY_PATH, destination: '/tmp/id_rsa.pub'
-    config.vm.provision :shell, :inline => "rm /root/.ssh/authorized_keys && mv /tmp/id_rsa.pub /root/.ssh/authorized_keys"
+    config.vm.provision :shell, :inline => "rm -f /root/.ssh/authorized_keys && cp /tmp/id_rsa.pub /root/.ssh/authorized_keys"
   end
 end

contrib/stackscript.sh

@@ -137,7 +137,7 @@ function install_prerequisites {
   sudo apt-get install -qq -y curl > /dev/null 2>&1
 
   logit "Installing docker gpg key"
-  curl --silent https://get.docker.io/gpg 2> /dev/null | apt-key add - > /dev/null 2>&1
+  curl --silent https://get.docker.com/gpg 2> /dev/null | apt-key add - > /dev/null 2>&1
 
   logit "Installing dokku gpg key"
   curl --silent https://packagecloud.io/gpg.key 2> /dev/null | apt-key add - > /dev/null 2>&1

deb.mk

@@ -29,8 +29,12 @@ GOPATH = /home/vagrant/gocode
 .PHONY: install-from-deb deb-all deb-buildstep deb-dokku deb-gems deb-pluginhook deb-setup deb-sshcommand
 
 install-from-deb:
+	echo "--> Initial apt-get update"
+	sudo apt-get update > /dev/null
+	sudo apt-get install -y apt-transport-https
+
 	echo "--> Installing docker gpg key"
-	curl --silent https://get.docker.io/gpg 2> /dev/null | apt-key add - 2>&1 >/dev/null
+	curl --silent https://get.docker.com/gpg 2> /dev/null | apt-key add - 2>&1 >/dev/null
 
 	echo "--> Installing dokku gpg key"
 	curl --silent https://packagecloud.io/gpg.key 2> /dev/null | apt-key add - 2>&1 >/dev/null
@@ -43,7 +47,7 @@ install-from-deb:
 	sudo apt-get update > /dev/null
 
 	echo "--> Installing pre-requisites"
-	sudo apt-get install -y linux-image-extra-`uname -r` apt-transport-https
+	sudo apt-get install -y linux-image-extra-`uname -r`
 
 	echo "--> Installing dokku"
 	sudo apt-get install -y dokku

debian/postinst

@@ -13,6 +13,8 @@ case "$1" in
     egrep -i "^docker" /etc/group || groupadd docker
     usermod -aG docker dokku
     dokku plugins-install
+    rm -f /home/dokku/VERSION
+    cp /var/lib/dokku/STABLE_VERSION /home/dokku/VERSION
 
     if [ -f /etc/init/dokku-installer.conf ] && service dokku-installer status 2> /dev/null | grep waiting; then
         sudo service dokku-installer start