dapp 0.32.3 → 0.32.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f8b0c69d06cefccf647a57e03e1fbafddea8879480ed3dccec6c9873a438b181
-  data.tar.gz: a432890c366d70ea9373d894632d33aa3631d65b8c20a4b3770ddd0473ef1013
+  metadata.gz: 9f5583e1391377bea9cf4e8b6be0f3ec8bf71f7059f7162cad6ce53da868452f
+  data.tar.gz: b94d1240dff28b874918b9bddc502b08e6a84f28c9e40546bad3e8f70937faa0
 SHA512:
-  metadata.gz: 906041da704ab096c66df61c5d1a6728fe28ca63eb9b60512091aadf9ac89a5ed2dfa54b8222b4b11e4a75df6ddc8e6c927ef5ebff4933d9e9d8789481356c6c
-  data.tar.gz: fde358328c9b14b7e7f594f249444b76ece676c35fa46fe5113e089d7a680a68b7ab6d2902f57d6d2b526e61213863de200e82e5d0cf4ce3db216b81f0b5ce8f
+  metadata.gz: 6cf03c1bf20a9bbb866190968e32fd0ba019bac185dd09ffd19f0fb0c5a371548bfbc650fdf9707b2b7fe0af1e34c1ffe84f9d3ea6a7586020bb347e981fbd0b
+  data.tar.gz: ecfab8ad64fa943b334428d902374433659275c50fc7321f42f2b2d0df98e087d2ebe5175568e6b6edaf889f2d49b3c10a2da70a3c8fb8a034a137646ff638b7

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

@@ -32,6 +32,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

@@ -57,6 +57,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
@@ -240,6 +241,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.32.3"
+  VERSION = "0.32.4"
   BUILD_CACHE_VERSION = 31
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dapp
 version: !ruby/object:Gem::Version
-  version: 0.32.3
+  version: 0.32.4
 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