mirror of
https://github.com/codeninjasllc/discourse.git
synced 2024-11-27 09:36:19 -05:00
FIX: Update vagrant box for ruby and phantomjs versions
These updates are needed to successfully run tests on the vagrant box.
This commit is contained in:
parent
c681b353f2
commit
b3b34314b6
2 changed files with 28 additions and 28 deletions
4
Vagrantfile
vendored
4
Vagrantfile
vendored
|
@ -3,8 +3,8 @@
|
|||
# See https://github.com/discourse/discourse/blob/master/docs/VAGRANT.md
|
||||
#
|
||||
Vagrant.configure("2") do |config|
|
||||
config.vm.box = 'discourse-0.9.9.13'
|
||||
config.vm.box_url = "https://d3fvb7b7auiut8.cloudfront.net/discourse-0.9.9.13.box"
|
||||
config.vm.box= "edgibbs/discourse-0.9.9.15.box"
|
||||
config.vm.box_url = "https://vagrantcloud.com/edgibbs/discourse-0.9.9.15.box"
|
||||
|
||||
# Make this VM reachable on the host network as well, so that other
|
||||
# VM's running other browsers can access our dev server.
|
||||
|
|
|
@ -1,26 +1,26 @@
|
|||
execute "upgrade-rvm" do
|
||||
command "gpg --keyserver hkp://keys.gnupg.net --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3"
|
||||
command "rvm get stable && rvm reload"
|
||||
action :nothing
|
||||
end
|
||||
|
||||
execute "upgrade-ruby" do
|
||||
command "yes | rvm install ruby-2.1.5 --verify-downloads 1"
|
||||
action :nothing
|
||||
end
|
||||
|
||||
execute "set-ruby" do
|
||||
command "rvm use ruby-2.1.5"
|
||||
user "vagrant"
|
||||
action :nothing
|
||||
end
|
||||
|
||||
ruby_block "ruby-upgrade-message" do
|
||||
block do
|
||||
Chef::Log.info "Upgrading ruby. This will take a while."
|
||||
end
|
||||
notifies :run, "execute[upgrade-rvm]", :immediately
|
||||
notifies :run, "execute[upgrade-ruby]", :immediately
|
||||
notifies :run, "execute[set-ruby]", :immediately
|
||||
action :create
|
||||
end
|
||||
# execute "upgrade-rvm" do
|
||||
# command "gpg --keyserver hkp://keys.gnupg.net --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3"
|
||||
# command "rvm get stable && rvm reload"
|
||||
# action :nothing
|
||||
# end
|
||||
#
|
||||
# execute "upgrade-ruby" do
|
||||
# command "yes | rvm install ruby-2.1.5 --verify-downloads 1"
|
||||
# action :nothing
|
||||
# end
|
||||
#
|
||||
# execute "set-ruby" do
|
||||
# command "rvm use ruby-2.1.5"
|
||||
# user "vagrant"
|
||||
# action :nothing
|
||||
# end
|
||||
#
|
||||
# ruby_block "ruby-upgrade-message" do
|
||||
# block do
|
||||
# Chef::Log.info "Upgrading ruby. This will take a while."
|
||||
# end
|
||||
# notifies :run, "execute[upgrade-rvm]", :immediately
|
||||
# notifies :run, "execute[upgrade-ruby]", :immediately
|
||||
# notifies :run, "execute[set-ruby]", :immediately
|
||||
# action :create
|
||||
# end
|
||||
|
|
Loading…
Reference in a new issue