Discourse/discourse
Discourse/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-09-06 10:50:21 +08:00
Code Packages Activity Actions 13

FIX: Update vagrant box for ruby and phantomjs versions

Browse source 
These updates are needed to successfully run tests on the
vagrant box.
This commit is contained in:
Ed Gibbs 2015-01-12 06:36:48 -08:00
parent c681b353f2
commit b3b34314b6
2 changed files with 28 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Vagrantfile vendored
View file

@ -3,8 +3,8 @@
# See https://github.com/discourse/discourse/blob/master/docs/VAGRANT.md # See https://github.com/discourse/discourse/blob/master/docs/VAGRANT.md
# #
Vagrant.configure("2") do |config| Vagrant.configure("2") do |config|
config.vm.box = 'discourse-0.9.9.13' config.vm.box= "edgibbs/discourse-0.9.9.15.box"
config.vm.box_url = "https://d3fvb7b7auiut8.cloudfront.net/discourse-0.9.9.13.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 # Make this VM reachable on the host network as well, so that other
# VM's running other browsers can access our dev server. # VM's running other browsers can access our dev server.

52
chef/cookbooks/discourse/recipes/default.rb
View file

@ -1,26 +1,26 @@
execute "upgrade-rvm" do # execute "upgrade-rvm" do
command "gpg --keyserver hkp://keys.gnupg.net --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3" # command "gpg --keyserver hkp://keys.gnupg.net --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3"
command "rvm get stable && rvm reload" # command "rvm get stable && rvm reload"
action :nothing # action :nothing
end # end
#
execute "upgrade-ruby" do # execute "upgrade-ruby" do
command "yes | rvm install ruby-2.1.5 --verify-downloads 1" # command "yes | rvm install ruby-2.1.5 --verify-downloads 1"
action :nothing # action :nothing
end # end
#
execute "set-ruby" do # execute "set-ruby" do
command "rvm use ruby-2.1.5" # command "rvm use ruby-2.1.5"
user "vagrant" # user "vagrant"
action :nothing # action :nothing
end # end
#
ruby_block "ruby-upgrade-message" do # ruby_block "ruby-upgrade-message" do
block do # block do
Chef::Log.info "Upgrading ruby. This will take a while." # Chef::Log.info "Upgrading ruby. This will take a while."
end # end
notifies :run, "execute[upgrade-rvm]", :immediately # notifies :run, "execute[upgrade-rvm]", :immediately
notifies :run, "execute[upgrade-ruby]", :immediately # notifies :run, "execute[upgrade-ruby]", :immediately
notifies :run, "execute[set-ruby]", :immediately # notifies :run, "execute[set-ruby]", :immediately
action :create # action :create
end # end