dapp 0.33.3 → 0.33.5

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: cef1dba41d4f5144d24bf6e822b09b10e9fcb910ddb01d4cd9644f5dd947f3be
4
- data.tar.gz: a97f192610a7f15b9740c3714875614a0a159457c60b3fe9b0cb1ef071342a41
3
+ metadata.gz: 661f56c8680aecc66fc7a9c400ad22d8828eed14d978be89f852e0f3a7f9abec
4
+ data.tar.gz: 6fb2b49e193bed5a3cf7474ab1fffcb918bb63c0278d7afaa69c0f0a500b5b7c
5
5
  SHA512:
6
- metadata.gz: 3203571855074f30bf7010c61de5fc773105095efb2cfd790cf0274326c6ef505e4e0348d9597413db07855a2d71bd8ee42b1034e0e39894b250758f5fa6762b
7
- data.tar.gz: 4f74eb5ff78103a0994c09168295bb2b7a56abb8d93fef2caf1e83e8327a9b91f33aff3a323492baba827fd30e5bc314a7bf44507ee172420371fc83f6b7fa1c
6
+ metadata.gz: d49b4da74809bd052b1f7ff35f5a8b3422a7875945641af6b0be2870dd6780910809fc95e6894b9f0af17830891519476efea11da1ab2c3c8554e9082fd465c7
7
+ data.tar.gz: c853c0bee006855a35eb7f41c8102c81b1787f17d8b6292432f011e2c188aab710ae637455606a53c0c18a10c246211b8130183c899602b85830c0db76365413
data/config/en/common.yml CHANGED
@@ -13,7 +13,7 @@ en:
13
13
  process:
14
14
  artifact_copy: "copying artifact `%{name}`"
15
15
  artifact_building: "building artifact `%{name}`"
16
- layer_building: "building layer `%{name}`"
16
+ from_dimg_building: "building from dimg `%{name}`"
17
17
  git_artifact_clone: "cloning remote git_artifact `%{url}`"
18
18
  git_artifact_fetch: "fetching remote git_artifact `%{url}`"
19
19
  vendoring_builder_cookbooks: 'vendoring builder cookbooks'
@@ -52,8 +52,15 @@ module Dapp
52
52
  end
53
53
  end
54
54
 
55
- system("#{bin_path} -args-from-file #{args_file} -result-to-file #{res_file}")
56
- status_code = $?.exitstatus
55
+ begin
56
+ exec("#{bin_path} -args-from-file #{args_file} -result-to-file #{res_file}") unless (pid = fork)
57
+ pid, status = Process.waitpid2(pid)
58
+ rescue Interrupt => _e
59
+ Process.kill('INT', pid)
60
+ raise
61
+ end
62
+
63
+ status_code = status.exitstatus
57
64
  if [0, 16].include?(status_code)
58
65
  res = nil
59
66
  File.open(res_file, "r") {|f| res = JSON.load(f.read)}
@@ -11,7 +11,7 @@ module Dapp
11
11
 
12
12
  def prepare_image
13
13
  if !from_dimg.nil?
14
- process = dimg.dapp.t(code: 'process.layer_building', data: { name: from_dimg.name })
14
+ process = dimg.dapp.t(code: 'process.from_dimg_building', data: { name: from_dimg.name })
15
15
  dimg.dapp.log_secondary_process(process) { from_dimg.build! }
16
16
  elsif !from_image.tagged?
17
17
  try_host_docker_login
data/lib/dapp/version.rb CHANGED
@@ -1,4 +1,4 @@
1
1
  module Dapp
2
- VERSION = "0.33.3"
2
+ VERSION = "0.33.5"
3
3
  BUILD_CACHE_VERSION = 31
4
4
  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.33.3
4
+ version: 0.33.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: 2018-08-22 00:00:00.000000000 Z
11
+ date: 2018-08-24 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: mixlib-shellout