Merge pull request #61 from melgene/new_version_convention

Update release naming convention
marcus-drake · Mar 2, 2017 · 2bb33d1 · 2bb33d1
2 parents 3e33a7f + bee4734
commit 2bb33d1
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/src/main/scala/sbtdocker/DockerVersion.scala b/src/main/scala/sbtdocker/DockerVersion.scala
@@ -28,7 +28,7 @@ object DockerVersion extends RegexParsers {
   }
 
   private val positiveWholeNumber: Parser[Int] = {
-    ("0".r | """[1-9]?\d*""".r).map(_.toInt).withFailureMessage("non-negative integer value expected")
+    """\d+""".r.map(_.toInt).withFailureMessage("non-negative integer value expected")
   }
 
   private val parser: Parser[DockerVersion] = {

diff --git a/src/test/scala/sbtdocker/DockerVersionSpec.scala b/src/test/scala/sbtdocker/DockerVersionSpec.scala
@@ -9,6 +9,7 @@ class DockerVersionSpec extends FlatSpec with Matchers {
     DockerVersion.parseVersion("1.0.0-SNAPSHOT") shouldEqual DockerVersion(1,0,0)
     DockerVersion.parseVersion("1.2.3") shouldEqual DockerVersion(1,2,3)
     DockerVersion.parseVersion("1.2.3-rc3") shouldEqual DockerVersion(1,2,3)
+    DockerVersion.parseVersion("17.03.0-ce") shouldEqual DockerVersion(17,3,0)
   }
 
   it should "not parse" in {