dockly 1.5.14 → 1.5.15

data/dockly.gemspec

@@ -15,7 +15,7 @@ Gem::Specification.new do |gem|
   gem.require_paths = %w{lib}
   gem.version       = Dockly::VERSION
   gem.add_dependency 'clamp', '~> 0.6'
-  gem.add_dependency 'docker-api', '>= 1.13.1'
+  gem.add_dependency 'docker-api', '>= 1.14.0'
   gem.add_dependency 'dockly-util', '~> 0.0.9'
   gem.add_dependency 'excon'
   gem.add_dependency 'fog', '~> 1.21.0'

data/lib/dockly/build_cache/docker.rb

@@ -1,6 +1,10 @@
 class Dockly::BuildCache::Docker < Dockly::BuildCache::Base
   attr_accessor :image
 
+  def wait_time
+    300 # max 5 minutes
+  end
+
   def execute!
     ensure_present! :image
     super
@@ -30,7 +34,7 @@ class Dockly::BuildCache::Docker < Dockly::BuildCache::Base
       tar_flags = keep_old_files ? '-xkf' : 'xf'
       container = ::Docker::Container.create(
         'Image' => image.id,
-        'Cmd' => ['/bin/bash', '-lc', [
+        'Cmd' => ['/bin/bash', '-c', [
             "mkdir -p #{File.dirname(output_directory)}",
             '&&',
             "tar #{tar_flags} #{File.join('/', 'host', path)} -C #{File.dirname(output_directory)}"
@@ -85,11 +89,11 @@ class Dockly::BuildCache::Docker < Dockly::BuildCache::Base
   end
 
   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(logs: true) { |source,chunk| resp += chunk }
-    status = container.wait['StatusCode']
+    container = image.run(["/bin/bash", "-c", "cd #{command_directory} && #{command}"])
+    debug "command running in container #{container.id}"
+    status = container.wait(wait_time)['StatusCode']
+    resp = container.streaming_logs(stdout: true, stderr: true)
     debug "`#{command}` returned the following output:"
     debug resp.strip
     debug "`#{command}` exited with status #{status}, resulting container id: #{container.id}"

data/lib/dockly/version.rb

@@ -1,3 +1,3 @@
 module Dockly
-  VERSION = '1.5.14'
+  VERSION = '1.5.15'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dockly
 version: !ruby/object:Gem::Version
-  version: 1.5.14
+  version: 1.5.15
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-17 00:00:00.000000000 Z
+date: 2014-11-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clamp
@@ -34,7 +34,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.13.1
+        version: 1.14.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,7 +42,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.13.1
+        version: 1.14.0
 - !ruby/object:Gem::Dependency
   name: dockly-util
   requirement: !ruby/object:Gem::Requirement