dapp 0.22.10 → 0.22.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 78fab913a2b20d2b84ee2f1b819bbae1b65cca9e
-  data.tar.gz: 500e09bbb06f3b61859d0e4c65f23eb5bd497975
+SHA256:
+  metadata.gz: df63272ff7c89a05981b38fc919bd40ccd4f803661bb81acb14755ef0d71664d
+  data.tar.gz: ec7979bd0890cbae7a67a502737af9fbd39e19bdf8334350d7f6d8e1a5892ef2
 SHA512:
-  metadata.gz: cbbf7d5239b9d1a7e6a9a8fdf69c908fb69bdebd9deca7419057eaf179ec2a17232ddf745d8a1675352cd640ee70f56e0d0da8eab98bf1f7772300cbbd0558d3
-  data.tar.gz: 22d96f4598aa8537e4a8b940225e79c3bf2000c1ec550db2099e735ec2052d3d849d236c0843079158a925cf8fd58f182e06b30265054b2d909ea39ed4ef8378
+  metadata.gz: cdc9f720d70cc1b8e6fd951fb19206bb1481db4dbb4ce31b544994d846578699750dc3efc8ba91ce4bae221eb9ee98cc5a186cf8d21d88cc54bf918b5183903c
+  data.tar.gz: 37f1a386c28da57604d8c9c06c8f9dd9dda0e0b4cd384ee2b2805861bccc9df3770a21bed1766b38bc055946898f37fda1aa72a71eaa53b9b7f3c3ab1f698b1c

data/config/en/net_status.yml

@@ -16,6 +16,7 @@ en:
       from_image_not_found: 'Image `%{name}` not found!'
       unsupported_patch_format: "Unsupported patch format:\n\n%{patch}"
       unsupported_docker_image_size_format: "Unsupported docker image size format `%{value}`"
+      export_failed: "Artifact export failed (`%{artifact_name}`): check artifact.export in Dappfile!"
     command:
       command_unexpected_dimgs_number: "Command can process only one dimg!\nAmbiguous dimg pattern: `%{dimgs_names}`!"
       mrproper_required_option: "Expected command option `--improper-dev-mode-cache`, `--improper-cache-version-stages` or `--all`!"

data/lib/dapp/dimg/build/stage/artifact_base.rb

@@ -64,6 +64,9 @@ module Dapp
             dimg.dapp.log_secondary_process(dimg.dapp.t(code: 'process.artifact_copy', data: { name: artifact_name }), short: true) do
               artifact_dimg.run(docker_options, [%(-ec '#{dimg.dapp.shellout_pack(commands)}')])
             end
+          rescue Error::Dimg => e
+            raise unless e.net_status[:code] == :dimg_not_run
+            raise Error::Build, code: :export_failed, data: { artifact_name: artifact_name }
           end
           # rubocop:enable Metrics/AbcSize
         end # ArtifactBase

data/lib/dapp/kube/helm/values.rb

@@ -82,8 +82,12 @@ module Dapp
             dimg_labels = {}
             docker_image_id = TEMPLATE_EMPTY_VALUE
             unless fake || without_registry
-              dimg_labels = dapp.dimg_registry(repo).image_labels(docker_tag, dimg.config._name)
-              docker_image_id = dapp.dimg_registry(repo).image_id(docker_tag, dimg.config._name)
+              begin
+                dimg_labels = dapp.dimg_registry(repo).image_labels(docker_tag, dimg.config._name)
+                docker_image_id = dapp.dimg_registry(repo).image_id(docker_tag, dimg.config._name)
+              rescue ::Dapp::Dimg::Error::Registry => err
+                dapp.log_warning "Registry `#{err.net_status[:data][:registry]}` is not availabble: cannot determine <dimg>.docker_image_id and <dimg>.git.<ga>.commit_id helm values of dimg#{dimg.config._name ? " `#{dimg.config._name}`" : nil}"
+              end
             end
 
             dimg_data["docker_image"] = [[repo, dimg.config._name].compact.join("/"), docker_tag].join(":")

data/lib/dapp/version.rb

@@ -1,4 +1,4 @@
 module Dapp
-  VERSION = '0.22.10'.freeze
+  VERSION = '0.22.11'.freeze
   BUILD_CACHE_VERSION = 26
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dapp
 version: !ruby/object:Gem::Version
-  version: 0.22.10
+  version: 0.22.11
 platform: ruby
 authors:
 - Dmitry Stolyarov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-26 00:00:00.000000000 Z
+date: 2017-12-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-shellout
@@ -719,7 +719,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 2.5.0
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.7.4
 signing_key: 
 specification_version: 4
 summary: Build docker packaged apps using chef or shell