dockly 2.6.0 → 2.7.0

data/lib/dockly/docker.rb

@@ -168,10 +168,19 @@ class Dockly::Docker
   end
 
   def import_base(docker_tar)
-    info "importing the docker image from #{docker_tar}"
-    image = ::Docker::Image.import(docker_tar)
-    info "imported initial docker image: #{image.id}"
-    image
+    repo = "#{name}-base"
+    tag = "dockly-#{Dockly::VERSION}-#{File.basename(docker_tar).split('.').first}"
+    info "looking for imported base image with tag: #{tag}"
+    image = Docker::Image.all.find { |img| img.info['RepoTags'].include?("#{repo}:#{tag}") }
+    if image
+      info "found imported base image: #{image.id}"
+      image
+    else
+      info "could not find image with tag #{tag}, importing the docker image from #{docker_tar}"
+      image = ::Docker::Image.import(docker_tar, 'repo' => repo, 'tag' => tag)
+      info "imported initial docker image: #{image.id}"
+      image
+    end
   end
 
   def add_build_env(image)

data/lib/dockly/history.rb

@@ -8,7 +8,7 @@ module Dockly::History
   TAG_PREFIX = 'dockly-'
 
   def push_content_tag!
-    fail 'An SSH agent must be running to push the tag' if ENV['SSH_AGENT_PID'].nil?
+    fail 'An SSH agent must be running to push the tag' if ENV['SSH_AUTH_SOCK'].nil?
     refs = ["refs/tags/#{content_tag}"]
     repo.remotes.each do |remote|
       username = remote.url.split('@').first

data/lib/dockly/rake_task.rb

@@ -78,11 +78,10 @@ namespace :dockly do
         end
       end
 
-      deb inst.name => [
-        'dockly:load',
-        "dockly:deb:prepare:#{inst.name}",
-        "dockly:deb:upload:#{inst.name}"
-      ]
+      deb inst.name => 'dockly:load' do |name|
+        inst.build
+      end
+
       prepare_targets << "dockly:deb:prepare:#{inst.name}"
       upload_targets << "dockly:deb:upload:#{inst.name}"
       copy_targets << "dockly:deb:copy:#{inst.name}"
@@ -110,11 +109,10 @@ namespace :dockly do
         end
       end
 
-      rpm inst.name => [
-        'dockly:load',
-        "dockly:rpm:prepare:#{inst.name}",
-        "dockly:rpm:upload:#{inst.name}"
-      ]
+      rpm inst.name => 'dockly:load' do |name|
+        inst.build
+      end
+
       prepare_targets << "dockly:rpm:prepare:#{inst.name}"
       upload_targets << "dockly:rpm:upload:#{inst.name}"
       copy_targets << "dockly:rpm:copy:#{inst.name}"
@@ -137,7 +135,7 @@ namespace :dockly do
       end
 
       namespace :upload do
-        task inst.name => 'dockly:load' do
+        docker inst.name => 'dockly:load' do
           Thread.current[:rake_task] = inst.name
           inst.export_only
         end
@@ -150,11 +148,10 @@ namespace :dockly do
         end
       end
 
-      docker inst.name => [
-        'dockly:load',
-        "dockly:docker:prepare:#{inst.name}",
-        "dockly:docker:upload:#{inst.name}"
-      ]
+      docker inst.name => 'dockly:load' do
+        Thread.current[:rake_task] = inst.name
+        inst.generate!
+      end
 
       # Docker image will be generated by 'dockly:deb:package'
       unless inst.s3_bucket.nil?

data/lib/dockly/version.rb

@@ -1,3 +1,3 @@
 module Dockly
-  VERSION = '2.6.0'
+  VERSION = '2.7.0'
 end

data/spec/dockly/docker_spec.rb

@@ -85,6 +85,10 @@ describe Dockly::Docker do
         end
       end
       images << subject.import_base(subject.ensure_tar(docker_file))
+      expect(Docker::Image.all).to be_any do |image|
+        image.info['RepoTags']
+          .include?("my-app-base:dockly-#{Dockly::VERSION}-docker-export-ubuntu-latest")
+      end
       expect(images.last).to_not be_nil
       expect(images.last.id).to_not be_nil
 
@@ -97,6 +101,15 @@ describe Dockly::Docker do
       subject.export_image(images.last)
       expect(File.exist?('build/docker/test_docker-image.tgz')).to be_true
     end
+
+    context 'when the image has already been imported' do
+      before { images << subject.import_base(docker_file) }
+
+      it 'does not reimport the image' do
+        expect(Docker::Image).to_not receive(:import)
+        subject.import_base(docker_file)
+      end
+    end
   end
 
   describe '#fetch_import' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dockly
 version: !ruby/object:Gem::Version
-  version: 2.6.0
+  version: 2.7.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-22 00:00:00.000000000 Z
+date: 2015-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clamp