linecook-gem 0.5.6 → 0.5.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ee54645b2e182e0aa4f8c40d7dda5685d743972d
-  data.tar.gz: 602ff0898efb7b578c4f7fdb3398094b205a7d0f
+  metadata.gz: cce2615879f794147894aa74975081c3d398563c
+  data.tar.gz: 7fcc50dbe5e86411bae22b27d97fac338dad972b
 SHA512:
-  metadata.gz: 701617fea4cfe33880db86b3c17a0dcdd15402f25a050da4469f4734f85bd9da80cdaccdbe2cf704e58f020b3ea35e4653e79e1d8cfc918e1b7c34d32fe322e1
-  data.tar.gz: 6bb3c78a373ae13c17d6bf71ec692a688c5cac026d110e00ef3829e7de88b6b7531ac8b3501a9b26f731d68adbfa6ca3944af7529dc63a90a2ac3f7b96e6cb79
+  metadata.gz: d820b2680bc55310f63828501c612766c4d98f59a9ca18696bf44fdde16ce44f81b766797d77fae52198598a1b5fe8b81305cccffe4ddd8d27089b9a40d431bd
+  data.tar.gz: c0582af148803041adcbaee5396706868c883b9f66bf9ffa11180cb417e9272fa005b90e6c5ad427b2cb6015d2c65afc75e47c1fb3b4863fbcc469087e8a2861

data/lib/linecook/builder/lxc.rb

@@ -160,13 +160,15 @@ module Linecook
 
       def unmount(clean: false)
         @socket_dirs.each { |sock| execute("umount #{sock}") }
-        source = capture("mount | grep #{@lower_dir} | awk '{print $1}'") if clean
+        source = capture("mount | grep #{@lower_dir} | grep squashfs | awk '{print $1}'") if clean
         execute("umount #{@root}")
         execute("umount #{@upper_base}")
         execute("umount #{@lower_dir}")
         execute("rmdir #{@lower_dir}")
         execute("rmdir #{@upper_base}")
-        FileUtils.rm_f(source) if clean
+
+        # 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?
       end
 
       def bridge_network
@@ -198,9 +200,13 @@ eos
       def setup_image
         @source_path = Linecook::ImageManager.fetch(@source_image, profile: :public)
         if @remote
-          dest = "#{File.basename(@source_path)}"
+          name = File.basename(@source_path)
+          dest = "/u/linecook/images/#{name}"
           unless test("[ -f #{dest} ]") && capture("shasum #{dest}").split.first == `shasum #{@source_path}`.split.first
-            @remote.upload(@source_path, dest)
+            tmp = "/tmp/#{name}-#{SecureRandom.hex(4)}"
+            @remote.run("sudo mkdir -p #{File.dirname(dest)}")
+            @remote.upload(@source_path, tmp)
+            @remote.run("sudo mv #{tmp} #{dest}")
           end
           @image_path = dest
         else

data/lib/linecook/version.rb

@@ -1,3 +1,3 @@
 module Linecook
-  VERSION = '0.5.6'
+  VERSION = '0.5.7'
 end

metadata

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