dapp 0.33.9 → 0.33.10
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 +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/kube/kubernetes/client.rb +6 -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: 92739a71a9e72630af6a35004375492b9fc3c3294e7959969eab94f47be9ac32
|
|
4
|
+
data.tar.gz: 70c44dc2b3f934845ec60f2837586fff68b3a4d37a6b9d4daecd4d6b95d88b7b
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 40631b0a31d40f6be70d8bc7ebd4fd4e6d47b4505b8e7f20afeab2818a0df8e2fd8d7077a64ea3fe030fbf202d0a9515180f042ec8e0f1cdd0817d6f9a848738
|
|
7
|
+
data.tar.gz: 825db23b5b2385b17b7b9af624d91132fed7d61e0762a31b75fa17521b85894721f9321aeac88b9d07c20ef78677eb8125c126baf7977fa73deabb491d53f2bc
|
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
|
@@ -62,6 +62,7 @@ module Dapp
|
|
|
62
62
|
end
|
|
63
63
|
|
|
64
64
|
def after_stages_build!
|
|
65
|
+
return unless dev_mode? || force_save_cache?
|
|
65
66
|
last_stage.save_in_cache!
|
|
66
67
|
artifacts.each { |artifact| artifact.last_stage.save_in_cache! }
|
|
67
68
|
end
|
|
@@ -245,6 +246,14 @@ module Dapp
|
|
|
245
246
|
dapp.dev_mode?
|
|
246
247
|
end
|
|
247
248
|
|
|
249
|
+
def force_save_cache?
|
|
250
|
+
if ENV.key? "DAPP_FORCE_SAVE_CACHE"
|
|
251
|
+
%w(yes 1 true).include? ENV["DAPP_FORCE_SAVE_CACHE"].to_s
|
|
252
|
+
else
|
|
253
|
+
!!dapp.options[:force_save_cache]
|
|
254
|
+
end
|
|
255
|
+
end
|
|
256
|
+
|
|
248
257
|
def build_cache_version
|
|
249
258
|
[::Dapp::BUILD_CACHE_VERSION, dev_mode? ? 1 : 0]
|
|
250
259
|
end
|
|
@@ -35,6 +35,12 @@ module Dapp
|
|
|
35
35
|
'/apis/batch/v1' => [:job, ],
|
|
36
36
|
'/apis/batch/v1beta1' => [:cronjob, ],
|
|
37
37
|
},
|
|
38
|
+
'1.11' => {
|
|
39
|
+
'/api/v1' => [:service, :replicationcontroller, :pod, :podtemplate, ],
|
|
40
|
+
'/apis/apps/v1' => [:daemonset, :deployment, :replicaset, :statefulset, ],
|
|
41
|
+
'/apis/batch/v1' => [:job, ],
|
|
42
|
+
'/apis/batch/v1beta1' => [:cronjob, ],
|
|
43
|
+
},
|
|
38
44
|
'stable' => {
|
|
39
45
|
'/api/v1' => [:service, :replicationcontroller, :pod, :podtemplate, ],
|
|
40
46
|
'/apis/batch/v1' => [:job, ],
|
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.33.
|
|
4
|
+
version: 0.33.10
|
|
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
|