docker_registry2 1.14.0 → 1.16.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6c331456d39ce2a4a57002e7117101f261b2b78bea3b056843430b6c8ccc2110
-  data.tar.gz: 2370009afd0319cfc35a49443e51ad6566508362e5cf3fce941af793c16ac885
+  metadata.gz: bf700e5c43bdbd9216827748cc2010b4f4a2ab6fc83615478589e24200a17e80
+  data.tar.gz: 10dc661ce6689a5a4009d64483c4e26c78bb8dae08412058e4a565cc79169c59
 SHA512:
-  metadata.gz: 32a04a5987fa31cd7feb34d476f82b771e02fd4e5f93caeb4888ad27da0ab7b20cd5cf279f3f06954c599cf68ac930ed9183e5b0410ef90642110bd9ca859b62
-  data.tar.gz: 6ae15951f3f7ca11af1700a701fbc5e270f4adf9a9fb1998bb3657ef85fc79bd1c7cb18e1f9e598e8d592eec9d3c2dfb412d34c7c39fab26b7a3df69585b0dc0
+  metadata.gz: e2f999e780c186e6e19c23698984f2897ddda4e312641cbea94fb1f6e873053c14a55b7fe6422508537eb6e9c3eb023086030156a3ec2214a828f886e956ddba
+  data.tar.gz: 33166c81576a0f368ce6326c1d62726524e8143eeb9e9c579433efa172e87dea00f2a469359ff87238750b7595af7508798c090dcfd68a1d0e5c02192ed134db

data/lib/registry/exceptions.rb

@@ -4,30 +4,30 @@ module DockerRegistry2
   class Exception < RuntimeError
   end
 
-  class RegistryAuthenticationException < StandardError
+  class RegistryAuthenticationException < DockerRegistry2::Exception
   end
 
-  class RegistryAuthorizationException < StandardError
+  class RegistryAuthorizationException < DockerRegistry2::Exception
   end
 
-  class RegistryUnknownException < StandardError
+  class RegistryUnknownException < DockerRegistry2::Exception
   end
 
-  class RegistrySSLException < StandardError
+  class RegistrySSLException < DockerRegistry2::Exception
   end
 
-  class RegistryVersionException < StandardError
+  class RegistryVersionException < DockerRegistry2::Exception
   end
 
-  class ReauthenticatedException < StandardError
+  class ReauthenticatedException < DockerRegistry2::Exception
   end
 
-  class UnknownRegistryException < StandardError
+  class UnknownRegistryException < DockerRegistry2::Exception
   end
 
-  class NotFound < StandardError
+  class NotFound < DockerRegistry2::Exception
   end
 
-  class InvalidMethod < StandardError
+  class InvalidMethod < DockerRegistry2::Exception
   end
 end

data/lib/registry/registry.rb

@@ -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] || {}
@@ -83,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
 
@@ -138,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
+
+      manifest.headers[:docker_content_digest]
     end
 
     def rmtag(image, tag)

data/lib/registry/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: docker_registry2
 version: !ruby/object:Gem::Version
-  version: 1.14.0
+  version: 1.16.0
 platform: ruby
 authors:
 - Avi Deitcher https://github.com/deitch
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-03-31 00:00:00.000000000 Z
+date: 2023-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler