dockly 1.4.3 → 1.4.4

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.8.0'
+  gem.add_dependency 'docker-api', '~> 1.8.3'
   gem.add_dependency 'dockly-util', '~> 0.0.7'
   gem.add_dependency 'excon'
   gem.add_dependency 'fog', '~> 1.18.0'

data/lib/dockly/docker.rb

@@ -17,7 +17,7 @@ class Dockly::Docker
   dsl_class_attribute :registry, Dockly::Docker::Registry
 
   dsl_attribute :name, :import, :git_archive, :build, :tag, :build_dir, :package_dir,
-    :timeout, :cleanup_images, :registry_import, :auth_config_file
+    :timeout, :cleanup_images, :auth_config_file
 
   default_value :tag, nil
   default_value :build_dir, 'build/docker'
@@ -34,7 +34,10 @@ class Dockly::Docker
       images[:one] = import_base(docker_tar)
     else
       registry.authenticate! unless registry.nil?
-      images[:one] = ::Docker::Image.create('fromImage' => registry_import)
+      full_name = "#{registry_import[:name]}:#{registry_import[:tag]}"
+      info "Pulling #{full_name}"
+      images[:one] = ::Docker::Image.create('repo' => registry_import[:name], 'tag' => registry_import[:tag])
+      info "Successfully pulled #{full_name}"
     end
 
     images[:two] = add_git_archive(images[:one])
@@ -48,6 +51,16 @@ class Dockly::Docker
     cleanup(images.values.compact) if cleanup_images
   end
 
+  def registry_import(img_name = nil, opts = {})
+    if img_name
+      @registry_import ||= {}
+      @registry_import[:name] = img_name
+      @registry_import[:tag] = opts[:tag] || 'latest'
+    else
+      @registry_import
+    end
+  end
+
   def cleanup(images)
     ::Docker::Container.all(:all => true).each do |container|
       image_id = container.json['Image']

data/lib/dockly/version.rb

@@ -1,3 +1,3 @@
 module Dockly
-  VERSION = '1.4.3'
+  VERSION = '1.4.4'
 end

data/spec/dockly/docker_spec.rb

@@ -213,7 +213,7 @@ describe Dockly::Docker do
     context 'when there is a registry' do
       subject {
         Dockly::Docker.new do
-          registry_import 'nahiluhmot/base'
+          registry_import 'nahiluhmot/base', :tag => 'latest'
           git_archive '.'
           build "run touch /it_worked"
           repository 'dockly_test'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dockly
 version: !ruby/object:Gem::Version
-  version: 1.4.3
+  version: 1.4.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-20 00:00:00.000000000 Z
+date: 2014-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clamp
@@ -34,7 +34,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.8.0
+        version: 1.8.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,7 +42,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.8.0
+        version: 1.8.3
 - !ruby/object:Gem::Dependency
   name: dockly-util
   requirement: !ruby/object:Gem::Requirement
@@ -338,3 +338,4 @@ test_files:
 - spec/fixtures/test-2.tar.gz
 - spec/spec_helper.rb
 - spec/support/vcr.rb
+has_rdoc: