dockly 1.4.0 → 1.4.1

data/README.md

@@ -99,8 +99,12 @@ The `build_cache` DSL is used to prevent rebuilding assets every build and used
 
 The `docker` DSL is used to define Docker containers. It has the following attributes:
 
+- `registry_import`
+    - required: `false` -- only required when `import` is not supplied
+    - description: the location  of the base image to start building from
+    - examples: `paintedfox/ruby`, `registry.example.com/my-custom-image`
 - `import`
-    - required: `true`
+    - required: `false` -- only required when `registry_import` is not supplied
     - description: the location (url or S3 path) of the base image to start building from
 - `git_archive`:
     - required: `false`

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
+    :timeout, :cleanup_images, :registry_import
 
   default_value :tag, nil
   default_value :build_dir, 'build/docker'
@@ -27,11 +27,16 @@ class Dockly::Docker
 
   def generate!
     Docker.options = { :read_timeout => timeout, :write_timeout => timeout }
-    docker_tar = File.absolute_path(ensure_tar(fetch_import))
-
     images = {}
 
-    images[:one] = import_base(docker_tar)
+    if registry_import.nil?
+      docker_tar = File.absolute_path(ensure_tar(fetch_import))
+      images[:one] = import_base(docker_tar)
+    else
+      registry.authenticate! unless registry.nil?
+      images[:one] = ::Docker::Image.create('fromImage' => registry_import)
+    end
+
     images[:two] = add_git_archive(images[:one])
     images[:three] = run_build_caches(images[:two])
     images[:four] = build_image(images[:three])

data/lib/dockly/version.rb

@@ -1,3 +1,3 @@
 module Dockly
-  VERSION = '1.4.0'
+  VERSION = '1.4.1'
 end

data/spec/dockly/docker/registry_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Dockly::Docker::Registry, :current do
+describe Dockly::Docker::Registry do
   subject { described_class.new(:name => :dockly_registry) }
 
   describe '#authenticate!' do

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
-          import 'https://s3.amazonaws.com/swipely-pub/docker-export-ubuntu-latest.tgz'
+          registry_import 'nahiluhmot/base'
           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.0
+  version: 1.4.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-18 00:00:00.000000000 Z
+date: 2014-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clamp