From 3a8060916699d35378395d30d3b469d4190adaa5 Mon Sep 17 00:00:00 2001 From: Christoph Hartmann Date: Fri, 2 Aug 2013 19:35:14 +0200 Subject: [PATCH 1/2] add missing git dependency --- Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile b/Makefile index 8bcdcfc50..4cbcf608d 100644 --- a/Makefile +++ b/Makefile @@ -19,6 +19,7 @@ plugins: pluginhook docker dependencies: gitreceive sshcommand pluginhook docker stack gitreceive: + apt-get -y install git wget -qO /usr/local/bin/gitreceive ${GITRECEIVE_URL} chmod +x /usr/local/bin/gitreceive test -f /home/git/receiver || gitreceive init From ba8a84d42225a0f096e118c7c825b96d9f457e54 Mon Sep 17 00:00:00 2001 From: Christoph Hartmann Date: Sat, 3 Aug 2013 09:33:15 +0200 Subject: [PATCH 2/2] moved git dependency to Vagrantfile --- Makefile | 1 - Vagrantfile | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 4cbcf608d..8bcdcfc50 100644 --- a/Makefile +++ b/Makefile @@ -19,7 +19,6 @@ plugins: pluginhook docker dependencies: gitreceive sshcommand pluginhook docker stack gitreceive: - apt-get -y install git wget -qO /usr/local/bin/gitreceive ${GITRECEIVE_URL} chmod +x /usr/local/bin/gitreceive test -f /home/git/receiver || gitreceive init diff --git a/Vagrantfile b/Vagrantfile index 7e35d2a93..26148b687 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -10,7 +10,7 @@ Vagrant::configure("2") do |config| config.vm.box = BOX_NAME config.vm.box_url = BOX_URI config.vm.synced_folder File.dirname(__FILE__), "/root/dokku" - config.vm.provision :shell, :inline => "cd /root/dokku && make all" + config.vm.provision :shell, :inline => "apt-get -y install git && cd /root/dokku && make all" config.vm.network :forwarded_port, guest: 80, host: 8080 config.vm.hostname = "#{DOKKU_DOMAIN}" config.vm.network :private_network, ip: DOKKU_IP