Skip to content

Commit 3c44f30

Browse files
jalazizmuuki88
authored andcommitted
Fix docker server version parsing (#1108)
Add support for numbers in the release version. This allows version detection to parse server version of the form '18.03.0-ce-rc3'.
1 parent fdcf08a commit 3c44f30

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

src/main/scala/com/typesafe/sbt/packager/docker/DockerVersion.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import scala.util.matching.Regex
55
case class DockerVersion(major: Int, minor: Int, patch: Int, release: Option[String])
66

77
object DockerVersion {
8-
private val DockerVersionPattern: Regex = "^'?([0-9]+).([0-9]+).([0-9]+)-?([-a-z]+)?'?$".r
8+
private val DockerVersionPattern: Regex = "^'?([0-9]+).([0-9]+).([0-9]+)-?([-a-z0-9]+)?'?$".r
99

1010
def parse(version: String): Option[DockerVersion] =
1111
Option(version).collect {

0 commit comments

Comments
 (0)