lib/dockly/rake_task.rb in dockly-2.6.0 vs lib/dockly/rake_task.rb in dockly-2.7.0

@@ -76,15 +76,14 @@
         task inst.name => 'dockly:load' do |name|
           inst.copy_from_s3(Dockly::History.duplicate_build_sha[0..6])
         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}"
       build_targets << "dockly:deb:#{inst.name}"
     end
@@ -108,15 +107,14 @@
         task inst.name => 'dockly:load' do |name|
           inst.copy_from_s3(Dockly::History.duplicate_build_sha[0..6])
         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}"
       build_targets << "dockly:rpm:#{inst.name}"
     end
@@ -135,11 +133,11 @@
           inst.generate_build
         end
       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
       end
 
@@ -148,14 +146,13 @@
           Thread.current[:rake_task] = inst.name
           inst.copy_from_s3(Dockly::History.duplicate_build_sha[0..6])
         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?
         prepare_targets << "dockly:docker:prepare:#{inst.name}"
         upload_targets << "dockly:docker:upload:#{inst.name}"