linux_container 1.2 → 1.3

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZDM4ZDdiZDVmZDI0OTAyYzVjMDBlZWMzY2ZjMzRjZTNjMjhhZTQ5MQ==
+    ZTJjMTU1MTEyNDM2MDNiMDU1Njg0YmZiYTE1NjI5NjQ0ODI2OGY2NA==
   data.tar.gz: !binary |-
-    YTBjMTEwODU4YjVmMDFlOTUwNWJjMjI1Nzc2YjViM2M2MjMyOWFmOQ==
+    M2VmMTFlZWE3OTYwNGM5OGRhZTQ3NjgxMzM0ZmE4YTA5OWEyNTU0NA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    YmYzZmFmODE2YjI5MmNhOWIyZDJkMTMyZTg5YTU5M2IzNTFhNTk2NWFhYzU5
-    MWQ5NDEyOTVlZGI2MWIwZmY1Y2EwNzFmYzIwZGNhMjRkNmU2YmQxNDJiOGYz
-    YzBjMzliZjY3Y2MzMzViNWM4M2IzMGZiNjY0YTZjNTE4Yzk4ZDk=
+    NGVhZGNkMTc4MWU5YTk1ZmY4NWFmMzJmNGU4NGU4YTVkYjI3NmI3YjYyYTA5
+    NzU2ZWFiZTY0MGFjMDM1ZTYwN2QyNzBhMzM5ZDc4Y2YxNWI5NGI5MzgzNzUw
+    MWFiOGI2NGNhMjM0NTdkODA3MmM4MjA5ZTViNjc5OTViOGQ0OWE=
   data.tar.gz: !binary |-
-    YTI1MDk1OGJiODkzZjQ1NGZhM2NiNmY2N2JiZmU1MTNjNmYzMjIxMDEzYzIw
-    NzY5YTk0ZTU4ODU3ZThmNjkyYjRlMzk2NzgzNzBlNjIxOTBiYmEyMzdiNzMx
-    NTg0M2I0MTRmZjg0MWIxZTZkMzIwOWE5NTY5OWQxODBkOTMxN2Y=
+    N2M1YjQ0MTliMDk5NzJkM2FiYmUyZDVmNWVhNDQ1ODdjOWU0Njg2NDNmNjQz
+    NmU0YTllYTYzMmRhMjc3NTA4N2ZkYzA5NzY1NDJkODNmZWEyNDM2YzUyNzE4
+    Mjk1YTI0MGE0ZmZiYTQxN2FlMWY0YWQwYmYyMmM0MGI2NWVmMTE=

data/CHANGELOG

@@ -1,3 +1,4 @@
+v1.3. make aufs overridable for lxc 0.9+
 v1.2. make overlayfs overridable for lxc 0.8
 v1.1. scp into container support
 v1.0. state() should always return a string

data/lib/linux_container.rb

@@ -46,11 +46,13 @@ class LinuxContainer
   end
 
   def start_ephemeral(config={})
-    argshash = {'orig' => name, 'user' => username, 'union-type' => 'overlayfs'}.merge!(config)
+    argshash = {'orig' => name, 'user' => username}.merge!(config)
     args = []
     if self.class.version == '0.8' # ubuntu quantal and older
+      argshash['union-type'] ||= 'aufs'
       args.push '-U', argshash.delete('union-type')
     else # ubuntu raring and newer
+      argshash['union-type'] ||= 'overlayfs'
       args << '-d'
     end
     args.push *argshash.map {|k, v| "--#{k}=#{v}" }

data/linux_container.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = "linux_container"
-  s.version = "1.2"
+  s.version = "1.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Andrew Snow"]

data/test/test_all.rb

@@ -3,10 +3,10 @@ at_exit do
   File.unlink($sshkey) rescue nil
   ($ec.destroy '-f' if $ec) rescue nil
   ($c2.destroy '-f' if $c2) rescue nil
-  $c.destroy '-f'
+  $c.destroy '-f' if $c
 end
 
-require 'minitest/autorun'
+require 'minitest/unit'
 require "#{File.dirname(__FILE__)}/../lib/linux_container"
 
 class TestLinuxContainer < MiniTest::Unit::TestCase
@@ -56,6 +56,18 @@ class TestLinuxContainer < MiniTest::Unit::TestCase
     assert($ec.wait_for { !running? }, 'wait_for !running?')
     assert($ec.wait_for { !File.exists?($ec.dir) }, 'wait_for directory deletion')
   end
+  
+  def test_ephemeral_overlayfs
+    assert($ec = $c.start_ephemeral('union-type' => 'overlayfs'))
+    assert($ec.wait_for { running? }, 'wait_for running?')
+    assert_match /type overlayfs/, `mount`.lines.grep(/#{$ec.name}/).first
+    $ec.stop
+    assert($ec.wait_for { !running? }, 'wait_for !running?')
+  end
+  
+
+
 end
 
 TestLinuxContainer.startup
+MiniTest::Unit.new.run ARGV

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: linux_container
 version: !ruby/object:Gem::Version
-  version: '1.2'
+  version: '1.3'
 platform: ruby
 authors:
 - Andrew Snow