linux_container 0.7 → 0.8

data/CHANGELOG

@@ -1,3 +1,4 @@
+v0.8. Support lxc 0.9
 v0.7. Switch to overlayfs
 v0.6. Ephemeral containers long-lived log file
 v0.5. Detach ephemeral containers from process group

data/lib/linux_container.rb

@@ -11,6 +11,12 @@ class LinuxContainer
     `#{sudo_if_needed} lxc-ls -1`.lines.map(&:strip).uniq.map {|cname| new(name: cname) }
   end
   
+  def self.version
+    @version ||= if `lxc-version` =~ /version: (\d+\.\d+)\./i
+      $1
+    end
+  end
+    
   def initialize(params={})
     params.each {|k,v| instance_variable_set "@#{k}", v }
     @username ||= 'ubuntu'
@@ -40,11 +46,12 @@ class LinuxContainer
 
   def start_ephemeral
     args = ['lxc-start-ephemeral','-U','overlayfs','-u',username,'-o',name]
+    args << '-d' if self.class.version == '0.9'
     logfile_path = bg_execute(*args)
     newname = nil
     while newname.nil?
       sleep 1
-      newname = $1 if File.read(logfile_path) =~ /^(.*) is running/
+      newname = $1 || $2 if File.read(logfile_path) =~ /^(.*) is running|lxc-console -n (.*)$/
      end
     self.class.new(name: newname, ssh_key_path: ssh_key_path, username: username)
   end
@@ -107,7 +114,8 @@ class LinuxContainer
   end
 
   def self.get_ip_for(name)
-    File.read('/var/lib/misc/dnsmasq.leases').each_line do |line|
+    fn = ['/var/lib/misc/dnsmasq.lxcbr0.leases', '/var/lib/misc/dnsmasq.leases'].detect {|f| File.readable?(f) }
+    File.read(fn).each_line do |line|
       (timestamp,macaddr,ip,hostname,misc) = line.split(' ')
       return ip if hostname == name
     end

data/linux_container.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = "linux_container"
-  s.version = "0.7"
+  s.version = "0.8"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Andrew Snow"]
-  s.date = "2013-03-16"
+  s.date = "2013-03-17"
   s.description = "Ruby gem for ephemeral LXC linux containers"
   s.email = "andrew@modulus.org"
   s.extra_rdoc_files = ["CHANGELOG", "README.md", "lib/linux_container.rb"]

metadata

@@ -2,14 +2,14 @@
 name: linux_container
 version: !ruby/object:Gem::Version
   prerelease: 
-  version: '0.7'
+  version: '0.8'
 platform: ruby
 authors:
 - Andrew Snow
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-16 00:00:00.000000000 Z
+date: 2013-03-17 00:00:00.000000000 Z
 dependencies: []
 description: Ruby gem for ephemeral LXC linux containers
 email: andrew@modulus.org