dapp 0.18.0 → 0.18.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d6f675f931b5b79d8637e493f875973f718547a6f77978bd1d8b3e5bc6c606c3
-  data.tar.gz: fe73c28ca5d6962a19deb01778b420f23c5169bcf5fd1aa31a2e65c460c49bfc
+  metadata.gz: b36446e8acb49a7145d9787e3e13e833c1c35cb80ca137210131c9f2bdc8e52c
+  data.tar.gz: 57a6b73ee8736d0218a594b7e282b9260a03ef1ed493b92b6696ec2859003032
 SHA512:
-  metadata.gz: 2589954a540ca69262a3af36ae7e7532e7830a5b59feafd2dce0b32b66798eef968aad7518610556815fe26654fb332dce94c424865b39461e297d25a82da77e
-  data.tar.gz: 218644c687bc41cb81977a08ffdf6ebbdc64411e9d4b34bfeb4766f2378eafbb7ffec58a71b19d9e759bbd3c7eea230a0fe5c82d694ae5d601ead60627d9b093
+  metadata.gz: 24426a46adede038593a7f2fc2ded64e52ad0520b77b26e3f26db64f6efab92d65992ca19e77e20a21a767865fcd17721fc1a3fc401dc8316100fa4625011452
+  data.tar.gz: bcfcf731bf3cf1fc09f8bae99136dc2fcc3a3465cf044eece3a8f05367fbca8de8a871c51d71b0073f1d2b1624a6af6b8f6e2d096f879e5def0a3ff5db495394

data/lib/dapp/dimg/dapp/command/build_context/export.rb

@@ -18,7 +18,7 @@ module Dapp
                 end.flatten
 
                 log_secondary_process(:images, short: true) do
-                  Image::Docker.save!(context_images_names, build_context_images_tar, verbose: true, quiet: log_quiet?)
+                  Image::Docker.save!(context_images_names, build_context_images_tar, verbose: true, quiet: log_quiet?) unless dry_run?
                 end unless context_images_names.empty?
               end
             end
@@ -40,7 +40,7 @@ module Dapp
                       end
                     end
                   end
-                end
+                end unless dry_run?
               end
             end
           end

data/lib/dapp/dimg/dapp/command/build_context/import.rb

@@ -19,7 +19,7 @@ module Dapp
                 log_secondary_process(:images, short: true) do
                   lock("#{name}.images") do
                     Image::Docker.load!(build_context_images_tar, verbose: true, quiet: log_quiet?)
-                  end
+                  end unless dry_run?
                 end
               else
                 log_warning(desc: { code: :context_archive_not_found, data: { path: build_context_images_tar } })
@@ -44,7 +44,7 @@ module Dapp
                         File.chmod(header.mode, path)
                       end
                     end
-                  end
+                  end unless dry_run?
                 end
               else
                 log_warning(desc: { code: :context_archive_not_found, data: { path: build_context_build_tar } })

data/lib/dapp/dimg/dapp/command/common.rb

@@ -60,7 +60,7 @@ module Dapp
           end
 
           def image_labels(image_id)
-            Image::Stage.image_config_option(image_id: image_id, option: 'labels')
+            Image::Stage.image_config_option(image_id: image_id, option: 'Labels') || {}
           end
 
           def run_command(cmd)

data/lib/dapp/dimg/dapp/command/mrproper.rb

@@ -34,6 +34,8 @@ module Dapp
 
           def remove_build_dir
             log_step_with_indent(:build_dir) { FileUtils.rm_rf(build_path) }
+          rescue ::Dapp::Error::Dapp => e
+            raise unless e.net_status[:code] == :dappfile_not_found
           end
 
           def proper_all?

data/lib/dapp/dimg/dapp/command/stages/cleanup_local.rb

@@ -92,7 +92,7 @@ module Dapp
             end
 
             def image_dapp_artifacts_label(image_id)
-              select_dapp_artifacts_ids(::Dapp::Dimg::Image::Docker.image_config_option(image_id: image_id, option: 'labels'))
+              select_dapp_artifacts_ids(::Dapp::Dimg::Image::Docker.image_config_option(image_id: image_id, option: 'Labels') || {})
             end
 
             def image_parent(image_id)

data/lib/dapp/dimg/dapp/command/stages/flush_repo.rb

@@ -4,10 +4,10 @@ module Dapp
       module Command
         module Stages
           module FlushRepo
-            def stages_flush_repo(repo)
-              lock_repo(repo) do
-                log_step_with_indent(repo) do
-                  registry = registry(repo)
+            def stages_flush_repo
+              lock_repo(option_repo) do
+                log_step_with_indent(option_repo) do
+                  registry = registry(option_repo)
                   repo_dimgs, repo_stages = repo_dimgs_and_cache(registry)
                   repo_dimgs.merge(repo_stages).keys.each { |image_tag| delete_repo_image(registry, image_tag) }
                 end

data/lib/dapp/dimg/image/argument.rb

@@ -97,7 +97,7 @@ module Dapp
         def from_change_options
           return {} if from.nil?
           [:entrypoint, :cmd].each_with_object({}) do |option, options|
-            options[option] = self.class.image_config_option(image_id: from.built_id, option: option)
+            options[option] = from.config_option(option.to_s.capitalize) || []
           end
         end
 

data/lib/dapp/dimg/image/docker.rb

@@ -23,6 +23,7 @@ module Dapp
         def untag!
           raise Error::Build, code: :image_already_untagged, data: { name: name } unless tagged?
           dapp.shellout!("#{dapp.host_docker} rmi #{name}")
+          image_config_delete(id)
           self.class.cache.delete(name)
         end
 
@@ -55,15 +56,36 @@ module Dapp
           cache[:size]
         end
 
-        def self.image_config_option(image_id:, option:)
-          output = ::Dapp::Dapp.shellout!("#{::Dapp::Dapp.host_docker} inspect --format='{{json .Config.#{option.to_s.capitalize}}}' #{image_id}").stdout.strip
-          output == 'null' ? [] : JSON.parse(output)
+        def config_option(option)
+          raise Error::Build, code: :image_not_exist, data: { name: name } if built_id.nil?
+          self.class.image_config_option(image_id: built_id, option: option)
         end
 
         def cache_reset
           self.class.cache_reset(name)
         end
 
+        class << self
+          def image_config(image_id)
+            image_configs[image_id] ||= begin
+              output = ::Dapp::Dapp.shellout!("#{::Dapp::Dapp.host_docker} inspect --format='{{json .Config}}' #{image_id}").stdout.strip
+              JSON.parse(output)
+            end
+          end
+
+          def image_config_option(image_id:, option:)
+            image_config(image_id)[option]
+          end
+
+          def image_config_delete(image_id)
+            image_configs.delete(image_id)
+          end
+
+          def image_configs
+            @image_configs ||= {}
+          end
+        end
+
         protected
 
         def cache
@@ -138,6 +160,7 @@ module Dapp
                 number * (1000**coef)
               end
               cache[name] = { id: id, created_at: created_at, size: size }
+              image_config_delete(id)
             end
             #p [:cache_reset, name, :took, Time.now - t]
           end

data/lib/dapp/dimg/image/stage.rb

@@ -60,8 +60,7 @@ module Dapp
         end
 
         def labels
-          raise Error::Build, code: :image_not_exist, data: { name: name } if built_id.nil?
-          self.class.image_config_option(image_id: built_id, option: 'labels')
+          config_option('Labels')
         end
 
         protected

data/lib/dapp/version.rb

@@ -1,4 +1,4 @@
 module Dapp
-  VERSION = '0.18.0'.freeze
+  VERSION = '0.18.1'.freeze
   BUILD_CACHE_VERSION = 20
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dapp
 version: !ruby/object:Gem::Version
-  version: 0.18.0
+  version: 0.18.1
 platform: ruby
 authors:
 - Dmitry Stolyarov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-03 00:00:00.000000000 Z
+date: 2017-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-shellout
@@ -706,7 +706,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 2.5.0
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.0
+rubygems_version: 2.7.1
 signing_key: 
 specification_version: 4
 summary: Build docker packaged apps using chef or shell