vagrant-lxc 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 186bdb083beeef3921bd1365defc643f73ee384e
-  data.tar.gz: 493eaf050cd7c208af7098ed3f0d6a4ecd3b508f
+  metadata.gz: 1c9e378441e40002c34e265155c4066485bf4e00
+  data.tar.gz: 26cfdc7e029ba157e961944c2346fa1e3d3b5135
 SHA512:
-  metadata.gz: 1efa2adc9cce87eca8a4fa1878f019cecb0834ec347f0ec5fed463fed8a5dd50f63792d72928d2ba34fecc9ee908190d6a3119551987158bba47d68444e7dc95
-  data.tar.gz: 080dde3c3857967619f7b1033e379d9c8e0c340e6128b7d53edcd2a89b71b496fefbe4f525c7c6874ee1978c207f054777da6bf7e9f13234c4fb0beedb6a9b4a
+  metadata.gz: 20495f21d5311e8397de76cfab8d01cb40247dca891a5051382b16e5b4ba6a948f4708addcafc691384a6f82aca1dc64b7318ea03b98a65c3ca3bb64bcd43010
+  data.tar.gz: d9b10838087a6d919a83c28430e8c657bd2fddf0223f9cd910d64f6051591a912cf7308ece39f5535ea4c24b02dcdb2124af5d5633b14680b73e09ad9d986b2c

data/.gitignore

@@ -24,5 +24,6 @@ doc/
 /cache
 
 /boxes/**/*.tar.gz
-/boxes/quantal64/rootfs-amd64/
+/boxes/quantal64/partial/
+/boxes/quantal64/rootfs/
 /boxes/output/

data/.vimrc

@@ -1 +1 @@
-set wildignore+=*/vagrant-1.1/*
+set wildignore+=*/boxes/quantal64/rootfs/*,*/boxes/quantal64/partial/*

data/CHANGELOG.md

@@ -1,3 +1,25 @@
+## [0.3.0](https://github.com/fgrehm/vagrant-lxc/compare/v0.2.0...v0.3.0)
+
+BACKWARDS INCOMPATIBILITIES:
+
+  - Boxes `lxc-template` should support a `--tarball` parameter
+  - `start_opts` config was renamed to `customize`, please check the README for the expected parameters
+  - V1 boxes are no longer supported
+  - `target_rootfs_path` is no longer supported, just symlink `/var/lib/lxc` to the desired folder in case you want to point it to another partition
+
+IMPROVEMENTS:
+
+  - lxc templates are removed from lxc template dir after container is created
+  - Treat NFS shared folders as a normal shared folder instead of ignoring it so we can share the same Vagrantfile with VBox environments
+  - Support for lxc 0.7.5 (tested on Ubuntu 12.04) [#49](https://github.com/fgrehm/vagrant-lxc/issues/49)
+  - Remove `/tmp` files when packaging quantal64 base box [#48](https://github.com/fgrehm/vagrant-lxc/issues/48)
+  - Avoid picking the best mirror on quantal64 base box [#38](https://github.com/fgrehm/vagrant-lxc/issues/38)
+
+BUG FIXES:
+
+  - Redirect `redir`'s stderr output to `/dev/null` [#51](https://github.com/fgrehm/vagrant-lxc/issues/51)
+  - Switch from `ifconfig` to `ip` to grab container's IP to avoid localization issues [#50](https://github.com/fgrehm/vagrant-lxc/issues/50)
+
 ## [0.2.0](https://github.com/fgrehm/vagrant-lxc/compare/v0.1.1...v0.2.0)
 
   - Experimental box packaging (only tested with Ubuntu 64 base box)

data/Gemfile

@@ -6,7 +6,7 @@ group :development do
   # We depend on Vagrant for development, but we don't add it as a
   # gem dependency because we expect to be installed within the
   # Vagrant environment itself using `vagrant plugin`.
-  gem 'vagrant', git: 'https://github.com/mitchellh/vagrant.git'
+  gem 'vagrant', git: 'https://github.com/mitchellh/vagrant.git', tag: 'v1.1.5'
   gem 'guard'
   gem 'guard-rspec'
   gem 'guard-bundler'

data/Gemfile.lock

@@ -1,8 +1,9 @@
 GIT
   remote: https://github.com/mitchellh/vagrant.git
-  revision: 87613ec9392d4660ffcb1d5755307136c06af08c
+  revision: 64e360814c3ad960d810456add977fd4c7d47ce6
+  tag: v1.1.5
   specs:
-    vagrant (1.1.4)
+    vagrant (1.1.5)
       childprocess (~> 0.3.7)
       erubis (~> 2.7.0)
       i18n (~> 0.6.0)
@@ -14,7 +15,7 @@ GIT
 PATH
   remote: .
   specs:
-    vagrant-lxc (0.2.0)
+    vagrant-lxc (0.3.0)
 
 GEM
   remote: https://rubygems.org/
@@ -22,21 +23,22 @@ GEM
     childprocess (0.3.9)
       ffi (~> 1.0, >= 1.0.11)
     coderay (1.0.9)
-    diff-lcs (1.2.1)
+    diff-lcs (1.2.2)
     erubis (2.7.0)
     ffi (1.6.0)
-    guard (1.6.2)
+    formatador (0.2.4)
+    guard (1.7.0)
+      formatador (>= 0.2.4)
       listen (>= 0.6.0)
       lumberjack (>= 1.0.2)
       pry (>= 0.9.10)
-      terminal-table (>= 1.4.3)
       thor (>= 0.14.6)
     guard-bundler (1.0.0)
       bundler (~> 1.0)
       guard (~> 1.1)
     guard-ctags-bundler (0.1.6)
       guard (>= 1.1)
-    guard-rspec (2.5.1)
+    guard-rspec (2.5.2)
       guard (>= 1.1)
       rspec (~> 2.11)
     i18n (0.6.4)
@@ -73,8 +75,7 @@ GEM
       simplecov-html (~> 0.7.1)
     simplecov-html (0.7.1)
     slop (3.4.4)
-    terminal-table (1.4.5)
-    thor (0.18.0)
+    thor (0.18.1)
 
 PLATFORMS
   ruby

data/README.md

@@ -1,22 +1,27 @@
 # vagrant-lxc [![Build Status](https://travis-ci.org/fgrehm/vagrant-lxc.png?branch=master)](https://travis-ci.org/fgrehm/vagrant-lxc) [![Gem Version](https://badge.fury.io/rb/vagrant-lxc.png)](http://badge.fury.io/rb/vagrant-lxc) [![Code Climate](https://codeclimate.com/github/fgrehm/vagrant-lxc.png)](https://codeclimate.com/github/fgrehm/vagrant-lxc)
 
-Experimental Linux Containers support for Vagrant 1.1+
+Linux Containers support for Vagrant 1.1+
 
 
 ## Dependencies
 
-Vagrant 1.1+ (1.1.4+ recommended), `lxc` and `redir` packages and a Kernel [higher than 3.5.0-17.28](#help-im-unable-to-restart-containers),
-which on Ubuntu 12.10 means something like:
+* Vagrant 1.1+ (1.1.3+ recommended)
+* lxc 0.7.5+ (0.8.0-rc1+ recommended)
+* redir
+* A Kernel [higher than 3.5.0-17.28](#help-im-unable-to-restart-containers)
+
+On a clean Ubuntu 12.10 machine it means something like:
 
 ```
 sudo apt-get update && sudo apt-get dist-upgrade
 sudo apt-get install lxc redir
-wget "http://files.vagrantup.com/packages/87613ec9392d4660ffcb1d5755307136c06af08c/vagrant_`uname -m`.deb" -O /tmp/vagrant.deb
+# Downloads and install Vagrant 1.1.5
+wget "http://files.vagrantup.com/packages/64e360814c3ad960d810456add977fd4c7d47ce6/vagrant_`uname -m`.deb" -O /tmp/vagrant.deb
 sudo dpkg -i /tmp/vagrant.deb
 ```
 
 
-## What is currently supported? (v0.2.0)
+## What is currently supported? (v0.3.0)
 
 Pretty much everything you need from Vagrant:
 
@@ -27,13 +32,13 @@ Pretty much everything you need from Vagrant:
 * Port forwarding
 
 *Please refer to the [closed issues](https://github.com/fgrehm/vagrant-lxc/issues?labels=&milestone=&page=1&state=closed)
-for the most up to date list.*
+and the [changelog](CHANGELOG.md) for most up to date information.*
 
 
 ## Current limitations
 
 * Does not detect forwarded ports collision, right now you are responsible for taking care of that
-* A hell lot of `sudo`s
+* A hell lot of `sudo`s (this will probably be like this until [user namespaces](http://s3hh.wordpress.com/2013/02/12/user-namespaces-lxc-meeting/) are supported)
 * Only a [single ubuntu box supported](boxes)
 * "[works on  my machine](https://github.com/fgrehm/vagrant-lxc/issues/20)" (TM)
 * [Does not tell you if dependencies are not met](https://github.com/fgrehm/vagrant-lxc/issues/11)
@@ -42,42 +47,52 @@ for the most up to date list.*
   and some known [bugs](https://github.com/fgrehm/vagrant-lxc/issues?labels=bug&page=1&state=open)
 
 
+## Installation
+
+```
+vagrant plugin install vagrant-lxc
+```
+
 ## Usage
 
-Make sure you have [Vagrant 1.1+](http://downloads.vagrantup.com/) and run:
+After installing, add the quantal64 base box using any name you want:
 
 ```
-vagrant plugin install vagrant-lxc
+vagrant box add lxc-quantal64 http://dl.dropbox.com/u/13510779/lxc-quantal64-2013-04-10.box
 ```
 
-After that you can create a `Vagrantfile` like the one below and run `vagrant up --provider=lxc`:
+Make a Vagrantfile that looks like the following, filling in your information where necessary:
 
 ```ruby
 Vagrant.configure("2") do |config|
-  config.vm.box     = "lxc-quantal64"
-  config.vm.box_url = 'http://dl.dropbox.com/u/13510779/lxc-quantal64-2013-03-31.box'
-
-  # Share an additional folder to the guest Container. The first argument
-  # is the path on the host to the actual folder. The second argument is
-  # the path on the guest to mount the folder. And the optional third
-  # argument is a set of non-required options.
-  config.vm.synced_folder "/tmp", "/host_tmp"
+  config.vm.box = "lxc-quantal64"
 
+  # You can omit this block if you don't need to override any container setting
   config.vm.provider :lxc do |lxc|
-    # Set the folder where container's rootfs will be stored when created
-    lxc.target_rootfs_path = '/path/to/container/rootfs'
-    # Same as 'customize ["modifyvm", :id, "--memory", "1024"]' for VirtualBox
-    lxc.start_opts << 'lxc.cgroup.memory.limit_in_bytes=400M'
-    # Limits swap size
-    lxc.start_opts << 'lxc.cgroup.memory.memsw.limit_in_bytes=500M'
+    # OPTIONAL: Same effect as as 'customize ["modifyvm", :id, "--memory", "1024"]' for VirtualBox
+    lxc.customize 'cgroup.memory.limit_in_bytes', '1024M'
+    # OPTIONAL: Limits swap size
+    lxc.customize 'cgroup.memory.memsw.limit_in_bytes', '512M'
   end
-
-  # ... your puppet / chef / shell provisioner configs here ...
 end
 ```
 
+And finally run `vagrant up --provider=lxc`.
+
 If you are on a mac or window host and still want to try this plugin out, you
-can use the [same Vagrant VirtualBox machine I use for development](#using-virtualbox-and-vagrant-11-for-development).
+can use the [same Vagrant VirtualBox machine I use for development](#using-virtualbox-for-development).
+
+### Storing container's rootfs on a separate partition
+
+Before the 0.3.0 version of this plugin, there used to be a support for specifying
+the container's rootfs path from the `Vagrantfile`, on 0.3.0 this was removed as you
+can achieve the same effect by symlinking or mounting `/var/lib/lxc` on a separate
+partition.
+
+### NFS shared folders
+
+NFS shared folders are not supported and will behave as a "normal" shared folder
+so we can share the same Vagrantfile with VBox environments.
 
 
 ## Development
@@ -85,7 +100,7 @@ can use the [same Vagrant VirtualBox machine I use for development](#using-virtu
 If  want to develop from your physical machine, just sing that same old song:
 
 ```
-git clone git://github.com/fgrehm/vagrant-lxc.git --recurse
+git clone git://github.com/fgrehm/vagrant-lxc.git
 cd vagrant-lxc
 bundle install
 bundle exec rake # to run all specs
@@ -98,7 +113,6 @@ bundle exec rake boxes:quantal64:build
 vagrant box add quantal64 boxes/output/lxc-quantal64.box
 ```
 
-
 ### Using `vagrant-lxc` to develop itself
 
 Yes! The gem has been [bootstrapped](http://en.wikipedia.org/wiki/Bootstrapping_(compilers)

data/boxes/quantal64/download-ubuntu

@@ -15,16 +15,15 @@ suggest_flush()
 
 cleanup()
 {
-    rm -rf $cache/partial-$arch
-    rm -rf $cache/rootfs-$arch
+    rm -rf $cache/partial
+    rm -rf $cache/rootfs
 }
 
 write_sourceslist()
 {
     # $1 => path to the rootfs
 
-    # TODO: Mirrors sometimes are giving us some 404s
-    MIRROR=${MIRROR:-mirror://mirrors.ubuntu.com/mirrors.txt}
+    MIRROR=${MIRROR:-http://archive.ubuntu.com/ubuntu}
     SECURITY_MIRROR=${SECURITY_MIRROR:-http://security.ubuntu.com/ubuntu}
 
     cat >> "$1/etc/apt/sources.list" << EOF
@@ -41,18 +40,18 @@ download_ubuntu()
 
     trap cleanup EXIT SIGHUP SIGINT SIGTERM
     # check the mini ubuntu was not already downloaded
-    mkdir -p "$cache/partial-$arch"
+    mkdir -p "$cache/partial"
     if [ $? -ne 0 ]; then
-        echo "Failed to create '$cache/partial-$arch' directory"
+        echo "Failed to create '$cache/partial' directory"
         return 1
     fi
 
     # download a mini ubuntu into a cache
     echo "Downloading ubuntu $release minimal ..."
     if [ -n "$(which qemu-debootstrap)" ]; then
-        qemu-debootstrap --verbose --components=main,universe --arch=$arch --include=$packages $release $cache/partial-$arch $MIRROR
+        qemu-debootstrap --verbose --components=main,universe --arch=$arch --include=$packages $release $cache/partial $MIRROR
     else
-        debootstrap --verbose --components=main,universe --arch=$arch --include=$packages $release $cache/partial-$arch $MIRROR
+        debootstrap --verbose --components=main,universe --arch=$arch --include=$packages $release $cache/partial $MIRROR
     fi
 
     if [ $? -ne 0 ]; then
@@ -63,27 +62,27 @@ download_ubuntu()
     # Serge isn't sure whether we should avoid doing this when
     # $release == `distro-info -d`
     echo "Installing updates"
-    > $cache/partial-$arch/etc/apt/sources.list
-    write_sourceslist $cache/partial-$arch/ $arch
+    > $cache/partial/etc/apt/sources.list
+    write_sourceslist $cache/partial/ $arch
 
-    chroot "$1/partial-${arch}" apt-get update
+    chroot "$1/partial" apt-get update
     if [ $? -ne 0 ]; then
         echo "Failed to update the apt cache"
         return 1
     fi
-    cat > "$1/partial-${arch}"/usr/sbin/policy-rc.d << EOF
+    cat > "$1/partial"/usr/sbin/policy-rc.d << EOF
 #!/bin/sh
 exit 101
 EOF
-    chmod +x "$1/partial-${arch}"/usr/sbin/policy-rc.d
+    chmod +x "$1/partial"/usr/sbin/policy-rc.d
 
-    lxc-unshare -s MOUNT -- chroot "$1/partial-${arch}" apt-get dist-upgrade -y || { suggest_flush; false; }
+    lxc-unshare -s MOUNT -- chroot "$1/partial" apt-get dist-upgrade -y || { suggest_flush; false; }
 
-    rm -f "$1/partial-${arch}"/usr/sbin/policy-rc.d
+    rm -f "$1/partial"/usr/sbin/policy-rc.d
 
-    chroot "$1/partial-${arch}" apt-get clean
+    chroot "$1/partial" apt-get clean
 
-    mv "$1/partial-$arch" "$1/rootfs-$arch"
+    mv "$1/partial" "$1/rootfs"
     trap EXIT
     trap SIGINT
     trap SIGTERM
@@ -96,14 +95,14 @@ declare cache=`readlink -f .` \
         arch=amd64 \
         release=quantal
 
-if [ -d "${cache}/rootfs-${arch}" ]; then
-  echo 'The rootfs cache has been downloaded already, please remove it if you want to update'
+if [ -d "${cache}/rootfs" ]; then
+  echo 'The rootfs cache has been built already, please remove it if you want to update'
   exit 1
 fi
 
 download_ubuntu $cache $arch $release
 
-rootfs="${cache}/rootfs-${arch}"
+rootfs="${cache}/rootfs"
 
 echo "installing puppet"
 wget http://apt.puppetlabs.com/puppetlabs-release-precise.deb -O "${rootfs}/tmp/puppetlabs-release-${release}.deb"
@@ -118,3 +117,5 @@ curl -L https://www.opscode.com/chef/install.sh -k | sudo bash
 EOF
 chmod +x $rootfs/tmp/install-chef.sh
 chroot $rootfs /tmp/install-chef.sh
+
+rm -rf $rootfs/tmp/*

data/boxes/quantal64/lxc-template

@@ -155,16 +155,17 @@ EOF
     fi
 }
 
-copy_ubuntu()
+extract_rootfs()
 {
-    cache=$1
+    tarball=$1
     arch=$2
     rootfs=$3
 
-    # make a local copy of the miniubuntu
-    echo "Copying rootfs to $rootfs ..."
+    echo "Extracting $tarball ..."
     mkdir -p $(dirname $rootfs)
-    mv $cache/rootfs-$arch $rootfs || return 1
+    # Make sure the rootfs does not exist before extracting
+    rm -rf $rootfs
+    (cd `dirname $rootfs` && tar xfz $tarball)
     return 0
 }
 
@@ -172,7 +173,7 @@ install_ubuntu()
 {
     rootfs=$1
     release=$2
-    cache=$3 # "/var/cache/lxc/$release"
+    tarball=$3
     mkdir -p /var/lock/subsys/
 
     (
@@ -182,8 +183,7 @@ install_ubuntu()
             return 1
         fi
 
-        echo "Copy $cache/rootfs-$arch to $rootfs ... "
-        copy_ubuntu $cache $arch $rootfs
+        extract_rootfs $tarball $arch $rootfs
         if [ $? -ne 0 ]; then
             echo "Failed to copy rootfs"
             return 1
@@ -454,7 +454,7 @@ EOF
     return 0
 }
 
-options=$(getopt -o a:b:hp:r:xn:FS:d:C -l arch:,help,path:,release:,trim,name:,flush-cache,auth-key:,debug:,cache: -- "$@")
+options=$(getopt -o a:b:hp:r:xn:FS:d:C -l arch:,help,path:,release:,trim,name:,flush-cache,auth-key:,debug:,tarball: -- "$@")
 if [ $? -ne 0 ]; then
     usage $(basename $0)
     exit 1
@@ -496,7 +496,7 @@ do
     -h|--help)      usage $0 && exit 0;;
     -p|--path)      path=$2; shift 2;;
     -n|--name)      name=$2; shift 2;;
-    -C|--cache)     cache=$2; shift 2;;
+    -T|--tarball)   tarball=$2; shift 2;;
     -r|--release)   release=$2; shift 2;;
     -a|--arch)      arch=$2; shift 2;;
     -x|--trim)      trim_container=1; shift 1;;
@@ -539,7 +539,7 @@ else
     rootfs=$path/rootfs
 fi
 
-install_ubuntu $rootfs $release $cache
+install_ubuntu $rootfs $release $tarball
 if [ $? -ne 0 ]; then
     echo "failed to install ubuntu $release"
     exit 1

data/boxes/quantal64/metadata.json

@@ -1,6 +1,6 @@
 {
   "provider": "lxc",
-  "version":  "1",
+  "version":  "2",
 
   "template-opts": {
     "--arch":    "amd64",

data/development/Vagrantfile

@@ -49,17 +49,21 @@ Vagrant.configure("2") do |config|
     end
   end
 
+  config.vm.define :precise do |precise|
+    precise.vm.box      = 'precise64'
+    precise.vm.hostname = 'vbox'
+    precise.vm.box_url  = 'http://files.vagrantup.com/precise64.box'
+  end
+
   config.vm.define :lxc do |lxc_config|
     lxc_config.vm.hostname = 'lxc-dev-box'
-    lxc_config.vm.box_url  = 'http://dl.dropbox.com/u/13510779/lxc-quantal64-2013-03-31.box'
+    lxc_config.vm.box_url  = 'http://dl.dropbox.com/u/13510779/lxc-quantal64-2013-04-10.box'
     # Uncomment to test boxes built locally:
     # lxc_config.vm.box_url  = '../boxes/output/lxc-quantal64.box'
 
     lxc_config.vm.provider :lxc do |lxc|
       # Required to boot nested containers
-      lxc.start_opts << 'lxc.aa_profile=unconfined'
-      # Change this to override the path where the rootfs gets stored
-      # lxc.target_rootfs_path = '/path/to/vagrant-lxc-dev-box-rootfs'
+      lxc.customize 'aa_profile', 'unconfined'
     end
   end