linecook-gem 0.7.17 → 0.7.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1fc909f3951c5ae4fc57416d814aa35af64dd4ca
-  data.tar.gz: 5475b236c792a6081006491ac34e272e87920054
+  metadata.gz: b001996cfee5a58c8e31afa14333fc10a8d6ab41
+  data.tar.gz: e5a68c7c98d64b00457d15e5d4e1e8d5cc1c4a6e
 SHA512:
-  metadata.gz: 589950d3ed66b497d9e89de3c990ba9f5ac04b0d3d28f33d657c8d66ac643d55636b651345031dd5803cdd0434cceb0ba51c699645cffef8f83bbec428c29165
-  data.tar.gz: 4d4667fb844e1e3d8c3d45839e6252f45a50d9addcc50832b4032f2b9ad9487d016e9853c23de73ddd00d435e77eb8dd68891850a965e4aa0d4c090252fa0491
+  metadata.gz: 03ae2fd874ea77e9f14ad96a292f0b553111fbca750fbdef5d0a77f23588bf4af99a3bf46bce069a0c787fb7d7dc26d2d4fb7aec7c98906df1d8d70020228542
+  data.tar.gz: f040be86621c1904e742d91ce695e24e1926f2c780770f40ac6ef3404856c547f16d62889ce0de686dbc3ea59a32d51a598ecad158e3b33d3fde7a58ef756935

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

@@ -5,6 +5,7 @@ require 'docker'
 
 require 'linecook-gem/image'
 require 'linecook-gem/util/locking'
+require 'linecook-gem/util/common'
 
 module Linecook
   module Baker
@@ -34,7 +35,18 @@ module Linecook
       end
 
       def converge
+        if @inherited
+          lock("create_#{@inherited.id}")
+
+          with_retries(3) do
+            instance.create
+          end
+
+          unlock("create_#{@inherited.id}")
+        end
         instance.converge
+      ensure
+        unlock("create_#{@inherited.id}") if @inherited
       end
 
       def destroy
@@ -52,9 +64,11 @@ module Linecook
       def inherit(image)
         puts "Inheriting from #{image.id}..."
         import(image) unless image_exists?(image)
+        @inherited = image
       end
 
     private
+
       def container
         @container ||= ::Docker::Container::get(@image.id)
       end

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

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

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

@@ -7,8 +7,11 @@ module Linecook
     end
 
     def unlock(name)
+      return unless File.exists?(lock_path(name))
       lockfile(name).flock(File::LOCK_UN)
       lockfile(name).close
+    rescue IOError => e
+      puts e.message
     end
 
     def clear_lock(name)

data/lib/linecook-gem/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: linecook-gem
 version: !ruby/object:Gem::Version
-  version: 0.7.17
+  version: 0.7.18
 platform: ruby
 authors:
 - Dale Hamel
@@ -285,6 +285,7 @@ files:
 - lib/linecook-gem/packager/packer.rb
 - lib/linecook-gem/packager/route53.rb
 - lib/linecook-gem/packager/squashfs.rb
+- lib/linecook-gem/util/common.rb
 - lib/linecook-gem/util/downloader.rb
 - lib/linecook-gem/util/locking.rb
 - lib/linecook-gem/util/secrets.rb