linecook-gem 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c897a173dfc0fbfff66b44853e4d7e5fbf735fb3
-  data.tar.gz: ad92c0dd3f835ea109f2dd2d5024133a91774e00
+  metadata.gz: 24bf13e1616e8352819d62a8a7456dac3c2810a9
+  data.tar.gz: 93ac6a5839f3bd104b6b4b6be422683cefb4647d
 SHA512:
-  metadata.gz: 82ea68ce99f675787d7c03b0c039cf74c0cb28c3715238ccf87440e8833e9dec6c48adbd71e021012655a87f7fedad1e4d54318cd7e0f704ac43fbdc505a2371
-  data.tar.gz: 88072bf2787e866ff4d5ac44301966796ab465c0fe471955034c22cc819e18629d809db97b27c04556d65043e3587dd232e21231e7719f2b5a713de70da4643a
+  metadata.gz: 3aaaf7df96d2febdb5edc58dc27034d20ff00e906dc762fe15ec27291b310e3d47002d05cc3195043b73042a747c195a8fd760fdeb1b57b6c156e445e6ade4e0
+  data.tar.gz: 22af8bbb43d7495428e2db2a80562b4ca18549a9ae993ad3fa40b13bb5111e3e80a8b983473b54084f55a60f07913c461807b6732b2bda84eee7af0464e670e1

data/lib/linecook/builder/build.rb

@@ -25,11 +25,11 @@ module Linecook
       @ssh ||= Linecook::SSH.new(@container.ip, username: USERNAME, proxy: Linecook::Builder.ssh, keyfile: Linecook::SSH.private_key, setup: false)
     end
 
-    def snapshot(save: false)
+    def snapshot(save: false, resume: false)
       path = "/tmp/#{@id}-#{Time.now.to_i}.squashfs"
       @container.pause
       Linecook::Builder.ssh.run("sudo mksquashfs #{@container.root} #{path} -wildcards -e 'usr/src' 'var/lib/apt/lists/archive*' 'var/cache/apt/archives'") # FIXME make these excludes dynamic based on OS
-      @container.resume
+      @container.resume if resume
       path = if save
         local_path = File.join(Linecook::ImageManager::IMAGE_PATH, File.basename(path))
         Linecook::Builder.ssh.download(path, local: local_path)

data/lib/linecook/cli.rb

@@ -114,6 +114,7 @@ class Build < Thor
 
   desc 'snapshot', 'Take a snapshot of the build with NAME'
   method_option :name, type: :string, required: true, banner: 'ROLE_NAME', desc: 'Name of the role to build', aliases: '-n'
+  method_option :resume, type: :boolean, default: false,  desc: 'Resume the build after snapshotting it', aliases: '-r'
   def snapshot
     build = Linecook::Build.new(name, '')
     build.snapshot(save: true)

data/lib/linecook/provisioner/manager.rb

@@ -12,7 +12,7 @@ module Linecook
     def bake(name: nil, tag: nil, id: nil, snapshot: nil, upload: nil, package: nil, build: nil, keep: nil, clean: nil)
       build_agent = Linecook::Build.new(name, tag: tag, id: id, image: image(name))
       provider(name).provision(build_agent, name) if build
-      snapshot = build_agent.snapshot(save: true) if snapshot ||  upload || package
+      snapshot = build_agent.snapshot(save: true, resume: true unless clean) if snapshot ||  upload || package
       Linecook::ImageManager.upload(snapshot, type: build_agent.type) if upload || package
       Linecook::Packager.package(snapshot, type: build_agent.type) if package
     rescue => e

data/lib/linecook/util/ssh.rb

@@ -88,7 +88,7 @@ module Linecook
 
     def forward(local, remote:nil)
       remote ||= local
-      opts = { password: @password }
+      opts = { password: @password, paranoid: Net::SSH::Verifiers::Null.new }
       opts.merge!({ proxy: @proxy }) if @proxy
       @session = Net::SSH.start(@hostname, @username, opts)
       @session.forward.remote(local, '127.0.0.1', remote)

data/lib/linecook/version.rb

@@ -1,3 +1,3 @@
 module Linecook
-  VERSION = '0.4.1'
+  VERSION = '0.4.2'
 end

metadata

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