dapp 0.6.9 → 0.6.10
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/bin/dapp +8 -3
- data/lib/dapp/build/stage/base.rb +6 -3
- data/lib/dapp/build/stage/before_install.rb +5 -1
- data/lib/dapp/build/stage/before_setup.rb +5 -1
- data/lib/dapp/build/stage/build_artifact.rb +5 -1
- data/lib/dapp/build/stage/install/install.rb +5 -1
- data/lib/dapp/build/stage/setup/setup.rb +5 -1
- data/lib/dapp/builder/chef.rb +2 -2
- data/lib/dapp/version.rb +2 -2
- metadata +2 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 40169e89d8925c041d21e62f299117ae75974a75
|
4
|
+
data.tar.gz: 7967139ea2e4433fe4328e3567640fdf4bf2c4d4
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: ad73a8b4e86664bb5b3751a0cb0e347c71ca3a0467621120dcd3ce55a01c70b1181fd8cfbc26cb8dec2307963e9a07e211d29aaf58351d0f443ab417385cad95
|
7
|
+
data.tar.gz: 9826816cb89d9d6b913f7e345f4f0d96cce6301eb0021954570230a6f7ff621f246d8e64ea92fdbc364fe659d5246544f8d7bbaf0e36e3ad08b1d1203b6d2b20
|
data/bin/dapp
CHANGED
@@ -8,11 +8,16 @@ require 'dapp'
|
|
8
8
|
begin
|
9
9
|
begin
|
10
10
|
Dapp::CLI.new.run
|
11
|
+
rescue ::SystemExit
|
12
|
+
raise
|
11
13
|
rescue ::Exception => e
|
12
|
-
|
13
|
-
|
14
|
+
"/tmp/dapp-stacktrace-#{SecureRandom.uuid}.out".tap do |filename|
|
15
|
+
::File.open(filename, 'w') do |dapp_stacktrace|
|
16
|
+
dapp_stacktrace.write "#{e.backtrace.join("\n")}\n"
|
17
|
+
end
|
18
|
+
$stderr.puts "\033[1m\033[31mStacktrace dumped to #{filename}\033[0m"
|
14
19
|
end
|
15
|
-
|
20
|
+
|
16
21
|
raise
|
17
22
|
end
|
18
23
|
rescue Dapp::Error::Shellout => e
|
@@ -82,8 +82,8 @@ module Dapp
|
|
82
82
|
image.add_service_change_label 'dapp-cache-version'.to_sym => Dapp::BUILD_CACHE_VERSION
|
83
83
|
|
84
84
|
if application.project.ssh_auth_sock
|
85
|
-
image.add_volume "#{application.project.ssh_auth_sock}
|
86
|
-
image.add_env 'SSH_AUTH_SOCK',
|
85
|
+
image.add_volume "#{application.project.ssh_auth_sock}:/tmp/dapp-ssh-agent"
|
86
|
+
image.add_env 'SSH_AUTH_SOCK', '/tmp/dapp-ssh-agent'
|
87
87
|
end
|
88
88
|
end
|
89
89
|
|
@@ -112,10 +112,13 @@ module Dapp
|
|
112
112
|
if empty?
|
113
113
|
prev_stage.signature
|
114
114
|
else
|
115
|
-
hashsum [prev_stage.signature, *dependencies.flatten]
|
115
|
+
hashsum [prev_stage.signature, builder_checksum, *dependencies.flatten]
|
116
116
|
end
|
117
117
|
end
|
118
118
|
|
119
|
+
def builder_checksum
|
120
|
+
end
|
121
|
+
|
119
122
|
def dependencies
|
120
123
|
[]
|
121
124
|
end
|
@@ -12,8 +12,12 @@ module Dapp
|
|
12
12
|
super && !application.builder.before_install?
|
13
13
|
end
|
14
14
|
|
15
|
+
def builder_checksum
|
16
|
+
application.builder.before_install_checksum
|
17
|
+
end
|
18
|
+
|
15
19
|
def context
|
16
|
-
[
|
20
|
+
[builder_checksum]
|
17
21
|
end
|
18
22
|
|
19
23
|
def prepare_image
|
@@ -12,8 +12,12 @@ module Dapp
|
|
12
12
|
!application.builder.before_setup?
|
13
13
|
end
|
14
14
|
|
15
|
+
def builder_checksum
|
16
|
+
application.builder.before_setup_checksum
|
17
|
+
end
|
18
|
+
|
15
19
|
def context
|
16
|
-
[
|
20
|
+
[builder_checksum]
|
17
21
|
end
|
18
22
|
|
19
23
|
def prepare_image
|
@@ -12,8 +12,12 @@ module Dapp
|
|
12
12
|
!application.builder.build_artifact?
|
13
13
|
end
|
14
14
|
|
15
|
+
def builder_checksum
|
16
|
+
application.builder.build_artifact_checksum
|
17
|
+
end
|
18
|
+
|
15
19
|
def context
|
16
|
-
[artifact_dependencies_files_checksum,
|
20
|
+
[artifact_dependencies_files_checksum, builder_checksum]
|
17
21
|
end
|
18
22
|
|
19
23
|
def prepare_image
|
@@ -15,8 +15,12 @@ module Dapp
|
|
15
15
|
!application.builder.install?
|
16
16
|
end
|
17
17
|
|
18
|
+
def builder_checksum
|
19
|
+
application.builder.install_checksum
|
20
|
+
end
|
21
|
+
|
18
22
|
def context
|
19
|
-
[install_dependencies_files_checksum,
|
23
|
+
[install_dependencies_files_checksum, builder_checksum]
|
20
24
|
end
|
21
25
|
|
22
26
|
def prepare_image
|
@@ -15,8 +15,12 @@ module Dapp
|
|
15
15
|
!application.builder.setup?
|
16
16
|
end
|
17
17
|
|
18
|
+
def builder_checksum
|
19
|
+
application.builder.setup_checksum
|
20
|
+
end
|
21
|
+
|
18
22
|
def context
|
19
|
-
[setup_dependencies_files_checksum,
|
23
|
+
[setup_dependencies_files_checksum, builder_checksum]
|
20
24
|
end
|
21
25
|
|
22
26
|
def prepare_image
|
data/lib/dapp/builder/chef.rb
CHANGED
@@ -251,9 +251,9 @@ module Dapp
|
|
251
251
|
*berksfile.local_cookbooks
|
252
252
|
.values
|
253
253
|
.map { |cookbook| "--volume #{cookbook[:path]}:#{cookbook[:path]}" },
|
254
|
-
("--volume #{application.project.ssh_auth_sock}
|
254
|
+
("--volume #{application.project.ssh_auth_sock}:/tmp/dapp-ssh-agent" if application.project.ssh_auth_sock),
|
255
255
|
"--volume #{dest_path.tap(&:mkpath)}:#{dest_path}",
|
256
|
-
("--env SSH_AUTH_SOCK
|
256
|
+
("--env SSH_AUTH_SOCK=/tmp/dapp-ssh-agent" if application.project.ssh_auth_sock),
|
257
257
|
('--env DAPP_CHEF_COOKBOOKS_VENDORING=1' if chef_cookbooks_stage),
|
258
258
|
"dappdeps/berksdeps:0.1.0 #{application.project.bash_path} -ec '#{application.project.shellout_pack(vendor_commands.join(' && '))}'"].compact.join(' '),
|
259
259
|
log_verbose: application.project.log_verbose?
|
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.6.
|
4
|
+
version: 0.6.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: 2016-
|
11
|
+
date: 2016-11-03 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: mixlib-shellout
|