dapp 0.7.5 → 0.7.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8cd65c99fc4cd2ebc304c8de2c5680919199ced5
-  data.tar.gz: 9279deb5fa383a4b907be5888da7db5ee98ff31b
+  metadata.gz: d8fd9b77a1915c11e7e07c74ed60cfa95d7d4c17
+  data.tar.gz: fcbed9875e6dc62eaea6e1ddf20c093b7149263d
 SHA512:
-  metadata.gz: a77f2d367d84b1a6ab9bc4aaec24b4a12292f45a39363476e6d8d94305c14c034c5cb029dbd61b97623826e420a638240046094b53cd368ad875305b776aa69c
-  data.tar.gz: 085af446ec514d03769945e77f1888840fdabf370f9e576b995e10ef18b1a0dd052a9875d7fab88dec9d889d363860900e27f05e063b1a75a37d8e484fde8436
+  metadata.gz: 0fbc36924c0bd92196d442106cf0cc49f26aa8e2102c62d8fc652cc2664fca14af2e1439fb11c27136dc07bd99b7b1352bea5f049053b2d6063f8474ba266c00
+  data.tar.gz: 0e777b8756ad477d212093504c689200144add04225d2557b528038ebd6bf06ad1ef453d5206664f7c52784b00affb2d075bb5cf15f236d34d2cf2029f371116

data/lib/dapp/build/stage/base.rb

@@ -54,7 +54,7 @@ module Dapp
             prepare_image unless image.tagged?
             log_image_build(&method(:image_build))
           end
-          raise Exception::IntrospectImage, data: { built_id: image.built_id, options: image.send(:prepared_options) } if should_be_introspected?
+          dimg.introspect_image!(image: image.built_id, options: image.send(:prepared_options)) if should_be_introspected?
         end
 
         def save_in_cache!

data/lib/dapp/dimg.rb

@@ -147,6 +147,11 @@ module Dapp
       [Dapp::BUILD_CACHE_VERSION, dev_mode? ? 1 : 0]
     end
 
+    def introspect_image!(image:, options:)
+      cmd = "docker run -ti --rm --entrypoint #{project.bash_path} #{options} #{image}"
+      system(cmd)
+    end
+
     protected
 
     def should_be_built?
@@ -160,9 +165,7 @@ module Dapp
       yield
     rescue Exception::IntrospectImage => e
       data = e.net_status[:data]
-      cmd = "docker run -ti --rm --entrypoint #{project.bash_path} #{data[:options]} #{data[:built_id]}"
-      system(cmd)
-      project.shellout!("docker rmi #{data[:built_id]}") if data[:rmi]
+      introspect_image!(image: data[:built_id], options: data[:options])
       raise data[:error]
     end
   end # Dimg

data/lib/dapp/project/command/tag.rb

@@ -8,7 +8,7 @@ module Dapp
         def tag(tag)
           raise Error::Project, code: :tag_command_unexpected_dimgs_number unless build_configs.one?
           raise Error::Project, code: :tag_command_incorrect_tag, data: { name: tag } unless Image::Docker.image_name?(tag)
-          Application.new(config: build_configs.first, project: self, ignore_git_fetch: true, should_be_built: true).tap do |app|
+          Dimg.new(config: build_configs.first, project: self, ignore_git_fetch: true, should_be_built: true).tap do |app|
             app.tag!(tag)
           end
         end

data/lib/dapp/version.rb

@@ -1,5 +1,5 @@
 # Version
 module Dapp
-  VERSION = '0.7.5'.freeze
+  VERSION = '0.7.6'.freeze
   BUILD_CACHE_VERSION = 6
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dapp
 version: !ruby/object:Gem::Version
-  version: 0.7.5
+  version: 0.7.6
 platform: ruby
 authors:
 - Dmitry Stolyarov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-15 00:00:00.000000000 Z
+date: 2016-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-shellout