From 6eb7ec1a2e01b52d3033c309b5ca580828f2f4c0 Mon Sep 17 00:00:00 2001 From: Virgil Dupras Date: Wed, 13 Dec 2017 15:47:01 -0500 Subject: [PATCH] Bump Vagrant and LXC requirements --- Gemfile | 5 +++-- README.md | 11 ++++------- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/Gemfile b/Gemfile index a3e7670..14b158e 100644 --- a/Gemfile +++ b/Gemfile @@ -1,7 +1,7 @@ source 'https://rubygems.org' group :development do - gem 'vagrant', git: 'https://github.com/mitchellh/vagrant.git', tag: 'v1.7.4' + gem 'vagrant', git: 'https://github.com/mitchellh/vagrant.git', tag: 'v1.8.7' gem 'guard' gem 'guard-rspec' gem 'rb-inotify' @@ -11,7 +11,8 @@ group :development, :test do gem 'rake', '~> 10.4.2' gem 'rspec', '~> 2.99.0' gem 'coveralls', '~> 0.7.2', require: (ENV['COVERAGE'] == 'true') - gem 'vagrant-spec', git: 'https://github.com/mitchellh/vagrant-spec.git', ref: '1df5a3af81cb7cce568b2eac52b8f6822bcb1d8e' + # The is the ref *just* before we switch to childprocess 0.6, which conflicts with vagrant 1.8 deps. + gem 'vagrant-spec', git: 'https://github.com/mitchellh/vagrant-spec.git', ref: '5006bc73cd8796465ca09307d4774f8ec8375aa0' end group :plugins do diff --git a/README.md b/README.md index b8568b9..bbac664 100644 --- a/README.md +++ b/README.md @@ -17,17 +17,14 @@ to see it in action. ## Requirements -* [Vagrant 1.5+](http://www.vagrantup.com/downloads.html) (tested with 1.7.2) -* lxc >=0.7.5 and <2.1.0 (see [#445](https://github.com/fgrehm/vagrant-lxc/issues/445)) -* tar 1.27 (the lxc-template script uses the --xattrs option) +* [Vagrant 1.8+](http://www.vagrantup.com/downloads.html) +* lxc >=1.0 and <2.1.0 (see [#445](https://github.com/fgrehm/vagrant-lxc/issues/445)) * `redir` (if you are planning to use port forwarding) * `brctl` (if you are planning to use private networks, on Ubuntu this means `apt-get install bridge-utils`) -* A [kernel != 3.5.0-17.28](https://github.com/fgrehm/vagrant-lxc/wiki/Troubleshooting#wiki-im-unable-to-restart-containers) The plugin is known to work better and pretty much out of the box on Ubuntu 14.04+ -hosts and installing the dependencies on it basically means a `apt-get install lxc lxc-templates cgroup-lite redir` -(older LXC versions like 0.7.5 shipped with Ubuntu 12.04 by default might require -[additional configurations to work](#backingstore-options)). For setting up other +hosts and installing the dependencies on it basically means a +`apt-get install lxc lxc-templates cgroup-lite redir`. For setting up other types of hosts please have a look at the [Wiki](https://github.com/fgrehm/vagrant-lxc/wiki). If you are on a Mac or Windows machine, you might want to have a look at [this](http://the.taoofmac.com/space/HOWTO/Vagrant)