dapp 0.22.8 → 0.22.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5be296595c66f302d0e6226ba61deadbed26a924
-  data.tar.gz: 7ccabbde07fe12ff244351d029f14bac3d84e47d
+  metadata.gz: 87d870e47e02c8023739cbb69023773078cfaba2
+  data.tar.gz: 964af737b236f914d3ad849ff89dad31da62450b
 SHA512:
-  metadata.gz: 8eefcc9b0784aaf84d3132129e27cc450ee5835b3f29a9688a60fdf3dc86e4e62b6a280cf9471f77ff4cec0eabc2f47237e86551a5cddbd72ee080e3163fc906
-  data.tar.gz: a80bc990f70fd9fc8244c2a76a8958a94d20ba7fd5c94aa0130ef5fd0ef980c674f4bf11ab519a489e88176281ef32e319cb4af75702310f9176f8343e0a4a7a
+  metadata.gz: 63ba1bb29b00a230b9394d6164789058afc82040144c9f832606731df41693facb7bb824d2c74e9bbbbb05322918fb2400607ff0f28510cb3bcd31c05dfaa75f
+  data.tar.gz: 203d94c7fe95ddd34635459e4d789c0e4b13b91adddcb60e3b12ab9f0fbe9a564b5a5050710f273d08a72dfaef7cdd1de49f76a876efade3361fb51b267f680b

data/lib/dapp/dapp.rb

@@ -188,8 +188,8 @@ module Dapp
       def docker_credentials
         if options.key?(:registry_username) && options.key?(:registry_password)
           [options[:registry_username], options[:registry_password]]
-        elsif ENV.key?('DAPP_CI_JOB_TOKEN') || ENV.key?('CI_JOB_TOKEN')
-          ['gitlab-ci-token', ENV['DAPP_CI_JOB_TOKEN'] || ENV['CI_JOB_TOKEN']]
+        elsif ENV.key?('CI_JOB_TOKEN')
+          ['gitlab-ci-token', ENV['CI_JOB_TOKEN']]
         end
       end
 

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

@@ -24,10 +24,12 @@ BANNER
                boolean: true
 
         option :registry_username,
-               long: '--registry-username USERNAME'
+               long: '--registry-username USERNAME',
+               default: ENV.key?("DAPP_DIMG_CLEANUP_REGISTRY_PASSWORD") ? : "dapp-cleanup-repo" : nil # FIXME: https://gitlab.com/gitlab-org/gitlab-ce/issues/41384
 
         option :registry_password,
-               long: '--registry-password PASSWORD'
+               long: '--registry-password PASSWORD',
+               default: ENV["DAPP_DIMG_CLEANUP_REGISTRY_PASSWORD"] # FIXME: https://gitlab.com/gitlab-org/gitlab-ce/issues/41384
 
         def run(argv = ARGV)
           self.class.parse_options(self, argv)

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

@@ -76,15 +76,23 @@ module Dapp
             %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
+                    if scheme == 'git_tag'
+                      !consistent_git_tags.include?(dimg[:tag])
+                    elsif scheme == 'git_commit'
+                      !git_local_repo.commit_exists?(dimg[:tag])
+                    end
+                  end
+
                   dimg[:created_at] = begin
                     if scheme == 'git_tag'
-                      git_local_repo.tag_at(dimg[:tag])
+                      git_local_repo.tag_at(git_tag_by_consistent_git_tag(dimg[:tag]))
                     elsif scheme == 'git_commit'
                       git_local_repo.commit_at(dimg[:tag])
                     end
                   end
                   dimg
-                end
+                end.compact
               end
             end.tap do |detailed_dimgs_images|
               sorted_detailed_dimgs_images = detailed_dimgs_images.sort_by { |dimg| dimg[:created_at] }

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

@@ -86,7 +86,7 @@ module Dapp
 
         def tag_at(name)
           tag = git.tags.find { |t| t.name == name }
-          commit_at(tag.target)
+          tag.target.time.to_i
         end
 
         def tags

data/lib/dapp/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dapp
 version: !ruby/object:Gem::Version
-  version: 0.22.8
+  version: 0.22.9
 platform: ruby
 authors:
 - Dmitry Stolyarov