dapp 0.22.7 → 0.22.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8d39108e47246ec97bcdb25fd0464b58772efc23
-  data.tar.gz: 0d0262e3bd5675b69bc988e4c25588523e6881d0
+  metadata.gz: 5be296595c66f302d0e6226ba61deadbed26a924
+  data.tar.gz: 7ccabbde07fe12ff244351d029f14bac3d84e47d
 SHA512:
-  metadata.gz: 5e182c079f4848bbf817d2380c1b3dae904eb6c69beebc541fcfaad6d480060608b5d3ecd126faa94cd2146345b57afdd96ba03aca8bd1b954db90b5192b7e7d
-  data.tar.gz: ac6a75467e166fa1a20c360cb2cb82846d8de06e3c3ba187cbcd281010a767309e2eef0ac3fb754d97e701bb80422b8f485703485b7184cfd42422f119cbf31e
+  metadata.gz: 8eefcc9b0784aaf84d3132129e27cc450ee5835b3f29a9688a60fdf3dc86e4e62b6a280cf9471f77ff4cec0eabc2f47237e86551a5cddbd72ee080e3163fc906
+  data.tar.gz: a80bc990f70fd9fc8244c2a76a8958a94d20ba7fd5c94aa0130ef5fd0ef980c674f4bf11ab519a489e88176281ef32e319cb4af75702310f9176f8343e0a4a7a

data/lib/dapp/dapp.rb

@@ -149,24 +149,28 @@ module Dapp
 
       def host_docker
         @host_docker ||= begin
-          raise Error::Dapp, code: :docker_not_found if (res = shellout('which docker')).exitstatus.nonzero?
-          docker_bin = res.stdout.strip
-
-          current_docker_version = Gem::Version.new(shellout!("#{docker_bin} --version").stdout.strip[/(\d+\.)+\d+(?=\.\d+)/])
-          required_min_docker_version = Gem::Version.new('1.10')
-
-          if required_min_docker_version >= current_docker_version
-            raise Error::Dapp, code: :docker_version, data: { min_version: required_min_docker_version.to_s,
-                                                              version: current_docker_version.to_s }
+          min_docker_minor_version = Gem::Version.new('1.10')
+          unless host_docker_minor_version > min_docker_minor_version
+            raise Error::Dapp, code: :docker_version, data: { min_version: min_docker_minor_version.to_s,
+                                                              version:     host_docker_minor_version.to_s }
           end
 
           [].tap do |cmd|
-            cmd << docker_bin
+            cmd << host_docker_bin
             cmd << "--config #{host_docker_config_dir}"
           end.join(' ')
         end
       end
 
+      def host_docker_bin
+        raise Error::Dapp, code: :docker_not_found if (res = shellout('which docker')).exitstatus.nonzero?
+        res.stdout.strip
+      end
+
+      def host_docker_minor_version
+        Gem::Version.new(shellout!("#{host_docker_bin} --version").stdout.strip[/\d+\.\d+/])
+      end
+
       def host_docker_config_dir
         if options_with_docker_credentials? && !options[:repo].nil?
           host_docker_tmp_config_dir
@@ -178,14 +182,14 @@ module Dapp
       end
 
       def options_with_docker_credentials?
-        (options.key?(:registry_username) && options.key?(:registry_password)) || ENV.key?('CI_JOB_TOKEN')
+        !docker_credentials.nil?
       end
 
       def docker_credentials
         if options.key?(:registry_username) && options.key?(:registry_password)
           [options[:registry_username], options[:registry_password]]
-        elsif ENV.key?('CI_JOB_TOKEN')
-          ['gitlab-ci-token', ENV['CI_JOB_TOKEN']]
+        elsif ENV.key?('DAPP_CI_JOB_TOKEN') || ENV.key?('CI_JOB_TOKEN')
+          ['gitlab-ci-token', ENV['DAPP_CI_JOB_TOKEN'] || ENV['CI_JOB_TOKEN']]
         end
       end
 

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

@@ -31,6 +31,12 @@ BANNER
                              '(use system ssh-agent by default)'].join,
                default: nil,
                proc: ->(v) { composite_options(:ssh_key) << v }
+
+        option :registry_username,
+               long: '--registry-username USERNAME'
+
+        option :registry_password,
+               long: '--registry-password PASSWORD'
       end
     end
   end

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

@@ -24,15 +24,15 @@ BANNER
                boolean: true
 
         option :registry_username,
-              long: '--registry-username USERNAME'
+               long: '--registry-username USERNAME'
 
         option :registry_password,
-              long: '--registry-password PASSWORD'
+               long: '--registry-password PASSWORD'
 
         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, verbose: true))
         end
       end
     end

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

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

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

@@ -19,10 +19,16 @@ BANNER
                long: '--with-stages',
                boolean: true
 
+        option :registry_username,
+               long: '--registry-username USERNAME'
+
+        option :registry_password,
+               long: '--registry-password PASSWORD'
+
         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, verbose: true))
         end
       end
     end

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

@@ -45,11 +45,8 @@ module Dapp
             end
 
             def delete_repo_image(registry, repo_image)
-              if dry_run?
-                log([repo_image[:dimg], repo_image[:tag]].compact.join(':'))
-              else
-                registry.image_delete(repo_image[:tag], repo_image[:dimg])
-              end
+              log([repo_image[:dimg], repo_image[:tag]].compact.join(':')) if dry_run? || log_verbose?
+              registry.image_delete(repo_image[:tag], repo_image[:dimg])           unless dry_run?
             end
 
             def select_dapp_artifacts_ids(labels)

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

@@ -39,7 +39,7 @@ module Dapp
           api_request(repo_suffix, "/manifests/#{image_digest(tag)}",
                       method: :delete,
                       expects: [202, 404],
-                      headers: { Accept: 'Accept: application/vnd.docker.distribution.manifest.v2+json' })
+                      headers: { Accept: 'application/vnd.docker.distribution.manifest.v2+json' })
         end
 
         def image_history(tag)

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

@@ -3,9 +3,9 @@ module Dapp
     module DockerRegistry
       class Base
         module Authorization
-          def authorization_options(url)
-            (@authorization_options ||= {})[@repo_suffix] ||= begin
-              case authenticate_header = raw_request(url).headers['Www-Authenticate']
+          def authorization_options(url, method:)
+            (@authorization_options ||= {})[[@repo_suffix, method]] ||= begin
+              case authenticate_header = raw_request(url, method: method).headers['Www-Authenticate']
                 when /Bearer/ then { headers: { Authorization: "Bearer #{authorization_token(authenticate_header)}" } }
                 when /Basic/ then { headers: { Authorization: "Basic #{authorization_auth}" } }
                 when nil then {}
@@ -34,18 +34,20 @@ module Dapp
           end
 
           def authorization_auth
-            if ::Dapp::Dapp.options_with_docker_credentials?
-              Base64.strict_encode64(::Dapp::Dapp.docker_credentials.join(':'))
-            else
-              auths = auths_section_from_docker_config
-              r = repo
-              loop do
-                break unless r.include?('/') && !auths.keys.any? { |auth| auth.start_with?(r) }
-                r = chomp_name(r)
+            @authorization_auth ||= begin
+              if ::Dapp::Dapp.options_with_docker_credentials?
+                Base64.strict_encode64(::Dapp::Dapp.docker_credentials.join(':'))
+              else
+                auths = auths_section_from_docker_config
+                r = repo
+                loop do
+                  break unless r.include?('/') && !auths.keys.any? { |auth| auth.start_with?(r) }
+                  r = chomp_name(r)
+                end
+                credential = (auths[r] || auths.find { |repo, _| repo == r })
+                user_not_authorized! if credential.nil?
+                credential['auth']
               end
-              credential = (auths[r] || auths.find { |repo, _| repo == r })
-              user_not_authorized! if credential.nil?
-              credential['auth']
             end
           end
 

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

@@ -8,7 +8,7 @@ module Dapp
           end
 
           def request(url, **options)
-            raw_request(url, options.in_depth_merge(authorization_options(url)))
+            raw_request(url, options.in_depth_merge(authorization_options(url, method: options[:method] || :get)))
           end
 
           def raw_request(url, **options)

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

@@ -66,7 +66,7 @@ module Dapp
           options.map do |key, vals|
             case key
             when :cmd, :entrypoint
-              vals = [''] if vals == []
+              vals = [''] if vals == [] && ::Dapp::Dapp.host_docker_minor_version >= Gem::Version.new('17.10')
               [vals]
             when :env, :label then vals.map(&method(:options_to_args)).flatten
             else vals

data/lib/dapp/kube/cli/command/kube/lint.rb

@@ -29,6 +29,12 @@ BANNER
              default: [],
              proc: proc { |v| composite_options(:helm_secret_values) << v }
 
+      option :registry_username,
+             long: '--registry-username USERNAME'
+
+      option :registry_password,
+             long: '--registry-password PASSWORD'
+
       def run(argv = ARGV)
         self.class.parse_options(self, argv)
 

data/lib/dapp/kube/cli/command/kube/render.rb

@@ -39,6 +39,12 @@ BANNER
              default: [],
              proc: proc { |v| composite_options(:templates) << v }
 
+      option :registry_username,
+             long: '--registry-username USERNAME'
+
+      option :registry_password,
+             long: '--registry-password PASSWORD'
+
       def run(argv = ARGV)
         self.class.parse_options(self, argv)
         run_dapp_command(nil, options: cli_options, log_running_time: false) do |dapp|

data/lib/dapp/version.rb

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

metadata

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