dockly 1.4.6 → 1.4.7

data/lib/dockly/build_cache/base.rb

@@ -58,15 +58,20 @@ class Dockly::BuildCache::Base
     file_path = File.join(tmp_dir,file_name)
 
     FileUtils.mkdir_p(File.dirname(file_path))
-    unless File.exist?(file_path)
+    file = unless File.exist?(file_path)
+      debug 'Pulling build cache from s3'
       object = connection.get_object(s3_bucket, file_name)
+      debug 'Pulled build cache from s3'
 
       file = File.open(file_path, 'w+b')
       file.write(object.body)
       file.tap(&:rewind)
     else
+      info 'Build cache already exists locally'
       File.open(file_path, 'rb')
     end
+
+    file
   rescue Excon::Errors::NotFound
     nil
   end

data/lib/dockly/build_cache/docker.rb

@@ -13,8 +13,12 @@ class Dockly::BuildCache::Docker < Dockly::BuildCache::Base
     cache = copy_output_dir(container)
     debug "pushing #{output_directory} to s3"
     push_to_s3(cache)
+    debug "pushed #{output_directory} to s3"
     cache.close
-    self.image = container.commit
+    debug "commiting the completed container with id: #{container.id}"
+    image = self.image = container.commit
+    debug "created image with id: #{image.id}"
+    image
   end
 
   def push_cache(version)
@@ -22,11 +26,12 @@ class Dockly::BuildCache::Docker < Dockly::BuildCache::Base
     if cache = pull_from_s3(version)
       debug "inserting to #{output_directory}"
       container = image.run("mkdir -p #{File.dirname(output_directory)}")
-      image_with_dir = container.tap { |c| c.wait }.commit
+      image_with_dir = container.tap(&:wait).commit
       self.image = image_with_dir.insert_local(
         'localPath' => cache.path,
         'outputPath' => File.dirname(output_directory)
       )
+      debug "inserted cache into #{output_directory}"
       cache.close
     else
       info "could not find #{s3_object(version)}"
@@ -64,9 +69,11 @@ class Dockly::BuildCache::Docker < Dockly::BuildCache::Base
 
   def run_command(command)
     resp = ""
+    debug "running command `#{command}` on image #{image.id}"
     container = image.run(["/bin/bash", "-lc", "cd #{command_directory} && #{command}"])
     container.attach { |source,chunk| resp += chunk }
     status = container.wait['StatusCode']
+    debug "`#{command}` exited with status #{status}, resulting container id: #{conatiner.id}"
     [status, resp.strip, container]
   end
 end

data/lib/dockly/version.rb

@@ -1,3 +1,3 @@
 module Dockly
-  VERSION = '1.4.6'
+  VERSION = '1.4.7'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dockly
 version: !ruby/object:Gem::Version
-  version: 1.4.6
+  version: 1.4.7
   prerelease: 
 platform: ruby
 authors: