dapp 0.23.2 → 0.23.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: b824d82111173d42881d595fa087ea22e0f631c4cfd41f679779dd54dd08e5eb
-  data.tar.gz: 65b7d687aed97303a38a64bba5941a97014306fb9cda93e05ca823d40b2ac1bc
+SHA1:
+  metadata.gz: bae0c6892f439eeb2733d7c3767b70769c94a492
+  data.tar.gz: 63a6652f3b687bc044c6a0312b9def251ba8f130
 SHA512:
-  metadata.gz: 738498c3f2f7cbea60cbe147069c7e834b8ea60fa63051afd82899c330f075b5b7b9cead2b219e4eec2be4d38bc085b9f5538f36e18841bd482f66176114a77a
-  data.tar.gz: 05dc719a00c3203e62b03aeac743e0c0bbaa2e7db90c59c38f5cebda1d638f1747ae72606cde6f3c376f725823e1086133e0ab594d674b3341911bbfca26d62f
+  metadata.gz: 0332c89d8ea89a0611f4cb10abcdd6af84ae81c0c5b75d8635f85e0880ad89ab2e0ac59e9ecff9e085c8334839924b42f8943c89dd2a0e640e2cab15dac4bcab
+  data.tar.gz: 8ae4bd3b958a1853d22e2424452dc8a9af548ff52443dc04972e0e799be4271d5302eb9f26196eebcb43fce2ec4f07958692e30cdddbabbc4705cfcaa07956f6

data/config/en/net_status.yml

@@ -39,7 +39,6 @@ en:
       values_file_not_found: "Values file `%{path}` not found!"
       secret_file_not_found: "Secret file `%{path}` not found!"
       secret_file_empty: "Secret file `%{path}` can't be empty!"
-      user_containers_detected: "User containers are using these images:\n%{ids}"
       incorrect_yaml_structure: "Incorrect YAML structure in `%{path}`!"
       editor_not_found: "Editor not found!"
       expected_only_one_tag: 'Expected only one tag (`%{tags}`)!'

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

@@ -54,7 +54,7 @@ module Dapp
           end
 
           def update_project_images_cache(project_images)
-            dapp_project_images.delete_if { |image| project_images.include?(image) }
+            dapp_project_images.delete_if { |image| project_images.map { |i| i[:id] }.include?(image[:id]) }
           end
 
           def project_images_to_delete(project_images)
@@ -74,15 +74,19 @@ module Dapp
           end
 
           def remove_images(images_ids_or_names)
-            images_ids_or_names.uniq!
-            check_user_containers!(images_ids_or_names)
+            images_ids_or_names = ignore_used_images(images_ids_or_names.uniq)
             remove_base("#{host_docker} rmi%{force_option} %{ids}", images_ids_or_names, force: false)
           end
 
-          def check_user_containers!(images_ids)
-            return if images_ids.empty?
-            run_command(%(#{host_docker} ps -a -q #{images_ids.uniq.map { |image_id| "--filter=ancestor=#{image_id}" }.join(' ')} --no-trunc)).tap do |res|
-              raise ::Dapp::Error::Command, code: :user_containers_detected, data: { ids: res.stdout.strip } if res && !res.stdout.strip.empty? && !dry_run?
+          def ignore_used_images(images_ids_or_names)
+            images_ids_or_names.select do |image_id_or_name|
+              res = run_command(%(#{host_docker} ps -a -q --filter=ancestor=#{image_id_or_name}))
+              if res && !res.stdout.strip.empty? && !dry_run?
+                log_info("Skip `#{image_id_or_name}` (used by containers: #{res.stdout.strip.split.join(' ')})")
+                false
+              else
+                true
+              end
             end
           end
 

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

@@ -19,7 +19,11 @@ module Dapp
             def proper_cache
               log_proper_cache do
                 lock("#{name}.images") do
-                  remove_project_images(dapp_project_dimgstages - actual_cache_project_dimgstages)
+                  remove_project_images begin
+                    dapp_project_dimgstages.select do |image|
+                      !actual_cache_project_dimgstages.map { |dimgstage| dimgstage[:id] }.include?(image[:id])
+                    end
+                  end
                 end
               end
             end
@@ -39,8 +43,8 @@ module Dapp
 
                   # Удаление только образов старше 2ч
                   dimgstages.delete_if do |dimgstage|
-                    Time.now - dimgstage[:created_at] < 2*60*60
-                  end
+                    Time.now - dimgstage[:created_at] < 2 * 60 * 60
+                  end unless ENV['DAPP_STAGES_CLEANUP_LOCAL_DISABLED_DATE_POLICY']
 
                   remove_project_images(dimgstages)
                 end

data/lib/dapp/version.rb

@@ -1,4 +1,4 @@
 module Dapp
-  VERSION = '0.23.2'.freeze
+  VERSION = '0.23.3'.freeze
   BUILD_CACHE_VERSION = 26
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dapp
 version: !ruby/object:Gem::Version
-  version: 0.23.2
+  version: 0.23.3
 platform: ruby
 authors:
 - Dmitry Stolyarov
@@ -721,7 +721,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 2.5.0
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.4
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Build docker packaged apps using chef or shell