dapp 0.7.25 → 0.7.26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: edf33f0121fa04840347b6b5c1378833a9b8f147
-  data.tar.gz: 8ca914be38675be877a226f12e7f845c9dc5d3b1
+  metadata.gz: b893b6ddcfb274548cc720601ff48bfd0a69a72b
+  data.tar.gz: bab7817e8ec86beee772e5bc43e2dbedd9a1adb0
 SHA512:
-  metadata.gz: 8e28d60430d685361cc56eb0fda74c7be4c147eef08967926750ecab92a785f8847ffe5e2b4f38918d52a8a484fcfc4e7973f37fb0706d2f7230395ce24f3e35
-  data.tar.gz: 17814dc0723adc95f2a1a0733e2d414e987560f8173e1c2c3998a10d966927d223b9f78f7b46ca8cfcc86331c37302e10ab7cb687e6930de4ba5ffcb79ff735c
+  metadata.gz: 34d0d1b5fc871e1e1856b374163e866fa65284f6961542fdf0b3a159e4dfc78c04b50bc25107b1bc85beb15d9812453b87c3b382b2d44f115339f4d76f40735f
+  data.tar.gz: 5466f9ea72a452762ec0eb3643596ca388e5808e9d43463c9bfbb33bc9c8eea593e00a7de949bb223a1923967820acd097d67952dc44ed3c20ca00d2d029ac2c

data/lib/dapp/build/stage/base.rb

@@ -51,7 +51,7 @@ module Dapp
           return if should_be_skipped?
           prev_stage.build! if prev_stage
           if image_should_be_build?
-            prepare_image unless image.tagged?
+            prepare_image if !image.tagged? && !should_be_not_present?
             log_image_build(&method(:image_build))
           end
           dimg.introspect_image!(image: image.built_id, options: image.send(:prepared_options)) if should_be_introspected?
@@ -59,7 +59,8 @@ module Dapp
 
         def save_in_cache!
           prev_stage.save_in_cache! if prev_stage
-          image.save_in_cache! if should_be_tagged? && !dimg.project.dry_run?
+          return unless should_be_tagged?
+          image.save_in_cache! unless dimg.project.dry_run?
         end
 
         def image
@@ -156,7 +157,12 @@ module Dapp
         end
 
         def should_be_tagged?
-          !(empty? || image.tagged?) && image.built?
+          !(empty? || image.tagged? || should_be_not_present?) && image.built?
+        end
+
+        def should_be_not_present?
+          return false if next_stage.nil?
+          next_stage.image.tagged? || next_stage.should_be_not_present?
         end
 
         def image_name

data/lib/dapp/build/stage/mod/logging.rb

@@ -8,6 +8,7 @@ module Dapp
           def log_image_build(&image_build)
             if empty?                            then log_state(:empty)
             elsif image.tagged?                  then log_state(:using_cache)
+            elsif should_be_not_present?         then log_state(:not_present)
             elsif dimg.project.dry_run?          then log_state(:build, styles: { status: :success })
             else log_image_build_process(&image_build)
             end

data/lib/dapp/dimg.rb

@@ -31,9 +31,7 @@ module Dapp
               builder.before_build_check
               last_stage.build!
             ensure
-              last_stage.save_in_cache! if last_stage.image.built? ||    # after all stages built
-                                             last_stage.image.tagged? || # some stage cache wasn't presented
-                                             dev_mode?
+              last_stage.save_in_cache! if last_stage.image.built? || dev_mode?
             end
           end
         end

data/lib/dapp/version.rb

@@ -1,5 +1,5 @@
 # Version
 module Dapp
-  VERSION = '0.7.25'.freeze
+  VERSION = '0.7.26'.freeze
   BUILD_CACHE_VERSION = 6
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dapp
 version: !ruby/object:Gem::Version
-  version: 0.7.25
+  version: 0.7.26
 platform: ruby
 authors:
 - Dmitry Stolyarov