dapp 0.19.4 → 0.19.5
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/dapp/dimg/build/stage/base.rb +1 -1
- data/lib/dapp/dimg/dimg.rb +4 -4
- data/lib/dapp/kube/dapp/command/render.rb +5 -2
- data/lib/dapp/kube/helm/release.rb +1 -1
- data/lib/dapp/version.rb +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: aae9ac6942e53a5dfc819ef116bace7d9b6ee0b796854c19f1bbef759384fbd1
|
|
4
|
+
data.tar.gz: e6755cecd0d3974ecbd5f02272e1d7838fe1abd6e969753290420ca653821653
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 82b164a8819abb9deac8ec34f7c3bf21853bb0e625698b73bf895ad1075ecf25c14666ceb5c1db2426c6fff0c28148541160cb93b49feb9d9b6e39c68143b57e
|
|
7
|
+
data.tar.gz: f72c0dcada882ed289d89f94574c0d06c4f32f08d8241f616c6c2e72c50b11506e2957e8a6359960791f53b7bf4949f6baa22468a226cf7090fe24ac638ff1a1
|
|
@@ -87,7 +87,7 @@ module Dapp
|
|
|
87
87
|
image.add_service_change_label dapp: dimg.stage_dapp_label
|
|
88
88
|
image.add_service_change_label 'dapp-version'.to_sym => ::Dapp::VERSION
|
|
89
89
|
image.add_service_change_label 'dapp-cache-version'.to_sym => ::Dapp::BUILD_CACHE_VERSION
|
|
90
|
-
image.add_service_change_label 'dapp-dev-mode'.to_sym => true if dimg.
|
|
90
|
+
image.add_service_change_label 'dapp-dev-mode'.to_sym => true if dimg.dev_mode?
|
|
91
91
|
|
|
92
92
|
if dimg.dapp.ssh_auth_sock
|
|
93
93
|
image.add_volume "#{dimg.dapp.ssh_auth_sock}:/tmp/dapp-ssh-agent"
|
data/lib/dapp/dimg/dimg.rb
CHANGED
|
@@ -42,7 +42,7 @@ module Dapp
|
|
|
42
42
|
end
|
|
43
43
|
|
|
44
44
|
def after_stages_build!
|
|
45
|
-
return unless last_stage.image.built? ||
|
|
45
|
+
return unless last_stage.image.built? || dev_mode? || force_save_cache?
|
|
46
46
|
last_stage.save_in_cache!
|
|
47
47
|
artifacts.each { |artifact| artifact.last_stage.save_in_cache! }
|
|
48
48
|
end
|
|
@@ -154,12 +154,12 @@ module Dapp
|
|
|
154
154
|
dapp.dev_mode?
|
|
155
155
|
end
|
|
156
156
|
|
|
157
|
-
def
|
|
158
|
-
|
|
157
|
+
def force_save_cache?
|
|
158
|
+
!!dapp.options[:force_save_cache]
|
|
159
159
|
end
|
|
160
160
|
|
|
161
161
|
def build_cache_version
|
|
162
|
-
[::Dapp::BUILD_CACHE_VERSION,
|
|
162
|
+
[::Dapp::BUILD_CACHE_VERSION, dev_mode? ? 1 : 0]
|
|
163
163
|
end
|
|
164
164
|
|
|
165
165
|
def introspect_image!(image:, options:)
|
|
@@ -9,9 +9,12 @@ module Dapp
|
|
|
9
9
|
if options[:templates].any?
|
|
10
10
|
release.templates.select do |template_path, _|
|
|
11
11
|
options[:templates].map { |t| "#{t}*" }.any? do |template_path_pattern|
|
|
12
|
-
|
|
12
|
+
template_path_without_chart_name = template_path[/.*?\/(.*)/, 1]
|
|
13
|
+
template_relative_path_pattern = Pathname(File.expand_path(template_path_pattern)).subpath_of(path('.helm'))
|
|
13
14
|
template_relative_path_pattern ||= template_path_pattern
|
|
14
|
-
|
|
15
|
+
|
|
16
|
+
File.fnmatch(template_relative_path_pattern, template_path_without_chart_name) ||
|
|
17
|
+
File.fnmatch(template_relative_path_pattern, template_path)
|
|
15
18
|
end
|
|
16
19
|
end
|
|
17
20
|
else
|
data/lib/dapp/version.rb
CHANGED
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: dapp
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 0.19.
|
|
4
|
+
version: 0.19.5
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Dmitry Stolyarov
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2017-11-
|
|
11
|
+
date: 2017-11-18 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: mixlib-shellout
|