dapp 0.7.25 → 0.7.26

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: edf33f0121fa04840347b6b5c1378833a9b8f147
4
- data.tar.gz: 8ca914be38675be877a226f12e7f845c9dc5d3b1
3
+ metadata.gz: b893b6ddcfb274548cc720601ff48bfd0a69a72b
4
+ data.tar.gz: bab7817e8ec86beee772e5bc43e2dbedd9a1adb0
5
5
  SHA512:
6
- metadata.gz: 8e28d60430d685361cc56eb0fda74c7be4c147eef08967926750ecab92a785f8847ffe5e2b4f38918d52a8a484fcfc4e7973f37fb0706d2f7230395ce24f3e35
7
- data.tar.gz: 17814dc0723adc95f2a1a0733e2d414e987560f8173e1c2c3998a10d966927d223b9f78f7b46ca8cfcc86331c37302e10ab7cb687e6930de4ba5ffcb79ff735c
6
+ metadata.gz: 34d0d1b5fc871e1e1856b374163e866fa65284f6961542fdf0b3a159e4dfc78c04b50bc25107b1bc85beb15d9812453b87c3b382b2d44f115339f4d76f40735f
7
+ data.tar.gz: 5466f9ea72a452762ec0eb3643596ca388e5808e9d43463c9bfbb33bc9c8eea593e00a7de949bb223a1923967820acd097d67952dc44ed3c20ca00d2d029ac2c
@@ -51,7 +51,7 @@ module Dapp
51
51
  return if should_be_skipped?
52
52
  prev_stage.build! if prev_stage
53
53
  if image_should_be_build?
54
- prepare_image unless image.tagged?
54
+ prepare_image if !image.tagged? && !should_be_not_present?
55
55
  log_image_build(&method(:image_build))
56
56
  end
57
57
  dimg.introspect_image!(image: image.built_id, options: image.send(:prepared_options)) if should_be_introspected?
@@ -59,7 +59,8 @@ module Dapp
59
59
 
60
60
  def save_in_cache!
61
61
  prev_stage.save_in_cache! if prev_stage
62
- image.save_in_cache! if should_be_tagged? && !dimg.project.dry_run?
62
+ return unless should_be_tagged?
63
+ image.save_in_cache! unless dimg.project.dry_run?
63
64
  end
64
65
 
65
66
  def image
@@ -156,7 +157,12 @@ module Dapp
156
157
  end
157
158
 
158
159
  def should_be_tagged?
159
- !(empty? || image.tagged?) && image.built?
160
+ !(empty? || image.tagged? || should_be_not_present?) && image.built?
161
+ end
162
+
163
+ def should_be_not_present?
164
+ return false if next_stage.nil?
165
+ next_stage.image.tagged? || next_stage.should_be_not_present?
160
166
  end
161
167
 
162
168
  def image_name
@@ -8,6 +8,7 @@ module Dapp
8
8
  def log_image_build(&image_build)
9
9
  if empty? then log_state(:empty)
10
10
  elsif image.tagged? then log_state(:using_cache)
11
+ elsif should_be_not_present? then log_state(:not_present)
11
12
  elsif dimg.project.dry_run? then log_state(:build, styles: { status: :success })
12
13
  else log_image_build_process(&image_build)
13
14
  end
@@ -31,9 +31,7 @@ module Dapp
31
31
  builder.before_build_check
32
32
  last_stage.build!
33
33
  ensure
34
- last_stage.save_in_cache! if last_stage.image.built? || # after all stages built
35
- last_stage.image.tagged? || # some stage cache wasn't presented
36
- dev_mode?
34
+ last_stage.save_in_cache! if last_stage.image.built? || dev_mode?
37
35
  end
38
36
  end
39
37
  end
@@ -1,5 +1,5 @@
1
1
  # Version
2
2
  module Dapp
3
- VERSION = '0.7.25'.freeze
3
+ VERSION = '0.7.26'.freeze
4
4
  BUILD_CACHE_VERSION = 6
5
5
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: dapp
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.7.25
4
+ version: 0.7.26
5
5
  platform: ruby
6
6
  authors:
7
7
  - Dmitry Stolyarov