dapp 0.33.11 → 0.33.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5b7734dc02121e713c2988f38b4dc2b82b211e34919995d431fa27974d36c263
-  data.tar.gz: 5e43d7550a77c33e6b2516a3d83410c88e26a80520689e3e8b5d4cd39b736232
+  metadata.gz: 16368d9fd55b2b5d9537042f9b85379206ff6f044fa7354d9ab4cd7ea2ad3d80
+  data.tar.gz: a20d87caf6479b2de7420ef40e08e8a19aaad75c54c33b5b36837c7133534a0f
 SHA512:
-  metadata.gz: 9c7cc7dcbd99c0b75691624e5c35039657faf53d113a23e0e629056b3bed8420ace12b0853fe044dfec5896a0d754f29276b25cec04e525644e3d10eabce1592
-  data.tar.gz: 22a35824d28c77ee5df4ceb837a2d300957e3df54209ccf831691a09d162b683ac764c099c5014774cf8570b00ae05a3c167732f18ad032b7094f3bd5d7088a1
+  metadata.gz: b8a61ac3e971c8b28e2016cf7f0c2e81e983d4954ea1448b6a8e69de5451ceaa6fe279d73df04e9eac748dc44eb66ee9904ce2d6ca5795c50b170ac193c37be0
+  data.tar.gz: 24b45f6b70606af754823ef45abeb2b058dfa2ec0ce10c0db974613aadd05c2766f350a93d57d00b8f4d61d3f9d56343d594f4effebfac22a58e23f29ce73d32

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

@@ -65,6 +65,9 @@ module Dapp
                 if image_should_be_locked?
                   yield
                 else
+                  stage = self
+                  stage.renew until (stage = stage.next_stage).nil?
+
                   no_lock = true
                 end
               end

data/lib/dapp/dimg/cli/command/dimg/bp.rb

@@ -19,22 +19,27 @@ BANNER
         extend ::Dapp::CLI::Options::Ssh
 
         option :tmp_dir_prefix,
-              long: '--tmp-dir-prefix PREFIX',
-              description: 'Tmp directory prefix (/tmp by default). Used for build process service directories.'
+               long: '--tmp-dir-prefix PREFIX',
+               description: 'Tmp directory prefix (/tmp by default). Used for build process service directories.'
 
         option :lock_timeout,
-              long: '--lock-timeout TIMEOUT',
-              description: 'Redefine resource locking timeout (in seconds)',
-              proc: ->(v) { v.to_i }
+               long: '--lock-timeout TIMEOUT',
+               description: 'Redefine resource locking timeout (in seconds)',
+               proc: ->(v) { v.to_i }
 
         option :build_context_directory,
-              long: '--build-context-directory DIR_PATH',
-              default: nil
+               long: '--build-context-directory DIR_PATH',
+               default: nil
 
         option :use_system_tar,
-              long: '--use-system-tar',
-              boolean: true,
-              default: false
+               long: '--use-system-tar',
+               boolean: true,
+               default: false
+
+        option :force_save_cache,
+               long: '--force-save-cache',
+               boolean: true,
+               default: false
 
         # push options
 

data/lib/dapp/dimg/cli/command/dimg/build.rb

@@ -32,6 +32,11 @@ BANNER
                long: '--use-system-tar',
                boolean: true,
                default: false
+
+        option :force_save_cache,
+               long: '--force-save-cache',
+               boolean: true,
+               default: false
       end
     end
   end

data/lib/dapp/dimg/dimg.rb

@@ -62,6 +62,7 @@ module Dapp
       end
 
       def after_stages_build!
+        return unless last_stage.image.built? || dev_mode? || force_save_cache?
         last_stage.save_in_cache!
         artifacts.each { |artifact| artifact.last_stage.save_in_cache! }
       end
@@ -245,6 +246,14 @@ module Dapp
         dapp.dev_mode?
       end
 
+      def force_save_cache?
+        if ENV.key? "DAPP_FORCE_SAVE_CACHE"
+          %w(yes 1 true).include? ENV["DAPP_FORCE_SAVE_CACHE"].to_s
+        else
+          !!dapp.options[:force_save_cache]
+        end
+      end
+
       def build_cache_version
         [::Dapp::BUILD_CACHE_VERSION, dev_mode? ? 1 : 0]
       end

data/lib/dapp/version.rb

@@ -1,4 +1,4 @@
 module Dapp
-  VERSION = "0.33.11"
+  VERSION = "0.33.12"
   BUILD_CACHE_VERSION = 31
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dapp
 version: !ruby/object:Gem::Version
-  version: 0.33.11
+  version: 0.33.12
 platform: ruby
 authors:
 - Dmitry Stolyarov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-29 00:00:00.000000000 Z
+date: 2018-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-shellout