dapp 0.7.5 → 0.7.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 +4 -4
- data/lib/dapp/build/stage/base.rb +1 -1
- data/lib/dapp/dimg.rb +6 -3
- data/lib/dapp/project/command/tag.rb +1 -1
- data/lib/dapp/version.rb +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: d8fd9b77a1915c11e7e07c74ed60cfa95d7d4c17
|
|
4
|
+
data.tar.gz: fcbed9875e6dc62eaea6e1ddf20c093b7149263d
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 0fbc36924c0bd92196d442106cf0cc49f26aa8e2102c62d8fc652cc2664fca14af2e1439fb11c27136dc07bd99b7b1352bea5f049053b2d6063f8474ba266c00
|
|
7
|
+
data.tar.gz: 0e777b8756ad477d212093504c689200144add04225d2557b528038ebd6bf06ad1ef453d5206664f7c52784b00affb2d075bb5cf15f236d34d2cf2029f371116
|
|
@@ -54,7 +54,7 @@ module Dapp
|
|
|
54
54
|
prepare_image unless image.tagged?
|
|
55
55
|
log_image_build(&method(:image_build))
|
|
56
56
|
end
|
|
57
|
-
|
|
57
|
+
dimg.introspect_image!(image: image.built_id, options: image.send(:prepared_options)) if should_be_introspected?
|
|
58
58
|
end
|
|
59
59
|
|
|
60
60
|
def save_in_cache!
|
data/lib/dapp/dimg.rb
CHANGED
|
@@ -147,6 +147,11 @@ module Dapp
|
|
|
147
147
|
[Dapp::BUILD_CACHE_VERSION, dev_mode? ? 1 : 0]
|
|
148
148
|
end
|
|
149
149
|
|
|
150
|
+
def introspect_image!(image:, options:)
|
|
151
|
+
cmd = "docker run -ti --rm --entrypoint #{project.bash_path} #{options} #{image}"
|
|
152
|
+
system(cmd)
|
|
153
|
+
end
|
|
154
|
+
|
|
150
155
|
protected
|
|
151
156
|
|
|
152
157
|
def should_be_built?
|
|
@@ -160,9 +165,7 @@ module Dapp
|
|
|
160
165
|
yield
|
|
161
166
|
rescue Exception::IntrospectImage => e
|
|
162
167
|
data = e.net_status[:data]
|
|
163
|
-
|
|
164
|
-
system(cmd)
|
|
165
|
-
project.shellout!("docker rmi #{data[:built_id]}") if data[:rmi]
|
|
168
|
+
introspect_image!(image: data[:built_id], options: data[:options])
|
|
166
169
|
raise data[:error]
|
|
167
170
|
end
|
|
168
171
|
end # Dimg
|
|
@@ -8,7 +8,7 @@ module Dapp
|
|
|
8
8
|
def tag(tag)
|
|
9
9
|
raise Error::Project, code: :tag_command_unexpected_dimgs_number unless build_configs.one?
|
|
10
10
|
raise Error::Project, code: :tag_command_incorrect_tag, data: { name: tag } unless Image::Docker.image_name?(tag)
|
|
11
|
-
|
|
11
|
+
Dimg.new(config: build_configs.first, project: self, ignore_git_fetch: true, should_be_built: true).tap do |app|
|
|
12
12
|
app.tag!(tag)
|
|
13
13
|
end
|
|
14
14
|
end
|
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.7.
|
|
4
|
+
version: 0.7.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-11-
|
|
11
|
+
date: 2016-11-16 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: mixlib-shellout
|