vagrant-lxc 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 92bccd1befe677dbdc19efd2a933735360940bbf
-  data.tar.gz: 94562a0d7b89f14d4813f3c914dc6ed71083358d
+  metadata.gz: 186bdb083beeef3921bd1365defc643f73ee384e
+  data.tar.gz: 493eaf050cd7c208af7098ed3f0d6a4ecd3b508f
 SHA512:
-  metadata.gz: b45e42a6f567badf41f207056a47e408714c5c9571760502ec91d64439100558d9e20eac33810d0d40965a82a2bda9b091c7726ca56d950940ba989dfd55f49c
-  data.tar.gz: 730254e8c4288d87a36a60255e0c0c6aae18f2abacfccb76bea7ccad5d9b151cecbbd68c36b44e2e1859c35efa99651a2a57f5ecbf350671192819da827d7167
+  metadata.gz: 1efa2adc9cce87eca8a4fa1878f019cecb0834ec347f0ec5fed463fed8a5dd50f63792d72928d2ba34fecc9ee908190d6a3119551987158bba47d68444e7dc95
+  data.tar.gz: 080dde3c3857967619f7b1033e379d9c8e0c340e6128b7d53edcd2a89b71b496fefbe4f525c7c6874ee1978c207f054777da6bf7e9f13234c4fb0beedb6a9b4a

data/CHANGELOG.md

@@ -1,4 +1,8 @@
-## [0.1.1](https://github.com/fgrehm/vagrant-lxc/pull/43)
+## [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)
+
+## [0.1.1](https://github.com/fgrehm/vagrant-lxc/compare/v0.1.0...v0.1.1)
 
   - Removed support for development under Vagrant < 1.1
   - Removed rsync from base quantal64 box to speed up containers creation [#40](https://github.com/fgrehm/vagrant-lxc/issues/40)
@@ -6,7 +10,7 @@
   - Skip Vagrant's built in SSH redirect
   - Allow setting rootfs from Vagrantfile [#30](https://github.com/fgrehm/vagrant-lxc/issues/30)
 
-## 0.1.0
+## [0.1.0](https://github.com/fgrehm/vagrant-lxc/compare/v0.0.3...v0.1.0)
 
   - Support for chef added to base quantal64 box
   - Puppet upgraded to 3.1.1 on base quantal64 box

data/Gemfile.lock

@@ -14,7 +14,7 @@ GIT
 PATH
   remote: .
   specs:
-    vagrant-lxc (0.1.1)
+    vagrant-lxc (0.2.0)
 
 GEM
   remote: https://rubygems.org/

data/README.md

@@ -16,9 +16,11 @@ sudo dpkg -i /tmp/vagrant.deb
 ```
 
 
-## What is currently supported? (v0.1.1)
+## What is currently supported? (v0.2.0)
 
-* Vagrant's `up`, `halt`, `reload`, `destroy`, and `ssh` commands
+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
@@ -32,8 +34,7 @@ for the most up to date list.*
 
 * Does not detect forwarded ports collision, right now you are responsible for taking care of that
 * A hell lot of `sudo`s
-* Only a [single ubuntu box supported](boxes), I'm still [figuring out what should go
-  on the .box file](https://github.com/fgrehm/vagrant-lxc/issues/4)
+* 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)
   (will probably just throw up some random error)
@@ -54,7 +55,7 @@ After that you can create a `Vagrantfile` like the one below and run `vagrant up
 ```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-26.box'
+  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

data/boxes/quantal64/lxc-template

@@ -78,8 +78,10 @@ EOF
         rm -f $rootfs/etc/init/tty{5,6}.conf
     fi
 
-    chroot $rootfs useradd --create-home -s /bin/bash vagrant
-    echo "vagrant:vagrant" | chroot $rootfs chpasswd
+    if ! (grep -q vagrant $rootfs/etc/passwd); then
+      chroot $rootfs useradd --create-home -s /bin/bash vagrant
+      echo "vagrant:vagrant" | chroot $rootfs chpasswd
+    fi
 
     return 0
 }

data/boxes/quantal64/metadata.json

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

data/development/Vagrantfile

@@ -21,18 +21,19 @@ def local_gem_cache(box_name)
   cache_dir
 end
 
+# Required to make sure vagrant picks it up during development
 Vagrant.require_plugin 'vagrant-lxc'
 
 Vagrant.configure("2") do |config|
   config.vm.box = "quantal64"
 
-  config.vm.synced_folder "../", "/vagrant", name: 'vagrant-root'
+  config.vm.synced_folder "../", "/vagrant", id: 'vagrant-root'
 
   cache_dir = local_apt_cache(config.vm.box)
-  config.vm.synced_folder cache_dir, "/var/cache/apt/archives", name: "vagrant-apt-cache"
+  config.vm.synced_folder cache_dir, "/var/cache/apt/archives", id: "vagrant-apt-cache"
 
   cache_dir = local_gem_cache(config.vm.box)
-  config.vm.synced_folder cache_dir, "/home/vagrant/gems/cache", name: "vagrant-gem-cache"
+  config.vm.synced_folder cache_dir, "/home/vagrant/gems/cache", id: "vagrant-gem-cache"
 
   config.vm.define :vbox do |vb_config|
     vb_config.vm.box_url  = "https://github.com/downloads/roderik/VagrantQuantal64Box/quantal64.box"
@@ -50,13 +51,15 @@ Vagrant.configure("2") do |config|
 
   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'
     # Uncomment to test boxes built locally:
     # lxc_config.vm.box_url  = '../boxes/output/lxc-quantal64.box'
-    lxc_config.vm.box_url  = 'http://dl.dropbox.com/u/13510779/lxc-quantal64-2013-03-26.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'
     end
   end
 

data/example/Vagrantfile

@@ -11,12 +11,15 @@ def local_cache(box_name)
   cache_dir
 end
 
+# Not really needed, but useful while developing so that vagrant picks it up
 Vagrant.require_plugin 'vagrant-lxc'
 
 Vagrant.configure("2") do |config|
   config.vm.box      = "quantal64"
-  config.vm.box_url  = 'http://dl.dropbox.com/u/13510779/lxc-quantal64-2013-03-26.box'
-  config.vm.hostname = 'lxc-quantal64'
+  config.vm.box_url  = 'http://dl.dropbox.com/u/13510779/lxc-quantal64-2013-03-31.box'
+  # Uncomment if you want to try out a box built locally
+  # config.vm.box_url  = '../boxes/output/lxc-quantal64.box'
+  config.vm.hostname = 'lxc-quantal64-example'
 
   config.vm.synced_folder "/tmp", "/vagrant_data"
 
@@ -36,7 +39,10 @@ echo "Hi there I'm a shell script used for provisioning"
     puppet.module_path    = "puppet/modules"
     puppet.manifests_path = "puppet/manifests"
     puppet.manifest_file  = "site.pp"
-    # If you want to make some debugging noise
-    # puppet.options << [ '--verbose', '--debug' ]
+  end
+
+  config.vm.provision :chef_solo do |chef|
+    chef.add_recipe "hello-world"
+    chef.log_level = :debug
   end
 end

data/example/cookbooks/hello-world/recipes/default.rb

@@ -0,0 +1,4 @@
+execute "hello world" do
+  command "echo 'Hello from Chef!'"
+  action :run
+end

data/lib/vagrant-lxc/action.rb

@@ -10,11 +10,13 @@ require 'vagrant-lxc/action/create'
 require 'vagrant-lxc/action/created'
 require 'vagrant-lxc/action/destroy'
 require 'vagrant-lxc/action/disconnect'
+require 'vagrant-lxc/action/compress_rootfs'
 require 'vagrant-lxc/action/forced_halt'
 require 'vagrant-lxc/action/forward_ports'
 require 'vagrant-lxc/action/handle_box_metadata'
 require 'vagrant-lxc/action/is_running'
 require 'vagrant-lxc/action/network'
+require 'vagrant-lxc/action/setup_package_files'
 require 'vagrant-lxc/action/share_folders'
 
 module Vagrant
@@ -58,7 +60,6 @@ module Vagrant
           b.use ShareFolders
           b.use Network
           b.use Vagrant::Action::Builtin::SetHostname
-          # b.use SaneDefaults
           # b.use Customize
           b.use ForwardPorts
           b.use Boot
@@ -84,7 +85,6 @@ module Vagrant
                 next
               end
 
-              # b3.use CheckAccessible
               b3.use Vagrant::Action::Builtin::Provision
             end
           end
@@ -175,12 +175,30 @@ module Vagrant
         end
       end
 
+      # This action packages the virtual machine into a single box file.
+      def self.action_package
+        Vagrant::Action::Builder.new.tap do |b|
+          # b.use CheckDependencies
+          b.use Vagrant::Action::Builtin::Call, Created do |env1, b2|
+            if !env1[:result]
+              # TODO: Implement our own MessageNotCreated
+              b2.use VagrantPlugins::ProviderVirtualBox::Action::MessageNotCreated
+              next
+            end
+
+            b2.use action_halt
+            b2.use CompressRootFS
+            b2.use SetupPackageFiles
+            b2.use Vagrant::Action::General::Package
+          end
+        end
+      end
+
       # This is the action that will exec into an SSH shell.
       def self.action_ssh
         Vagrant::Action::Builder.new.tap do |b|
           # b.use CheckDependencies
           b.use CheckCreated
-          # b.use CheckAccessible
           b.use CheckRunning
           b.use Vagrant::Action::Builtin::SSHExec
         end
@@ -191,7 +209,6 @@ module Vagrant
         Vagrant::Action::Builder.new.tap do |b|
           # b.use CheckDependencies
           b.use CheckCreated
-          # b.use CheckAccessible
           b.use CheckRunning
           b.use Vagrant::Action::Builtin::SSHRun
         end

data/lib/vagrant-lxc/action/compress_rootfs.rb

@@ -0,0 +1,30 @@
+require "fileutils"
+
+module Vagrant
+  module LXC
+    module Action
+      class CompressRootFS
+        def initialize(app, env)
+          @app = app
+        end
+
+        def call(env)
+          raise Vagrant::Errors::VMPowerOffToPackage if env[:machine].provider.state.id != :stopped
+
+          env[:ui].info I18n.t("vagrant.actions.lxc.compressing_rootfs")
+          @rootfs = env['package.rootfs'] = env[:machine].provider.container.compress_rootfs
+
+          @app.call env
+
+          recover # called to remove the rootfs tarball
+        end
+
+        def recover(*)
+          if @rootfs && File.exist?(@rootfs)
+            FileUtils.rm_rf(File.dirname @rootfs)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/vagrant-lxc/action/handle_box_metadata.rb

@@ -29,7 +29,8 @@ module Vagrant
           system(%Q[sudo su root -c "cp #{lxc_template_src} #{dest}"])
 
           @logger.debug('Extracting rootfs')
-          system(%Q[sudo su root -c "cd #{box.directory} && tar xfz rootfs.tar.gz -C #{rootfs_cache}"])
+          # TODO: Ideally the compressed rootfs should not output errors...
+          system(%Q[sudo su root -c "cd #{box.directory} && tar xfz rootfs.tar.gz -C #{rootfs_cache} 2>/dev/null"])
 
           box.metadata.merge!(
             'template-name'     => template_name,

data/lib/vagrant-lxc/action/setup_package_files.rb

@@ -0,0 +1,52 @@
+require 'fileutils'
+
+module Vagrant
+  module LXC
+    module Action
+      class SetupPackageFiles
+        def initialize(app, env)
+          @app = app
+
+          env["package.include"]     ||= []
+          env["package.vagrantfile"] ||= nil
+        end
+
+        def call(env)
+          @env = env
+
+          create_package_temp_dir
+          move_rootfs_to_pkg_dir
+          copy_box_files_to_pkg_dir
+
+          @app.call env
+
+          recover # called to cleanup temp directory
+        end
+
+        def recover(*)
+          if @temp_dir && File.exist?(@temp_dir)
+            FileUtils.rm_rf(@temp_dir)
+          end
+        end
+
+        private
+
+        def create_package_temp_dir
+          @env[:ui].info I18n.t("vagrant.actions.vm.export.create_dir")
+          @temp_dir = @env["package.directory"] = @env[:tmp_path].join("container-export-#{Time.now.to_i.to_s}")
+          FileUtils.mkpath(@temp_dir)
+        end
+
+        def move_rootfs_to_pkg_dir
+          FileUtils.mv @env['package.rootfs'].to_s, @env['package.directory'].to_s
+        end
+
+        def copy_box_files_to_pkg_dir
+          box_dir = @env[:machine].box.directory
+          FileUtils.cp box_dir.join('lxc-template').to_s, @env['package.directory'].to_s
+          FileUtils.cp box_dir.join('metadata.json').to_s, @env['package.directory'].to_s
+        end
+      end
+    end
+  end
+end

data/lib/vagrant-lxc/container.rb

@@ -93,6 +93,26 @@ module Vagrant
         @cli.destroy
       end
 
+      # TODO: This needs to be reviewed and specs needs to be written
+      def compress_rootfs
+        # TODO: Our template should not depend on container's arch
+        arch           = base_path.join('config').read.match(/^lxc\.arch\s+=\s+(.+)$/)[1]
+        rootfs_dirname = File.dirname rootfs_path
+        basename       = rootfs_path.to_s.gsub(/^#{Regexp.escape rootfs_dirname}\//, '')
+        # TODO: Pass in tmpdir so we can clean up from outside
+        target_path    = "#{Dir.mktmpdir}/rootfs.tar.gz"
+
+        Dir.chdir base_path do
+          @logger.info "Compressing '#{rootfs_path}' rootfs to #{target_path}"
+          system "sudo rm -f rootfs.tar.gz && sudo bsdtar -s /#{basename}/rootfs-#{arch}/ --numeric-owner -czf #{target_path} #{basename}/* 2>/dev/null"
+
+          @logger.info "Changing rootfs tarbal owner"
+          system "sudo chown #{ENV['USER']}:#{ENV['USER']} #{target_path}"
+        end
+
+        target_path
+      end
+
       def state
         if @name
           @cli.state

data/lib/vagrant-lxc/version.rb

@@ -1,5 +1,5 @@
 module Vagrant
   module LXC
-    VERSION = "0.1.1"
+    VERSION = "0.2.0"
   end
 end

data/locales/en.yml

@@ -2,6 +2,8 @@ en:
   vagrant:
     actions:
       lxc:
+        compressing_rootfs: Compressing container's rootfs...
+
         share_folders:
           preparing: Setting up mount entries for shared folders...
 

data/spec/unit/action/compress_rootfs_spec.rb

@@ -0,0 +1,27 @@
+require 'unit_helper'
+
+require 'vagrant-lxc/action/compress_rootfs'
+
+describe Vagrant::LXC::Action::CompressRootFS do
+  let(:app)                    { mock(:app, call: true) }
+  let(:env)                    { {machine: machine, ui: stub(info: true)} }
+  let(:machine)                { fire_double('Vagrant::Machine', provider: provider) }
+  let(:provider)               { fire_double('Vagrant::LXC::Provider', container: container) }
+  let(:container)              { fire_double('Vagrant::LXC::Container', compress_rootfs: compressed_rootfs_path) }
+  let(:compressed_rootfs_path) { '/path/to/rootfs.tar.gz' }
+
+  subject { described_class.new(app, env) }
+
+  before do
+    provider.stub_chain(:state, :id).and_return(:stopped)
+    subject.call(env)
+  end
+
+  it 'asks the container to compress its rootfs' do
+    container.should have_received(:compress_rootfs)
+  end
+
+  it 'sets export.temp_dir on action env' do
+    env['package.rootfs'].should == compressed_rootfs_path
+  end
+end

data/spec/unit/action/handle_box_metadata_spec.rb

@@ -39,6 +39,6 @@ describe Vagrant::LXC::Action::HandleBoxMetadata do
 
   it 'extracts rootfs into a tmp folder' do
     subject.should have_received(:system).
-                   with(%Q[sudo su root -c "cd #{box_directory} && tar xfz rootfs.tar.gz -C #{tmpdir}"])
+                   with(%Q[sudo su root -c "cd #{box_directory} && tar xfz rootfs.tar.gz -C #{tmpdir} 2>/dev/null"])
   end
 end

data/spec/unit/action/setup_package_files_spec.rb

@@ -0,0 +1,41 @@
+require 'unit_helper'
+
+require 'vagrant-lxc/action/setup_package_files'
+
+describe Vagrant::LXC::Action::SetupPackageFiles do
+  let(:app)         { mock(:app, call: true) }
+  let(:env)         { {machine: machine, tmp_path: tmp_path, ui: stub(info: true), 'package.rootfs' => rootfs_path} }
+  let(:machine)     { fire_double('Vagrant::Machine', box: box) }
+  let!(:tmp_path)   { Pathname.new(Dir.mktmpdir) }
+  let(:box)         { fire_double('Vagrant::Box', directory: tmp_path.join('box')) }
+  let(:rootfs_path) { tmp_path.join('rootfs-amd64.tar.gz') }
+
+  subject { described_class.new(app, env) }
+
+  before do
+    box.directory.mkdir
+    [box.directory.join('lxc-template'), box.directory.join('metadata.json'), rootfs_path].each do |file|
+      file.open('w') { |f| f.puts file.to_s }
+    end
+
+    subject.stub(recover: true) # Prevents files from being removed on specs
+    subject.call(env)
+  end
+
+  after do
+    FileUtils.rm_rf(tmp_path.to_s)
+  end
+
+  it 'copies box lxc-template to package directory' do
+    env['package.directory'].join('lxc-template').should be_file
+  end
+
+  it 'copies metadata.json to package directory' do
+    env['package.directory'].join('metadata.json').should be_file
+  end
+
+  it 'moves the compressed rootfs to package directory' do
+    env['package.directory'].join(rootfs_path.basename).should be_file
+    env['package.rootfs'].should_not be_file
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-lxc
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Fabio Rehm
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-29 00:00:00.000000000 Z
+date: 2013-03-31 00:00:00.000000000 Z
 dependencies: []
 description: Linux Containers provider for Vagrant
 email:
@@ -37,6 +37,7 @@ files:
 - development/shell-provisioning/upgrade-kernel
 - development/site.pp
 - example/Vagrantfile
+- example/cookbooks/hello-world/recipes/default.rb
 - example/puppet/manifests/site.pp
 - example/puppet/modules/hello_world/manifests/init.pp
 - lib/vagrant-lxc.rb
@@ -46,6 +47,7 @@ files:
 - lib/vagrant-lxc/action/check_created.rb
 - lib/vagrant-lxc/action/check_running.rb
 - lib/vagrant-lxc/action/clear_forwarded_ports.rb
+- lib/vagrant-lxc/action/compress_rootfs.rb
 - lib/vagrant-lxc/action/create.rb
 - lib/vagrant-lxc/action/created.rb
 - lib/vagrant-lxc/action/destroy.rb
@@ -55,6 +57,7 @@ files:
 - lib/vagrant-lxc/action/handle_box_metadata.rb
 - lib/vagrant-lxc/action/is_running.rb
 - lib/vagrant-lxc/action/network.rb
+- lib/vagrant-lxc/action/setup_package_files.rb
 - lib/vagrant-lxc/action/share_folders.rb
 - lib/vagrant-lxc/config.rb
 - lib/vagrant-lxc/container.rb
@@ -69,8 +72,10 @@ files:
 - spec/spec_helper.rb
 - spec/support/unit_example_group.rb
 - spec/unit/action/clear_forwarded_ports_spec.rb
+- spec/unit/action/compress_rootfs_spec.rb
 - spec/unit/action/forward_ports_spec.rb
 - spec/unit/action/handle_box_metadata_spec.rb
+- spec/unit/action/setup_package_files_spec.rb
 - spec/unit/container/cli_spec.rb
 - spec/unit/container_spec.rb
 - spec/unit/machine_state_spec.rb
@@ -106,8 +111,10 @@ test_files:
 - spec/spec_helper.rb
 - spec/support/unit_example_group.rb
 - spec/unit/action/clear_forwarded_ports_spec.rb
+- spec/unit/action/compress_rootfs_spec.rb
 - spec/unit/action/forward_ports_spec.rb
 - spec/unit/action/handle_box_metadata_spec.rb
+- spec/unit/action/setup_package_files_spec.rb
 - spec/unit/container/cli_spec.rb
 - spec/unit/container_spec.rb
 - spec/unit/machine_state_spec.rb