dapp 0.35.13 → 0.35.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9a9837abcf859677dfcfc1ac5d345c291a78a20481bddb731f51cbed9a0dc8da
-  data.tar.gz: 2d23a99bd288dee61a27605eac7c8a9be7ae8b0f4cbc832885900d5517fe0674
+  metadata.gz: 9b79f74ea56e3fa0b73cf59ffcf7575c03ed24c570b6340a29e87080144e89be
+  data.tar.gz: d0a49cdf9540c200d2d3a3c511ac5d983aed2bc74212b289f074d2042ccae029
 SHA512:
-  metadata.gz: f8e25c106fca1b5362cd2898db82814e0c135a9640158c79d9c278c17140a4abc8209d5a3b40cff858a97d3975302eead06456122efb74923db7e15976f7039c
-  data.tar.gz: 1af9e3d8bcc73a5dc8ab910101861c2d8010dba4ce42aa61fe2aab158e71dcd55009fa68924f8c2c8bc9648f8ec618adcb4dee4067703341acbc4bb400a8288d
+  metadata.gz: 55790f11cd30cd2f1ed9de5ba581369a76bdd06c9475f64f06aa17163ce9fe6b77fc09e25167ac0f2bcff9385a12f1b8856611f2ff38a1c02e668fba9d42c0af
+  data.tar.gz: eeaac232968bf0a80d1748b14f48e8a6eeb9ab156fc5d721eddbe6a1bc53b34ebf5536cc378f7716249493b210381cab2cc74e995d93b8a2b30e5b298d096276

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

@@ -24,11 +24,7 @@ module Dapp
                   cleanup_repo_by_policies(registry, actual_detailed_dimgs_images_by_scheme(registry))
                 end
 
-                begin
-                  repo_dimgs      = repo_dimgs_images(registry)
-                  repo_dimgstages = repo_dimgstages_images(registry)
-                  repo_dimgstages_cleanup(registry, repo_dimgs, repo_dimgstages)
-                end if with_stages?
+                repo_dimgstages_cleanup(registry, repo_dimgs, repo_dimgstages) if with_stages?
               end
             end
           end

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

@@ -16,9 +16,11 @@ module Dapp
                   force: true
                 }
               },
-              with_dimgs: true,
-              with_stages: with_stages?,
-              only_repo: false,
+              mode: {
+                with_dimgs: true,
+                with_stages: with_stages?,
+                only_repo: false,
+              },
             }.tap do |json|
               break JSON.dump(json)
             end

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

@@ -14,9 +14,11 @@ module Dapp
                 dimg_names: dimgs_names,
                 dry_run: dry_run?
               },
-              with_dimgs: true,
-              with_stages: with_stages?,
-              only_repo: true,
+              mode: {
+                with_dimgs: true,
+                with_stages: with_stages?,
+                only_repo: true,
+              },
             }.tap do |json|
               break JSON.dump(json)
             end

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

@@ -14,6 +14,34 @@ module Dapp
               raise Error::Build, code: :ruby2go_cleanup_command_failed_unexpected_error, data: { command: command, message: res["error"] } unless res["error"].nil?
             end
           end
+
+          def ruby2go_cleanup_sync_common_project_options
+            {
+              common_project_options: {
+                project_name: name,
+                common_options: {
+                  dry_run: dry_run?,
+                  force: true
+                }
+              },
+            }
+          end
+
+          def ruby2go_cleanup_sync_cache_version_option
+            {
+              cache_version: ::Dapp::BUILD_CACHE_VERSION.to_s
+            }
+          end
+
+          def ruby2go_cleanup_sync_common_repo_options
+            {
+              common_repo_options: {
+                repository: option_repo,
+                dimg_names: dimgs_names,
+                dry_run: dry_run?
+              }
+            }
+          end
         end
       end
     end

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

@@ -5,115 +5,28 @@ module Dapp
         module Stages
           module CleanupLocal
             def stages_cleanup_local
-              lock_repo(option_repo, readonly: true) do
-                raise ::Dapp::Error::Command, code: :stages_cleanup_required_option unless stages_cleanup_option?
+              raise ::Dapp::Error::Command, code: :stages_cleanup_required_option unless stages_cleanup_option?
 
-                proper_cache           if proper_cache_version?
-                stages_cleanup_by_repo if proper_repo_cache?
-                proper_git_commit      if proper_git_commit?
-
-                dapp_containers_flush_by_label("dapp=#{name}")
-                dapp_dangling_images_flush_by_label("dapp=#{name}")
+              if proper_cache_version?
+                ruby2go_cleanup_command(:sync, cleanup_local_proper_cache_version_options)
               end
-            end
 
-            protected
-
-            def proper_cache
-              log_proper_cache do
-                lock("#{name}.images") do
-                  remove_project_images begin
-                    dapp_project_dimgstages.select do |image|
-                      !actual_cache_project_dimgstages.map { |dimgstage| dimgstage["Id"] }.include?(image["Id"])
-                    end
-                  end
-                end
+              if proper_repo_cache?
+                ruby2go_cleanup_command(:sync, cleanup_local_proper_repo_cache_options)
               end
             end
 
-            def actual_cache_project_dimgstages
-              @actual_cache_project_dimgstages ||= begin
-                filters = [{ label: "dapp-cache-version=#{::Dapp::BUILD_CACHE_VERSION}", reference: stage_cache }]
-                prepare_docker_images(extra_filters: filters)
+            def cleanup_local_proper_cache_version_options
+              ruby2go_cleanup_sync_common_project_options.merge(ruby2go_cleanup_sync_cache_version_option).tap do |data|
+                break JSON.dump(data)
               end
             end
 
-            def stages_cleanup_by_repo
-              log_proper_repo_cache do
-                lock("#{name}.images") do
-                  registry   = dimg_registry(option_repo)
-                  repo_dimgs = repo_detailed_dimgs_images(registry)
-                  dimgstages = clone_dapp_project_dimgstages
-
-                  repo_dimgs.each { |repo_dimg| except_image_id_with_parents(repo_dimg[:parent], dimgstages) }
-
-                  # Удаление только образов старше 2ч
-                  dimgstages.delete_if do |dimgstage|
-                    Time.now.to_i - dimgstage["Created"] < 2 * 60 * 60
-                  end unless ENV['DAPP_STAGES_CLEANUP_LOCAL_DISABLED_DATE_POLICY']
-
-                  remove_project_images(dimgstages)
-                end
-              end
-            end
-
-            def clone_dapp_project_dimgstages
-              Marshal.load(Marshal.dump(dapp_project_dimgstages))
-            end
-
-            def except_image_id_with_parents(image_id, dimgstages)
-              return unless (project_image = dapp_project_image_by_id(image_id))
-              except_dapp_project_image_with_parents(project_image, dimgstages)
-            end
-
-            def except_dapp_project_image_with_parents(image, dimgstages)
-              dapp_project_image_artifacts_ids_in_labels(image).each { |aiid| except_image_id_with_parents(aiid, dimgstages) }
-              i = image
-              loop do
-                array_hash_delete_if_by_id(dimgstages, i)
-                break if (i = dapp_project_image_parent(i)).nil?
+            def cleanup_local_proper_repo_cache_options
+              ruby2go_cleanup_sync_common_project_options.merge(ruby2go_cleanup_sync_common_repo_options).tap do |data|
+                break JSON.dump(data)
               end
             end
-
-            def dapp_project_image_artifacts_ids_in_labels(image)
-              select_dapp_artifacts_ids(image['Labels'])
-            end
-
-            def proper_git_commit
-              log_proper_git_commit do
-                lock("#{name}.images") do
-                  unproper_images = []
-                  dapp_project_dimgstages.each do |dimgstage|
-                    dimgstage["Labels"].each do |repo_name, commit|
-                      next if (repo = dapp_git_repositories[repo_name]).nil?
-                      unproper_images.concat(dapp_project_image_with_children(dimgstage)) unless repo.commit_exists?(commit)
-                    end
-                  end
-                  remove_project_images(unproper_images)
-                end
-              end
-            end
-
-            def dapp_project_image_with_children(image)
-              children = []
-              images   = [image]
-
-              loop do
-                children.concat(dapp_project_images.select { |project_image| images.include?(project_image) })
-                images.map! do |parent_image|
-                  dapp_project_images
-                    .select { |project_image| dapp_project_image_parent(project_image) == parent_image }
-                end
-                images.flatten!
-                break if images.empty?
-              end
-
-              children
-            end
-
-            def dapp_project_image_parent(image)
-              dapp_project_image_by_id(image['ParentId'])
-            end
           end
         end
       end

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

@@ -8,103 +8,26 @@ module Dapp
               lock_repo(repo = option_repo) do
                 raise ::Dapp::Error::Command, code: :stages_cleanup_required_option unless stages_cleanup_option?
 
-                log_step_with_indent("#{repo} stages") do
-                  registry        = dimg_registry(repo)
-                  repo_dimgs      = repo_dimgs_images(registry)
-                  repo_dimgstages = repo_dimgstages_images(registry)
-
-                  array_hash_delete_if_by_id(repo_dimgstages, repo_dimgs) # ignoring stages with dimgs ids (v2)
-
-                  proper_repo_cache(registry, repo_dimgstages)                   if proper_cache_version?
-                  repo_dimgstages_cleanup(registry, repo_dimgs, repo_dimgstages) if proper_repo_cache?
-                  proper_repo_git_commit(registry)                               if proper_git_commit?
-                end
+                ruby2go_cleanup_command(:sync, cleanup_repo_proper_cache_version_options) if proper_cache_version?
+                repo_dimgstages_cleanup if proper_repo_cache?
               end
             end
 
-            protected
-
-            def proper_repo_cache(registry, repo_dimgstages)
-              log_proper_cache do
-                repo_dimgstages
-                  .select { |dimgstage| repo_image_dapp_cache_version_label(registry, dimgstage) != ::Dapp::BUILD_CACHE_VERSION.to_s }
-                  .each { |dimgstage| delete_repo_image(registry, dimgstage); repo_dimgstages.delete_at(repo_dimgstages.index(dimgstage)) }
-              end
+            def repo_dimgstages_cleanup
+              ruby2go_cleanup_command(:sync, cleanup_repo_proper_repo_cache_options)
             end
 
-            def repo_dimgstages_cleanup(registry, repo_dimgs, repo_dimgstages)
-              log_proper_repo_cache do
-                repo_dimgs.each { |dimg| except_repo_image_with_parents(registry, dimg, repo_dimgstages) }
-                repo_dimgstages.each { |dimgstage| delete_repo_image(registry, dimgstage) }
+            def cleanup_repo_proper_cache_version_options
+              ruby2go_cleanup_sync_common_repo_options.merge({ mode: { sync_repo: true, only_cache_version: true } }).merge(ruby2go_cleanup_sync_cache_version_option).tap do |data|
+                break JSON.dump(data)
               end
             end
 
-            def except_repo_image_with_parents(registry, repo_image, repo_dimgstages)
-              repo_image_dapp_artifacts_labels(registry, repo_image).each do |aiid|
-                unless (repo_artifact_image = repo_image_by_id(aiid, repo_dimgstages)).nil?
-                  except_repo_image_with_parents(registry, repo_artifact_image, repo_dimgstages)
-                end
-              end
-
-              ri = repo_image
-              loop do
-                array_hash_delete_if_by_id(repo_dimgstages, ri)
-                ri_parent_id = registry.image_parent_id(ri[:tag], ri[:dimg])
-                break if ri_parent_id.empty? || (ri = repo_image_by_id(ri_parent_id, repo_dimgstages)).nil?
+            def cleanup_repo_proper_repo_cache_options
+              ruby2go_cleanup_sync_common_repo_options.merge({ sync_repo: true }).tap do |data|
+                break JSON.dump(data)
               end
             end
-
-            def repo_image_dapp_artifacts_labels(registry, repo_image)
-              select_dapp_artifacts_ids(registry.image_config(repo_image[:tag], repo_image[:dimg])["config"]["Labels"])
-            end
-
-            def repo_image_dapp_cache_version_label(registry, repo_image)
-              registry.image_config(repo_image[:tag], repo_image[:dimg])["config"]["Labels"]['dapp-cache-version']
-            end
-
-            def repo_image_by_id(repo_image_id, repo_images)
-              repo_images.find { |repo_image| repo_image[:id] == repo_image_id }
-            end
-
-            def proper_repo_git_commit(registry)
-              log_proper_git_commit do
-                unproper_dimgstages = []
-                repo_detailed_dimgstage_images(registry).each do |dimgstage|
-                  dimgstage[:labels].each do |repo_name, commit|
-                    next if (repo = dapp_git_repositories[repo_name]).nil?
-                    unproper_dimgstages.concat(repo_detailed_image_with_children(registry, dimgstage)) unless repo.commit_exists?(commit)
-                  end
-                end
-                unproper_dimgstages.uniq.each { |dimgstage| delete_repo_image(registry, dimgstage) }
-              end
-            end
-
-            def repo_detailed_dimgstage_images(registry)
-              @repo_dapp_dimgstage_images_detailed ||= begin
-                repo_dimgstages_images(registry).each do |dimgstage|
-                  image_config = registry.image_config(dimgstage[:tag], nil)
-                  dimgstage[:parent] = image_config["container_config"]["Image"]
-                  dimgstage[:labels] = image_config["config"]["Labels"]
-                end
-              end
-            end
-
-            def repo_detailed_image_with_children(registry, image)
-              children        = []
-              detailed_images = [image]
-
-              loop do
-                children.concat(detailed_images)
-                detailed_images.map! do |repo_image|
-                  repo_detailed_dimgstage_images(registry)
-                    .select { |dimgstage| dimgstage[:parent] == repo_image[:id] }
-                end
-                detailed_images.flatten!
-                break if detailed_images.empty?
-              end
-
-              children
-            end
           end
         end
       end

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

@@ -76,25 +76,6 @@ module Dapp
               end
             end
 
-            def select_dapp_artifacts_ids(labels)
-              labels.select { |k, _v| k.start_with?('dapp-artifact') }.values
-            end
-
-            def dapp_git_repositories
-              @dapp_git_repositories ||= begin
-                {}.tap do |repositories|
-                  dimgs = build_configs.map { |config| dimg(config: config, ignore_signature_auto_calculation: true) }
-                  dimgs.each do |dimg|
-                    [dimg, dimg.artifacts]
-                      .flatten
-                      .map(&:git_artifacts)
-                      .flatten
-                      .map { |git_artifact| repositories[dimgstage_g_a_commit_label(git_artifact.paramshash)] = git_artifact.repo }
-                  end
-                end
-              end
-            end
-
             def proper_repo_cache?
               !!options[:proper_repo_cache]
             end

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

@@ -17,9 +17,11 @@ module Dapp
                     force: true
                   }
                 },
-                with_dimgs: false,
-                with_stages: true,
-                only_repo: false,
+                mode: {
+                  with_dimgs: false,
+                  with_stages: true,
+                  only_repo: false,
+                },
               }.tap do |json|
                 break JSON.dump(json)
               end

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

@@ -15,9 +15,11 @@ module Dapp
                   dimg_names: dimgs_names,
                   dry_run: dry_run?
                 },
-                with_dimgs: false,
-                with_stages: true,
-                only_repo: true,
+                mode: {
+                  with_dimgs: false,
+                  with_stages: true,
+                  only_repo: true,
+                },
               }.tap do |json|
                 break JSON.dump(json)
               end

data/lib/dapp/version.rb

@@ -1,4 +1,4 @@
 module Dapp
-  VERSION = "0.35.13"
+  VERSION = "0.35.14"
   BUILD_CACHE_VERSION = 31
 end

metadata

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