Merge pull request #3128 from Modicrumb/modicrumb-3125

Changes to Dokku
This commit is contained in:
Jose Diaz-Gonzalez authored and GitHub committed 2018-03-23 16:57:20 -04:00
commit 80eb3bf8b9
2 files changed
+3 -3

No files matched your search

Vendored
+2 -2
View File
@@ -66,8 +66,8 @@ Vagrant::configure("2") do |config|
vm.vm.network :forwarded_port, guest: 80, host: FORWARDED_PORT vm.vm.network :forwarded_port, guest: 80, host: FORWARDED_PORT
vm.vm.hostname = "#{DOKKU_DOMAIN}" vm.vm.hostname = "#{DOKKU_DOMAIN}"
vm.vm.network :private_network, ip: DOKKU_IP 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 => "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 ./ && bash bootstrap.sh" 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 end
config.vm.define "dokku-deb", autostart: false do |vm| config.vm.define "dokku-deb", autostart: false do |vm|
+1 -1
View File
@@ -23,7 +23,7 @@
# for most users # for most users
vagrant up 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 vagrant up dokku-windows
``` ```