linecook-gem 0.6.8 → 0.6.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fd349482e39e136417611db9075534899f42db24
-  data.tar.gz: 0539cc47ba2b5ae11dd788da9874cbd12d24c709
+  metadata.gz: 7548b07e15bc2a9a01fa16dbf1d9ad6929293602
+  data.tar.gz: ff6d6af3f5dee670c3b27dd5eced9b6c48d236e4
 SHA512:
-  metadata.gz: 2b1e85cb294cc635b51e10657ed075f0d898328ee4ef8762d0f438eb48c96be41727b5a16bf82ffa36ac2ea5e7b9b1f7ccd00ce44cd18451135c10020f71945d
-  data.tar.gz: 628b06990be9c159b1745f7711b870d81c6b08391af729dc3603b7c6c1ed56bf548c878766b47aa8a3f6d6f47f50706c6eea9825775c40c7738accff95e5fa73
+  metadata.gz: 4eceda73724113932ba5fbc76922324760cc64fbd19ebb512ef96269e87a061cb3d8bf11ba8a7fda5cada581d268a9aa04ebc33ed7a49c48f3408f5ae8a3c3b7
+  data.tar.gz: 575d0682c6e9e1c7b3a42aa18b3ca541c71d342dd37a002f4815a1eed39051f2d8f86e4f20d792b1bb681cad6fddb6bc0ddac7ec1e0ffcae817c93536f2a2dc2

data/lib/linecook-gem/builder/build.rb

@@ -15,7 +15,7 @@ module Linecook
       @id = id ? "#{@type}-#{id}" : @type
       @id = @id.gsub(/[\/|\.]/,'_')
       @image = image || Linecook.config[:provisioner][:default_image]
-      @container = Linecook::Lxc::Container.new(name: @id, image: @image, remote: Linecook::Builder.ssh)
+      @container = Linecook::Lxc::Container.new(name: @id, image: @image, remote: Linecook::Builder.ssh, tmp: Linecook.config[:tmp])
     end
 
     def clean

data/lib/linecook-gem/builder/linux_backend.rb

@@ -5,7 +5,7 @@ module Linecook
     def backend
       config = Linecook.config[:builder]
       images = Linecook.config[:image][:images]
-      Linecook::Lxc::Container.new(name: config[:name], home: config[:home], image: config[:image], bridge: true)
+      Linecook::Lxc::Container.new(name: config[:name], home: config[:home], image: config[:image], bridge: true, tmp: Linecook.config[:tmp])
     end
   end
 end

data/lib/linecook-gem/builder/lxc.rb

@@ -12,13 +12,17 @@ module Linecook
       include Executor
       MAX_WAIT = 60
       attr_reader :config, :root
-      def initialize(name: 'linecook', home: '/u/lxc', image: nil, remote: :local, bridge: false)
+      def initialize(name: 'linecook', home: '/u/lxc', image: nil, remote: :local, bridge: false, tmp: nil)
         @name = name
         @home = home
         @bridge = bridge
         @remote = remote == :local ? false : remote
         @root = File.join(@home, @name, 'rootfs')
-        config = { utsname: name, rootfs: @root }
+        @tmp = tmp
+        @tmpmount = "linecook_#{name}"
+        config = { utsname: name, rootfs: @root,  }
+        config.merge!(mount: {entry: "#{capture("mktemp -d --tmpdir=/#{@tmp} #{@tmpmount}XXXXXXX").strip} #{@tmp} none bind,create=dir 0 0"}) if @tmp
+
         @config = Linecook::Lxc::Config.generate(config) # FIXME read link from config
         @source_image = image || :base_image
       end
@@ -165,6 +169,7 @@ module Linecook
         execute("umount #{@lower_dir}")
         execute("rmdir #{@lower_dir}")
         execute("rmdir #{@upper_base}")
+        execute("rm -rf /#{@tmp}/#{@tmpmount}*") if @tmp && !@tmp.empty? && @tmp != '/'
 
         # Clean up the source image, but only if it's not mounted elsewhre
         FileUtils.rm_f(source) if clean && capture("mount | grep #{source} || true").strip.empty?
@@ -237,7 +242,7 @@ eos
           link: 'lxcbr0'
         },
         mount: {
-          auto: 'cgroup'
+          auto: 'cgroup',
         },
         cgroup: {
           devices: {

data/lib/linecook-gem/version.rb

@@ -1,3 +1,3 @@
 module Linecook
-  VERSION = '0.6.8'
+  VERSION = '0.6.9'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: linecook-gem
 version: !ruby/object:Gem::Version
-  version: 0.6.8
+  version: 0.6.9
 platform: ruby
 authors:
 - Dale Hamel