dapp 0.6.5 → 0.6.6

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: ebbc168a681eb7fc65bdca3360e6f96065e385f9
4
- data.tar.gz: 41f8060f05490a079acf426cf56f0a5d745af5fb
3
+ metadata.gz: ee54d245eb6039c4a5b4b85400e14465de04fe39
4
+ data.tar.gz: a0f918bc07b0f95ae5d0517cbc9ce9f9df49ab2b
5
5
  SHA512:
6
- metadata.gz: 012d735a9cd29a12364a179d1603d1262b4d5dfddd0dd07c1ef6686e5ae838fdb4fa402709c6a5f9554081a32ca53e4c273978dc4b8cf498217f8bfdc344d61f
7
- data.tar.gz: b79fff7ff0fe614e67831dccdfd81bf22ac7fccf0af0231b8ce6bbbd4f72f22671980cfd7f5261e97ff6688701b37dda8b9f7476b48c3b18eb04384550e3cea6
6
+ metadata.gz: 777933444ad6170a2ae0bb670749f6123b3357910e620b5990007c32009b78ae02ddf54c587aa57349e66f07017eef89000e853b8631aaeb2f289e738e6723ef
7
+ data.tar.gz: 7c91130885e79371ee6a1cc5b4d334b96cf6e5a016597c6c73ba6e50fd4c6a5030f79cafd6a313169b6ba8c8bbdd97e4b9a74342573bdde2a90401050ac2c389
@@ -137,11 +137,9 @@ module Dapp
137
137
  rescue Exception::IntrospectImage => e
138
138
  data = e.net_status[:data]
139
139
  cmd = "docker run -ti --rm --entrypoint #{project.bash_path} #{data[:options]} #{data[:built_id]}"
140
- system(cmd).tap do |res|
141
- project.shellout!("docker rmi #{data[:built_id]}") if data[:rmi]
142
- res || raise(Error::Application, code: :application_not_run)
143
- end
144
- exit 0
140
+ system(cmd)
141
+ project.shellout!("docker rmi #{data[:built_id]}") if data[:rmi]
142
+ raise data[:error]
145
143
  end
146
144
  end # Application
147
145
  end # Dapp
@@ -9,10 +9,6 @@ module Dapp
9
9
  false
10
10
  end
11
11
 
12
- def with_introspection
13
- yield
14
- end
15
-
16
12
  protected
17
13
 
18
14
  def last_stage
@@ -61,10 +61,13 @@ module Dapp
61
61
  def run!
62
62
  raise Error::Build, code: :built_id_not_defined if from.built_id.nil?
63
63
  project.shellout!("docker run #{prepared_options} #{from.built_id} -ec '#{prepared_bash_command}'", log_verbose: true)
64
- rescue Error::Shellout => _e
64
+ rescue Error::Shellout => error
65
65
  raise unless project.introspect_error? || project.introspect_before_error?
66
66
  built_id = project.introspect_error? ? commit! : from.built_id
67
- raise Exception::IntrospectImage, data: { built_id: built_id, options: prepared_options, rmi: project.introspect_error? }
67
+ raise Exception::IntrospectImage, data: { built_id: built_id,
68
+ options: prepared_options,
69
+ rmi: project.introspect_error?,
70
+ error: error }
68
71
  end
69
72
 
70
73
  def commit!
@@ -1,5 +1,5 @@
1
1
  # Version
2
2
  module Dapp
3
- VERSION = '0.6.5'.freeze
3
+ VERSION = '0.6.6'.freeze
4
4
  BUILD_CACHE_VERSION = 3
5
5
  end
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.5
4
+ version: 0.6.6
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-10-25 00:00:00.000000000 Z
11
+ date: 2016-10-26 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: mixlib-shellout