dapp 0.32.1 → 0.32.2
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/dapp/dapp/sentry.rb +1 -0
- data/lib/dapp/dimg/cli/command/dimg/bp.rb +15 -10
- data/lib/dapp/dimg/cli/command/dimg/build.rb +5 -0
- data/lib/dapp/dimg/dimg.rb +9 -0
- 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: 6dfe648c584065e6db4066e8107af42608eccb035310acdeb06cb877eef479b3
|
|
4
|
+
data.tar.gz: e6028c928aadbded1802f68ad3a2de56d1c6b5f31e40af505a4be6ad021ed976
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 642f30700becacb64ba61cbd270c2048400a47bf6f9bb3c5f8e59311dee15af7430a5d24bcf544f427edede6baea4109be5e2934d174ddfe46f90609f50e9458
|
|
7
|
+
data.tar.gz: c2a7407020cda71b916fa3913b407a737ca16f01afb1bb75157f84f02eecf6cf92f1094efdb9e3e836570f70487c2270ff01e817eb6b6160638aacf836696216
|
data/lib/dapp/dapp/sentry.rb
CHANGED
|
@@ -50,6 +50,7 @@ module Dapp
|
|
|
50
50
|
"build-dir" => self.build_dir,
|
|
51
51
|
"options" => self.options,
|
|
52
52
|
"env-options" => {
|
|
53
|
+
"DAPP_FORCE_SAVE_CACHE" => ENV["DAPP_FORCE_SAVE_CACHE"],
|
|
53
54
|
"DAPP_BIN_DAPPFILE_YML" => ENV["DAPP_BIN_DAPPFILE_YML"],
|
|
54
55
|
"ANSIBLE_ARGS" => ENV["ANSIBLE_ARGS"],
|
|
55
56
|
"DAPP_CHEF_DEBUG" => ENV["DAPP_CHEF_DEBUG"],
|
|
@@ -19,22 +19,27 @@ BANNER
|
|
|
19
19
|
extend ::Dapp::CLI::Options::Ssh
|
|
20
20
|
|
|
21
21
|
option :tmp_dir_prefix,
|
|
22
|
-
|
|
23
|
-
|
|
22
|
+
long: '--tmp-dir-prefix PREFIX',
|
|
23
|
+
description: 'Tmp directory prefix (/tmp by default). Used for build process service directories.'
|
|
24
24
|
|
|
25
25
|
option :lock_timeout,
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
26
|
+
long: '--lock-timeout TIMEOUT',
|
|
27
|
+
description: 'Redefine resource locking timeout (in seconds)',
|
|
28
|
+
proc: ->(v) { v.to_i }
|
|
29
29
|
|
|
30
30
|
option :build_context_directory,
|
|
31
|
-
|
|
32
|
-
|
|
31
|
+
long: '--build-context-directory DIR_PATH',
|
|
32
|
+
default: nil
|
|
33
33
|
|
|
34
34
|
option :use_system_tar,
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
35
|
+
long: '--use-system-tar',
|
|
36
|
+
boolean: true,
|
|
37
|
+
default: false
|
|
38
|
+
|
|
39
|
+
option :force_save_cache,
|
|
40
|
+
long: '--force-save-cache',
|
|
41
|
+
boolean: true,
|
|
42
|
+
default: false
|
|
38
43
|
|
|
39
44
|
# push options
|
|
40
45
|
|
data/lib/dapp/dimg/dimg.rb
CHANGED
|
@@ -57,6 +57,7 @@ module Dapp
|
|
|
57
57
|
end
|
|
58
58
|
|
|
59
59
|
def after_stages_build!
|
|
60
|
+
return unless dev_mode? || force_save_cache?
|
|
60
61
|
last_stage.save_in_cache!
|
|
61
62
|
artifacts.each { |artifact| artifact.last_stage.save_in_cache! }
|
|
62
63
|
end
|
|
@@ -240,6 +241,14 @@ module Dapp
|
|
|
240
241
|
dapp.dev_mode?
|
|
241
242
|
end
|
|
242
243
|
|
|
244
|
+
def force_save_cache?
|
|
245
|
+
if ENV.key? "DAPP_FORCE_SAVE_CACHE"
|
|
246
|
+
%w(yes 1 true).include? ENV["DAPP_FORCE_SAVE_CACHE"].to_s
|
|
247
|
+
else
|
|
248
|
+
!!dapp.options[:force_save_cache]
|
|
249
|
+
end
|
|
250
|
+
end
|
|
251
|
+
|
|
243
252
|
def build_cache_version
|
|
244
253
|
[::Dapp::BUILD_CACHE_VERSION, dev_mode? ? 1 : 0]
|
|
245
254
|
end
|
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.32.
|
|
4
|
+
version: 0.32.2
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Dmitry Stolyarov
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2018-08-
|
|
11
|
+
date: 2018-08-29 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: mixlib-shellout
|