Ensure Docker versions are valid Dependabot::Versions

docker/lib/dependabot/docker/version.rb

@@ -14,16 +14,11 @@ class Version < Dependabot::Version
       def initialize(version)
         release_part, update_part = version.split("_", 2)
 
-        @release_part = Dependabot::Version.new(release_part.tr("-", "."))
+        @release_part = Dependabot::Version.new(release_part.sub("v", "").tr("-", "."))
 
         @update_part = Dependabot::Version.new(update_part&.start_with?(/[0-9]/) ? update_part : 0)
-      end
 
-      def self.correct?(version)
-        super(new(version).to_semver)
-      rescue ArgumentError
-        # if we can't instantiate a version, it can't be correct
-        false
+        super(@release_part)
       end
 
       def to_semver

docker/spec/dependabot/docker/version_spec.rb

@@ -27,13 +27,19 @@
   end
 
   describe ".correct?" do
+    def check_version_for_correctness?(version)
+      docker_version = described_class.new(version)
+      described_class.correct?(docker_version)
+    end
+
     it "classifies standard versions as correct" do
-      expect(described_class.correct?("2.4.2")).to be true
+      expect(check_version_for_correctness?("2.4.2")).to be true
     end
 
     it "classifies java versions as correct" do
-      expect(described_class.correct?("11.0.16_8")).to be true
-      expect(described_class.correct?("11.0.16.1")).to be true
+      expect(check_version_for_correctness?("11.0.16_8")).to be true
+      expect(check_version_for_correctness?("v11.0.16_8")).to be true
+      expect(check_version_for_correctness?("11.0.16.1")).to be true
     end
   end
 

updater/lib/dependabot/updater/group_update_creation.rb

@@ -217,8 +217,11 @@ def semver_rules_allow_grouping?(group, dependency, checker)
         return false if git_dependency?(dependency)
 
         version = Dependabot::Utils.version_class_for_package_manager(job.package_manager).new(dependency.version.to_s)
+        latest_version = Dependabot::Utils.version_class_for_package_manager(job.package_manager).
+                         new(checker.latest_version)
+
         # Not every version class implements .major, .minor, .patch so we calculate it here from the segments
-        latest = semver_segments(checker.latest_version)
+        latest = semver_segments(latest_version)
         current = semver_segments(version)
         return group.rules["update-types"].include?("major") if latest[:major] > current[:major]
         return group.rules["update-types"].include?("minor") if latest[:minor] > current[:minor]

updater/spec/dependabot/updater/operations/group_update_all_versions_spec.rb

@@ -535,6 +535,13 @@
         expect(dependency_change.updated_dependency_files_hash.length).to eql(2)
         expect(dependency_change.updated_dependency_files.map(&:name)).
           to eql(%w(Dockerfile.bundler Dockerfile.cargo))
+
+        # We are able to handle the irregular semver version strings like "v2.0.20230509134123"
+        expect(
+          dependency_change.updated_dependencies.
+          map  { |dependency| Dependabot::Docker::Version.new(dependency.version) }.
+          all? { |dependency| Dependabot::Docker::Version.correct?(dependency) }
+        ).to be_truthy
       end
 
       group_update_all.perform