diff --git a/common/dependabot-common.gemspec b/common/dependabot-common.gemspec index cbf811aff74..3b668a3aaa8 100644 --- a/common/dependabot-common.gemspec +++ b/common/dependabot-common.gemspec @@ -29,7 +29,7 @@ Gem::Specification.new do |spec| spec.add_dependency "aws-sdk-ecr", "~> 1.5" spec.add_dependency "bundler", ">= 1.16", "< 3.0.0" spec.add_dependency "commonmarker", ">= 0.20.1", "< 0.24.0" - spec.add_dependency "docker_registry2", "~> 1.13" + spec.add_dependency "docker_registry2", "~> 1.14" spec.add_dependency "excon", "~> 0.96", "< 0.100" spec.add_dependency "faraday", "2.7.4" spec.add_dependency "faraday-retry", "2.0.0" diff --git a/docker/lib/dependabot/docker/update_checker.rb b/docker/lib/dependabot/docker/update_checker.rb index 4cc55988680..fbb759bd69c 100644 --- a/docker/lib/dependabot/docker/update_checker.rb +++ b/docker/lib/dependabot/docker/update_checker.rb @@ -10,36 +10,6 @@ require "dependabot/docker/requirement" require "dependabot/docker/utils/credentials_finder" -module DockerRegistry2 - class Registry - private - - # By default the Docker Registry client sets the Accept header to - # `application/vnd.docker.distribution.manifest.v2+json`. This is fine for - # most images, but for multi-architecture images, it fetches the digest of a - # specific architecture instead of the digest for the multi-architecture - # image. We override the header to tell the Docker API to vary its behavior - # depending on whether the image is a uses a traditional (non-list) manifest - # or a manifest list. If the image uses a traditional manifest, the API will - # return the manifest digest. If the image uses a manifest list, the API - # will return the manifest list digest. - def headers(payload: nil, bearer_token: nil) - headers = {} - headers["Authorization"] = "Bearer #{bearer_token}" unless bearer_token.nil? - if payload.nil? - headers["Accept"] = %w( - application/vnd.docker.distribution.manifest.v2+json - application/vnd.docker.distribution.manifest.list.v2+json - application/json - ).join(",") - end - headers["Content-Type"] = "application/vnd.docker.distribution.manifest.v2+json" unless payload.nil? - - headers - end - end -end - module Dependabot module Docker class UpdateChecker < Dependabot::UpdateCheckers::Base diff --git a/updater/Gemfile.lock b/updater/Gemfile.lock index be5bfc8c528..cdf20f6fb0e 100644 --- a/updater/Gemfile.lock +++ b/updater/Gemfile.lock @@ -18,7 +18,7 @@ PATH aws-sdk-ecr (~> 1.5) bundler (>= 1.16, < 3.0.0) commonmarker (>= 0.20.1, < 0.24.0) - docker_registry2 (~> 1.13) + docker_registry2 (~> 1.14) excon (~> 0.96, < 0.100) faraday (= 2.7.4) faraday-retry (= 2.0.0) @@ -143,7 +143,7 @@ GEM irb (>= 1.5.0) reline (>= 0.3.1) diff-lcs (1.5.0) - docker_registry2 (1.13.0) + docker_registry2 (1.14.0) rest-client (>= 1.8.0) domain_name (0.5.20190701) unf (>= 0.0.5, < 1.0.0)