dapp 0.22.10 → 0.22.11
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +5 -5
- data/config/en/net_status.yml +1 -0
- data/lib/dapp/dimg/build/stage/artifact_base.rb +3 -0
- data/lib/dapp/kube/helm/values.rb +6 -2
- data/lib/dapp/version.rb +1 -1
- metadata +3 -3
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
|
-
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
2
|
+
SHA256:
|
|
3
|
+
metadata.gz: df63272ff7c89a05981b38fc919bd40ccd4f803661bb81acb14755ef0d71664d
|
|
4
|
+
data.tar.gz: ec7979bd0890cbae7a67a502737af9fbd39e19bdf8334350d7f6d8e1a5892ef2
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: cdc9f720d70cc1b8e6fd951fb19206bb1481db4dbb4ce31b544994d846578699750dc3efc8ba91ce4bae221eb9ee98cc5a186cf8d21d88cc54bf918b5183903c
|
|
7
|
+
data.tar.gz: 37f1a386c28da57604d8c9c06c8f9dd9dda0e0b4cd384ee2b2805861bccc9df3770a21bed1766b38bc055946898f37fda1aa72a71eaa53b9b7f3c3ab1f698b1c
|
data/config/en/net_status.yml
CHANGED
|
@@ -16,6 +16,7 @@ en:
|
|
|
16
16
|
from_image_not_found: 'Image `%{name}` not found!'
|
|
17
17
|
unsupported_patch_format: "Unsupported patch format:\n\n%{patch}"
|
|
18
18
|
unsupported_docker_image_size_format: "Unsupported docker image size format `%{value}`"
|
|
19
|
+
export_failed: "Artifact export failed (`%{artifact_name}`): check artifact.export in Dappfile!"
|
|
19
20
|
command:
|
|
20
21
|
command_unexpected_dimgs_number: "Command can process only one dimg!\nAmbiguous dimg pattern: `%{dimgs_names}`!"
|
|
21
22
|
mrproper_required_option: "Expected command option `--improper-dev-mode-cache`, `--improper-cache-version-stages` or `--all`!"
|
|
@@ -64,6 +64,9 @@ module Dapp
|
|
|
64
64
|
dimg.dapp.log_secondary_process(dimg.dapp.t(code: 'process.artifact_copy', data: { name: artifact_name }), short: true) do
|
|
65
65
|
artifact_dimg.run(docker_options, [%(-ec '#{dimg.dapp.shellout_pack(commands)}')])
|
|
66
66
|
end
|
|
67
|
+
rescue Error::Dimg => e
|
|
68
|
+
raise unless e.net_status[:code] == :dimg_not_run
|
|
69
|
+
raise Error::Build, code: :export_failed, data: { artifact_name: artifact_name }
|
|
67
70
|
end
|
|
68
71
|
# rubocop:enable Metrics/AbcSize
|
|
69
72
|
end # ArtifactBase
|
|
@@ -82,8 +82,12 @@ module Dapp
|
|
|
82
82
|
dimg_labels = {}
|
|
83
83
|
docker_image_id = TEMPLATE_EMPTY_VALUE
|
|
84
84
|
unless fake || without_registry
|
|
85
|
-
|
|
86
|
-
|
|
85
|
+
begin
|
|
86
|
+
dimg_labels = dapp.dimg_registry(repo).image_labels(docker_tag, dimg.config._name)
|
|
87
|
+
docker_image_id = dapp.dimg_registry(repo).image_id(docker_tag, dimg.config._name)
|
|
88
|
+
rescue ::Dapp::Dimg::Error::Registry => err
|
|
89
|
+
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}"
|
|
90
|
+
end
|
|
87
91
|
end
|
|
88
92
|
|
|
89
93
|
dimg_data["docker_image"] = [[repo, dimg.config._name].compact.join("/"), docker_tag].join(":")
|
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.22.
|
|
4
|
+
version: 0.22.11
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Dmitry Stolyarov
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2017-12-
|
|
11
|
+
date: 2017-12-29 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: mixlib-shellout
|
|
@@ -719,7 +719,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
|
719
719
|
version: 2.5.0
|
|
720
720
|
requirements: []
|
|
721
721
|
rubyforge_project:
|
|
722
|
-
rubygems_version: 2.
|
|
722
|
+
rubygems_version: 2.7.4
|
|
723
723
|
signing_key:
|
|
724
724
|
specification_version: 4
|
|
725
725
|
summary: Build docker packaged apps using chef or shell
|