Skip to content

Commit

Permalink
created new version of the boxes with ruby 2.2.2. Also removed nano r…
Browse files Browse the repository at this point in the history
…eceipt since it seems to be broken...
  • Loading branch information
tkowark committed Oct 26, 2015
1 parent 75ac7f3 commit 2f78389
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 33 deletions.
3 changes: 1 addition & 2 deletions Cheffile
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,5 @@ cookbook 'apt'
cookbook 'build-essential'
cookbook 'postgresql', git: 'https://github.com/phlipper/chef-postgresql'
cookbook 'ruby_build'
cookbook 'rbenv', git: 'https://github.com/fnichol/chef-rbenv'
cookbook 'ruby_rbenv'
cookbook 'vim'
cookbook 'nano'
25 changes: 9 additions & 16 deletions Cheffile.lock
Original file line number Diff line number Diff line change
@@ -1,33 +1,26 @@
SITE
remote: https://community.opscode.com/api/v1/
specs:
apt (2.6.0)
build-essential (2.0.6)
nano (1.0.0)
apt (2.9.1)
build-essential (2.2.4)
ruby_build (0.8.0)
vim (1.1.2)

GIT
remote: https://github.com/fnichol/chef-rbenv
ref: master
sha: 0a3018634bafe58ad21c6ee271af015220e444b9
specs:
rbenv (0.7.3)
ruby_rbenv (1.0.1)
ruby_build (>= 0.0.0)
vim (2.0.0)

GIT
remote: https://github.com/phlipper/chef-postgresql
ref: master
sha: 4ed030dd3f6c770dd0f6a7a9bdc20f48ede448e0
sha: df0423d11db9f4cf1c66ae6d94bcde86ab32f30a
specs:
postgresql (0.14.1)
apt (>= 1.9.0)
postgresql (0.16.1)
apt (>= 2.6.1)

DEPENDENCIES
apt (>= 0)
build-essential (>= 0)
nano (>= 0)
postgresql (>= 0)
rbenv (>= 0)
ruby_build (>= 0)
ruby_rbenv (>= 0)
vim (>= 0)

25 changes: 10 additions & 15 deletions Vagrantfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@
# vi: set ft=ruby :

Vagrant.configure("2") do |config|
config.vm.box = "ubuntu/trusty64"
config.vm.box_url = "http://cloud-images.ubuntu.com/vagrant/trusty/current/trusty-server-cloudimg-amd64-vagrant-disk1.box"
#config.vm.box = "ubuntu/trusty32"
#config.vm.box_url = "http://cloud-images.ubuntu.com/vagrant/trusty/current/trusty-server-cloudimg-i386-vagrant-disk1.box"
#config.vm.box = "ubuntu/trusty64"
#config.vm.box_url = "http://cloud-images.ubuntu.com/vagrant/trusty/current/trusty-server-cloudimg-amd64-vagrant-disk1.box"
config.vm.box = "ubuntu/trusty32"
config.vm.box_url = "http://cloud-images.ubuntu.com/vagrant/trusty/current/trusty-server-cloudimg-i386-vagrant-disk1.box"

config.vm.provider :virtualbox do |vb|
vb.customize ["modifyvm", :id, "--memory", "2048"]
vb.customize ["modifyvm", :id, "--cpus", 2]
Expand All @@ -19,9 +19,7 @@ Vagrant.configure("2") do |config|

chef.add_recipe "apt"
chef.add_recipe "ruby_build"
chef.add_recipe "rbenv::user"
chef.add_recipe "rbenv::vagrant"
chef.add_recipe "nano"
chef.add_recipe "ruby_rbenv::user"
chef.add_recipe "vim"
chef.add_recipe "postgresql::server"
chef.add_recipe "postgresql::client"
Expand All @@ -31,13 +29,10 @@ Vagrant.configure("2") do |config|
rbenv: {
user_installs: [{
user: 'vagrant',
rubies: ["2.1.3","2.1.2"],
global: "2.1.2",
rubies: ["2.2.2"],
global: "2.2.2",
gems: {
"2.1.2" => [
{ name: "bundler" }
],
"2.1.3" => [
"2.2.2" => [
{ name: "bundler" }
]
}
Expand Down Expand Up @@ -81,7 +76,7 @@ Vagrant.configure("2") do |config|

]
},

}
end

Expand Down

0 comments on commit 2f78389

Please sign in to comment.