diff --git a/CHANGELOG.md b/CHANGELOG.md index aac93f5..2cdc7d1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,6 @@ FEATURES: - - Enable Chef for Ubuntu Raring base box - New box format [#89](https://github.com/fgrehm/vagrant-lxc/issues/89) BUG FIXES: diff --git a/README.md b/README.md index 7d7c308..d0ee68c 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ to see the plugin in action and find out more about it. ## Features -* Vagrant's `up`, `halt`, `reload`, `destroy`, `ssh`, `provision` and `package` commands +* Vagrant's `up`, `halt`, `reload`, `destroy`, `ssh`, `provision` and `package` * Shared folders * Provisioning with any built-in Vagrant provisioner * Port forwarding @@ -55,7 +55,7 @@ vagrant plugin install vagrant-lxc After installing, add a [base box](#base-boxes) using any name you want, for example: ``` -vagrant box add quantal64 http://dl.dropbox.com/u/13510779/lxc-quantal-amd64-2013-05-08.box +vagrant box add quantal64 http://dl.dropbox.com/u/13510779/lxc-quantal-amd64-2013-07-08.box ``` Then create a Vagrantfile that looks like the following, changing the box name @@ -100,8 +100,9 @@ For other configuration options, please check [lxc.conf manpages](http://manpage ### Base boxes -Please check [the wiki](https://github.com/fgrehm/vagrant-lxc/wiki/Base-boxes#v2-boxes) -for a list of pre built base boxes and information on [how to build your own](https://github.com/fgrehm/vagrant-lxc/wiki/Base-boxes#building-your-own). +Please check [the wiki](https://github.com/fgrehm/vagrant-lxc/wiki/Base-boxes) +for a list of [pre built](https://github.com/fgrehm/vagrant-lxc/wiki/Base-boxes#available-boxes) +base boxes and information on [how to build your own](https://github.com/fgrehm/vagrant-lxc/wiki/Base-boxes#building-your-own). ## Current limitations diff --git a/development/Vagrantfile b/development/Vagrantfile index 03ab7a1..3f6798b 100644 --- a/development/Vagrantfile +++ b/development/Vagrantfile @@ -3,7 +3,7 @@ require 'pathname' BASE_URL = 'http://dl.dropbox.com/u/13510779' -LAST_RELEASE_DATE = '2013-05-08' +LAST_RELEASE_DATE = '2013-07-08' LOCAL_BOXES_PATH = Pathname('../boxes/output').expand_path def lxc_box_url(release_name) file_name = "lxc-#{release_name}-amd64-#{LAST_RELEASE_DATE}.box" diff --git a/example/Vagrantfile b/example/Vagrantfile index faf8564..a684cd7 100644 --- a/example/Vagrantfile +++ b/example/Vagrantfile @@ -32,10 +32,10 @@ echo "Hi there I'm a shell script used for provisioning" releases.each do |release| config.vm.define(release) do |lxc_config| lxc_config.vm.box = "#{release}64" - lxc_config.vm.box_url = "http://dl.dropbox.com/u/13510779/lxc-#{release}-amd64-2013-05-08.box" - lxc_config.vm.network :forwarded_port, guest: 80, host: (port += 1) + lxc_config.vm.box_url = "http://dl.dropbox.com/u/13510779/lxc-#{release}-amd64-2013-07-08.box" # Uncomment if you want to try out a box built locally - # lxc_config.vm.box_url = "../boxes/output/lxc-#{release}64.box" + # lxc_config.vm.box_url = "../boxes/output/lxc-#{release}-amd64-2013-07-08.box" + lxc_config.vm.network :forwarded_port, guest: 80, host: (port += 1) lxc_config.vm.hostname = "lxc-#{release}64-example" end end