dapp 0.28.9 → 0.28.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 606f920d89eb260413661a3a30098442df068a1a
-  data.tar.gz: 8576a586ebc9213fe8ed3a335fb25ff495cd1cb3
+  metadata.gz: 435bfad980694c0766403ee37dc76a22df40f9d1
+  data.tar.gz: 547eb74b7dfcd6da66ac0198ee88c4481238f7d3
 SHA512:
-  metadata.gz: 72c82ed6e36ffaa1dd905314074366793cf04976929e59ce5691158c2393f675f065561ec89885f3692a7b764e8fd891987ed415b0b3ca42c4b047f097dbd9e4
-  data.tar.gz: cc0180070f5d9beb7513cefe54193e96988ece5e10af1054a21dcb495a5e6cc8144087ba65de47331451e3c327aad2e2bf052aefaf23d89870180273e9300947
+  metadata.gz: 80568b12b3424f0d2565d0c0f3314ebca37b19d941af313ee5debbd5a871e55084effc0cee35fcd379867329f30a2b0714569e4ae8a19a832bcc95bfd2bcc05c
+  data.tar.gz: 1003e256b226c28f2742e92b8847cbf0181fca828530f7f36b342f3294896d7e054b846c4f121a878e1c2775374c88df76f0386754f704ae825a68fd45afd52d

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

@@ -77,27 +77,18 @@ module Dapp
           def cleanup_repo_by_policies(registry, detailed_dimgs_images_by_scheme)
             %w(git_tag git_commit).each_with_object([]) do |scheme, dimgs_images|
               dimgs_images.concat begin
-                detailed_dimgs_images_by_scheme[scheme].map do |dimg|
-                  next if dry_run? && begin
+                detailed_dimgs_images_by_scheme[scheme].select do |dimg|
+                  !dry_run? && begin
                     if scheme == 'git_tag'
-                      !consistent_git_tags.include?(dimg[:tag])
+                      consistent_git_tags.include?(dimg[:tag])
                     elsif scheme == 'git_commit'
-                      !git_own_repo.commit_exists?(dimg[:tag])
+                      git_own_repo.commit_exists?(dimg[:tag])
                     end
                   end
-
-                  dimg[:created_at] = begin
-                    if scheme == 'git_tag'
-                      git_own_repo.tag_at(git_tag_by_consistent_git_tag(dimg[:tag]))
-                    elsif scheme == 'git_commit'
-                      git_own_repo.commit_at(dimg[:tag])
-                    end
-                  end
-                  dimg
-                end.compact
+                end
               end
             end.tap do |detailed_dimgs_images|
-              sorted_detailed_dimgs_images = detailed_dimgs_images.sort_by { |dimg| dimg[:created_at] }
+              sorted_detailed_dimgs_images = detailed_dimgs_images.sort_by { |dimg| dimg[:created_at] }.reverse
               expired_dimgs_images, not_expired_dimgs_images = sorted_detailed_dimgs_images.partition do |dimg_image|
                 dimg_image[:created_at] < DATE_POLICY
               end

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

@@ -48,14 +48,14 @@ module Dapp
                 .reject(&:empty?)
                 .each do |l|
                 id, name, created_at = l.split(';')
-                images << { id: id, name: name, created_at: Time.parse(created_at), **extra_fields }
+                images << { id: id, name: name, created_at: Time.parse(created_at).to_i, **extra_fields }
               end
             end
           end
 
-          def remove_project_images(project_images)
+          def remove_project_images(project_images, force: false)
             update_project_images_cache(project_images)
-            remove_images(project_images_to_delete(project_images))
+            remove_images(project_images_to_delete(project_images), force: force)
           end
 
           def update_project_images_cache(project_images)
@@ -72,7 +72,7 @@ module Dapp
 
           def dapp_containers_flush_by_label(label)
             log_proper_containers do
-              remove_containers_by_query(%(#{host_docker} ps -a -f "label=#{label}" -q --no-trunc))
+              remove_containers_by_query(%(#{host_docker} ps -a -f "label=#{label}" -f "name=dapp.build." -q --no-trunc))
             end
           end
 
@@ -90,10 +90,10 @@ module Dapp
             with_subquery(images_query) { |ids| remove_images(ids) }
           end
 
-          def remove_images(images_ids_or_names)
+          def remove_images(images_ids_or_names, force: false)
             ids_chunks(images_ids_or_names) do |chunk|
-              chunk = ignore_used_images(chunk)
-              remove_base("#{host_docker} rmi%{force_option} %{ids}", chunk, force: false)
+              chunk = ignore_used_images(chunk) unless force
+              remove_base("#{host_docker} rmi%{force_option} %{ids}", chunk, force: force)
             end
           end
 

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

@@ -6,7 +6,7 @@ module Dapp
           def flush_local
             lock("#{name}.images") do
               log_step_with_indent(:flush) do
-                remove_project_images(dapp_project_dimgs)
+                remove_project_images(dapp_project_dimgs, force: true)
                 stages_flush_local if with_stages?
               end
             end

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

@@ -58,14 +58,14 @@ module Dapp
 
           def dapp_images_flush_by_label(label)
             log_step_with_indent('proper images') do
-              remove_images(dapp_images_names_by_label(label))
+              remove_images(dapp_images_names_by_label(label), force: true)
             end
           end
 
           def proper_cache_version
             log_proper_cache do
               proper_cache_all_images_names.tap do |proper_cache_images|
-                remove_images(dapp_images_names_by_label('dapp').select { |image_name| !proper_cache_images.include?(image_name) })
+                remove_images(dapp_images_names_by_label('dapp').select { |image_name| !proper_cache_images.include?(image_name) }, force: true)
               end
             end
           end

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

@@ -46,7 +46,7 @@ module Dapp
 
                   # Удаление только образов старше 2ч
                   dimgstages.delete_if do |dimgstage|
-                    Time.now - dimgstage[:created_at] < 2 * 60 * 60
+                    Time.now.to_i - dimgstage[:created_at] < 2 * 60 * 60
                   end unless ENV['DAPP_STAGES_CLEANUP_LOCAL_DISABLED_DATE_POLICY']
 
                   remove_project_images(dimgstages)

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

@@ -7,10 +7,12 @@ module Dapp
             protected
 
             def repo_detailed_dimgs_images(registry)
-              repo_dimgs_images(registry).each do |dimg|
+              repo_dimgs_images(registry).select do |dimg|
                 image_history = registry.image_history(dimg[:tag], dimg[:dimg])
+                dimg[:created_at] = Time.parse(image_history['created']).to_i
                 dimg[:parent] = image_history['container_config']['Image']
-                dimg[:labels] = image_history['config']['Labels']
+                dimg[:labels] = image_history['config']['Labels'] || {}
+                dimg[:labels]['dapp'] == name
               end
             end
 

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

@@ -6,7 +6,7 @@ module Dapp
           module FlushLocal
             def stages_flush_local
               lock("#{name}.images") do
-                log_step_with_indent('flush stages') { remove_project_images(dapp_project_dimgstages) }
+                log_step_with_indent('flush stages') { remove_project_images(dapp_project_dimgstages, force: true) }
               end
 
               dapp_containers_flush_by_label("dapp=#{name}")

data/lib/dapp/dimg/git_repo/base.rb

@@ -146,11 +146,6 @@ module Dapp
           raise Error::Rugged, code: :git_repository_reference_error, data: { name: name, message: e.message.downcase }
         end
 
-        def tag_at(name)
-          tag = git.tags.find { |t| t.name == name }
-          tag.target.time.to_i
-        end
-
         def tags
           git.tags.map(&:name)
         end
@@ -161,11 +156,7 @@ module Dapp
             .select { |b| b.start_with?('origin/') }
             .map { |b| b.reverse.chomp('origin/'.reverse).reverse }
         end
-
-        def commit_at(commit)
-          lookup_commit(commit).time.to_i
-        end
-
+        
         def find_commit_id_by_message(regex)
           walker.each do |commit|
             msg = commit.message.encode('UTF-8', invalid: :replace, undef: :replace)

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

@@ -5,7 +5,7 @@ module Dapp
         include Argument
 
         def initialize(name:, dapp:, built_id: nil, from: nil)
-          @container_name = "#{dapp.name}.#{SecureRandom.hex(4)}"
+          @container_name = "dapp.build.#{SecureRandom.hex(4)}"
           @built_id = built_id
 
           @bash_commands          = []

data/lib/dapp/version.rb

@@ -1,4 +1,4 @@
 module Dapp
-  VERSION = "0.28.9"
+  VERSION = "0.28.10"
   BUILD_CACHE_VERSION = 29
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dapp
 version: !ruby/object:Gem::Version
-  version: 0.28.9
+  version: 0.28.10
 platform: ruby
 authors:
 - Dmitry Stolyarov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-28 00:00:00.000000000 Z
+date: 2018-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-shellout