docker_registry2 1.13.0 → 1.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7d2c4b1b61074554ed7e15a5d3c662ebeaae19594cb8c4e3e3ba3dc78e67f0c5
-  data.tar.gz: a1dea179ace034fff0914bbc2a1eb6bcd0dd24cd274f01379a6ffd8215e56c7d
+  metadata.gz: 2b93252a450c644a699ad3e18d6350d734de156a6c034d326be58745c8454242
+  data.tar.gz: af73611edfe95ec8b47cda4059a82b1902c0c3230dba8399c524e7cb4a6491e0
 SHA512:
-  metadata.gz: 7778fc311ce302caf634887a0801490043e7550d819dde8926312b0496134736dfeec474b045ecc5e74a7f29b7195a5977c52b530496edf6a54d187be0ce039e
-  data.tar.gz: 7ff181d7d3b7fe9ba0f87e2cdf342044a1e4442e55fe760ea5cf351994f41c0bf5d6316b33d1e920533b5ee7032dcb10a4230b5ca5d469dbedbe47919eb4063d
+  metadata.gz: 5e2c641cc6a23b0751b535dfebaa780ab87fc9992f7639423537f369e33b8b034b81d2ea215a83117667527c4bdf4998b5df1bae308b70f95f31ccc835082979
+  data.tar.gz: a40c907aa5f98b0f1d719d1b3a57a75c9ae39dd95a8fcdc63c596d5444383ea241c6522f1314526ed81bc9c6412f4d1da2f0062dba4704feec24ef509d7fa028

data/lib/registry/registry.rb

@@ -5,7 +5,7 @@ require 'rest-client'
 require 'json'
 
 module DockerRegistry2
-  class Registry
+  class Registry # rubocop:disable Metrics/ClassLength
     # @param [#to_s] base_uri Docker registry base URI
     # @param [Hash] options Client options
     # @option options [#to_s] :user User name for basic authentication
@@ -17,7 +17,7 @@ module DockerRegistry2
     # @option options [Hash] :http_options Extra options for RestClient::Request.execute.
     def initialize(uri, options = {})
       @uri = URI.parse(uri)
-      @base_uri = "#{@uri.scheme}://#{@uri.host}:#{@uri.port}"
+      @base_uri = "#{@uri.scheme}://#{@uri.host}:#{@uri.port}#{@uri.path}"
       @user = options[:user]
       @password = options[:password]
       @http_options = options[:http_options] || {}
@@ -45,26 +45,22 @@ module DockerRegistry2
     # response with the URL of the next page. See <https://docs.docker.com/registry/spec/api/#pagination>. This method
     # iterates over the pages and calls the given block with each response.
     def paginate_doget(url)
-      while url
+      loop do
         response = doget(url)
         yield response
 
-        break unless (link = response.headers[:link])
-
-        url = parse_link_header(link)[:next]
+        link_header = response.headers[:link]
+        break unless link_header
 
+        url = parse_link_header(link_header)[:next]
       end
     end
 
     def search(query = '')
       all_repos = []
-      paginate_doget '/v2/_catalog' do |response|
-        # parse the response
+      paginate_doget('/v2/_catalog') do |response|
         repos = JSON.parse(response)['repositories']
-        if query.strip.length.positive?
-          re = Regexp.new query
-          repos = repos.find_all { |e| re =~ e }
-        end
+        repos.select! { |repo| repo.match?(/#{query}/) } unless query.empty?
         all_repos += repos
       end
       all_repos
@@ -87,21 +83,9 @@ module DockerRegistry2
 
       # do we include the hashes?
       if withHashes
-        useGet = false
         resp['hashes'] = {}
         resp['tags'].each do |tag|
-          if useGet
-            head = doget "/v2/#{repo}/manifests/#{tag}"
-          else
-            begin
-              head = dohead "/v2/#{repo}/manifests/#{tag}"
-            rescue DockerRegistry2::InvalidMethod
-              # in case we are in a registry pre-2.3.0, which did not support manifest HEAD
-              useGet = true
-              head = doget "/v2/#{repo}/manifests/#{tag}"
-            end
-          end
-          resp['hashes'][tag] = head.headers[:docker_content_digest]
+          resp['hashes'][tag] = digest(repo, tag)
         end
       end
 
@@ -142,12 +126,29 @@ module DockerRegistry2
       end
     end
 
-    def digest(repo, tag)
-      tag_path = "/v2/#{repo}/manifests/#{tag}"
-      dohead(tag_path).headers[:docker_content_digest]
-    rescue DockerRegistry2::InvalidMethod
-      # Pre-2.3.0 registries didn't support manifest HEAD requests
-      doget(tag_path).headers[:docker_content_digest]
+    def digest(image, tag, architecture = nil, os = nil, variant = nil)
+      manifest = manifest(image, tag)
+      parsed_manifest = JSON.parse(manifest.body)
+
+      # Multi-arch images
+      if parsed_manifest.key?('manifests')
+        manifests = parsed_manifest['manifests']
+
+        return manifests if architecture.nil? || os.nil?
+
+        manifests.each do |entry|
+          if !variant.nil?
+            return entry['digest'] if entry['platform']['architecture'] == architecture && entry['platform']['os'] == os && entry['platform']['variant'] == variant
+          elsif entry['platform']['architecture'] == architecture && entry['platform']['os'] == os
+            return entry['digest']
+          end
+        end
+
+        raise DockerRegistry2::NotFound, "No matches found for the image=#{image} tag=#{tag} os=#{os} architecture=#{architecture}"
+
+      end
+
+      parsed_manifest.dig('config', 'digest')
     end
 
     def rmtag(image, tag)
@@ -411,7 +412,14 @@ module DockerRegistry2
     def headers(payload: nil, bearer_token: nil)
       headers = {}
       headers['Authorization'] = "Bearer #{bearer_token}" unless bearer_token.nil?
-      headers['Accept'] = 'application/vnd.docker.distribution.manifest.v2+json,application/vnd.docker.distribution.manifest.list.v2+json,application/json' if payload.nil?
+      if payload.nil?
+        headers['Accept'] =
+          %w[application/vnd.docker.distribution.manifest.v2+json
+             application/vnd.docker.distribution.manifest.list.v2+json
+             application/vnd.oci.image.manifest.v1+json
+             application/vnd.oci.image.index.v1+json
+             application/json].join(',')
+      end
       headers['Content-Type'] = 'application/vnd.docker.distribution.manifest.v2+json' unless payload.nil?
 
       headers

data/lib/registry/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module DockerRegistry2
-  VERSION = '1.13.0'
+  VERSION = '1.15.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: docker_registry2
 version: !ruby/object:Gem::Version
-  version: 1.13.0
+  version: 1.15.0
 platform: ruby
 authors:
 - Avi Deitcher https://github.com/deitch
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-12-23 00:00:00.000000000 Z
+date: 2023-05-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler