dry-dock 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ef4755b8fb67f4a9be9cedd7b34c2f3973fe8ba2
-  data.tar.gz: a19658f0006572ad6321e19a2cc7f170bf2b1ec5
+  metadata.gz: 488e56c2a6889532224d9d3badd1e03c696422e5
+  data.tar.gz: eb96040c6163b845684154856770d03afbaabce4
 SHA512:
-  metadata.gz: 82a85bc7b40c024711ff4a0414af0a4cdcade29f44c5f3d73f71876339b2445a2398775f06061ac854e45ea5d873b2b9ca1ede567dca5d7fc8930764c73a22cb
-  data.tar.gz: 6732586269516b09b7e65c1b10eb4ff513050879d9fa4f56ee3a8750ec4bbe452c6ceea35474a94c67d8a5fb8e3014b38f34ff5ab2a5084e6ff156a38039b8b9
+  metadata.gz: 7ae957bf3ee4af5f6992d5810de25575e21d4a3f7b7bfbb0fbfdc568f72989e284f0d86a387968456bc9df84a2a8e4ee2f3ef65438408623c3bfb36f0ccb3790
+  data.tar.gz: a6531965d422e56a82a5c27feb550edc2d8aadd556547dcd9b97e8e649ac0b6a534f3c64de4bd73e279448a2049a715c3e77608697b7311c8587c99491385170

data/VERSION

@@ -1 +1 @@
-0.1.2
+0.1.3

data/dry-dock.gemspec

@@ -2,11 +2,11 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: dry-dock 0.1.2 ruby lib
+# stub: dry-dock 0.1.3 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "dry-dock"
-  s.version = "0.1.2"
+  s.version = "0.1.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]

data/lib/drydock/container_config.rb

@@ -3,6 +3,7 @@ module Drydock
   class ContainerConfig < ::Hash
 
     DEFAULTS = {
+      'MetaOptions'  => {},
       'OpenStdin'    => false,
       'AttachStdin'  => false,
       'AttachStdout' => false,

data/lib/drydock/phase_chain.rb

@@ -39,11 +39,10 @@ module Drydock
 
         (cc[:OnBuild] ||= []).push(opts[:on_build]) if opts.key?(:on_build)
 
+        cc[:MetaOptions] ||= {}
         [:connect_timeout, :read_timeout].each do |key|
-          if opts.key?(key)
-            cc[:meta_options] ||= {}
-            cc[:meta_options][key] = opts[key]
-          end
+          cc[:MetaOptions][key] = opts[key] if opts.key?(key)
+          cc[:MetaOptions][key] = opts[:timeout] if opts.key?(:timeout)
         end
       end
     end
@@ -57,9 +56,9 @@ module Drydock
     end
 
     def self.create_container(cfg, &blk)
-      meta_options = cfg.fetch(:meta_options, {})
+      meta_options = cfg[:MetaOptions] || {}
       timeout = meta_options.fetch(:read_timeout, Excon.defaults[:read_timeout]) || 60
-
+      
       Docker::Container.create(cfg).tap do |c|
         t = Thread.new do
           begin
@@ -205,9 +204,9 @@ module Drydock
               opts[:command]   = src_image_config['Cmd'] if src_image_config.key?('Cmd')
             end
 
-            Drydock.logger.info("Command retrieval: #{opts[:command].inspect}")
-            Drydock.logger.info("Source image info: #{src_image.info.class} #{src_image.info.inspect}")
-            Drydock.logger.info("Source image config: #{src_image.info['Config'].inspect}")
+            Drydock.logger.debug(message: "Command retrieval: #{opts[:command].inspect}")
+            Drydock.logger.debug(message: "Source image info: #{src_image.info.class} #{src_image.info.inspect}")
+            Drydock.logger.debug(message: "Source image config: #{src_image.info['Config'].inspect}")
           end
 
           commit_config = self.class.build_commit_opts(opts)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dry-dock
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Ripta Pasay