dependabot-docker 0.113.21 → 0.113.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9db4f16fca4cbcc7232ebfa0cdce96c7a0e8e8f340957359da72f3457860fcb8
-  data.tar.gz: abed59f8a120394f0b2be986fdd0f9945006ba77cbaf614ce47b60c5b0e4f62f
+  metadata.gz: e934b9d0c4276eb5be7fd6b6c2f542fb403294770212ebfa9c406a46bac9239d
+  data.tar.gz: be9f2e7ce4d4c895a08b714ec350fcfbf1d08dce824501fa0b1a18f657bcffcf
 SHA512:
-  metadata.gz: d63426dd75d1806be7f4d65ea86042b146546ddb9ee32e3a9ffaf08208cd6cbe3bc560029bf57ff7f4996be54f58d7a5ae7682483eafe10dbdf5641a2a1e5949
-  data.tar.gz: f36a9fe3ff16669b292729a7035b699e4c35b41d3ab2ac04c56d2b6917a1f3807506a29ffebfd95b2fd3b84f094decd6b7450e38e59dfe6222fe7936b27a8f9f
+  metadata.gz: 48af18790bdd820e8283852b0358e5db270c179300c01d949a33eb6eb27abf3de1f06e0bbbade33b395f29e4291aa35224bc2ed790c7d0a2e0cc9d2eb97f2600
+  data.tar.gz: 914e8e679302a233a208f88900a3a85f9a552ffb20816d0f97cb825e767a6b8866dbdd57af420ead5b94a7dcde79ff6aa9f09aff3168fffb9d5fb9cf373a2ea4

data/lib/dependabot/docker/file_updater.rb

@@ -71,21 +71,29 @@ module Dependabot
       end
 
       def update_tag(file)
-        return unless old_tag(file)
+        old_tags = old_tags(file)
+        return if old_tags.empty?
 
-        old_declaration =
-          if private_registry_url(file) then "#{private_registry_url(file)}/"
-          else ""
-          end
-        old_declaration += "#{dependency.name}:#{old_tag(file)}"
-        escaped_declaration = Regexp.escape(old_declaration)
+        modified_content = file.content
 
-        old_declaration_regex =
-          %r{^#{FROM_REGEX}\s+(docker\.io/)?#{escaped_declaration}(?=\s|$)}
+        old_tags.each do |old_tag|
+          old_declaration =
+            if private_registry_url(file) then "#{private_registry_url(file)}/"
+            else ""
+            end
+          old_declaration += "#{dependency.name}:#{old_tag}"
+          escaped_declaration = Regexp.escape(old_declaration)
 
-        file.content.gsub(old_declaration_regex) do |old_dec|
-          old_dec.gsub(":#{old_tag(file)}", ":#{new_tag(file)}")
+          old_declaration_regex =
+            %r{^#{FROM_REGEX}\s+(docker\.io/)?#{escaped_declaration}(?=\s|$)}
+
+          modified_content = modified_content.
+                             gsub(old_declaration_regex) do |old_dec|
+            old_dec.gsub(":#{old_tag}", ":#{new_tag(file)}")
+          end
         end
+
+        modified_content
       end
 
       def specified_with_digest?(file)
@@ -117,10 +125,11 @@ module Dependabot
           fetch(:source)[:tag]
       end
 
-      def old_tag(file)
-        dependency.previous_requirements.
-          find { |r| r[:file] == file.name }.
-          fetch(:source)[:tag]
+      def old_tags(file)
+        dependency.
+          previous_requirements.
+          select { |r| r[:file] == file.name }.
+          map { |r| r.fetch(:source)[:tag] }
       end
 
       def private_registry_url(file)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dependabot-docker
 version: !ruby/object:Gem::Version
-  version: 0.113.21
+  version: 0.113.22
 platform: ruby
 authors:
 - Dependabot
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-19 00:00:00.000000000 Z
+date: 2019-11-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dependabot-common
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.113.21
+        version: 0.113.22
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.113.21
+        version: 0.113.22
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement