dapp 0.35.5 → 0.35.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0b5bf2e3848de5bcc3d7f3b412a4e0962bfc392b20d594418942d6b2867208cd
-  data.tar.gz: 7896c94e7afbf9a49c0b691a50164b0dd92ef2a320e9a89b5539405b3b7e7f2d
+  metadata.gz: f6da308baee3d0be11b5b9057a8c67634fdaed1b3b23d7e6ffe31ea32c6d85b2
+  data.tar.gz: c17ba9e63b18eb0e08ba3c601e604b4ebd069fe1695172dc32e97c8a90249a7b
 SHA512:
-  metadata.gz: 8fee2f28deed656798cd7371ff8f7961e0bbf36ca8431f57747c9a4638aa2094df47bcc11bc13143f9351264c4e7306d966017fa96fd053757edce86fcee57f8
-  data.tar.gz: ca862f95889ff946f92445e8878c11bb01670edf252d9d0997ee0b5fd8db002d00925316f8ae1ca891cf4a04375f9a424027dbaacf9c6d9041f7e30e525f17c4
+  metadata.gz: d458e443c0df94e353ddcaa837aff69493d67fbfa5e09ce7994b11dfaa668b1b7b3f15b2b7fa94b841a14a06252a6df027d89c1819a9e04580a4056562780946
+  data.tar.gz: 76b408686d669d451d72e90a4be372e58276dca209d783f1c4b15c4ada4bd5595fbdf8d6ac12bc69ba168ddd1e3e2452ebe208effca6243eddcd0023f50011e8

data/lib/dapp/dapp.rb

@@ -59,7 +59,7 @@ module Dapp
       ruby2go_init
 
       setup_ssh_agent
-      try_host_docker_login
+      try_host_docker_login unless !!options[:ignore_try_host_docker_login]
     end
 
     def options
@@ -245,7 +245,7 @@ module Dapp
         if options[:registry_username] && options[:registry_password]
           [options[:registry_username], options[:registry_password]]
         elsif ENV.key?('DAPP_DOCKER_CONFIG')
-        elsif !gcr_registry? && !ENV.key?('DAPP_IGNORE_CI_DOCKER_AUTOLOGIN') && ENV.key?('CI_JOB_TOKEN')
+        elsif !gcr_registry? && !ENV.key?('DAPP_IGNORE_CI_DOCKER_AUTOLOGIN') && ENV.key?('CI_REGISTRY') && ENV.key?('CI_JOB_TOKEN')
           ['gitlab-ci-token', ENV['CI_JOB_TOKEN']]
         end
       end

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

@@ -16,7 +16,7 @@ BANNER
         def run(argv = ARGV)
           self.class.parse_options(self, argv)
           repo = self.class.required_argument(self, 'repo')
-          run_dapp_command(run_method, options: cli_options(dimgs_patterns: cli_arguments, repo: repo))
+          run_dapp_command(run_method, options: cli_options(dimgs_patterns: cli_arguments, repo: repo, ignore_try_host_docker_login: true))
         end
       end
     end

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

@@ -64,7 +64,11 @@ module Dapp
               log([repo_image[:dimg], repo_image[:tag]].compact.join(':')) if dry_run? || log_verbose?
               unless dry_run?
                 begin
-                  registry.image_delete(repo_image[:tag], repo_image[:dimg])
+                  if self.class.gcr_registry?
+                    registry.gcr_image_delete(repo_image[:tag], repo_image[:dimg])
+                  else
+                    registry.image_delete(repo_image[:tag], repo_image[:dimg])
+                  end
                 rescue ::Dapp::Dimg::Error::Registry => e
                   raise unless e.net_status[:data][:message].include?("MANIFEST_UNKNOWN")
                   log_warning "WARNING: Ignore dimg `#{repo_image[:dimg]}` tag `#{repo_image[:tag]}`: got not-found-error from docker registry on image-delete request: #{e.net_status[:data][:message]}"

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

@@ -22,8 +22,20 @@ module Dapp
           ruby2go_docker_registry_command(command: :image_config, options: { reference: tag_reference(tag) })
         end
 
+        def gcr_image_delete(tag)
+          image_delete_by_tag(tag)
+        end
+
         def image_delete(tag)
           digest = image_digest(tag)
+          image_delete_by_digest(digest)
+        end
+
+        def image_delete_by_tag(tag)
+          ruby2go_docker_registry_command(command: :image_delete, options: { reference: tag_reference(tag) })
+        end
+
+        def image_delete_by_digest(digest)
           ruby2go_docker_registry_command(command: :image_delete, options: { reference: digest_reference(digest) })
         end
 

data/lib/dapp/dimg/docker_registry/dimg.rb

@@ -41,6 +41,10 @@ module Dapp
           with_dimg_repository(dimg_repository.to_s) { super(tag) }
         end
 
+        def gcr_image_delete(tag, dimg_repository = nil)
+          with_dimg_repository(dimg_repository.to_s) { super(tag) }
+        end
+
         def image_delete(tag, dimg_repository = nil)
           with_dimg_repository(dimg_repository.to_s) { super(tag) }
         end

data/lib/dapp/version.rb

@@ -1,4 +1,4 @@
 module Dapp
-  VERSION = "0.35.5"
+  VERSION = "0.35.6"
   BUILD_CACHE_VERSION = 31
 end

metadata

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