dapp 0.27.3 → 0.27.4
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 +4 -4
- data/config/en/common.yml +0 -1
- data/lib/dapp/dapp/command/common.rb +1 -1
- data/lib/dapp/dimg/dimg.rb +0 -26
- data/lib/dapp/version.rb +1 -1
- metadata +1 -1
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: f1f27a244e9ea4322280e79e2ea6b0e7c2d02675
|
|
4
|
+
data.tar.gz: 9c8f56e544461a4017f133f07f5496350ce057ca
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: cd19f60baa8cf98dd7164d28f8bdde8fa9e06fb10d45f2f8a665227c97c288c873663c570f54a7bdbea0036d32ef6650b5d8d8f8dfdf6933186cfe6ce371045c
|
|
7
|
+
data.tar.gz: 3fb47dd74d293ef7122a2222c3785e8fdd4b0c7687e035cdabcfb2d82fad76c6916c34f70c66cae50df5cbea99981f485387313e1336339b043e2658ce8e927a
|
data/config/en/common.yml
CHANGED
|
@@ -48,7 +48,6 @@ en:
|
|
|
48
48
|
export: '[EXPORT]'
|
|
49
49
|
pull: '[PULL]'
|
|
50
50
|
tag: '[TAG]'
|
|
51
|
-
exist: '[EXIST]'
|
|
52
51
|
warning:
|
|
53
52
|
wrong_using_base_directive: "WARNING: Directive `%{directive}` has declared after dimg_group|dimg|artifact!"
|
|
54
53
|
wrong_using_directive: "WARNING: Directive `%{directive}` has declared after dimg_group|dimg!"
|
data/lib/dapp/dimg/dimg.rb
CHANGED
|
@@ -81,12 +81,6 @@ module Dapp
|
|
|
81
81
|
dapp.log_step_with_indent(tag_scheme_name) do
|
|
82
82
|
tags.each do |tag|
|
|
83
83
|
image_name = format(export_format, repo: repo, dimg_name: name, tag: tag)
|
|
84
|
-
|
|
85
|
-
if push && tag_should_not_be_pushed?(tag.to_s)
|
|
86
|
-
dapp.log_state(image_name, state: dapp.t(code: 'state.exist'))
|
|
87
|
-
next
|
|
88
|
-
end
|
|
89
|
-
|
|
90
84
|
export_base!(image_name, push: push) do
|
|
91
85
|
export_image = build_export_image!(image_name, scheme_name: tag_scheme_name)
|
|
92
86
|
if push
|
|
@@ -101,26 +95,6 @@ module Dapp
|
|
|
101
95
|
end
|
|
102
96
|
end
|
|
103
97
|
|
|
104
|
-
def tag_should_not_be_pushed?(tag)
|
|
105
|
-
return true unless registry_tags.include?(tag)
|
|
106
|
-
registry_tag_parent = registry.image_history(tag, name)['container_config']['Image']
|
|
107
|
-
registry_tag_parent == last_stage.image.built_id
|
|
108
|
-
end
|
|
109
|
-
|
|
110
|
-
def registry_tags
|
|
111
|
-
@registry_tags ||= begin
|
|
112
|
-
if name.nil?
|
|
113
|
-
registry.nameless_dimg_tags
|
|
114
|
-
else
|
|
115
|
-
registry.dimg_tags(name)
|
|
116
|
-
end
|
|
117
|
-
end
|
|
118
|
-
end
|
|
119
|
-
|
|
120
|
-
def registry
|
|
121
|
-
@registry ||= dapp.dimg_registry
|
|
122
|
-
end
|
|
123
|
-
|
|
124
98
|
def build_export_image!(image_name, scheme_name:)
|
|
125
99
|
Image::Dimg.image_by_name(name: image_name, from: last_stage.image, dapp: dapp).tap do |export_image|
|
|
126
100
|
export_image.add_service_change_label(:'dapp-tag-scheme' => scheme_name)
|
data/lib/dapp/version.rb
CHANGED