dependabot-docker 0.144.0 → 0.145.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5784db0216390f014adb41d180e53aa6c02c77b58d6459d1e40bcd4dde8570d5
-  data.tar.gz: d2f2d1af25e3436ac6399636ae2138063c5a3db6f247fa9e959b4ac2d9b1b58a
+  metadata.gz: f6b7a48ac114347d82205cca6ea2341e372b6c7b15439da10ee6af9d09446ded
+  data.tar.gz: 174a489e1af90eac015c0efe24ccd62c7c5b65fdbc49b57dd76f39c7f16c19cb
 SHA512:
-  metadata.gz: 5378224eed48efc7f7ab2b2198d953543a1e7ac0029977b8590fc5c94e79086dcaeba9b9d22e0b1f08ec558e2c33c033af8df3c2e17b443720232976b6df5e1a
-  data.tar.gz: '0833cb6adc44a89614b6d302973f2c7b9671d64615515254968ed5ed1f19c22330db94c89d9117fd7bb91907c369c4b5de80a3c22626a9f5cace4d21cca79376'
+  metadata.gz: a78b56114978d7601e38c2f057ba547355a6eb5c78ef4e62ecaed69b17da4e9e8e3d97c011aa79c35631e1b3b8ed9c930690bbe04ba448ca82f42625ba3725cf
+  data.tar.gz: 31e23a52f5ac3afa3c97aaab4b3dc2bd91703cd6047da6814d25f5b7798a982fdf7c11d2fa28ff7261252564666576ba09eb7098c73bcbd7ac668281bcbad15c

data/lib/dependabot/docker/file_parser.rb

@@ -7,6 +7,7 @@ require "dependabot/file_parsers"
 require "dependabot/file_parsers/base"
 require "dependabot/errors"
 require "dependabot/docker/utils/credentials_finder"
+require "dependabot/docker/update_checker"
 
 module Dependabot
   module Docker
@@ -35,7 +36,7 @@ module Dependabot
       AWS_ECR_URL = /dkr\.ecr\.(?<region>[^.]+).amazonaws\.com/.freeze
 
       def parse
-        dependency_set = DependencySet.new
+        dependencies = {}
 
         dockerfiles.each do |dockerfile|
           dockerfile.content.each_line do |line|
@@ -47,21 +48,29 @@ module Dependabot
             version = version_from(parsed_from_line)
             next unless version
 
-            dependency_set << Dependency.new(
-              name: parsed_from_line.fetch("image"),
-              version: version,
-              package_manager: "docker",
-              requirements: [
-                requirement: nil,
-                groups: [],
-                file: dockerfile.name,
-                source: source_from(parsed_from_line)
-              ]
-            )
+            name = parsed_from_line.fetch("image")
+            dep_uniq_key = dep_key(name, version)
+
+            requirement = {
+              requirement: nil,
+              groups: [],
+              file: dockerfile.name,
+              source: source_from(parsed_from_line)
+            }
+            if (existing = dependencies[dep_uniq_key])
+              existing.requirements.push(requirement) unless existing.requirements.any? { |r| r == requirement }
+            else
+              dependencies[dep_uniq_key] = Dependency.new(
+                name: name,
+                version: version,
+                package_manager: "docker",
+                requirements: [requirement]
+              )
+            end
           end
         end
 
-        dependency_set.dependencies
+        dependencies.values
       end
 
       private
@@ -154,6 +163,14 @@ module Dependabot
 
         raise "No Dockerfile!"
       end
+
+      def dep_key(name, version)
+        m = version.match(Dependabot::Docker::UpdateChecker::NAME_WITH_VERSION)
+        return name unless m
+
+        captures = m.named_captures
+        [name, captures.fetch("prefix"), captures.fetch("suffix")].compact.join(":")
+      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dependabot-docker
 version: !ruby/object:Gem::Version
-  version: 0.144.0
+  version: 0.145.0
 platform: ruby
 authors:
 - Dependabot
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.144.0
+        version: 0.145.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.144.0
+        version: 0.145.0
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement