vagrant-lxc 0.3.3 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e016d9b9740eb13e9c7ea4a907b11b68985c4375
-  data.tar.gz: 87be64028dec8c58df5d0ae1620f4dc6eccaab57
+  metadata.gz: c50dc38cceb25885011a091ace53495f0992bb45
+  data.tar.gz: d9e0c2cb8b70ff4a170d1744f438ffffcdaca199
 SHA512:
-  metadata.gz: 3cb85194a618d8f52280ae67bb87be6a02c8fe69089ec0eb9858dbe34fad8328a11fbf21cc97378a1cb5cbd810191639b944f86329ace4289eb9dfecf1965e48
-  data.tar.gz: 6aff2121764c2d6f9149c861949cd2148b429d3df03d7adf95c1fbf5499f878aa23ab34786b7f63c421f3f280d3a3c5fbb10d187d6cd90c712b9e35f77266e91
+  metadata.gz: a71590125708f5bdb688a46fc5e6d282e3acb49c9045946becb261a856b7f6a23b29b2bef25370c8d6bc9de23f765cf27f2e3e6a2e6442fe030dde5d8442fc31
+  data.tar.gz: 380309703b319c8eb6e91be92a8e2e1a09f28164d1076753667253ea9eb1a9b2b36ec11cffec8a1667d886cb32395ef2f5f44eab51c216e3a1e5bb66539cc45f

data/CHANGELOG.md

@@ -1,8 +1,22 @@
+## [0.?.?](https://github.com/fgrehm/vagrant-lxc/compare/v0.3.3...master)
+
+FEATURES:
+
+  - Support for building Debian boxes (tks to @Val)
+  - Support for installing babushka on base boxes (tks to @Val)
+
+IMPROVEMENTS:
+
+  - Remove `/tmp` files after the machine has been successfully shut down [#68][]
+  - Clean up base boxes files after they've been configured, resulting in smaller packages
+  - Bump development dependency to Vagrant 1.2+ series
+
 ## [0.3.3](https://github.com/fgrehm/vagrant-lxc/compare/v0.3.2...v0.3.3) (April 23, 2013)
 
 BUG FIXES:
 
   - Properly kill `redir` child processes [#59][]
+  - Use `uname -m` on base Ubuntu lxc-template [#53][]
 
 IMPROVEMENTS:
 

data/Gemfile

@@ -3,14 +3,11 @@ source 'https://rubygems.org'
 gemspec
 
 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', tag: 'v1.1.5'
+  # TODO: Lock to 1.2.3 once it is out with this fix: https://github.com/mitchellh/vagrant/pull/1685
+  gem 'vagrant', git: 'https://github.com/mitchellh/vagrant.git'
+  gem 'vagrant-cachier'
   gem 'guard'
   gem 'guard-rspec'
-  gem 'guard-bundler'
-  gem 'guard-ctags-bundler'
   gem 'rb-inotify'
 end
 

data/Gemfile.lock

@@ -1,9 +1,8 @@
 GIT
   remote: https://github.com/mitchellh/vagrant.git
-  revision: 64e360814c3ad960d810456add977fd4c7d47ce6
-  tag: v1.1.5
+  revision: ccfd321ef98dc5c12b180cc3a26f12d870c0eff5
   specs:
-    vagrant (1.1.5)
+    vagrant (1.2.3.dev)
       childprocess (~> 0.3.7)
       erubis (~> 2.7.0)
       i18n (~> 0.6.0)
@@ -15,7 +14,7 @@ GIT
 PATH
   remote: .
   specs:
-    vagrant-lxc (0.3.3)
+    vagrant-lxc (0.3.4)
 
 GEM
   remote: https://rubygems.org/
@@ -24,48 +23,49 @@ GEM
       ffi (~> 1.0, >= 1.0.11)
     coderay (1.0.9)
     colorize (0.5.8)
-    coveralls (0.6.5)
+    coveralls (0.6.7)
       colorize
       multi_json (~> 1.3)
       rest-client
       simplecov (>= 0.7)
       thor
-    diff-lcs (1.2.2)
+    diff-lcs (1.2.4)
     erubis (2.7.0)
-    ffi (1.6.0)
+    ffi (1.8.1)
     formatador (0.2.4)
-    guard (1.7.0)
+    guard (1.8.0)
       formatador (>= 0.2.4)
-      listen (>= 0.6.0)
+      listen (>= 1.0.0)
       lumberjack (>= 1.0.2)
       pry (>= 0.9.10)
       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.2)
-      guard (>= 1.1)
-      rspec (~> 2.11)
+    guard-rspec (2.6.0)
+      guard (>= 1.8)
+      rspec (~> 2.13)
     i18n (0.6.4)
     json (1.7.7)
-    listen (0.7.3)
+    listen (1.0.3)
+      rb-fsevent (>= 0.9.3)
+      rb-inotify (>= 0.9)
+      rb-kqueue (>= 0.2)
     log4r (1.1.10)
     lumberjack (1.0.3)
     method_source (0.8.1)
-    mime-types (1.22)
-    multi_json (1.7.2)
+    mime-types (1.23)
+    multi_json (1.7.3)
     net-scp (1.1.0)
       net-ssh (>= 2.6.5)
-    net-ssh (2.6.6)
-    pry (0.9.12)
+    net-ssh (2.6.7)
+    pry (0.9.12.1)
       coderay (~> 1.0.5)
       method_source (~> 0.8)
       slop (~> 3.4)
     rake (10.0.4)
+    rb-fsevent (0.9.3)
     rb-inotify (0.9.0)
       ffi (>= 0.5.0)
+    rb-kqueue (0.2.0)
+      ffi (>= 0.5.0)
     rest-client (1.6.7)
       mime-types (>= 1.16)
     rspec (2.13.0)
@@ -77,7 +77,7 @@ GEM
       diff-lcs (>= 1.1.3, < 2.0)
     rspec-fire (1.1.3)
       rspec (~> 2.11)
-    rspec-mocks (2.13.0)
+    rspec-mocks (2.13.1)
     rspec-spies (2.1.4)
       rspec (~> 2.0)
     simplecov (0.7.1)
@@ -86,6 +86,7 @@ GEM
     simplecov-html (0.7.1)
     slop (3.4.4)
     thor (0.18.1)
+    vagrant-cachier (0.0.2)
 
 PLATFORMS
   ruby
@@ -93,8 +94,6 @@ PLATFORMS
 DEPENDENCIES
   coveralls
   guard
-  guard-bundler
-  guard-ctags-bundler
   guard-rspec
   rake
   rb-inotify
@@ -102,4 +101,5 @@ DEPENDENCIES
   rspec-fire
   rspec-spies
   vagrant!
+  vagrant-cachier
   vagrant-lxc!

data/README.md

@@ -2,6 +2,8 @@
 
 Linux Containers support for Vagrant 1.1+
 
+Check out this [blog post](http://fabiorehm.com/blog/2013/04/28/lxc-provider-for-vagrant)
+to see the plugin in action and find out more about it.
 
 ## Dependencies
 
@@ -21,42 +23,19 @@ sudo dpkg -i /tmp/vagrant.deb
 ```
 
 
-## What is currently supported?
-
-Pretty much everything you need from Vagrant:
-
-* Vagrant's `up`, `halt`, `reload`, `destroy`, `ssh` and `package` commands (box packaging is kind of experimental)
-* Shared folders
-* Provisioning
-* Setting container's host name
-* Port forwarding
-
-*Please refer to the [closed issues](https://github.com/fgrehm/vagrant-lxc/issues?labels=&milestone=&page=1&state=closed)
-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 (this will probably be like this until [user namespaces](http://s3hh.wordpress.com/2013/02/12/user-namespaces-lxc-meeting/) are supported)
-* [Does not tell you if dependencies are not met](https://github.com/fgrehm/vagrant-lxc/issues/11)
-  (will probably just throw up some random error)
-* + bunch of other [core features](https://github.com/fgrehm/vagrant-lxc/issues?labels=core&milestone=&page=1&state=open)
-  and some known [bugs](https://github.com/fgrehm/vagrant-lxc/issues?labels=bug&page=1&state=open)
-
-
 ## Installation
 
 ```
 vagrant plugin install vagrant-lxc
 ```
 
+
 ## Usage
 
 After installing, add a [base box](#available-boxes) using any name you want, for example:
 
 ```
-vagrant box add lxc-quantal64 http://dl.dropbox.com/u/13510779/lxc-quantal-amd64-2013-04-21.box
+vagrant box add lxc-quantal64 http://dl.dropbox.com/u/13510779/lxc-quantal-amd64-2013-05-06.box
 ```
 
 Make a Vagrantfile that looks like the following, filling in your information where necessary:
@@ -76,7 +55,8 @@ Vagrant.configure("2") do |config|
 end
 ```
 
-And finally run `vagrant up --provider=lxc`.
+And finally run `vagrant up --provider=lxc`. If you are using Vagrant 1.2+ you can
+also set `VAGRANT_DEFAULT_PROVIDER` environmental variable to `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-for-development).
@@ -85,20 +65,28 @@ can use the [same Vagrant VirtualBox machine I use for development](#using-virtu
 
 | LINK | DESCRIPTION |
 | --- | ---         |
-| [lxc-raring-amd64-2013-04-21.box](http://dl.dropbox.com/u/13510779/lxc-raring-amd64-2013-04-21.box) | Ubuntu 13.04 Raring x86_64 (Puppet 3.1.1) |
-| [lxc-quantal-amd64-2013-04-21.box](http://dl.dropbox.com/u/13510779/lxc-quantal-amd64-2013-04-21.box) | Ubuntu 12.10 Quantal x86_64 (Puppet 3.1.1 & Chef 11.4.0) |
-| [lxc-precise-amd64-2013-04-21.box](http://dl.dropbox.com/u/13510779/lxc-precise-amd64-2013-04-21.box) | Ubuntu 12.04 Precise x86_64 (Puppet 3.1.1 & Chef 11.4.0) |
+| [lxc-raring-amd64-2013-05-08.box](http://dl.dropbox.com/u/13510779/lxc-raring-amd64-2013-05-08.box) | Ubuntu 13.04 Raring x86_64 (Puppet 3.1.1) |
+| [lxc-quantal-amd64-2013-05-08.box](http://dl.dropbox.com/u/13510779/lxc-quantal-amd64-2013-05-08.box) | Ubuntu 12.10 Quantal x86_64 (Puppet 3.1.1 & Chef 11.4.0) |
+| [lxc-precise-amd64-2013-05-08.box](http://dl.dropbox.com/u/13510779/lxc-precise-amd64-2013-05-08.box) | Ubuntu 12.04 Precise x86_64 (Puppet 3.1.1 & Chef 11.4.0) |
+| [lxc-sid-amd64-2013-05-08.box](http://dl.dropbox.com/u/13510779/lxc-sid-amd64-2013-05-08.box) | Debian Sid (Puppet 3.1.1) |
+| [lxc-wheezy-amd64-2013-05-08.box](http://dl.dropbox.com/u/13510779/lxc-wheezy-amd64-2013-05-08.box) | Debian Wheezy (Puppet 3.1.1) |
+| [lxc-squeeze-amd64-2013-05-08.box](http://dl.dropbox.com/u/13510779/lxc-squeeze-amd64-2013-05-08.box) | Debian Squeeze (Puppet 3.1.1) |
 
 *Please note that I'm currently using only the quantal x86_64 on a daily basis,
 and I've only done some basic testing with the others*
 
-You can also build a clean box by providing `CHEF=0` and `PUPPET=0` to the available
-[rake tasks](tasks/boxes.rake). For example:
+There is a set of [rake tasks](tasks/boxes.rake) that you can use to build base
+boxes as needed. By default it won't include any provisioning tool and you can
+pick the one you want by providing some environment variables.
+
+For example:
 
 ```
-CHEF=0 PUPPET=0 rake boxes:ubuntu:build:precise64
+CHEF=1 rake boxes:ubuntu:build:precise64
 ```
 
+Will build a Ubuntu Precise x86_64 box with chef pre-installed.
+
 ### 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
@@ -112,6 +100,30 @@ NFS shared folders are not supported and will behave as a "normal" shared folder
 so we can share the same Vagrantfile with VBox environments.
 
 
+## What is currently supported?
+
+Pretty much everything you need from Vagrant:
+
+* Vagrant's `up`, `halt`, `reload`, `destroy`, `ssh` and `package` commands (box packaging is kind of experimental)
+* Shared folders
+* Provisioning
+* Setting container's host name
+* Port forwarding
+
+*Please refer to the [closed issues](https://github.com/fgrehm/vagrant-lxc/issues?labels=&milestone=&page=1&state=closed)
+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 (this will probably be like this until [user namespaces](http://s3hh.wordpress.com/2013/02/12/user-namespaces-lxc-meeting/) are supported)
+* [Does not tell you if dependencies are not met](https://github.com/fgrehm/vagrant-lxc/issues/11)
+  (will probably just throw up some random error)
+* + bunch of other [core features](https://github.com/fgrehm/vagrant-lxc/issues?labels=core&milestone=&page=1&state=open)
+  and some known [bugs](https://github.com/fgrehm/vagrant-lxc/issues?labels=bug&page=1&state=open)
+
+
 ## Development
 
 If  want to develop from your physical machine, just sing that same old song:

data/boxes/common/cleanup

@@ -0,0 +1,7 @@
+#!/bin/bash
+
+cache=`readlink -f .`
+rootfs="${cache}/rootfs"
+
+rm -rf $rootfs/tmp/*
+chroot $rootfs apt-get clean

data/boxes/common/install-babushka

@@ -0,0 +1,15 @@
+#!/bin/bash
+
+cache=`readlink -f .`
+rootfs="${cache}/rootfs"
+
+echo "installing babushka"
+cat > $rootfs/tmp/install-babushka.sh << EOF
+#!/bin/sh
+curl -L https://babushka.me/up | sudo bash < /dev/null
+
+EOF
+chmod +x $rootfs/tmp/install-babushka.sh
+chroot $rootfs /tmp/install-babushka.sh
+
+rm -rf $rootfs/tmp/*

data/boxes/{ubuntu → common}/install-puppet

@@ -7,6 +7,6 @@ echo "installing puppet"
 wget http://apt.puppetlabs.com/puppetlabs-release-stable.deb -O "${rootfs}/tmp/puppetlabs-release-stable.deb"
 chroot $rootfs dpkg -i "/tmp/puppetlabs-release-stable.deb"
 chroot $rootfs apt-get update
-chroot $rootfs apt-get install puppet -y
+chroot $rootfs apt-get install puppet -y --force-yes
 
 rm -rf $rootfs/tmp/*

data/boxes/debian/download

@@ -0,0 +1,156 @@
+#!/bin/bash
+
+# This is the code extracted from /usr/share/lxc/templates/lxc-debian
+# that comes with Ubuntu 13.04 which is responsible for downloading the
+# rootfs files / packages
+
+set -e
+
+suggest_flush()
+{
+  echo <<EOF
+Container upgrade failed.  The container cache may be out of date,
+in which case flushing the case (see -F in the hep output) may help.
+EOF
+}
+
+cleanup()
+{
+  rm -rf $cache/partial
+  rm -rf $cache/rootfs
+}
+
+write_sourceslist()
+{
+  rootfs=$1
+  arch=$2
+  release=$3
+
+  MIRROR=${MIRROR:-http://ftp.debian.org/debian}
+  SECURITY_MIRROR=${SECURITY_MIRROR:-http://security.debian.org/debian-security}
+
+
+  if [ 'sid' == "${release}" -o 'unstable' == "${release}" ]; then
+    cat <<EOF > ${rootfs}/etc/apt/sources.list
+# ${release}
+#------------------------------------------------------------------------------
+deb ${MIRROR} ${release} main contrib non-free
+EOF
+  else
+    cat <<EOF > ${rootfs}/etc/apt/sources.list
+# ${release}
+#------------------------------------------------------------------------------
+deb ${MIRROR} ${release} main contrib non-free
+
+# ${release} security
+#------------------------------------------------------------------------------
+deb ${SECURITY_MIRROR} ${release}/updates main contrib non-free
+
+# ${release} updates
+#------------------------------------------------------------------------------
+deb ${MIRROR} ${release}-updates main contrib non-free
+
+# ${release} proposed updates
+#------------------------------------------------------------------------------
+deb ${MIRROR} ${release}-proposed-updates main contrib non-free
+EOF
+  fi
+}
+
+download_debian()
+{
+  cache=$1
+  arch=$2
+  release=$3
+
+  packages=\
+sudo,\
+ifupdown,\
+locales,\
+libui-dialog-perl,\
+dialog,\
+isc-dhcp-client,\
+netbase,\
+net-tools,\
+iproute,\
+openssh-server,\
+vim,\
+jed,\
+jed-extra,\
+ssh,\
+curl,\
+wget,\
+bash-completion,\
+manpages,\
+man-db,\
+psmisc,\
+bind9-host,\
+telnet,\
+mtr-tiny,\
+iputils-ping,\
+ca-certificates
+
+  if [ ! -z "${ADDITIONAL_PACKAGES}" ]; then
+      packages=${ADDITIONAL_PACKAGES},${packages}
+  fi
+
+  echo "installing packages: ${packages}"
+
+  trap cleanup EXIT SIGHUP SIGINT SIGTERM
+  # check the mini debian was not already downloaded
+  partial=${cache}/partial
+  mkdir -p ${partial}
+  if [ $? -ne 0 ]; then
+      echo "Failed to create '${partial}' directory"
+      return 1
+  fi
+
+  # download a mini debian into a cache
+  echo "Downloading debian ${release} minimal ..."
+  debootstrap \
+      --variant=minbase \
+      --verbose \
+      --components=main,contrib,non-free \
+      --arch=${arch} \
+      --include=${packages} ${release} ${partial} ${MIRROR}
+
+  if [ $? -ne 0 ]; then
+      echo 'Failed to download the rootfs, aborting.'
+      return 1
+  fi
+
+  echo 'Installing updates'
+  write_sourceslist ${partial} ${arch} ${release}
+
+  chroot ${partial} apt-get update
+  if [ $? -ne 0 ]; then
+      echo 'Failed to update the apt cache'
+      return 1
+  fi
+
+  lxc-unshare -s MOUNT -- chroot ${partial} \
+      apt-get dist-upgrade -y || { suggest_flush; false; }
+
+  chroot ${partial} apt-get clean
+
+  mv ${partial} ${cache}/rootfs
+  trap EXIT
+  trap SIGINT
+  trap SIGTERM
+  trap SIGHUP
+  echo 'Download complete'
+  return 0
+}
+
+declare cache=`readlink -f .` \
+        arch=$1 \
+        release=$2
+
+if [ -d ${cache}/rootfs ]; then
+    echo <<EOF
+The rootfs cache has been built already, please remove it if you want to update
+EOF
+    exit 1
+fi
+
+download_debian ${cache} ${arch} ${release}