dapp 0.21.10 → 0.21.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 84d84e0532287de87c019d7510a9c335bc9c18cb
-  data.tar.gz: f94268cbc49f418b377608ee1a83c884ce7fc56a
+SHA256:
+  metadata.gz: 0d56d3d9730f62e742ea9b2921c3d0685db05f5155e585f187853a06a8e0d9f5
+  data.tar.gz: 779054e20a4a4646b68c32e9211358e62c298464e43508e8cfe4af535528a373
 SHA512:
-  metadata.gz: f6fa6536f7c36ea9d73785cb35255e2e76efeabf53675d4f00ec8c62c7f1b6f7dcbe4d7f6dd640a6cff7ffda06f52b2a1bb1ba4013a7b5d89d4521ecf2c0700d
-  data.tar.gz: f8fa38c9a247fb2796c2328823e0d8b0d24e2111a75f6688702b980a068f5991bf4d729400803fbe2e1ea3bced53f315f0032902c15dfab60b320f4e78107d56
+  metadata.gz: 3b25dfee5043a773e558e6cb7eb7dc126dc9628032414cb1b3377589c3fa761b11d1ca676ca1ef5bdebe59ae9bb8c462acadae1739e444f21e877660c507573b
+  data.tar.gz: 61af6b702fbd0fd83f250b5f781cc8e8707011f1735d8c863c5c3c2a568b0c1067b31d9d3110777da784c474e332284f9e34f884a0588e0b755c4fcfcf419928

data/lib/dapp/dapp.rb

@@ -139,24 +139,28 @@ module Dapp
 
       def host_docker
         @host_docker ||= begin
-          raise Error::Dapp, code: :docker_not_found if (res = shellout('which docker')).exitstatus.nonzero?
-          docker_bin = res.stdout.strip
-
-          current_docker_version = Gem::Version.new(shellout!("#{docker_bin} --version").stdout.strip[/(\d+\.)+\d+(?=\.\d+)/])
-          required_min_docker_version = Gem::Version.new('1.10')
-
-          if required_min_docker_version >= current_docker_version
-            raise Error::Dapp, code: :docker_version, data: { min_version: required_min_docker_version.to_s,
-                                                              version: current_docker_version.to_s }
+          min_docker_minor_version = Gem::Version.new('1.10')
+          unless host_docker_minor_version > min_docker_minor_version
+            raise Error::Dapp, code: :docker_version, data: { min_version: min_docker_minor_version.to_s,
+                                                              version:     host_docker_minor_version.to_s }
           end
 
           [].tap do |cmd|
-            cmd << docker_bin
+            cmd << host_docker_bin
             cmd << "--config #{host_docker_config_dir}"
           end.join(' ')
         end
       end
 
+      def host_docker_bin
+        raise Error::Dapp, code: :docker_not_found if (res = shellout('which docker')).exitstatus.nonzero?
+        res.stdout.strip
+      end
+
+      def host_docker_minor_version
+        Gem::Version.new(shellout!("#{host_docker_bin} --version").stdout.strip[/\d+\.\d+/])
+      end
+
       def host_docker_config_dir
         if options_with_docker_credentials? && !options[:repo].nil?
           host_docker_tmp_config_dir

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

@@ -95,10 +95,8 @@ module Dapp
 
           def check_user_containers!(images_ids)
             return if images_ids.empty?
-            log_step_with_indent(:'check user containers') do
-              run_command(%(#{host_docker} ps -a -q #{images_ids.uniq.map { |image_id| "--filter=ancestor=#{image_id}" }.join(' ')} --no-trunc)).tap do |res|
-                raise Error::Command, code: :user_containers_detected, data: { ids: res.stdout.strip } if res && !res.stdout.strip.empty? && !dry_run?
-              end
+            run_command(%(#{host_docker} ps -a -q #{images_ids.uniq.map { |image_id| "--filter=ancestor=#{image_id}" }.join(' ')} --no-trunc)).tap do |res|
+              raise Error::Command, code: :user_containers_detected, data: { ids: res.stdout.strip } if res && !res.stdout.strip.empty? && !dry_run?
             end
           end
 
@@ -150,6 +148,10 @@ module Dapp
             log_step_with_indent(:'proper cache', &blk)
           end
 
+          def log_proper_repo_cache(&blk)
+            log_step_with_indent(:'proper repo cache', &blk)
+          end
+
           def one_dimg!
             return if build_configs.one?
             raise Error::Command, code: :command_unexpected_dimgs_number, data: { dimgs_names: build_configs.map(&:_name).join(' ') }

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

@@ -21,9 +21,7 @@ module Dapp
             def proper_cache
               log_proper_cache do
                 lock("#{name}.images") do
-                  log_step_with_indent(name) do
-                    remove_project_images(dapp_project_images_ids.select { |image_id| !actual_cache_project_images_ids.include?(image_id) })
-                  end
+                  remove_project_images(dapp_project_images_ids.select { |image_id| !actual_cache_project_images_ids.include?(image_id) })
                 end
               end
             end
@@ -38,15 +36,15 @@ module Dapp
             end
 
             def stages_cleanup_by_repo
-              registry   = registry(option_repo)
-              repo_dimgs = repo_dimgs_images(registry)
+              log_proper_repo_cache do
+                lock("#{name}.images") do
+                  registry   = dimg_registry(option_repo)
+                  repo_dimgs = repo_detailed_dimgs_images(registry)
 
-              lock("#{name}.images") do
-                log_step_with_indent(name) do
                   dapp_project_dangling_images_flush
 
-                  dimgs, dimgstages = dapp_project_images.partition { |image| repo_dimgs.any? { |dimg| dimg[:id] == image[:id] } }
-                  dimgs.each { |dimg_image| except_dapp_project_image_with_parents(dimg_image[:id], dimgstages) }
+                  _, dimgstages = dapp_project_images.partition { |image| repo_dimgs.any? { |dimg| dimg[:id] == image[:id] } }
+                  repo_dimgs.each { |repo_dimg| except_dapp_project_image_with_parents(repo_dimg[:parent], dimgstages) }
 
                   # Удаление только образов старше 2ч
                   dimgstages.delete_if do |dimgstage|

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

@@ -6,11 +6,9 @@ module Dapp
           module FlushLocal
             def stages_flush_local
               lock("#{name}.images") do
-                log_step_with_indent(name) do
-                  dapp_project_containers_flush
-                  dapp_project_dangling_images_flush
-                  remove_project_images(dapp_project_images_ids)
-                end
+                dapp_project_containers_flush
+                dapp_project_dangling_images_flush
+                remove_project_images(dapp_project_images_ids)
               end
             end
           end

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

@@ -66,7 +66,7 @@ module Dapp
           options.map do |key, vals|
             case key
             when :cmd, :entrypoint
-              vals = [''] if vals == []
+              vals = [''] if vals == [] && ::Dapp::Dapp.host_docker_minor_version >= Gem::Version.new('17.10')
               [vals]
             when :env, :label then vals.map(&method(:options_to_args)).flatten
             else vals

data/lib/dapp/version.rb

@@ -1,4 +1,4 @@
 module Dapp
-  VERSION = '0.21.10'.freeze
+  VERSION = '0.21.11'.freeze
   BUILD_CACHE_VERSION = 24.1
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dapp
 version: !ruby/object:Gem::Version
-  version: 0.21.10
+  version: 0.21.11
 platform: ruby
 authors:
 - Dmitry Stolyarov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-24 00:00:00.000000000 Z
+date: 2017-12-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-shellout
@@ -711,7 +711,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 2.5.0
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.7.4
 signing_key: 
 specification_version: 4
 summary: Build docker packaged apps using chef or shell