From 8a1ab4005df93e846933ea9e345a74b99633418b Mon Sep 17 00:00:00 2001 From: Richard Sacco Date: Wed, 21 Mar 2018 09:19:21 -0700 Subject: [PATCH 1/2] Changes to Dokku fixes windows vagrant installation --- docs/getting-started/install/vagrant.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/getting-started/install/vagrant.md b/docs/getting-started/install/vagrant.md index 0fe427a02..595fd836a 100644 --- a/docs/getting-started/install/vagrant.md +++ b/docs/getting-started/install/vagrant.md @@ -23,7 +23,7 @@ # for most users vagrant up - # windows users must instead use the following + # windows users must instead use the following in an elevated command prompt vagrant up dokku-windows ``` From 7a4ff80525093448af4b32b2035eee398eadb046 Mon Sep 17 00:00:00 2001 From: Richard Sacco Date: Fri, 23 Mar 2018 13:18:40 -0700 Subject: [PATCH 2/2] changes to vagrantfile to make sure bash file works out of the box on windows --- Vagrantfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Vagrantfile b/Vagrantfile index a61a83bfa..c892339b6 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -66,8 +66,8 @@ Vagrant::configure("2") do |config| vm.vm.network :forwarded_port, guest: 80, host: FORWARDED_PORT vm.vm.hostname = "#{DOKKU_DOMAIN}" vm.vm.network :private_network, ip: DOKKU_IP - vm.vm.provision :shell, :inline => "export DEBIAN_FRONTEND=noninteractive && apt-get update > /dev/null && apt-get -qq -y install git > /dev/null" - vm.vm.provision :shell, :inline => "cd /vagrant/ && export DOKKU_BRANCH=`git symbolic-ref -q --short HEAD 2>/dev/null` && export DOKKU_TAG=`git describe --tags --exact-match 2>/dev/null` && cd /root/ && cp /vagrant/bootstrap.sh ./ && bash bootstrap.sh" + vm.vm.provision :shell, :inline => "export DEBIAN_FRONTEND=noninteractive && apt-get update > /dev/null && apt-get -qq -y install git dos2unix > /dev/null" + vm.vm.provision :shell, :inline => "cd /vagrant/ && export DOKKU_BRANCH=`git symbolic-ref -q --short HEAD 2>/dev/null` && export DOKKU_TAG=`git describe --tags --exact-match 2>/dev/null` && cd /root/ && cp /vagrant/bootstrap.sh ./ && dos2unix bootstrap.sh && bash bootstrap.sh" end config.vm.define "dokku-deb", autostart: false do |vm|