linecook-gem 0.7.18 → 0.7.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b001996cfee5a58c8e31afa14333fc10a8d6ab41
-  data.tar.gz: e5a68c7c98d64b00457d15e5d4e1e8d5cc1c4a6e
+  metadata.gz: 593c2c8a635fcb5e22cc06f021a728d9891fd820
+  data.tar.gz: 2913f1728d7af49d7e20a1a2d7f485c547600010
 SHA512:
-  metadata.gz: 03ae2fd874ea77e9f14ad96a292f0b553111fbca750fbdef5d0a77f23588bf4af99a3bf46bce069a0c787fb7d7dc26d2d4fb7aec7c98906df1d8d70020228542
-  data.tar.gz: f040be86621c1904e742d91ce695e24e1926f2c780770f40ac6ef3404856c547f16d62889ce0de686dbc3ea59a32d51a598ecad158e3b33d3fde7a58ef756935
+  metadata.gz: ba3dc84325463e36c291cd4f93b2bab8ddfc4b120e907ffa23f8a4b74321be24d992b0e7977ef64589465ae066eb028102f60a257eb83b31f8bd779b6e824a72
+  data.tar.gz: 360ec87a4328866503c303e3a65cd6860b8b7f969d71f2863bb8382b9395d1d49a69990f8810238d4545f11cee6d7e9b784b9859f93b9d427ef03c66490350ad

data/lib/linecook-gem/baker/docker.rb

@@ -27,7 +27,10 @@ module Linecook
       def save
         FileUtils.mkdir_p(File.dirname(@image.path))
         container.stop
-        system("docker export #{@image.id} | xz -T 0 -0 > #{@image.path}")
+        with_retries(5) do
+          status = system("docker export #{@image.id} | xz -T 0 -0 > #{@image.path}")
+          fail "Export failed" unless status
+        end
       end
 
       def instance
@@ -36,13 +39,15 @@ module Linecook
 
       def converge
         if @inherited
-          lock("create_#{@inherited.id}")
-
-          with_retries(3) do
+          begin
             instance.create
+          rescue
+            # Disable the cache and retry if we ran into a problem
+            @data[:driver][:use_cache] = false
+            with_retries(5) do
+              instance.create
+            end
           end
-
-          unlock("create_#{@inherited.id}")
         end
         instance.converge
       ensure
@@ -98,15 +103,15 @@ module Linecook
 
       # May the gods forgive us for all the rules this breaks
       def munge_config
-        data = @config.send(:data).instance_variable_get(:@data)
-        data[:driver][:instance_name] = @image.id
-        suite = data[:suites].find{ |n| n[:name] == @image.name }
+        @data = @config.send(:data).instance_variable_get(:@data)
+        @data[:driver][:instance_name] = @image.id
+        suite = @data[:suites].find{ |n| n[:name] == @image.name }
         if suite && suite[:inherit]
           inherited = Linecook::Image.new(suite[:inherit][:name], suite[:inherit][:group], suite[:inherit][:tag])
           inherit(inherited)
-          data[:driver][:image] = "#{inherited.group}:#{inherited.tag}"
-          data[:driver][:provision_command] ||= []
-          data[:driver][:provision_command] << 'sed -i \'s/\(PasswordAuthentication no\)/#\1/g\' /etc/ssh/sshd_config'
+          @data[:driver][:image] = "#{inherited.group}:#{inherited.tag}"
+          @data[:driver][:provision_command] ||= []
+          @data[:driver][:provision_command] << 'sed -i \'s/\(PasswordAuthentication no\)/#\1/g\' /etc/ssh/sshd_config'
         end
       end
     end

data/lib/linecook-gem/util/common.rb

@@ -1,4 +1,4 @@
-def with_retries(retries, &block)
+def with_retries(retries, sleep_duration: 5, &block)
   attempts = 0
   while attempts < retries
     begin
@@ -6,7 +6,7 @@ def with_retries(retries, &block)
     rescue => e
       puts "Retrying a failed action, error was:"
       puts e.message
-      puts e.backtrace
+      sleep sleep_duration
     ensure
       attempts += 1
     end

data/lib/linecook-gem/version.rb

@@ -1,3 +1,3 @@
 module Linecook
-  VERSION = '0.7.18'
+  VERSION = '0.7.19'
 end

metadata

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